Skip to content

Commit

Permalink
fix: update packages and sync with Quasar Starter Kit
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastien-prudhomme committed Jun 23, 2020
1 parent de5693b commit 8fee8ea
Show file tree
Hide file tree
Showing 23 changed files with 783 additions and 1,455 deletions.
2,112 changes: 709 additions & 1,403 deletions package-lock.json

Large diffs are not rendered by default.

34 changes: 19 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
"version": "1.0.0",
"description": "Une roue pour identifier ses émotions, ses besoins et les solutions pour aller mieux.",
"productName": "Ma roue des émotions",
"cordovaId": "com.cowboysysop.roue_emotions",
"capacitorId": "",
"author": "Sébastien Prud'homme <[email protected]>",
"private": true,
"scripts": {
Expand All @@ -14,41 +12,47 @@
},
"dependencies": {
"@hapi/joi": "17.1.1",
"@quasar/extras": "1.8.1",
"@quasar/extras": "1.8.2",
"core-js": "3.6.5",
"langtag-utils": "2.0.1",
"quasar": "1.12.3",
"vue-i18n": "8.18.1",
"quasar": "1.12.7",
"vue-i18n": "8.18.2",
"vuedraggable": "2.23.2",
"vuex-persistedstate": "3.0.1"
},
"devDependencies": {
"@quasar/app": "1.9.6",
"@quasar/icongenie": "2.2.1",
"@quasar/app": "2.0.0",
"@quasar/icongenie": "2.3.0",
"babel-eslint": "10.1.0",
"devtron": "1.4.0",
"electron": "9.0.2",
"electron": "9.0.5",
"electron-builder": "22.7.0",
"electron-debug": "3.1.0",
"electron-devtools-installer": "3.0.0",
"eslint": "6.8.0",
"eslint-config-standard": "14.1.1",
"eslint-loader": "4.0.2",
"eslint-plugin-import": "2.20.2",
"eslint-plugin-import": "2.21.2",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "4.2.1",
"eslint-plugin-standard": "4.0.1",
"eslint-plugin-vue": "6.2.2",
"patch-package": "6.2.2"
},
"browserslist": [
"last 10 Chrome versions",
"last 10 Firefox versions",
"last 4 Edge versions",
"last 7 Safari versions",
"last 8 Android versions",
"last 8 ChromeAndroid versions",
"last 8 FirefoxAndroid versions",
"last 10 iOS versions",
"last 5 Opera versions"
],
"engines": {
"node": ">= 10.18.1",
"npm": ">= 6.13.4",
"yarn": ">= 1.21.1"
},
"browserslist": [
"last 1 version, not dead, ie >= 11"
],
"resolutions": {
"@babel/parser": "7.7.5"
}
}
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
45 changes: 18 additions & 27 deletions quasar.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,15 @@

module.exports = function (/* ctx */) {
return {
// https://quasar.dev/quasar-cli/cli-documentation/supporting-ie
supportIE: false,

// https://quasar.dev/quasar-cli/cli-documentation/supporting-ts
// https://quasar.dev/quasar-cli/supporting-ts
supportTS: false,

// https://quasar.dev/quasar-cli/cli-documentation/prefetch-feature
// https://quasar.dev/quasar-cli/prefetch-feature
// preFetch: true,

// app boot file (/src/boot)
// --> boot files are part of "main.js"
// https://quasar.dev/quasar-cli/cli-documentation/boot-files
// https://quasar.dev/quasar-cli/boot-files
boot: [
'cordova-screen-orientation',
'i18n'
Expand Down Expand Up @@ -50,12 +47,13 @@ module.exports = function (/* ctx */) {
build: {
vueRouterMode: 'hash', // available values: 'hash', 'history'

// Add dependencies for transpiling with Babel (Array of regexes)
// transpile: false,

// Add dependencies for transpiling with Babel (Array of string/regex)
// (from node_modules, which are by default not transpiled).
// Does not applies to modern builds.
// Applies only if "transpile" is set to true.
// transpileDependencies: [],

modern: true, // https://quasar.dev/quasar-cli/modern-build
// rtl: false, // https://quasar.dev/options/rtl-support
// preloadChunks: true,
// showProgress: false,
Expand All @@ -65,7 +63,7 @@ module.exports = function (/* ctx */) {
// Options below are automatically set depending on the env, set them if you want to override
// extractCSS: false,

// https://quasar.dev/quasar-cli/cli-documentation/handling-webpack
// https://quasar.dev/quasar-cli/handling-webpack
extendWebpack (cfg) {
cfg.module.rules.push({
enforce: 'pre',
Expand All @@ -87,18 +85,12 @@ module.exports = function (/* ctx */) {
framework: {
iconSet: 'material-icons', // Quasar icon set
lang: 'en-us', // Quasar language pack
config: {},

// Possible values for "all":
// * 'auto' - Auto-import needed Quasar components & directives
// (slightly higher compile time; next to minimum bundle size; most convenient)
// * false - Manually specify what to import
// (fastest compile time; minimum bundle size; most tedious)
// * true - Import everything from Quasar
// (not treeshaking Quasar; biggest bundle size; convenient)
all: 'auto',

components: [],
directives: [],
// Possible values for "importStrategy":
// * 'auto' - (DEFAULT) Auto-import needed Quasar components & directives
// * 'all' - Manually specify what to import
importStrategy: 'auto',

// Quasar plugins
plugins: [
Expand Down Expand Up @@ -129,27 +121,27 @@ module.exports = function (/* ctx */) {
theme_color: '#027be3',
icons: [
{
src: 'statics/icons/icon-128x128.png',
src: 'icons/icon-128x128.png',
sizes: '128x128',
type: 'image/png'
},
{
src: 'statics/icons/icon-192x192.png',
src: 'icons/icon-192x192.png',
sizes: '192x192',
type: 'image/png'
},
{
src: 'statics/icons/icon-256x256.png',
src: 'icons/icon-256x256.png',
sizes: '256x256',
type: 'image/png'
},
{
src: 'statics/icons/icon-384x384.png',
src: 'icons/icon-384x384.png',
sizes: '384x384',
type: 'image/png'
},
{
src: 'statics/icons/icon-512x512.png',
src: 'icons/icon-512x512.png',
sizes: '512x512',
type: 'image/png'
}
Expand All @@ -160,7 +152,6 @@ module.exports = function (/* ctx */) {
// Full list of options: https://quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova
cordova: {
// noIosLegacyBuildFlag: true, // uncomment only if you know what you are doing
id: 'com.cowboysysop.roue_emotions'
},

// Full list of options: https://quasar.dev/quasar-cli/developing-capacitor-apps/configuring-capacitor
Expand Down
9 changes: 9 additions & 0 deletions src-cordova/cordova-flag.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// THIS FEATURE-FLAG FILE IS AUTOGENERATED,
// REMOVAL OR CHANGES WILL CAUSE RELATED TYPES TO STOP WORKING
import "quasar/dist/types/feature-flag";

declare module "quasar/dist/types/feature-flag" {
interface QuasarFeatureFlags {
cordova: true;
}
}
9 changes: 9 additions & 0 deletions src-electron/electron-flag.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// THIS FEATURE-FLAG FILE IS AUTOGENERATED,
// REMOVAL OR CHANGES WILL CAUSE RELATED TYPES TO STOP WORKING
import "quasar/dist/types/feature-flag";

declare module "quasar/dist/types/feature-flag" {
interface QuasarFeatureFlags {
electron: true;
}
}
18 changes: 9 additions & 9 deletions src/index.template.html
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<!DOCTYPE html>
<html>
<head>
<title><%= htmlWebpackPlugin.options.productName %></title>
<title><%= productName %></title>

<meta charset="utf-8">
<meta name="description" content="<%= htmlWebpackPlugin.options.productDescription %>">
<meta name="description" content="<%= productDescription %>">
<meta name="format-detection" content="telephone=no">
<meta name="msapplication-tap-highlight" content="no">
<meta name="viewport" content="initial-scale=1, maximum-scale=2, minimum-scale=1, width=device-width<% if (htmlWebpackPlugin.options.ctx.mode.cordova || htmlWebpackPlugin.options.ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
<meta name="viewport" content="initial-scale=1, maximum-scale=2, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">

<link rel="icon" type="image/png" sizes="128x128" href="statics/icons/favicon-128x128.png">
<link rel="icon" type="image/png" sizes="96x96" href="statics/icons/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="32x32" href="statics/icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="statics/icons/favicon-16x16.png">
<link rel="icon" type="image/ico" href="statics/icons/favicon.ico">
<link rel="icon" type="image/png" sizes="128x128" href="icons/favicon-128x128.png">
<link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png">
<link rel="icon" type="image/ico" href="favicon.ico">
</head>
<body>
<noscript>
<strong>Unfortunately, <%= htmlWebpackPlugin.options.productName %> can't work without JavaScript enabled. Please enable it to continue.</strong>
<strong>Unfortunately, <%= productName %> can't work without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<!-- DO NOT touch the following DIV -->
<div id="q-app"></div>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Home.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<q-page class="bg-yellow-4 column justify-between">
<carousel height="32vh" :title="$t('i_feel')">
<carousel-slide-image-text v-for="(feeling, index) in feelings" :image="`statics/${index}.png`" :key="index" :name="index.toString()" :text="feeling" />
<carousel-slide-image-text v-for="(feeling, index) in feelings" :image="`${index}.png`" :key="index" :name="index.toString()" :text="feeling" />
</carousel>
<carousel height="16vh" :title="$t('i_need')">
<carousel-slide-text v-for="(need, index) in needs" :key="index" :name="index.toString()" :text="need" />
Expand Down
9 changes: 9 additions & 0 deletions src/store/store-flag.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// THIS FEATURE-FLAG FILE IS AUTOGENERATED,
// REMOVAL OR CHANGES WILL CAUSE RELATED TYPES TO STOP WORKING
import "quasar/dist/types/feature-flag";

declare module "quasar/dist/types/feature-flag" {
interface QuasarFeatureFlags {
store: true;
}
}

0 comments on commit 8fee8ea

Please sign in to comment.