Merge remote-tracking branch 'origin/dev' into dev

Author: hawkeye64

app-vite/lib/config-tools.js

@@ -108,6 +108,10 @@ function createViteConfig (quasarConf, quasarRunMode) {
         : build.sourcemap || false
     },
 
+    optimizeDeps: {
+      entries: [ 'index.html' ]
+    },
+
     plugins: [
       vueVitePlugin(vueVitePluginOptions),
       quasarVitePlugin({

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

@@ -247,17 +247,7 @@ class QuasarConfFile {
         vitePlugins: [],
         env: {},
         rawDefine: {},
-        resolve: {},
-        css: {},
-        json: {},
-        esbuild: {},
-        rollupOptions: {},
-        commonjsOptions: {},
-        dynamicImportVarsOptions: {},
-        optimizeDeps: {
-          entries: []
-        },
-        worker: {}
+        resolve: {}
       },
 
       ssr: {
@@ -467,10 +457,6 @@ class QuasarConfFile {
       cfg.build.target.node = 'node16'
     }
 
-    if (cfg.build.optimizeDeps.entries.length === 0) {
-      cfg.build.optimizeDeps.entries = [ 'index.html' ]
-    }
-
     if (this.#ctx.mode.ssr) {
       cfg.build.vueRouterMode = 'history'
     }

app-webpack/lib/webpack/create-chain.js

@@ -7,6 +7,7 @@ const { VueLoaderPlugin } = require('vue-loader')
 const WebpackProgressPlugin = require('./plugin.progress')
 const BootDefaultExport = require('./plugin.boot-default-export')
 const parseBuildEnv = require('../helpers/parse-build-env')
+const getPackagePath = require('../helpers/get-package-path')
 
 const appPaths = require('../app-paths')
 const injectStyleRules = require('./inject.style-rules')
@@ -38,6 +39,13 @@ function getRootDefines (rootDefines, configName) {
   return rootDefines
 }
 
+const extrasPath = (() => {
+  const ePath = getPackagePath('@quasar/extras')
+  return ePath !== void 0
+    ? path.dirname(ePath)
+    : false
+})()
+
 module.exports = function (cfg, configName) {
   const chain = new WebpackChain()
 
@@ -91,6 +99,11 @@ module.exports = function (cfg, configName) {
       'src-bex': appPaths.bexDir // needed for app/templates
     })
 
+  if (extrasPath) {
+    // required so quasar/icon-sets/* with imports to work correctly
+    chain.resolve.alias.merge({ '@quasar/extras': extrasPath })
+  }
+
   const vueFile = configName === webpackNames.ssr.serverSide
     ? (cfg.ctx.prod ? 'vue.cjs.prod.js' : 'vue.cjs.js')
     : (

extras/index.js

@@ -0,0 +1,2 @@
+// empty file
+// to help q/app-webpack discover where this package is installed