From f6710c3e9b02496f53ce5d1145446693b4230bd5 Mon Sep 17 00:00:00 2001 From: yoho Date: Wed, 13 Apr 2022 20:33:51 +0800 Subject: [PATCH] fix: move plugin at truth postion --- packages/vite/src/node/build.ts | 4 ++-- packages/vite/src/node/plugins/worker.ts | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts index 4e86a571550ced..9ad8a640a12f7b 100644 --- a/packages/vite/src/node/build.ts +++ b/packages/vite/src/node/build.ts @@ -40,7 +40,7 @@ import { assetImportMetaUrlPlugin } from './plugins/assetImportMetaUrl' import { loadFallbackPlugin } from './plugins/loadFallback' import { watchPackageDataPlugin } from './packages' import { ensureWatchPlugin } from './plugins/ensureWatch' -import { webWorkerImportMetaUrlPlugin } from './plugins/worker' +import { redirectWorkerImportMetaUrlPlugin } from './plugins/worker' export interface BuildOptions { /** @@ -310,13 +310,13 @@ export function resolveBuildPlugins(config: ResolvedConfig): { return { pre: [ - webWorkerImportMetaUrlPlugin(config), ...(options.watch ? [ensureWatchPlugin()] : []), watchPackageDataPlugin(config), commonjsPlugin(options.commonjsOptions), dataURIPlugin(), dynamicImportVars(options.dynamicImportVarsOptions), assetImportMetaUrlPlugin(config), + redirectWorkerImportMetaUrlPlugin(config), ...(options.rollupOptions.plugins ? (options.rollupOptions.plugins.filter(Boolean) as Plugin[]) : []) diff --git a/packages/vite/src/node/plugins/worker.ts b/packages/vite/src/node/plugins/worker.ts index 771788c0662b78..14298b25928473 100644 --- a/packages/vite/src/node/plugins/worker.ts +++ b/packages/vite/src/node/plugins/worker.ts @@ -289,7 +289,9 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin { } // just run in build mode -export function webWorkerImportMetaUrlPlugin(config: ResolvedConfig): Plugin { +export function redirectWorkerImportMetaUrlPlugin( + config: ResolvedConfig +): Plugin { const isWorker = config.isWorker return {