refactor: move the condition related to enableNativePlugin to the plugin file side (#239)

Author: shulaoda

packages/vite/src/node/__tests__/plugins/json.spec.ts

@@ -35,7 +35,7 @@ describe('transform', () => {
     opts: Required<JsonOptions>,
     isBuild: boolean,
   ) => {
-    const plugin = jsonPlugin(opts, isBuild)
+    const plugin = jsonPlugin(opts, isBuild, false)
     // @ts-expect-error transform.handler should exist
     return plugin.transform.handler(input, 'test.json', { moduleType: 'json' })
       .code

packages/vite/src/node/build.ts

@@ -23,12 +23,7 @@ import type {
   WarningHandlerWithDefault,
   WatcherOptions,
 } from 'rolldown'
-import {
-  loadFallbackPlugin as nativeLoadFallbackPlugin,
-  manifestPlugin as nativeManifestPlugin,
-  reporterPlugin as nativeReporterPlugin,
-  webWorkerPostPlugin as nativeWebWorkerPostPlugin,
-} from 'rolldown/experimental'
+import { loadFallbackPlugin as nativeLoadFallbackPlugin } from 'rolldown/experimental'
 import type { RollupCommonJSOptions } from 'dep-types/commonjs'
 import type { RollupDynamicImportVarsOptions } from 'dep-types/dynamicImportVars'
 import type { EsbuildTarget } from 'types/internal/esbuildOptions'
@@ -67,7 +62,7 @@ import {
 } from './utils'
 import { perEnvironmentPlugin, resolveEnvironmentPlugins } from './plugin'
 import { manifestPlugin } from './plugins/manifest'
-import { LogLevels, type Logger } from './logger'
+import { type Logger } from './logger'
 import { buildImportAnalysisPlugin } from './plugins/importAnalysisBuild'
 import { ssrManifestPlugin } from './ssr/ssrManifestPlugin'
 import { findNearestMainPackageData, findNearestPackageData } from './packages'
@@ -481,7 +476,6 @@ export async function resolveBuildPlugins(config: ResolvedConfig): Promise<{
   pre: Plugin[]
   post: Plugin[]
 }> {
-  const enableNativePlugin = config.experimental.enableNativePlugin
   return {
     pre: [
       completeSystemWrapPlugin(),
@@ -494,24 +488,11 @@ export async function resolveBuildPlugins(config: ResolvedConfig): Promise<{
             )
           ).filter(Boolean) as Plugin[],
       ),
-      ...(config.isWorker
-        ? [
-            enableNativePlugin === true
-              ? perEnvironmentPlugin(
-                  'native:web-worker-post-plugin',
-                  (environment) => {
-                    if (environment.config.worker.format === 'iife') {
-                      return nativeWebWorkerPostPlugin()
-                    }
-                  },
-                )
-              : webWorkerPostPlugin(),
-          ]
-        : []),
+      ...(config.isWorker ? [webWorkerPostPlugin(config)] : []),
     ],
     post: [
       ...buildImportAnalysisPlugin(config),
-      ...(enableNativePlugin !== true
+      ...(config.experimental.enableNativePlugin !== true
         ? [
             buildOxcPlugin(),
             ...(config.build.minify === 'esbuild'
@@ -522,36 +503,9 @@ export async function resolveBuildPlugins(config: ResolvedConfig): Promise<{
       terserPlugin(config),
       ...(!config.isWorker
         ? [
-            config.build.manifest && enableNativePlugin === true
-              ? perEnvironmentPlugin('native:manifest', (environment) => {
-                  if (!environment.config.build.manifest) return false
-
-                  return nativeManifestPlugin({
-                    root: environment.config.root,
-                    outPath:
-                      environment.config.build.manifest === true
-                        ? '.vite/manifest.json'
-                        : environment.config.build.manifest,
-                  })
-                })
-              : manifestPlugin(),
+            manifestPlugin(config),
             ssrManifestPlugin(),
-            enableNativePlugin === true
-              ? perEnvironmentPlugin('native:reporter', (env) => {
-                  const tty = process.stdout.isTTY && !process.env.CI
-                  const shouldLogInfo =
-                    LogLevels[config.logLevel || 'info'] >= LogLevels.info
-                  const assetsDir = path.join(env.config.build.assetsDir, '/')
-                  return nativeReporterPlugin({
-                    isTty: !!tty,
-                    isLib: !!env.config.build.lib,
-                    assetsDir,
-                    chunkLimit: env.config.build.chunkSizeWarningLimit,
-                    shouldLogInfo,
-                    reportCompressedSize: env.config.build.reportCompressedSize,
-                  })
-                })
-              : buildReporterPlugin(config),
+            buildReporterPlugin(config),
           ]
         : []),
       nativeLoadFallbackPlugin(),

packages/vite/src/node/plugins/dynamicImportVars.ts

@@ -4,6 +4,7 @@ import { init, parse as parseImports } from 'es-module-lexer'
 import type { ImportSpecifier } from 'es-module-lexer'
 import { parseAst } from 'rolldown/parseAst'
 import { dynamicImportToGlob } from '@rollup/plugin-dynamic-import-vars'
+import { dynamicImportVarsPlugin as nativeDynamicImportVarsPlugin } from 'rolldown/experimental'
 import { exactRegex } from '@rolldown/pluginutils'
 import type { Plugin } from '../plugin'
 import type { ResolvedConfig } from '../config'
@@ -166,6 +167,10 @@ export async function transformDynamicImport(
 }
 
 export function dynamicImportVarsPlugin(config: ResolvedConfig): Plugin {
+  if (config.experimental.enableNativePlugin === true) {
+    return nativeDynamicImportVarsPlugin()
+  }
+
   const resolve = createBackCompatIdResolver(config, {
     preferRelative: true,
     tryIndex: false,

packages/vite/src/node/plugins/importMetaGlob.ts

@@ -16,6 +16,7 @@ import { stringifyQuery } from 'ufo'
 import type { GeneralImportGlobOptions } from 'types/importGlob'
 import { parseAstAsync } from 'rolldown/parseAst'
 import { escapePath, glob } from 'tinyglobby'
+import { importGlobPlugin as nativeImportGlobPlugin } from 'rolldown/experimental'
 import type { Plugin } from '../plugin'
 import type { EnvironmentModuleNode } from '../server/moduleGraph'
 import type { ResolvedConfig } from '../config'
@@ -41,6 +42,13 @@ interface ParsedGeneralImportGlobOptions extends GeneralImportGlobOptions {
 }
 
 export function importGlobPlugin(config: ResolvedConfig): Plugin {
+  if (config.experimental.enableNativePlugin === true) {
+    return nativeImportGlobPlugin({
+      root: config.root,
+      restoreQueryExtension: config.experimental.importGlobRestoreExtension,
+    })
+  }
+
   const importGlobMaps = new Map<
     Environment,
     Map<string, Array<(file: string) => boolean>>

packages/vite/src/node/plugins/index.ts

@@ -1,26 +1,13 @@
-import url from 'node:url'
 import aliasPlugin, { type ResolverFunction } from '@rollup/plugin-alias'
 import type { ObjectHook } from 'rolldown'
-import type { TransformOptions as OxcTransformOptions } from 'rolldown/experimental'
-import {
-  aliasPlugin as nativeAliasPlugin,
-  dynamicImportVarsPlugin as nativeDynamicImportVarsPlugin,
-  importGlobPlugin as nativeImportGlobPlugin,
-  jsonPlugin as nativeJsonPlugin,
-  modulePreloadPolyfillPlugin as nativeModulePreloadPolyfillPlugin,
-  transformPlugin as nativeTransformPlugin,
-  wasmFallbackPlugin as nativeWasmFallbackPlugin,
-  wasmHelperPlugin as nativeWasmHelperPlugin,
-} from 'rolldown/experimental'
+import { aliasPlugin as nativeAliasPlugin } from 'rolldown/experimental'
 import type { PluginHookUtils, ResolvedConfig } from '../config'
 import {
   type HookHandler,
   type Plugin,
   type PluginWithRequiredHook,
-  perEnvironmentPlugin,
 } from '../plugin'
 import { watchPackageDataPlugin } from '../packages'
-import { normalizePath } from '../utils'
 import { jsonPlugin } from './json'
 import { oxcResolvePlugin, resolvePlugin } from './resolve'
 import { optimizedDepsPlugin } from './optimizedDeps'
@@ -44,7 +31,7 @@ import {
   createFilterForTransform,
   createIdFilter,
 } from './pluginFilter'
-import { type OxcOptions, oxcPlugin } from './oxc'
+import { oxcPlugin } from './oxc'
 import { esbuildBannerFooterCompatPlugin } from './esbuildBannerFooterCompatPlugin'
 
 export async function resolvePlugins(
@@ -83,19 +70,7 @@ export async function resolvePlugins(
     ...prePlugins,
 
     modulePreload !== false && modulePreload.polyfill
-      ? enableNativePlugin === true
-        ? perEnvironmentPlugin(
-            'native:modulepreload-polyfill',
-            (environment) => {
-              if (
-                config.command !== 'build' ||
-                environment.config.consumer !== 'client'
-              )
-                return false
-              return nativeModulePreloadPolyfillPlugin()
-            },
-          )
-        : modulePreloadPolyfillPlugin(config)
+      ? modulePreloadPolyfillPlugin(config)
       : null,
     ...(enableNativePlugin
       ? oxcResolvePlugin(
@@ -126,65 +101,23 @@ export async function resolvePlugins(
     htmlInlineProxyPlugin(config),
     cssPlugin(config),
     esbuildBannerFooterCompatPlugin(config),
-    config.oxc !== false
-      ? enableNativePlugin === true
-        ? perEnvironmentPlugin('native:transform', (environment) => {
-            const {
-              jsxInject,
-              include = /\.(m?ts|[jt]sx)$/,
-              exclude = /\.js$/,
-              jsxRefreshInclude,
-              jsxRefreshExclude,
-              ..._transformOptions
-            } = config.oxc as Exclude<OxcOptions, false | undefined>
-
-            const transformOptions: OxcTransformOptions = _transformOptions
-            transformOptions.sourcemap =
-              environment.config.mode !== 'build' ||
-              !!environment.config.build.sourcemap
-
-            return nativeTransformPlugin({
-              include,
-              exclude,
-              jsxRefreshInclude,
-              jsxRefreshExclude,
-              isServerConsumer: environment.config.consumer === 'server',
-              runtimeResolveBase: normalizePath(
-                url.fileURLToPath(import.meta.url),
-              ),
-              jsxInject,
-              transformOptions,
-            })
-          })
-        : oxcPlugin(config)
-      : null,
-    enableNativePlugin === true
-      ? nativeJsonPlugin({ ...config.json, minify: isBuild })
-      : jsonPlugin(config.json, isBuild),
-    enableNativePlugin === true ? nativeWasmHelperPlugin() : wasmHelperPlugin(),
+    config.oxc !== false ? oxcPlugin(config) : null,
+    jsonPlugin(config.json, isBuild, enableNativePlugin === true),
+    wasmHelperPlugin(config),
     webWorkerPlugin(config),
     assetPlugin(config),
 
     ...normalPlugins,
 
-    enableNativePlugin === true
-      ? nativeWasmFallbackPlugin()
-      : wasmFallbackPlugin(),
+    wasmFallbackPlugin(config),
     definePlugin(config),
     cssPostPlugin(config),
     isBuild && buildHtmlPlugin(config),
     workerImportMetaUrlPlugin(config),
     assetImportMetaUrlPlugin(config),
     ...buildPlugins.pre,
-    enableNativePlugin === true
-      ? nativeDynamicImportVarsPlugin()
-      : dynamicImportVarsPlugin(config),
-    enableNativePlugin === true
-      ? nativeImportGlobPlugin({
-          root: config.root,
-          restoreQueryExtension: config.experimental.importGlobRestoreExtension,
-        })
-      : importGlobPlugin(config),
+    dynamicImportVarsPlugin(config),
+    importGlobPlugin(config),
 
     ...postPlugins,
 

packages/vite/src/node/plugins/json.ts

@@ -7,6 +7,7 @@
  */
 
 import { dataToEsm, makeLegalIdentifier } from '@rollup/pluginutils'
+import { jsonPlugin as nativeJsonPlugin } from 'rolldown/experimental'
 import { SPECIAL_QUERY_RE } from '../constants'
 import type { Plugin } from '../plugin'
 import { stripBomTag } from '../utils'
@@ -40,7 +41,12 @@ export const isJSONRequest = (request: string): boolean =>
 export function jsonPlugin(
   options: Required<JsonOptions>,
   isBuild: boolean,
+  enableNativePlugin: boolean,
 ): Plugin {
+  if (enableNativePlugin) {
+    return nativeJsonPlugin({ ...options, minify: isBuild })
+  }
+
   const plugin = {
     name: 'vite:json',
 

packages/vite/src/node/plugins/manifest.ts

@@ -5,9 +5,11 @@ import type {
   OutputChunk,
   RenderedChunk,
 } from 'rolldown'
+import { manifestPlugin as nativeManifestPlugin } from 'rolldown/experimental'
 import type { Plugin } from '../plugin'
 import { normalizePath, sortObjectKeys } from '../utils'
 import { perEnvironmentState } from '../environment'
+import { type ResolvedConfig, perEnvironmentPlugin } from '..'
 import { cssEntriesMap } from './asset'
 
 const endsWithJSRE = /\.[cm]?js$/
@@ -26,7 +28,24 @@ export interface ManifestChunk {
   dynamicImports?: string[]
 }
 
-export function manifestPlugin(): Plugin {
+export function manifestPlugin(config: ResolvedConfig): Plugin {
+  if (
+    config.build.manifest &&
+    config.experimental.enableNativePlugin === true
+  ) {
+    return perEnvironmentPlugin('native:manifest', (environment) => {
+      if (!environment.config.build.manifest) return false
+
+      return nativeManifestPlugin({
+        root: environment.config.root,
+        outPath:
+          environment.config.build.manifest === true
+            ? '.vite/manifest.json'
+            : environment.config.build.manifest,
+      })
+    })
+  }
+
   const getState = perEnvironmentState(() => {
     return {
       manifest: {} as Manifest,

packages/vite/src/node/plugins/modulePreloadPolyfill.ts

@@ -1,12 +1,27 @@
 import { exactRegex } from '@rolldown/pluginutils'
-import type { ResolvedConfig } from '..'
+import { modulePreloadPolyfillPlugin as nativeModulePreloadPolyfillPlugin } from 'rolldown/experimental'
+import { type ResolvedConfig, perEnvironmentPlugin } from '..'
 import type { Plugin } from '../plugin'
 import { isModernFlag } from './importAnalysisBuild'
 
 export const modulePreloadPolyfillId = 'vite/modulepreload-polyfill'
 const resolvedModulePreloadPolyfillId = '\0' + modulePreloadPolyfillId + '.js'
 
 export function modulePreloadPolyfillPlugin(config: ResolvedConfig): Plugin {
+  if (config.experimental.enableNativePlugin === true) {
+    return perEnvironmentPlugin(
+      'native:modulepreload-polyfill',
+      (environment) => {
+        if (
+          config.command !== 'build' ||
+          environment.config.consumer !== 'client'
+        )
+          return false
+        return nativeModulePreloadPolyfillPlugin()
+      },
+    )
+  }
+
   let polyfillString: string | undefined
 
   return {