Merge branch 'quasarframework:dev' into marvellous-bass

.github/workflows/project-creation-tests.yml

@@ -17,6 +17,7 @@ jobs:
   lint:
     if: >-
       ${{
+        github.event_name == 'workflow_dispatch' ||
         github.event_name == 'pull_request' ||
 
         startsWith(github.event.release.tag_name, 'quasar') ||
@@ -42,7 +43,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           # create-quasar is not included in workspaces, and it's yarn.lock is .gitignored, so we can't have caching
           # cache: 'yarn'
 
@@ -69,7 +70,7 @@ jobs:
       matrix:
         script-type: [js, ts]
         app-engine: [vite, webpack]
-        node-version: [16, 18, 20]
+        node-version: [18, 20]
         package-manager: [yarn, npm, pnpm]
 
     name: Test ${{ matrix.script-type }}-${{ matrix.app-engine }} (Node v${{ matrix.node-version }} - ${{ matrix.package-manager }})

.vscode/settings.json

@@ -4,7 +4,7 @@
   "eslint.workingDirectories": ["./docs", "./ui"],
   "editor.tabSize": 2,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "eslint.validate": ["javascript", "vue"],
 }

ROADMAP.md

@@ -36,31 +36,33 @@ We are updating this section constantly in order to keep you up to date with our
 * 🚧 (WIP) Gradually add more automated tests to Quasar UI. **We're searching for contributors**, get in touch with the team on our [Discord server](https://chat.quasar.dev/) if you're willing to help!
 * 🚧 (WIP) Gather feedback about new Quasar website. [Let us know what do you like and what not!](https://github.com/quasarframework/quasar/discussions/15168)
 
-### Q1 2023
-* Release new Quasar website
-* Porting Quasar packages to ESM
-* Support Vite 3 and 4 in `@quasar/app-vite` ([#14077](https://github.com/quasarframework/quasar/issues/14077)) (already supported via [workaround](https://github.com/quasarframework/quasar/issues/14077#issuecomment-1353213893))
-* Publish official Quasar Organizational chart
-* More triaging automation ([quasarframework/rfcs#10](https://github.com/quasarframework/rfcs/issues/10))
-* Website update community survey
-
-### Q2 2023
-* Support Capacitor 4 and related bugfixes ([#14226](https://github.com/quasarframework/quasar/pull/14226))
-* Add Quasar entry in [Vite ecosystem CI](https://github.com/vitejs/vite-ecosystem-ci)
-* June 30th 2023 marks the end of life for Quasar v1. It will no longer receive updates. (postponed for the second time, previously reported EOL was 31th of December 2022)
-
-### Q3 2023
+### Q1 2024
 * New `@quasar/app-vite` major version -- beta release
 * New `@quasar/app-webpack` major version -- beta release
 
-### Q4 2023
+### Q2 2024
+* CLI Auto-routing
 * Release of the new major version of `@quasar/app-vite`
 * Release of the new major version of `@quasar/app-webpack`
-* CLI Auto-routing
+
+### Q3 2024
 * CLI SSG mode ([#2299](https://github.com/quasarframework/quasar/issues/2299)) ([community support](https://github.com/freddy38510/quasar-app-extension-ssg))
 
 ## Archive
 
+### Q2-4 2023
+* Support Capacitor 4 and related bugfixes ([#14226](https://github.com/quasarframework/quasar/pull/14226))
+* Add Quasar entry in [Vite ecosystem CI](https://github.com/vitejs/vite-ecosystem-ci)
+* June 30th 2023 marks the end of life for Quasar v1. It will no longer receive updates. (postponed for the second time, previously reported EOL was 31th of December 2022)
+
+### Q1 2023
+* Release new Quasar website
+* Porting Quasar packages to ESM
+* Support Vite 3 and 4 in `@quasar/app-vite` ([#14077](https://github.com/quasarframework/quasar/issues/14077)) (already supported via [workaround](https://github.com/quasarframework/quasar/issues/14077#issuecomment-1353213893))
+* Publish official Quasar Organizational chart
+* More triaging automation ([quasarframework/rfcs#10](https://github.com/quasarframework/rfcs/issues/10))
+* Website update community survey
+
 ### Q4 2022
 * ✌️ (DONE) New Quasar website [preview](https://new-docs.quasar.dev/) 🔥
 * ✌️ (DONE) Refactor & enhance QPagination [#14609](https://github.com/quasarframework/quasar/pull/14609)

app-vite/lib/app-builder.js

@@ -1,4 +1,3 @@
-
 import { lstatSync } from 'node:fs'
 import fse from 'fs-extra'
 import { join, isAbsolute, basename, dirname } from 'node:path'

app-vite/lib/app-devserver.js

@@ -1,4 +1,3 @@
-
 import { AppTool } from './app-tool.js'
 import { printDevRunningBanner } from './utils/banner.js'
 import { encodeForDiff } from './utils/encode-for-diff.js'

app-vite/lib/app-extension/AppExtensionInstance.js

@@ -1,4 +1,3 @@
-
 import { join, relative, resolve, dirname } from 'node:path'
 import { pathToFileURL } from 'node:url'
 import fse from 'fs-extra'

app-vite/lib/cache/module.eslint.js

@@ -1,4 +1,3 @@
-
 import { existsSync } from 'node:fs'
 
 import { getPackage } from '../utils/get-package.js'

app-vite/lib/cache/module.workboxBuild.js

@@ -1,4 +1,3 @@
-
 import { getPackage } from '../utils/get-package.js'
 
 export async function createInstance ({ appPaths }) {

app-vite/lib/cmd/dev.js

@@ -93,7 +93,7 @@ async function startVueDevtools (ctx, devtoolsPort) {
   const { spawn } = await import('../utils/spawn.js')
   const { getPackagePath } = await import('../utils/get-package-path.js')
 
-  let vueDevtoolsBin = getPackagePath('@vue/devtools/bin.js', appDir)
+  let vueDevtoolsBin = getPackagePath('.bin/vue-devtools', appDir)
 
   function run () {
     log('Booting up remote Vue Devtools...')
@@ -121,7 +121,7 @@ async function startVueDevtools (ctx, devtoolsPort) {
   // a small delay is a must, otherwise require.resolve
   // after a yarn/npm install will fail
   return new Promise(resolve => {
-    vueDevtoolsBin = getPackagePath('@vue/devtools/bin.js', appDir)
+    vueDevtoolsBin = getPackagePath('.bin/vue-devtools', appDir)
     run().then(resolve)
   })
 }

app-vite/lib/cmd/help.js

@@ -1,4 +1,3 @@
-
 import { readFileSync } from 'node:fs'
 
 console.log(

app-vite/lib/config-tools.js

@@ -1,4 +1,3 @@
-
 import { quasar as quasarVitePlugin } from '@quasar/vite-plugin'
 import vueVitePlugin from '@vitejs/plugin-vue'
 import { merge } from 'webpack-merge'

app-vite/lib/entry-files-generator.js

@@ -1,4 +1,3 @@
-
 import { readFileSync } from 'node:fs'
 import fse from 'fs-extra'
 import compileTemplate from 'lodash/template.js'

app-vite/lib/modes/bex/bex-builder.js

@@ -1,4 +1,3 @@
-
 import { join } from 'node:path'
 import fse from 'fs-extra'
 import archiver from 'archiver'

app-vite/lib/modes/bex/bex-config.js

@@ -1,4 +1,3 @@
-
 import { join } from 'node:path'
 import { readFileSync, writeFileSync } from 'node:fs'
 

app-vite/lib/modes/bex/bex-devserver.js

@@ -1,4 +1,3 @@
-
 import debounce from 'lodash/debounce.js'
 import chokidar from 'chokidar'
 import fse from 'fs-extra'

app-vite/lib/modes/bex/bex-installation.js

@@ -1,4 +1,3 @@
-
 import fs from 'node:fs'
 import fse from 'fs-extra'
 import inquirer from 'inquirer'

app-vite/lib/modes/bex/utils.js

@@ -1,4 +1,3 @@
-
 import fse from 'fs-extra'
 import { join } from 'node:path'
 

app-vite/lib/modes/capacitor/capacitor-installation.js

@@ -1,4 +1,3 @@
-
 import fs from 'node:fs'
 import fse from 'fs-extra'
 import compileTemplate from 'lodash/template.js'

app-vite/lib/modes/cordova/cordova-builder.js

@@ -1,4 +1,3 @@
-
 import fse from 'fs-extra'
 import { join } from 'node:path'
 

app-vite/lib/modes/cordova/cordova-installation.js

@@ -1,4 +1,3 @@
-
 import fs from 'node:fs'
 import fse from 'fs-extra'
 import inquirer from 'inquirer'

app-vite/lib/modes/cordova/vite-plugin.dev.cordova-platform-inject.js

@@ -1,4 +1,3 @@
-
 import { static as serveStatic } from 'express'
 
 import { entryPointMarkup } from '../../utils/html-template.js'

app-vite/lib/modes/electron/electron-builder.js

@@ -1,4 +1,3 @@
-
 import { join } from 'node:path'
 import { merge } from 'webpack-merge'
 

app-vite/lib/modes/pwa/pwa-builder.js

@@ -1,4 +1,3 @@
-
 import { writeFileSync } from 'node:fs'
 import { join } from 'node:path'
 

app-vite/lib/modes/pwa/pwa-config.js

@@ -1,4 +1,3 @@
-
 import { join } from 'node:path'
 
 import { escapeRegexString } from '../../utils/escape-regex-string.js'

app-vite/lib/modes/pwa/pwa-installation.js

@@ -1,4 +1,3 @@
-
 import fs from 'node:fs'
 import fse from 'fs-extra'
 

app-vite/lib/modes/pwa/utils.js

@@ -1,4 +1,3 @@
-
 import { readFileSync } from 'node:fs'
 
 import { progress } from '../../utils/logger.js'

app-vite/lib/modes/pwa/vite-plugin.pwa-resources.js

@@ -1,4 +1,3 @@
-
 import { static as serveStatic } from 'express'
 
 import { createHeadTags } from './utils.js'

app-vite/lib/modes/spa/spa-builder.js

@@ -1,4 +1,3 @@
-
 import { AppBuilder } from '../../app-builder.js'
 import { quasarSpaConfig } from './spa-config.js'
 

app-vite/lib/modes/spa/spa-config.js

@@ -1,4 +1,3 @@
-
 import { createViteConfig, extendViteConfig } from '../../config-tools.js'
 
 export const quasarSpaConfig = {

app-vite/lib/modes/spa/spa-installation.js

@@ -1,4 +1,3 @@
-
 // Nothing to do... installed by default
 
 export function isModeInstalled () {

app-vite/lib/modes/ssr/ssr-config.js

@@ -1,4 +1,3 @@
-
 import { join } from 'node:path'
 import { mergeConfig as mergeViteConfig } from 'vite'
 

app-vite/lib/modes/ssr/ssr-installation.js

@@ -1,4 +1,3 @@
-
 import fs from 'node:fs'
 import fse from 'fs-extra'
 

app-vite/lib/plugins/esbuild.eslint.js

@@ -1,4 +1,3 @@
-
 import { normalizePath } from 'vite'
 import { dim, underline, bold } from 'kolorist'
 

app-vite/lib/plugins/esbuild.inject-replacements.js

@@ -1,4 +1,3 @@
-
 import path from 'node:path'
 import { pathToFileURL } from 'node:url'
 import fse from 'fs-extra'

app-vite/lib/plugins/vite.eslint.js

@@ -1,4 +1,3 @@
-
 import { normalizePath } from 'vite'
 
 import { warning, error, success } from '../utils/logger.js'

app-vite/lib/plugins/vite.index-html-transform.js

@@ -1,4 +1,3 @@
-
 import { transformHtml } from '../utils/html-template.js'
 
 export function quasarViteIndexHtmlTransformPlugin (quasarConf) {

app-vite/lib/quasar-config-file.js

@@ -725,6 +725,7 @@ export class QuasarConfigFile {
         // vue
         __VUE_OPTIONS_API__: cfg.build.vueOptionsAPI !== false,
         __VUE_PROD_DEVTOOLS__: cfg.metaConf.debugging,
+        __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: cfg.metaConf.debugging, // Vue 3.4+
 
         // vue-i18n
         __VUE_I18N_FULL_INSTALL__: true,

app-vite/lib/utils/cli-runtime.js

@@ -1,4 +1,3 @@
-
 import { fileURLToPath } from 'node:url'
 import { join } from 'node:path'
 import { readFileSync } from 'node:fs'

app-vite/lib/utils/encode-for-diff.js

@@ -1,4 +1,3 @@
-
 export function encodeForDiff (obj) {
   return JSON.stringify(obj, (_, value) => {
     return typeof value === 'function'

app-vite/lib/utils/env.js

@@ -1,4 +1,3 @@
-
 import { existsSync, readFileSync } from 'node:fs'
 import { join, isAbsolute } from 'node:path'
 import { parse as dotEnvParse } from 'dotenv'

app-vite/lib/utils/escape-regex-string.js

@@ -1,4 +1,3 @@
-
 /**
  * Escape a string to then be supplied
  * to new RegExp()

app-vite/lib/utils/get-api.js

@@ -1,4 +1,3 @@
-
 import fs from 'node:fs'
 import path from 'node:path'
 import { createRequire } from 'node:module'

app-vite/lib/utils/get-app-paths.js

@@ -1,4 +1,3 @@
-
 import { existsSync } from 'node:fs'
 import { normalize, resolve, join, sep } from 'node:path'
 

app-vite/lib/utils/get-external-ip.js

@@ -1,4 +1,3 @@
-
 import inquirer from 'inquirer'
 
 import { warn, fatal } from './logger.js'

app-vite/lib/utils/get-package-json.js

@@ -1,4 +1,3 @@
-
 import { readFileSync } from 'node:fs'
 
 import { getPackagePath } from './get-package-path.js'

app-vite/lib/utils/get-package-path.js

@@ -1,4 +1,3 @@
-
 import { createRequire } from 'node:module'
 
 const require = createRequire(import.meta.url)

app-vite/lib/utils/get-package.js

@@ -1,4 +1,3 @@
-
 import { readFileSync } from 'node:fs'
 import { pathToFileURL } from 'node:url'
 

app-vite/lib/utils/get-pkg.js

@@ -1,4 +1,3 @@
-
 import { readFileSync } from 'node:fs'
 
 import { getPackageJson } from '../utils/get-package-json.js'

app-vite/lib/utils/html-template.js

@@ -1,4 +1,3 @@
-
 import compileTemplate from 'lodash/template.js'
 import { minify } from 'html-minifier'
 

app-vite/lib/utils/open-browser.js

@@ -1,4 +1,3 @@
-
 import open from 'open'
 
 import { log, warn } from './logger.js'

app-vite/lib/utils/resolve-extension.js

@@ -1,4 +1,3 @@
-
 import { existsSync } from 'node:fs'
 
 const extensions = [ '', '.js', '.ts', '.jsx', '.tsx' ]

app-vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quasar/app-vite",
-  "version": "2.0.0-alpha.44",
+  "version": "2.0.0-alpha.46",
   "description": "Quasar Framework App CLI with Vite",
   "bin": {
     "quasar": "./bin/quasar.js"

app-vite/types/configuration/build.d.ts

@@ -54,7 +54,7 @@ interface BuildTargetOptions {
    */
   browser?: string[];
   /**
-   * @example 'node16'
+   * @example 'node20'
    */
   node?: string;
 }
@@ -72,7 +72,7 @@ interface QuasarStaticBuildConfiguration {
    * @example
    *    {
    *      browser: ['es2019', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
-   *      node: 'node16'
+   *      node: 'node20'
    *    }
    */
   target?: BuildTargetOptions;

app-webpack/lib/cmd/dev.js

@@ -94,7 +94,7 @@ function startVueDevtools (ctx, devtoolsPort) {
   const { spawn } = require('../utils/spawn.js')
   const { getPackagePath } = require('../utils/get-package-path.js')
 
-  let vueDevtoolsBin = getPackagePath('@vue/devtools/bin.js', appDir)
+  let vueDevtoolsBin = getPackagePath('.bin/vue-devtools', appDir)
 
   function run () {
     log('Booting up remote Vue Devtools...')
@@ -121,7 +121,7 @@ function startVueDevtools (ctx, devtoolsPort) {
   // a small delay is a must, otherwise require.resolve
   // after a yarn/npm install will fail
   return new Promise(resolve => {
-    vueDevtoolsBin = getPackagePath('@vue/devtools/bin.js', appDir)
+    vueDevtoolsBin = getPackagePath('.bin/vue-devtools', appDir)
     run().then(resolve)
   })
 }