feat: use native Vite resolver (#65)

rolldown · Nov 19, 2024 · 07ad00f · 07ad00f
1 parent 0330bb1
commit 07ad00f
Show file tree

Hide file tree

Showing 7 changed files with 345 additions and 62 deletions.
diff --git a/packages/vite/src/node/idResolver.ts b/packages/vite/src/node/idResolver.ts
@@ -61,6 +61,7 @@ export function createIdResolver(
         [
           // @ts-expect-error  the aliasPlugin uses rollup types
           aliasPlugin({ entries: environment.config.resolve.alias }),
+          // TODO: use oxcResolvePlugin here as well
           resolvePlugin({
             root: config.root,
             isProduction: config.isProduction,

diff --git a/packages/vite/src/node/plugin.ts b/packages/vite/src/node/plugin.ts
@@ -349,9 +349,19 @@ export type PluginOption = Thenable<Plugin | FalsyPlugin | PluginOption[]>
 
 export async function resolveEnvironmentPlugins(
   environment: PartialEnvironment,
+): Promise<Plugin[]> {
+  return resolveEnvironmentPluginsRaw(
+    environment.getTopLevelConfig().plugins,
+    environment,
+  )
+}
+
+export async function resolveEnvironmentPluginsRaw(
+  plugins: readonly Plugin[],
+  environment: PartialEnvironment,
 ): Promise<Plugin[]> {
   const environmentPlugins: Plugin[] = []
-  for (const plugin of environment.getTopLevelConfig().plugins) {
+  for (const plugin of plugins) {
     if (plugin.applyToEnvironment) {
       const applied = await plugin.applyToEnvironment(environment)
       if (!applied) {

diff --git a/packages/vite/src/node/plugins/index.ts b/packages/vite/src/node/plugins/index.ts
@@ -20,7 +20,7 @@ import {
 } from '../plugin'
 import { watchPackageDataPlugin } from '../packages'
 import { jsonPlugin } from './json'
-import { filteredResolvePlugin, resolvePlugin } from './resolve'
+import { oxcResolvePlugin, resolvePlugin } from './resolve'
 import { optimizedDepsPlugin } from './optimizedDeps'
 import { importAnalysisPlugin } from './importAnalysis'
 import { cssAnalysisPlugin, cssPlugin, cssPostPlugin } from './css'
@@ -96,25 +96,30 @@ export async function resolvePlugins(
           )
         : modulePreloadPolyfillPlugin(config)
       : null,
-    enableNativePlugin
-      ? filteredResolvePlugin({
-          root: config.root,
-          isProduction: config.isProduction,
-          isBuild,
-          packageCache: config.packageCache,
-          asSrc: true,
-          optimizeDeps: true,
-          externalize: true,
-        })
-      : resolvePlugin({
-          root: config.root,
-          isProduction: config.isProduction,
-          isBuild,
-          packageCache: config.packageCache,
-          asSrc: true,
-          optimizeDeps: true,
-          externalize: true,
-        }),
+    ...(enableNativePlugin
+      ? oxcResolvePlugin(
+          {
+            root: config.root,
+            isProduction: config.isProduction,
+            isBuild,
+            packageCache: config.packageCache,
+            asSrc: true,
+            optimizeDeps: true,
+            externalize: true,
+          },
+          isWorker ? config : undefined,
+        )
+      : [
+          resolvePlugin({
+            root: config.root,
+            isProduction: config.isProduction,
+            isBuild,
+            packageCache: config.packageCache,
+            asSrc: true,
+            optimizeDeps: true,
+            externalize: true,
+          }),
+        ]),
     htmlInlineProxyPlugin(config),
     cssPlugin(config),
     config.oxc !== false