refactor: isWorker move into funtion params

poyoho · Mar 9, 2022 · 9a8b713 · 9a8b713
1 parent 6b8dad2
commit 9a8b713
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts
@@ -301,12 +301,14 @@ export function resolveBuildOptions(raw?: BuildOptions): ResolvedBuildOptions {
   return resolved
 }
 
-export function resolveBuildPlugins(config: ResolvedConfig): {
+export function resolveBuildPlugins(
+  config: ResolvedConfig,
+  isWorker: boolean
+): {
   pre: Plugin[]
   post: Plugin[]
 } {
   const options = config.build
-  const isWorker = config.isWorker
   return {
     pre: [
       watchPackageDataPlugin(config),

diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
@@ -248,7 +248,6 @@ export type ResolvedConfig = Readonly<
     cacheDir: string
     command: 'build' | 'serve'
     mode: string
-    isWorker: boolean
     isProduction: boolean
     env: Record<string, any>
     resolve: ResolveOptions & {
@@ -475,7 +474,6 @@ export async function resolveConfig(
     cacheDir,
     command,
     mode,
-    isWorker: false,
     isProduction,
     plugins: userPlugins,
     server,
@@ -508,12 +506,13 @@ export async function resolveConfig(
   // flat config.worker.plugin
   const [workerPrePlugins, workerNormalPlugins, workerPostPlugins] =
     sortUserPlugins(config.worker?.plugins as Plugin[])
-  const workerResolved: ResolvedConfig = { ...resolved, isWorker: true }
+  const workerResolved: ResolvedConfig = { ...resolved }
   resolved.worker.plugins = await resolvePlugins(
     workerResolved,
     workerPrePlugins,
     workerNormalPlugins,
-    workerPostPlugins
+    workerPostPlugins,
+    true
   )
   // call configResolved worker plugins hooks
   await Promise.all(

diff --git a/packages/vite/src/node/plugins/index.ts b/packages/vite/src/node/plugins/index.ts
@@ -23,13 +23,13 @@ export async function resolvePlugins(
   config: ResolvedConfig,
   prePlugins: Plugin[],
   normalPlugins: Plugin[],
-  postPlugins: Plugin[]
+  postPlugins: Plugin[],
+  isWorker?: boolean
 ): Promise<Plugin[]> {
   const isBuild = config.command === 'build'
-  const isWorker = config.isWorker
 
   const buildPlugins = isBuild
-    ? (await import('../build')).resolveBuildPlugins(config)
+    ? (await import('../build')).resolveBuildPlugins(config, !!isWorker)
     : { pre: [], post: [] }
 
   return [