From 655e159eeb481339935314b332809290cd74573d Mon Sep 17 00:00:00 2001 From: yurk Date: Mon, 10 Jun 2024 12:08:31 +0300 Subject: [PATCH 1/3] fix(vite-plugin): production builds --- vite-plugin/src/plugin.js | 6 +++--- vite-plugin/src/vite-config.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vite-plugin/src/plugin.js b/vite-plugin/src/plugin.js index a11d19986cd..6dc3d97cb3e 100644 --- a/vite-plugin/src/plugin.js +++ b/vite-plugin/src/plugin.js @@ -41,8 +41,8 @@ function getConfigPlugin (opts) { } }, - config (viteConf, { mode }) { - return getViteConfig(opts.runMode, mode, viteConf) + config (viteConf, { command }) { + return getViteConfig(opts.runMode, command, viteConf) } } } @@ -95,7 +95,7 @@ function getScriptTransformsPlugin (opts) { name: 'vite:quasar:script', configResolved (resolvedConfig) { - if (opts.devTreeshaking === false && resolvedConfig.mode !== 'production') { + if (opts.devTreeshaking === false && resolvedConfig.command === 'serve') { useTreeshaking = false } }, diff --git a/vite-plugin/src/vite-config.js b/vite-plugin/src/vite-config.js index fbe7c00ce1d..dc723e25e36 100644 --- a/vite-plugin/src/vite-config.js +++ b/vite-plugin/src/vite-config.js @@ -7,7 +7,7 @@ const { version } = JSON.parse( readFileSync(join(quasarPath, 'package.json'), 'utf-8') ) -export function getViteConfig (runMode, viteMode, externalViteCfg) { +export function getViteConfig (runMode, viteCommand, externalViteCfg) { const viteCfg = { define: { __QUASAR_VERSION__: `'${ version }'`, @@ -32,7 +32,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 (viteCommand === 'serve') { viteCfg.resolve = { alias: [ { find: /^quasar$/, replacement: 'quasar/dist/quasar.client.js' } From 6131b7502213bbe6571ce3b9e9f7ec5b5b4fc804 Mon Sep 17 00:00:00 2001 From: yurk Date: Sun, 25 Aug 2024 19:19:58 +0300 Subject: [PATCH 2/3] fix(vite-plugin): production builds --- vite-plugin/src/plugin.js | 4 ++-- vite-plugin/src/vite-config.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vite-plugin/src/plugin.js b/vite-plugin/src/plugin.js index 6dc3d97cb3e..0f642105f69 100644 --- a/vite-plugin/src/plugin.js +++ b/vite-plugin/src/plugin.js @@ -41,8 +41,8 @@ function getConfigPlugin (opts) { } }, - config (viteConf, { command }) { - return getViteConfig(opts.runMode, command, viteConf) + config (viteConf, viteConfEnv) { + return getViteConfig(opts.runMode, viteConfEnv, viteConf) } } } diff --git a/vite-plugin/src/vite-config.js b/vite-plugin/src/vite-config.js index dc723e25e36..da52adacbf2 100644 --- a/vite-plugin/src/vite-config.js +++ b/vite-plugin/src/vite-config.js @@ -7,7 +7,7 @@ const { version } = JSON.parse( readFileSync(join(quasarPath, 'package.json'), 'utf-8') ) -export function getViteConfig (runMode, viteCommand, externalViteCfg) { +export function getViteConfig (runMode, viteCfgEnv, externalViteCfg) { const viteCfg = { define: { __QUASAR_VERSION__: `'${ version }'`, @@ -32,7 +32,7 @@ export function getViteConfig (runMode, viteCommand, externalViteCfg) { else { // Alias "quasar" package to its dev file (which has flags) // to reduce the number of HTTP requests while in DEV mode - if (viteCommand === 'serve') { + if (viteCfgEnv.command === 'serve' && viteCfgEnv.mode === 'development') { viteCfg.resolve = { alias: [ { find: /^quasar$/, replacement: 'quasar/dist/quasar.client.js' } From 20a05756c8a5d22ae4e264a5f869f93e77d8b63b Mon Sep 17 00:00:00 2001 From: yurk Date: Sun, 25 Aug 2024 19:25:39 +0300 Subject: [PATCH 3/3] fix(vite-plugin): production builds --- vite-plugin/src/plugin.js | 3 ++- vite-plugin/src/vite-check-dev-mode.js | 3 +++ vite-plugin/src/vite-config.js | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100755 vite-plugin/src/vite-check-dev-mode.js diff --git a/vite-plugin/src/plugin.js b/vite-plugin/src/plugin.js index 0f642105f69..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', @@ -95,7 +96,7 @@ function getScriptTransformsPlugin (opts) { name: 'vite:quasar:script', configResolved (resolvedConfig) { - if (opts.devTreeshaking === false && resolvedConfig.command === 'serve') { + 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 da52adacbf2..a5ca3c2eaca 100644 --- a/vite-plugin/src/vite-config.js +++ b/vite-plugin/src/vite-config.js @@ -2,6 +2,7 @@ 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') @@ -32,7 +33,7 @@ export function getViteConfig (runMode, viteCfgEnv, externalViteCfg) { else { // Alias "quasar" package to its dev file (which has flags) // to reduce the number of HTTP requests while in DEV mode - if (viteCfgEnv.command === 'serve' && viteCfgEnv.mode === 'development') { + if (viteCheckDevMode(viteCfgEnv)) { viteCfg.resolve = { alias: [ { find: /^quasar$/, replacement: 'quasar/dist/quasar.client.js' }