Merge branch 'dev' into marvellous-bass

quasarframework · Feb 13, 2024 · f7a6d17 · f7a6d17
2 parents 6772f84 + 01895c9
commit f7a6d17
Show file tree

Hide file tree

Showing 265 changed files with 3,857 additions and 1,521 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ Hi! We are really excited that you are interested in contributing to Quasar 👏
 - [Issue Reporting Guidelines](#issue-reporting-guidelines)
 - [Pull Request Guidelines](#pull-request-guidelines)
 - [Development Setup](#development-setup)
-- [Project Structure](#project-structure)
+- [Project Structure](#project-structure-ui)
 - [Financial Contribution](#financial-contribution)
 
 ## Issue Reporting Guidelines
@@ -111,6 +111,7 @@ $ yarn lint # or: npm run lint
 - **`dev`**: app with Quasar sources linked directly used for testing purposes. Each feature/component has its own `*.vue` file. Adding a new file automatically creates a route for it and adds it to the "homepage" list (based on the file name).
 
 ## Dev Server for Quasar (/ui)
+
 Running `yarn dev` (or `npm run dev`) starts up a dev server which uses HMR (Hot Module Reload) for Quasar source code. You can easily test your changes by making necessary changes to `/dev` `*.vue` files.
 
 ## Financial Contribution

diff --git a/app-vite/package.json b/app-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quasar/app-vite",
-  "version": "2.0.0-alpha.46",
+  "version": "2.0.0-beta.1",
   "description": "Quasar Framework App CLI with Vite",
   "bin": {
     "quasar": "./bin/quasar.js"
@@ -51,23 +51,23 @@
     "@quasar/ssl-certificate": "^1.0.0",
     "@quasar/vite-plugin": "^1.6.0",
     "@rollup/pluginutils": "^5.0.4",
-    "@types/chrome": "^0.0.246",
+    "@types/chrome": "^0.0.260",
     "@types/compression": "^1.7.3",
     "@types/cordova": "^11.0.0",
     "@types/express": "^4.17.13",
-    "@vitejs/plugin-vue": "^4.3.4",
+    "@vitejs/plugin-vue": "^5.0.3",
     "archiver": "^6.0.1",
     "chokidar": "^3.5.3",
-    "ci-info": "^3.7.1",
+    "ci-info": "^4.0.0",
     "compression": "^1.7.4",
     "cross-spawn": "^7.0.3",
     "dot-prop": "8.0.2",
     "dotenv": "^16.3.1",
     "dotenv-expand": "^10.0.0",
     "elementtree": "0.1.7",
-    "esbuild": "^0.19.3",
+    "esbuild": "^0.20.0",
     "express": "^4.17.3",
-    "fast-glob": "3.3.1",
+    "fast-glob": "3.3.2",
     "fs-extra": "^11.1.0",
     "html-minifier": "^4.0.0",
     "http-proxy-middleware": "^2.0.6",
@@ -76,7 +76,7 @@
     "kolorist": "^1.5.1",
     "lodash": "^4.17.21",
     "minimist": "^1.2.6",
-    "open": "^9.1.0",
+    "open": "^10.0.3",
     "register-service-worker": "^1.7.2",
     "rollup-plugin-visualizer": "^5.9.2",
     "sass": "^1.33.0",
@@ -98,7 +98,7 @@
     "quasar": "^2.14.0",
     "ts-essentials": "^9.1.2",
     "typescript": "^5.2.2",
-    "vue": "^3.3.4",
+    "vue": "^3.4.18",
     "vue-router": "^4.2.1",
     "vuex": "^4.0.0",
     "workbox-build": "^7.0.0"

diff --git a/app-vite/types/configuration/conf.d.ts b/app-vite/types/configuration/conf.d.ts
@@ -35,7 +35,7 @@ type QuasarAnimationsConfiguration = "all" | QuasarAnimations[];
  *  pwaServiceWorker: 'src-pwa/custom-service-worker',
  *  pwaManifestFile: 'src-pwa/manifest.json',
  *  electronMain: 'src-electron/electron-main',
- *  bexManifestFile: 'src-bex/manifest.json
+ *  bexManifestFile: 'src-bex/manifest.json'
  * }
  * ```
  */

diff --git a/app-vite/types/configuration/pwa-conf.d.ts b/app-vite/types/configuration/pwa-conf.d.ts
@@ -86,7 +86,7 @@ export interface QuasarPwaConfiguration {
   swFilename?: string;
 
   /**
-   * PWA manifest filename to use (relative to /src-pwa or absolute path)
+   * PWA manifest filename to use on your browser
    * @default manifest.json
    */
   manifestFilename?: string;
@@ -105,6 +105,7 @@ export interface QuasarPwaConfiguration {
 
   /**
    * Auto inject the PWA meta tags?
+   * If using the function form, return HTML tags as one single string.
    * @default true
    */
   injectPwaMetaTags?: boolean | ((injectParam: InjectPwaMetaTagsParams) => string);

diff --git a/app-webpack/package.json b/app-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quasar/app-webpack",
-  "version": "4.0.0-alpha.33",
+  "version": "4.0.0-beta.1",
   "description": "Quasar Framework App CLI with Webpack",
   "bin": {
     "quasar": "./bin/quasar"

diff --git a/app-webpack/templates/electron/default/electron-main.js b/app-webpack/templates/electron/default/electron-main.js
@@ -22,7 +22,7 @@ function createWindow () {
     webPreferences: {
       contextIsolation: true,
       // More info: https://v2.quasar.dev/quasar-cli-webpack/developing-electron-apps/electron-preload-script
-      preload: preload: path.resolve(
+      preload: path.resolve(
         currentDir,
         path.join(process.env.QUASAR_ELECTRON_PRELOAD_FOLDER, 'electron-preload' + process.env.QUASAR_ELECTRON_PRELOAD_EXTENSION)
       )

diff --git a/app-webpack/types/configuration/build.d.ts b/app-webpack/types/configuration/build.d.ts
@@ -76,6 +76,7 @@ interface QuasarStaticBuildConfiguration {
    */
   webpackTranspileDependencies?: (RegExp | string)[];
   /**
+   * Esbuild is used to build contents of /src-pwa, /src-ssr, /src-electron, /src-bex
    * @example
    *    {
    *      browser: ['es2019', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],

diff --git a/app-webpack/types/configuration/conf.d.ts b/app-webpack/types/configuration/conf.d.ts
@@ -35,7 +35,7 @@ type QuasarAnimationsConfiguration = "all" | QuasarAnimations[];
  *  pwaServiceWorker: 'src-pwa/custom-service-worker',
  *  pwaManifestFile: 'src-pwa/manifest.json',
  *  electronMain: 'src-electron/electron-main',
- *  bexManifestFile: 'src-bex/manifest.json
+ *  bexManifestFile: 'src-bex/manifest.json'
  * }
  * ```
  */

diff --git a/app-webpack/types/configuration/pwa-conf.d.ts b/app-webpack/types/configuration/pwa-conf.d.ts
@@ -86,7 +86,7 @@ export interface QuasarPwaConfiguration {
   swFilename?: string;
 
   /**
-   * PWA manifest filename to use (relative to /src-pwa or absolute path)
+   * PWA manifest filename to use on your browser
    * @default manifest.json
    */
   manifestFilename?: string;
@@ -105,6 +105,7 @@ export interface QuasarPwaConfiguration {
 
   /**
    * Auto inject the PWA meta tags?
+   * If using the function form, return HTML tags as one single string.
    * @default true
    */
   injectPwaMetaTags?: boolean | ((injectParam: InjectPwaMetaTagsParams) => string);

diff --git a/create-quasar/package.json b/create-quasar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-quasar",
-  "version": "1.4.5",
+  "version": "1.5.3",
   "description": "Scaffolds Quasar Apps, AppExtensions or UI kits",
   "author": {
     "name": "Razvan Stoenescu",

diff --git a/create-quasar/templates/app/quasar-v2/index.js b/create-quasar/templates/app/quasar-v2/index.js
@@ -7,10 +7,10 @@ module.exports = async function ({ scope, utils }) {
       message: 'Pick Quasar App CLI variant:',
       initial: 0,
       choices: [
-        { title: 'Quasar App CLI with Vite', value: 'vite', description: 'recommended' },
-        // { title: 'Quasar App CLI with Vite 5 (BETA | next major version)', value: 'vite-beta' },
-        { title: 'Quasar App CLI with Webpack', value: 'webpack' }
-        // { title: 'Quasar App CLI with Webpack (BETA | next major version)', value: 'webpack-beta' }
+        { title: 'Quasar App CLI with Vite 2 (stable | v1)', value: 'vite', description: 'recommended' },
+        { title: 'Quasar App CLI with Vite 5 (BETA | next major version - v2)', value: 'vite-beta' },
+        { title: 'Quasar App CLI with Webpack (stable | v3)', value: 'webpack' },
+        { title: 'Quasar App CLI with Webpack (BETA | next major version - v4)', value: 'webpack-beta' }
       ]
     },
     {

diff --git a/create-quasar/templates/app/quasar-v2/js-vite-beta/BASE/_package.json b/create-quasar/templates/app/quasar-v2/js-vite-beta/BASE/_package.json
@@ -21,7 +21,7 @@
     <% if (preset.vuex) { %>"vuex": "^4.0.1",<% } %>
     "@quasar/extras": "^1.16.4",
     "quasar": "^2.6.0",
-    "vue": "^3.0.0",
+    "vue": "^3.4.18",
     "vue-router": "^4.0.0"
   },
   "devDependencies": {
@@ -40,8 +40,8 @@
     "eslint-config-prettier": "^9.0.0",
     "prettier": "^3.0.3",
     <% } } %>
-    <% if (preset.i18n) { %>"@intlify/vite-plugin-vue-i18n": "^3.3.1",<% } %>
-    "@quasar/app-vite": "^2.0.0-alpha.0",
+    <% if (preset.i18n) { %>"@intlify/unplugin-vue-i18n": "^2.0.0",<% } %>
+    "@quasar/app-vite": "^2.0.0-beta.1",
     "autoprefixer": "^10.4.2",
     "postcss": "^8.4.14"
   },

diff --git a/create-quasar/templates/app/quasar-v2/js-vite-beta/BASE/quasar.config.js b/create-quasar/templates/app/quasar-v2/js-vite-beta/BASE/quasar.config.js
@@ -6,7 +6,7 @@
 <% if (preset.lint && lintConfig === 'airbnb') { %>/* eslint func-names: 0 */
 /* eslint global-require: 0 */<% } %>
 import { configure } from 'quasar/wrappers'
-<% if (preset.i18n) { %>import path from 'node:path';<% } %>
+<% if (preset.i18n) { %>import { fileURLToPath } from 'node:url';<% } %>
 
 export default configure((/* ctx */) => {
   return {
@@ -39,7 +39,7 @@ export default configure((/* ctx */) => {
     // https://github.com/quasarframework/quasar/tree/dev/extras
     extras: [
       // 'ionicons-v4',
-      // 'mdi-v5',
+      // 'mdi-v7',
       // 'fontawesome-v6',
       // 'eva-icons',
       // 'themify',
@@ -77,7 +77,7 @@ export default configure((/* ctx */) => {
       // viteVuePluginOptions: {},
 
       <% if (preset.i18n) { %>vitePlugins: [
-        ['@intlify/vite-plugin-vue-i18n', {
+        ['@intlify/unplugin-vue-i18n/vite', {
           // if you want to use Vue I18n Legacy API, you need to set `compositionOnly: false`
           // compositionOnly: false,
 
@@ -86,7 +86,7 @@ export default configure((/* ctx */) => {
           // runtimeOnly: false,
 
           // you need to set i18n resource including paths !
-          include: path.resolve(__dirname, './src/i18n/**')
+          include: [ fileURLToPath(new URL('./src/i18n', import.meta.url)) ],
         }]
       ]<% } else { %>
       // vitePlugins: [

diff --git a/create-quasar/templates/app/quasar-v2/js-vite-beta/lint/_.eslintignore b/create-quasar/templates/app/quasar-v2/js-vite-beta/lint/_.eslintignore
@@ -3,5 +3,5 @@
 /src-cordova
 /.quasar
 /node_modules
-.eslintrc.js
+.eslintrc.cjs
 /quasar.config.*.temporary.compiled*
diff --git a/create-quasar/templates/app/quasar-v2/js-vite/BASE/_package.json b/create-quasar/templates/app/quasar-v2/js-vite/BASE/_package.json
@@ -20,7 +20,7 @@
     <% if (preset.vuex) { %>"vuex": "^4.0.1",<% } %>
     "@quasar/extras": "^1.16.4",
     "quasar": "^2.8.0",
-    "vue": "^3.2.29",
+    "vue": "^3.4.18",
     "vue-router": "^4.0.12"
   },
   "devDependencies": {

diff --git a/create-quasar/templates/app/quasar-v2/js-vite/BASE/quasar.config.js b/create-quasar/templates/app/quasar-v2/js-vite/BASE/quasar.config.js
@@ -43,7 +43,7 @@ module.exports = configure(function (/* ctx */) {
     // https://github.com/quasarframework/quasar/tree/dev/extras
     extras: [
       // 'ionicons-v4',
-      // 'mdi-v5',
+      // 'mdi-v7',
       // 'fontawesome-v6',
       // 'eva-icons',
       // 'themify',

diff --git a/create-quasar/templates/app/quasar-v2/js-vite/lint/_.eslintignore b/create-quasar/templates/app/quasar-v2/js-vite/lint/_.eslintignore
@@ -3,5 +3,5 @@
 /src-cordova
 /.quasar
 /node_modules
-.eslintrc.js
+.eslintrc.cjs
 /quasar.config.*.temporary.compiled*
diff --git a/create-quasar/templates/app/quasar-v2/js-webpack-beta/BASE/_package.json b/create-quasar/templates/app/quasar-v2/js-webpack-beta/BASE/_package.json
@@ -21,7 +21,7 @@
     "@quasar/extras": "^1.16.4",
     "core-js": "^3.31.1",
     "quasar": "^2.8.0",
-    "vue": "^3.2.29",
+    "vue": "^3.4.18",
     "vue-router": "^4.0.12"
   },
   "devDependencies": {
@@ -42,7 +42,7 @@
     "eslint-config-prettier": "^9.0.0",
     "prettier": "^3.0.3",
     <% } } %>
-    "@quasar/app-webpack": "^4.0.0-alpha.0"
+    "@quasar/app-webpack": "^4.0.0-beta.1"
   },
   "browserslist": [
     "last 10 Chrome versions",

diff --git a/create-quasar/templates/app/quasar-v2/js-webpack-beta/BASE/quasar.config.js b/create-quasar/templates/app/quasar-v2/js-webpack-beta/BASE/quasar.config.js
@@ -41,7 +41,7 @@ export default configure((ctx) => {
     // https://github.com/quasarframework/quasar/tree/dev/extras
     extras: [
       // 'ionicons-v4',
-      // 'mdi-v5',
+      // 'mdi-v7',
       // 'fontawesome-v6',
       // 'eva-icons',
       // 'themify',

diff --git a/create-quasar/templates/app/quasar-v2/js-webpack-beta/lint/_.eslintignore b/create-quasar/templates/app/quasar-v2/js-webpack-beta/lint/_.eslintignore
@@ -4,6 +4,6 @@
 /src-cordova
 /.quasar
 /node_modules
-.eslintrc.js
-babel.config.js
+.eslintrc.cjs
+babel.config.cjs
 /quasar.config.*.temporary.compiled*
diff --git a/create-quasar/templates/app/quasar-v2/js-webpack/BASE/_package.json b/create-quasar/templates/app/quasar-v2/js-webpack/BASE/_package.json
@@ -21,7 +21,7 @@
     "@quasar/extras": "^1.16.4",
     "core-js": "^3.31.1",
     "quasar": "^2.8.0",
-    "vue": "^3.2.29",
+    "vue": "^3.4.18",
     "vue-router": "^4.0.12"
   },
   "devDependencies": {

diff --git a/create-quasar/templates/app/quasar-v2/js-webpack/BASE/quasar.config.js b/create-quasar/templates/app/quasar-v2/js-webpack/BASE/quasar.config.js
@@ -41,7 +41,7 @@ module.exports = configure(function (ctx) {
     // https://github.com/quasarframework/quasar/tree/dev/extras
     extras: [
       // 'ionicons-v4',
-      // 'mdi-v5',
+      // 'mdi-v7',
       // 'fontawesome-v6',
       // 'eva-icons',
       // 'themify',

diff --git a/create-quasar/templates/app/quasar-v2/js-webpack/BASE/src/router/index.js b/create-quasar/templates/app/quasar-v2/js-webpack/BASE/src/router/index.js
@@ -23,7 +23,7 @@ export default route(function (/* { store, ssrContext } */) {
     // Leave this as is and make changes in quasar.conf.js instead!
     // quasar.conf.js -> build -> vueRouterMode
     // quasar.conf.js -> build -> publicPath
-    history: createHistory(process.env.MODE === 'ssr' ? void 0 : process.env.VUE_ROUTER_BASE)
+    history: createHistory(process.env.VUE_ROUTER_BASE)
   })
 
   return Router

diff --git a/create-quasar/templates/app/quasar-v2/js-webpack/lint/_.eslintignore b/create-quasar/templates/app/quasar-v2/js-webpack/lint/_.eslintignore
@@ -4,6 +4,6 @@
 /src-cordova
 /.quasar
 /node_modules
-.eslintrc.js
-babel.config.js
+.eslintrc.cjs
+babel.config.cjs
 /quasar.config.*.temporary.compiled*
diff --git a/create-quasar/templates/app/quasar-v2/ts-vite-beta/BASE/_package.json b/create-quasar/templates/app/quasar-v2/ts-vite-beta/BASE/_package.json
@@ -22,7 +22,7 @@
     <% if (preset.vuex) { %>"vuex": "^4.0.1",<% } %>
     "@quasar/extras": "^1.16.4",
     "quasar": "^2.6.0",
-    "vue": "^3.2.29",
+    "vue": "^3.4.18",
     "vue-router": "^4.0.12"
   },
   "devDependencies": {
@@ -44,8 +44,8 @@
     "prettier": "^3.0.3",
     <% } } %>
     "@types/node": "^20.5.9",
-    <% if (preset.i18n) { %>"@intlify/vite-plugin-vue-i18n": "^3.3.1",<% } %>
-    "@quasar/app-vite": "^2.0.0-alpha.14",
+    <% if (preset.i18n) { %>"@intlify/unplugin-vue-i18n": "^2.0.0",<% } %>
+    "@quasar/app-vite": "^2.0.0-beta.1",
     "autoprefixer": "^10.4.2",
     "typescript": "^5.2.2"
   },

diff --git a/create-quasar/templates/app/quasar-v2/ts-vite-beta/BASE/quasar.config.ts b/create-quasar/templates/app/quasar-v2/ts-vite-beta/BASE/quasar.config.ts
@@ -7,7 +7,7 @@
 /* eslint global-require: 0 */
 <% } %>
 import { configure } from 'quasar/wrappers';
-<% if (preset.i18n) { %>import path from 'node:path';<% } %>
+<% if (preset.i18n) { %>import { fileURLToPath } from 'node:url';<% } %>
 
 export default configure((/* ctx */) => {
   return {
@@ -40,7 +40,7 @@ export default configure((/* ctx */) => {
     // https://github.com/quasarframework/quasar/tree/dev/extras
     extras: [
       // 'ionicons-v4',
-      // 'mdi-v5',
+      // 'mdi-v7',
       // 'fontawesome-v6',
       // 'eva-icons',
       // 'themify',
@@ -78,7 +78,7 @@ export default configure((/* ctx */) => {
       // viteVuePluginOptions: {},
 
       <% if (preset.i18n) { %>vitePlugins: [
-        ['@intlify/vite-plugin-vue-i18n', {
+        ['@intlify/unplugin-vue-i18n/vite', {
           // if you want to use Vue I18n Legacy API, you need to set `compositionOnly: false`
           // compositionOnly: false,
 
@@ -87,7 +87,7 @@ export default configure((/* ctx */) => {
           // runtimeOnly: false,
 
           // you need to set i18n resource including paths !
-          include: path.resolve(__dirname, './src/i18n/**')
+          include: [ fileURLToPath(new URL('./src/i18n', import.meta.url)) ],
         }]
       ]<% } else { %>
       // vitePlugins: [

diff --git a/create-quasar/templates/app/quasar-v2/ts-vite-beta/lint/_.eslintignore b/create-quasar/templates/app/quasar-v2/ts-vite-beta/lint/_.eslintignore
@@ -3,6 +3,6 @@
 /src-cordova
 /.quasar
 /node_modules
-.eslintrc.js
+.eslintrc.cjs
 /src-ssr
 /quasar.config.*.temporary.compiled*