create-quasar 1.0.12 → 1.0.15

package/.eslintrc.js

@@ -0,0 +1,16 @@
+module.exports = {
+  root: true,
+
+  env: {
+    node: true,
+    es2020: true,
+  },
+
+  extends: [
+    'eslint:recommended',
+  ],
+
+  rules: {
+    'no-empty': 'off',
+  },
+}

package/index.js

@@ -112,7 +112,7 @@ async function run () {
         process.exit(0)
       }
 
-      if (scope.lint) {
+      if (scope.preset.lint) {
         try {
           await utils.lintFolder(scope)
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-quasar",
-  "version": "1.0.12",
+  "version": "1.0.15",
   "description": "Scaffolds Quasar Apps, AppExtensions or UI kits",
   "author": {
     "name": "Razvan Stoenescu",
@@ -25,11 +25,21 @@
   "engines": {
     "node": ">=12"
   },
+  "scripts": {
+    "lint": "eslint --ext .js,.ts ./ --fix"
+  },
   "dependencies": {
     "fast-glob": "^3.2.11",
     "fs-extra": "^10.0.1",
     "kolorist": "^1.5.1",
     "lodash.template": "^4.5.0",
     "prompts": "^2.4.2"
+  },
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^5.16.0",
+    "@typescript-eslint/parser": "^5.16.0",
+    "eslint": "^8.11.0",
+    "eslint-plugin-lodash-template": "^0.21.0",
+    "typescript": "^4.6.2"
   }
 }

package/templates/.eslintrc.js

@@ -0,0 +1,87 @@
+module.exports = {
+  overrides: [
+    {
+      files: './*/*/*/**/*.ts',
+
+      parserOptions: {
+        parser: '@typescript-eslint/parser',
+        sourceType: 'module'
+      },
+
+      env: {
+        node: false,
+        browser: true,
+      },
+
+      globals: {
+        process: 'readonly',
+      },
+
+      extends: [
+        'eslint:recommended',
+        'plugin:@typescript-eslint/recommended',
+        'plugin:lodash-template/recommended-with-script'
+      ],
+
+      rules: {
+        '@typescript-eslint/no-empty-function': 'off',
+        '@typescript-eslint/no-unused-vars': ['warn', { args: 'none' }],
+      },
+    },
+
+    {
+      files: './*/*/*/**/*.js',
+
+      parserOptions: {
+        sourceType: 'module'
+      },
+
+      env: {
+        node: false,
+        browser: true,
+      },
+
+      globals: {
+        process: 'readonly',
+        // For require.context
+        require: 'readonly',
+      },
+
+      extends: [
+        'eslint:recommended',
+        'plugin:lodash-template/recommended-with-script'
+      ],
+
+      rules: {
+        'no-empty-function': 'off',
+        'no-unused-vars': ['warn', { args: 'none' }],
+      },
+    },
+
+    {
+      files: [
+        './*/*/*/**/_*.js',
+        './*/*/*/**/*.{conf,config}.js'
+      ],
+
+      parserOptions: {
+        sourceType: 'script'
+      },
+
+      env: {
+        browser: false,
+        node: true,
+      },
+    },
+
+    {
+      // Template-specific manager/helper scripts (e.g. ./app/quasar-v2/index.js)
+      files: './*/*/*/*.js',
+
+      env: {
+        browser: false,
+        node: true,
+      },
+    }
+  ]
+}

package/templates/app/quasar-v1/js/.eslintrc.js

@@ -0,0 +1,21 @@
+module.exports = {
+  settings: {
+    'lodash-template/globals': [
+      // Base
+      'name',
+      'description',
+      'author',
+
+      // Quasar v1
+      'quasarVersion',
+      'scriptType',
+      'productName',
+
+      // Quasar v1 - JS
+      'css',
+      'importStrategy',
+      'preset',
+      'lintConfig'
+    ]
+  }
+}

package/templates/app/quasar-v1/ts/.eslintrc.js

@@ -0,0 +1,22 @@
+module.exports = {
+  settings: {
+    'lodash-template/globals': [
+      // Base
+      'name',
+      'description',
+      'author',
+
+      // Quasar v1
+      'quasarVersion',
+      'scriptType',
+      'productName',
+
+      // Quasar v1 - TS
+      'typescriptConfig',
+      'css',
+      'importStrategy',
+      'preset',
+      'lintConfig'
+    ]
+  }
+}

package/templates/app/quasar-v1/ts/i18n/src/boot/i18n.ts

@@ -4,7 +4,6 @@ import Vue from 'vue';
 import VueI18n from 'vue-i18n';
 
 declare module 'vue/types/vue' {
-  <% if (preset.lint && lintConfig === 'airbnb') { %>// eslint-disable-next-line no-shadow<% } %>
   interface Vue {
     i18n: VueI18n;
   }

package/templates/app/quasar-v1/ts/lint/{_eslintrc.js → _.eslintrc.js}

@@ -110,6 +110,10 @@ module.exports = {
     quotes: ['warn', 'single', { avoidEscape: true }],
     '@typescript-eslint/explicit-function-return-type': 'off',
     '@typescript-eslint/explicit-module-boundary-types': 'off',
+    <% if (lintConfig === 'airbnb') { %>
+    'no-shadow': 'off',
+    '@typescript-eslint/no-shadow': 'error',
+    <% } %>
 
     // allow debugger during development only
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'

package/templates/app/quasar-v1/ts/vuex/src/store/module-example/state.ts

@@ -6,6 +6,6 @@ function state(): ExampleStateInterface {
   return {
     prop: false
   }
-};
+}
 
 export default state;

package/templates/app/quasar-v2/js-vite/.eslintrc.js

@@ -0,0 +1,20 @@
+module.exports = {
+  settings: {
+    'lodash-template/globals': [
+      // Base
+      'name',
+      'description',
+      'author',
+
+      // Quasar v2
+      'quasarVersion',
+      'scriptType',
+      'productName',
+
+      // Quasar v2 - JS
+      'css',
+      'preset',
+      'lintConfig'
+    ]
+  }
+}

package/templates/app/quasar-v2/js-vite/BASE/{package.json → _package.json}

@@ -26,9 +26,9 @@
     "eslint": "^8.10.0",
     "eslint-plugin-vue": "^8.5.0",
     <% if (lintConfig === 'standard') { %>
-    "eslint-config-standard": "^16.0.2",
+    "eslint-config-standard": "^17.0.0-1",
     "eslint-plugin-import": "^2.19.1",
-    "eslint-plugin-node": "^11.0.0",
+    "eslint-plugin-n": "^14.0.0",
     "eslint-plugin-promise": "^6.0.0",
     <% } else if (lintConfig === 'airbnb') { %>
     "eslint-config-airbnb-base": "^15.0.0",

package/templates/app/quasar-v2/js-vite/lint/{_eslintignore → _.eslintignore}

@@ -4,4 +4,3 @@
 /.quasar
 /node_modules
 .eslintrc.js
-babel.config.js

package/templates/app/quasar-v2/js-vite/lint/{_eslintrc.js → _.eslintrc.js}

@@ -10,7 +10,8 @@ module.exports = {
 
   env: {
     node: true,
-    browser: true
+    browser: true,
+    'vue/setup-compiler-macros': true
   },
 
   // Rules order is important, please avoid shuffling them
@@ -53,10 +54,7 @@ module.exports = {
     __QUASAR_SSR_PWA__: 'readonly',
     process: 'readonly',
     Capacitor: 'readonly',
-    chrome: 'readonly',
-    defineProps: 'readonly', // Vue SFC setup compiler macro
-    defineEmits: 'readonly', // Vue SFC setup compiler macro
-    defineExpose: 'readonly' // Vue SFC setup compiler macro
+    chrome: 'readonly'
   },
 
   // add your custom rules here

package/templates/app/quasar-v2/js-webpack/.eslintrc.js

@@ -0,0 +1,20 @@
+module.exports = {
+  settings: {
+    'lodash-template/globals': [
+      // Base
+      'name',
+      'description',
+      'author',
+
+      // Quasar v2
+      'quasarVersion',
+      'scriptType',
+      'productName',
+
+      // Quasar v2 - JS
+      'css',
+      'preset',
+      'lintConfig'
+    ]
+  }
+}

package/templates/app/quasar-v2/js-webpack/BASE/{package.json → _package.json}

@@ -29,9 +29,9 @@
     "eslint-plugin-vue": "^8.5.0",
     "eslint-webpack-plugin": "^3.1.1",
     <% if (lintConfig === 'standard') { %>
-    "eslint-config-standard": "^16.0.2",
+    "eslint-config-standard": "^17.0.0-1",
     "eslint-plugin-import": "^2.19.1",
-    "eslint-plugin-node": "^11.0.0",
+    "eslint-plugin-n": "^14.0.0",
     "eslint-plugin-promise": "^6.0.0",
     <% } else if (lintConfig === 'airbnb') { %>
     "eslint-config-airbnb-base": "^15.0.0",

package/templates/app/quasar-v2/js-webpack/lint/{_eslintrc.js → _.eslintrc.js}

@@ -11,7 +11,8 @@ module.exports = {
   },
 
   env: {
-    browser: true
+    browser: true,
+    'vue/setup-compiler-macros': true
   },
 
   // Rules order is important, please avoid shuffling them
@@ -54,10 +55,7 @@ module.exports = {
     __QUASAR_SSR_PWA__: 'readonly',
     process: 'readonly',
     Capacitor: 'readonly',
-    chrome: 'readonly',
-    defineProps: 'readonly', // Vue SFC setup compiler macro
-    defineEmits: 'readonly', // Vue SFC setup compiler macro
-    defineExpose: 'readonly' // Vue SFC setup compiler macro
+    chrome: 'readonly'
   },
 
   // add your custom rules here

package/templates/app/quasar-v2/ts-vite/.eslintrc.js

@@ -0,0 +1,21 @@
+module.exports = {
+  settings: {
+    'lodash-template/globals': [
+      // Base
+      'name',
+      'description',
+      'author',
+
+      // Quasar v2
+      'quasarVersion',
+      'scriptType',
+      'productName',
+
+      // Quasar v2 - TS
+      'typescriptConfig',
+      'css',
+      'preset',
+      'lintConfig'
+    ]
+  }
+}

package/templates/app/quasar-v2/ts-vite/BASE/{package.json → _package.json}

@@ -29,9 +29,9 @@
     "eslint": "^8.10.0",
     "eslint-plugin-vue": "^8.5.0",
     <% if (lintConfig === 'standard') { %>
-    "eslint-config-standard": "^16.0.2",
+    "eslint-config-standard": "^17.0.0-1",
     "eslint-plugin-import": "^2.19.1",
-    "eslint-plugin-node": "^11.0.0",
+    "eslint-plugin-n": "^14.0.0",
     "eslint-plugin-promise": "^6.0.0",
     <% } else if (lintConfig === 'airbnb') { %>
     "eslint-config-airbnb-base": "^15.0.0",

package/templates/app/quasar-v2/ts-vite/BASE/{tsconfig.json → _tsconfig.json}

@@ -15,6 +15,5 @@
     "experimentalDecorators": true,
     "useDefineForClassFields": true<% } %>
   },
-  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
-  "references": [{ "path": "./tsconfig.node.json" }]
+  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"]
 }

package/templates/app/quasar-v2/ts-vite/lint/{_eslintrc.js → _.eslintrc.js}

@@ -1,5 +1,3 @@
-const { resolve } = require('path')
-
 module.exports = {
   // https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
   // This option interrupts the configuration hierarchy at this file
@@ -17,7 +15,8 @@ module.exports = {
   env: {
     browser: true,
     es2021: true,
-    node: true
+    node: true,
+    'vue/setup-compiler-macros': true
   },
 
   // Rules order is important, please avoid shuffling them
@@ -67,10 +66,7 @@ module.exports = {
     __QUASAR_SSR_PWA__: 'readonly',
     process: 'readonly',
     Capacitor: 'readonly',
-    chrome: 'readonly',
-    defineProps: 'readonly', // Vue SFC setup compiler macro
-    defineEmits: 'readonly', // Vue SFC setup compiler macro
-    defineExpose: 'readonly' // Vue SFC setup compiler macro
+    chrome: 'readonly'
   },
 
   // add your custom rules here
@@ -101,6 +97,9 @@ module.exports = {
     'no-nested-ternary': 'off',
     'max-classes-per-file': 'off',
 
+    'no-shadow': 'off',
+    '@typescript-eslint/no-shadow': 'error',
+
     'import/first': 'off',
     'import/named': 'error',
     'import/namespace': 'error',

package/templates/app/quasar-v2/ts-vite/vuex/src/store/module-example/state.ts

@@ -6,6 +6,6 @@ function state(): ExampleStateInterface {
   return {
     prop: false
   }
-};
+}
 
 export default state;

package/templates/app/quasar-v2/ts-webpack/.eslintrc.js

@@ -0,0 +1,21 @@
+module.exports = {
+  settings: {
+    'lodash-template/globals': [
+      // Base
+      'name',
+      'description',
+      'author',
+
+      // Quasar v2
+      'quasarVersion',
+      'scriptType',
+      'productName',
+
+      // Quasar v2 - TS
+      'typescriptConfig',
+      'css',
+      'preset',
+      'lintConfig'
+    ]
+  }
+}

package/templates/app/quasar-v2/ts-webpack/BASE/{package.json → _package.json}

@@ -25,15 +25,14 @@
   },
   "devDependencies": {
     <% if (preset.lint) { %>
-    "vue-tsc": "^0.29.8",
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.10.0",
     "eslint": "^8.10.0",
     "eslint-plugin-vue": "^8.5.0",
     <% if (lintConfig === 'standard') { %>
-    "eslint-config-standard": "^16.0.2",
+    "eslint-config-standard": "^17.0.0-1",
     "eslint-plugin-import": "^2.19.1",
-    "eslint-plugin-node": "^11.0.0",
+    "eslint-plugin-n": "^14.0.0",
     "eslint-plugin-promise": "^6.0.0",
     <% } else if (lintConfig === 'airbnb') { %>
     "eslint-config-airbnb-base": "^15.0.0",

package/templates/app/quasar-v2/ts-webpack/BASE/quasar.config.js

@@ -82,7 +82,7 @@ module.exports = configure(function (ctx) {
 
       // https://v2.quasar.dev/quasar-cli-webpack/handling-webpack
       // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain
-      chainWebpack (/* chain */) {}
+      // chainWebpack (/* chain */) {}
     },
 
     // Full list of options: https://v2.quasar.dev/quasar-cli-webpack/quasar-config-js#Property%3A-devServer
@@ -129,7 +129,7 @@ module.exports = configure(function (ctx) {
       maxAge: 1000 * 60 * 60 * 24 * 30,
         // Tell browser when a file from the server should expire from cache (in ms)
 
-      chainWebpackWebserver (/* chain */) {},
+      // chainWebpackWebserver (/* chain */) {},
 
       middlewares: [
         ctx.prod ? 'compression' : '',
@@ -144,7 +144,7 @@ module.exports = configure(function (ctx) {
 
       // for the custom service worker ONLY (/src-pwa/custom-service-worker.[js|ts])
       // if using workbox in InjectManifest mode
-      chainWebpackCustomSW (/* chain */) {},
+      // chainWebpackCustomSW (/* chain */) {},
 
       manifest: {
         name: `<%= productName %>`,
@@ -214,7 +214,7 @@ module.exports = configure(function (ctx) {
       builder: {
         // https://www.electron.build/configuration/configuration
 
-        appId: '{{ name }}'
+        appId: '<%= name %>'
       },
 
       // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain

package/templates/app/quasar-v2/ts-webpack/lint/{_eslintrc.js → _.eslintrc.js}

@@ -16,7 +16,8 @@ module.exports = {
   env: {
     browser: true,
     es2021: true,
-    node: true
+    node: true,
+    'vue/setup-compiler-macros': true
   },
 
   // Rules order is important, please avoid shuffling them
@@ -67,9 +68,6 @@ module.exports = {
     process: 'readonly',
     Capacitor: 'readonly',
     chrome: 'readonly',
-    defineProps: 'readonly', // Vue SFC setup compiler macro
-    defineEmits: 'readonly', // Vue SFC setup compiler macro
-    defineExpose: 'readonly' // Vue SFC setup compiler macro
   },
 
   // add your custom rules here
@@ -100,6 +98,9 @@ module.exports = {
     'no-nested-ternary': 'off',
     'max-classes-per-file': 'off',
 
+    'no-shadow': 'off',
+    '@typescript-eslint/no-shadow': 'error',
+
     'import/first': 'off',
     'import/namespace': 'error',
     'import/default': 'error',

package/templates/app/quasar-v2/ts-webpack/vuex/src/store/module-example/state.ts

@@ -6,6 +6,6 @@ function state(): ExampleStateInterface {
   return {
     prop: false
   }
-};
+}
 
 export default state;

package/templates/app-extension/ae-v1/.eslintrc.js

@@ -0,0 +1,35 @@
+module.exports = {
+  settings: {
+    'lodash-template/globals': [
+      // Base
+      'name',
+      'description',
+      'author',
+
+      'preset',
+      'orgName',
+      'license',
+      'repositoryType',
+      'repositoryURL',
+      'homepage',
+      'bugs'
+    ]
+  },
+
+  overrides: [
+    {
+      files: [
+        './*/**/*.js',
+      ],
+
+      parserOptions: {
+        sourceType: 'script'
+      },
+
+      env: {
+        browser: false,
+        node: true,
+      },
+    },
+  ]
+}

package/templates/ui-kit/.eslintrc.js

@@ -0,0 +1,45 @@
+module.exports = {
+  settings: {
+    'lodash-template/globals': [
+      // Base
+      'name',
+      'description',
+      'author',
+
+      'features',
+      'preset',
+
+      'packageDescription',
+      'aeDescription',
+
+      'umdExportName',
+      'componentName',
+      'directiveName',
+
+      'license',
+      'repositoryType',
+      'repositoryURL',
+      'homepage',
+      'bugs'
+    ]
+  },
+
+  overrides: [
+    {
+      files: [
+        './*/{ae,ae-*}/app-extension/src/*.js',
+        './*/{BASE,ui-ae}/ui/build/*.js',
+        './*/{BASE,ui-ae}/ui/build/*/!(entry)/**/*.js',
+      ],
+
+      parserOptions: {
+        sourceType: 'script'
+      },
+
+      env: {
+        browser: false,
+        node: true,
+      },
+    },
+  ]
+}

package/templates/ui-kit/quasar-v1/BASE/ui/build/index.js

@@ -1,27 +1,19 @@
 process.env.NODE_ENV = 'production'
 
-{{#or componentCss directiveCss}}
 const parallel = require('os').cpus().length > 1
 const runJob = parallel ? require('child_process').fork : require
-{{/or}}
 const { join } = require('path')
 const { createFolder } = require('./utils')
 const { green, blue } = require('chalk')
 
 console.log()
 
-{{#features.ae}}
-require('./script.app-ext.js').syncAppExt()
-{{/features.ae}}
+<% if (features.ae) { %>require('./script.app-ext.js').syncAppExt()<% } %>
 require('./script.clean.js')
 
-console.log(` 📦 Building ${green('v' + require('../package.json').version)}...{{#or componentCss directiveCss}}${parallel ? blue(' [multi-threaded]') : ''}{{/or}}\n`)
+console.log(` 📦 Building ${green('v' + require('../package.json').version)}...${parallel ? blue(' [multi-threaded]') : ''}\n`)
 
 createFolder('dist')
 
-{{#or componentCss directiveCss}}
 runJob(join(__dirname, './script.javascript.js'))
 runJob(join(__dirname, './script.css.js'))
-{{else}}
-require(join(__dirname, './script.javascript.js'))
-{{/or}}

package/templates/ui-kit/quasar-v1/BASE/ui/build/script.javascript.js

@@ -58,7 +58,7 @@ const builds = [
         input: pathResolve('entry/index.umd.js')
       },
       output: {
-        name: '{{umdExportName}}',
+        name: '<%= umdExportName %>',
         file: pathResolve('../dist/index.umd.js'),
         format: 'umd'
       }
@@ -89,7 +89,7 @@ function pathResolve (_path) {
 function addAssets (builds, type, injectName) {
   const
     files = fs.readdirSync(pathResolve('../../ui/src/components/' + type)),
-    plugins = [ buble(bubleConfig) ],
+    plugins = [ buble(/* bubleConfig */) ],
     outputDir = pathResolve(`../dist/${type}`)
 
     fse.mkdirp(outputDir)
@@ -107,7 +107,7 @@ function addAssets (builds, type, injectName) {
           output: {
             file: addExtension(pathResolve(`../dist/${type}/${file}`), 'umd'),
             format: 'umd',
-            name: `{{umdExportName}}.${injectName}.${name}`
+            name: `<%= umdExportName %>.${injectName}.${name}`
           }
         },
         build: {

package/templates/ui-kit/quasar-v1/BASE/ui/build/utils.js

@@ -2,8 +2,7 @@ const
   fs = require('fs'),
   path = require('path'),
   zlib = require('zlib'),
-  { green, blue, red, cyan } = require('chalk'),
-  kebabRegex = /[A-Z\u00C0-\u00D6\u00D8-\u00DE]/g
+  { green, blue, red, cyan } = require('chalk')
 
 function getSize (code) {
   return (code.length / 1024).toFixed(2) + 'kb'

package/templates/ui-kit/quasar-v1/BASE/ui/dev/quasar.config.js

@@ -2,7 +2,6 @@
 // https://quasar.dev/quasar-cli/quasar-conf-js
 
 const path = require('path')
-const webpack = require('webpack')
 
 module.exports = function (ctx) {
   return {

package/templates/ui-kit/quasar-v2/.eslintrc.js

@@ -0,0 +1,11 @@
+module.exports = {
+  overrides: [
+    {
+      files: './*/**/*.js',
+
+      globals: {
+        __UI_VERSION__: 'readonly'
+      },
+    },
+  ]
+}

package/templates/ui-kit/quasar-v2/BASE/ui/build/script.javascript.js

@@ -98,7 +98,7 @@ function pathResolve (_path) {
 function addAssets (builds, type, injectName) {
   const
     files = fs.readdirSync(pathResolve('../../ui/src/components/' + type)),
-    plugins = [ buble(bubleConfig) ],
+    plugins = [ buble(/* bubleConfig */) ],
     outputDir = pathResolve(`../dist/${type}`)
 
     fse.mkdirp(outputDir)

package/templates/ui-kit/quasar-v2/BASE/ui/build/utils.js

@@ -2,8 +2,7 @@ const
   fs = require('fs'),
   path = require('path'),
   zlib = require('zlib'),
-  { green, blue, red, cyan } = require('chalk'),
-  kebabRegex = /[A-Z\u00C0-\u00D6\u00D8-\u00DE]/g
+  { green, blue, red, cyan } = require('chalk')
 
 function getSize (code) {
   return (code.length / 1024).toFixed(2) + 'kb'

package/utils/index.js

@@ -58,9 +58,11 @@ module.exports.renderTemplate = function (templateDir, scope) {
   for (const rawPath of files) {
     const targetRelativePath = rawPath.split('/').map(name => {
       // dotfiles are ignored when published to npm, therefore in templates
-      // we need to use underscore instead (e.g. "_gitignore")
-      return name.charAt(0) === '_'
-        ? `.${name.slice(1)}`
+      // we need to prefix them with an underscore (e.g. "_.gitignore")
+      // Also, some tools like ESLint excepts valid config files, therefore
+      // we also prefix files like "package.json" too. (e.g. "_.package.json")
+      return name.startsWith('_')
+        ? name.slice(1)
         : name
     }).join('/')
 

package/templates/app/quasar-v2/ts-vite/BASE/tsconfig.node.json

@@ -1,7 +0,0 @@
-{
-  "compilerOptions": {
-    "composite": true,
-    "module": "esnext",
-    "moduleResolution": "node"
-  }
-}