Merge branch 'quasarframework:dev' into dev

Author: sainf

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

@@ -75,7 +75,7 @@ jobs:
       fail-fast: false
       matrix:
         script-type: [js, ts]
-        app-engine: [vite-1, vite-2, webpack-3, webpack-4]
+        app-engine: [vite-2, webpack-4]
         node-version: [18, 20]
         package-manager: [yarn, npm, pnpm]
 
@@ -181,4 +181,3 @@ jobs:
           fi
 
           kill $!
-

create-quasar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-quasar",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Scaffolds Quasar Apps, AppExtensions or UI kits",
   "type": "module",
   "author": {

create-quasar/scripts/create-test-project.ts

@@ -1,7 +1,7 @@
 import prompts from 'prompts';
 
 type ScriptType = 'js' | 'ts';
-type AppEngine = 'vite-1' | 'vite-2' | 'webpack-3' | 'webpack-4';
+type AppEngine = 'vite-2' | 'webpack-4';
 type PackageManager = 'yarn' | 'npm' | 'pnpm';
 
 type CreateProjectOptions = {
@@ -23,7 +23,6 @@ export async function createProject({ scriptType, appEngine, packageManager }: C
     projectFolder: 'test-project',
     overwrite: true,
 
-    quasarVersion: 'v2',
     scriptType: scriptType,
     engine: appEngine,
 
@@ -35,15 +34,9 @@ export async function createProject({ scriptType, appEngine, packageManager }: C
     // The defaults
     sfcStyle: 'composition-setup',
     css: 'scss',
-    ...(appEngine === 'vite-1' || appEngine === 'webpack-3'
-      ? {
-          preset: ['lint'],
-          lintConfig: 'prettier',
-        }
-      : {
-          preset: ['eslint'],
-          prettier: true,
-        }),
+
+    preset: ['eslint'],
+    prettier: true,
 
     packageManager,
   });

create-quasar/templates/app/quasar-v2/js-vite-2/BASE/_package.json

@@ -30,7 +30,7 @@
     "eslint": "^9.14.0",
     "eslint-plugin-vue": "^9.30.0",
     "globals": "^15.12.0",
-    "vite-plugin-checker": "^0.8.0",
+    "vite-plugin-checker": "^0.9.0",
     <% } %>
     <% if (prettier) { %>
     "@vue/eslint-config-prettier": "^10.1.0",

create-quasar/templates/app/quasar-v2/ts-vite-2/BASE/_package.json

@@ -31,7 +31,7 @@
     "globals": "^15.12.0",
     "vue-tsc": "^2.0.29",
     "@vue/eslint-config-typescript": "^14.4.0",
-    "vite-plugin-checker": "^0.8.0",
+    "vite-plugin-checker": "^0.9.0",
     <% } %>
     <% if (prettier) { %>
     "@vue/eslint-config-prettier": "^10.1.0",

create-quasar/templates/app/quasar-v2/ts-vite-2/prettier/_.prettierrc.json

@@ -1,6 +1,5 @@
 {
   "$schema": "https://json.schemastore.org/prettierrc",
-  "semi": false,
   "singleQuote": true,
   "printWidth": 100
 }

create-quasar/templates/app/quasar-v2/ts-webpack-4/prettier/_.prettierrc.json

@@ -1,6 +1,5 @@
 {
   "$schema": "https://json.schemastore.org/prettierrc",
-  "semi": false,
   "singleQuote": true,
   "printWidth": 100
 }

docs/package.json

@@ -37,7 +37,7 @@
     "markdown-it-container": "^4.0.0",
     "tinyglobby": "^0.2.10",
     "toml": "^3.0.0",
-    "vite-plugin-checker": "^0.7.2",
+    "vite-plugin-checker": "^0.9.0",
     "workbox-build": "^7.1.1"
   }
 }

docs/src/components/DocInstallation.vue

@@ -17,7 +17,7 @@
         <DocCode :code="QuasarCli" />
       </q-tab-panel>
 
-      <q-tab-panel class="q-pa-none" name="Vite plugin / Vue CLI">
+      <q-tab-panel class="q-pa-none" name="Vite plugin">
         <DocCode :code="ExternalCli" />
       </q-tab-panel>
 
@@ -47,7 +47,7 @@ const props = defineProps({
   }
 })
 
-const tabList = [ 'Quasar CLI', 'Vite plugin / Vue CLI', 'UMD' ]
+const tabList = [ 'Quasar CLI', 'Vite plugin', 'UMD' ]
 const currentTab = ref('Quasar CLI')
 
 const id = computed(() => slugify(props.title))

docs/src/examples/QRange/TrackImages.vue

@@ -48,7 +48,7 @@
 import { ref } from 'vue'
 
 // supports URL too!
-// or relative path (if on Quasar CLI / Vite / Vue CLI)
+// or relative path (if on Quasar CLI / Vite Plugin)
 // or ~assets/some-image.png (if on Quasar CLI)
 const img = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAH0lEQVQoU2NkYGAwZkAFZ5G5jPRRgOYEVDeB3EBjBQBOZwTVugIGyAAAAABJRU5ErkJggg=='