diff --git a/vite-plugin/src/plugin.js b/vite-plugin/src/plugin.js index a11d19986cd..66bbd59b878 100644 --- a/vite-plugin/src/plugin.js +++ b/vite-plugin/src/plugin.js @@ -5,6 +5,7 @@ import { vueTransform } from './vue-transform.js' import { createScssTransform } from './scss-transform.js' import { parseViteRequest, createExtMatcher } from './query.js' import { mapQuasarImports } from './js-transform.js' +import { viteCheckDevMode } from './vite-check-dev-mode.js' const defaultOptions = { runMode: 'web-client', @@ -41,8 +42,8 @@ function getConfigPlugin (opts) { } }, - config (viteConf, { mode }) { - return getViteConfig(opts.runMode, mode, viteConf) + config (viteConf, viteConfEnv) { + return getViteConfig(opts.runMode, viteConfEnv, viteConf) } } } @@ -95,7 +96,7 @@ function getScriptTransformsPlugin (opts) { name: 'vite:quasar:script', configResolved (resolvedConfig) { - if (opts.devTreeshaking === false && resolvedConfig.mode !== 'production') { + if (opts.devTreeshaking === false && viteCheckDevMode(resolvedConfig)) { useTreeshaking = false } }, diff --git a/vite-plugin/src/vite-check-dev-mode.js b/vite-plugin/src/vite-check-dev-mode.js new file mode 100755 index 00000000000..5322f9c6dac --- /dev/null +++ b/vite-plugin/src/vite-check-dev-mode.js @@ -0,0 +1,3 @@ +export function viteCheckDevMode ({ command, mode }) { + return command === 'serve' && mode === 'development' +} diff --git a/vite-plugin/src/vite-config.js b/vite-plugin/src/vite-config.js index fbe7c00ce1d..a5ca3c2eaca 100644 --- a/vite-plugin/src/vite-config.js +++ b/vite-plugin/src/vite-config.js @@ -2,12 +2,13 @@ import { readFileSync } from 'node:fs' import { join } from 'node:path' import { quasarPath } from './quasar-path.js' +import { viteCheckDevMode } from './vite-check-dev-mode.js' const { version } = JSON.parse( readFileSync(join(quasarPath, 'package.json'), 'utf-8') ) -export function getViteConfig (runMode, viteMode, externalViteCfg) { +export function getViteConfig (runMode, viteCfgEnv, externalViteCfg) { const viteCfg = { define: { __QUASAR_VERSION__: `'${ version }'`, @@ -32,7 +33,7 @@ export function getViteConfig (runMode, viteMode, externalViteCfg) { else { // Alias "quasar" package to its dev file (which has flags) // to reduce the number of HTTP requests while in DEV mode - if (viteMode !== 'production') { + if (viteCheckDevMode(viteCfgEnv)) { viteCfg.resolve = { alias: [ { find: /^quasar$/, replacement: 'quasar/dist/quasar.client.js' }