feat: update rolldown and support resolveSubpathImports for oxcResolvePlugin (#287)

Author: shulaoda

packages/vite/package.json

@@ -86,7 +86,7 @@
     "lightningcss": "^1.30.1",
     "picomatch": "^4.0.2",
     "postcss": "^8.5.6",
-    "rolldown": "1.0.0-beta.21",
+    "rolldown": "1.0.0-beta.23",
     "tinyglobby": "^0.2.14"
   },
   "optionalDependencies": {
@@ -98,7 +98,7 @@
     "@jridgewell/trace-mapping": "^0.3.25",
     "@oxc-project/types": "0.75.0",
     "@polka/compression": "^1.0.0-next.25",
-    "@rolldown/pluginutils": "1.0.0-beta.21",
+    "@rolldown/pluginutils": "1.0.0-beta.23",
     "@rollup/plugin-alias": "^5.1.1",
     "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-dynamic-import-vars": "2.1.4",

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

@@ -227,7 +227,6 @@ export function oxcResolvePlugin(
     ...(!resolveOptions.isBuild
       ? [optimizerResolvePlugin(resolveOptions)]
       : []),
-    importGlobSubpathImportsResolvePlugin(resolveOptions),
     ...perEnvironmentOrWorkerPlugin(
       'vite:resolve-builtin',
       overrideEnvConfig,
@@ -344,6 +343,11 @@ export function oxcResolvePlugin(
                 )
                 return newResolvedId === resolvedId ? undefined : newResolvedId
               },
+          resolveSubpathImports(id, importer, isRequire, scan) {
+            options.isRequire = resolveOptions.isRequire ?? isRequire
+            options.scan = scan
+            return resolveSubpathImports(id, importer, options)
+          },
         })
       },
     ),
@@ -448,39 +452,6 @@ function optimizerResolvePlugin(
   }
 }
 
-function importGlobSubpathImportsResolvePlugin(
-  resolveOptions: ResolvePluginOptionsWithOverrides,
-): Plugin {
-  const { root } = resolveOptions
-
-  return {
-    name: 'vite:resolve-import-glob-subpath-imports',
-    resolveId: {
-      filter: {
-        id: {
-          include: [/^#/],
-        },
-      },
-      handler(id, importer, resolveOpts) {
-        const options: InternalResolveOptions = {
-          isRequire: resolveOpts.kind === 'require-call',
-          ...this.environment.config.resolve,
-          ...resolveOptions,
-          scan: resolveOpts.scan ?? resolveOptions.scan,
-        }
-        options.preferRelative ||= importer?.endsWith('.html')
-
-        if (resolveOpts.custom?.['vite:import-glob']?.isSubImportsPattern) {
-          const resolvedImports = resolveSubpathImports(id, importer, options)
-          if (resolvedImports) {
-            return normalizePath(path.join(root, resolvedImports))
-          }
-        }
-      },
-    },
-  }
-}
-
 export function resolvePlugin(
   resolveOptions: ResolvePluginOptionsWithOverrides,
 ): Plugin {

playground/package.json

@@ -10,6 +10,6 @@
     "convert-source-map": "^2.0.0",
     "css-color-names": "^1.0.1",
     "kill-port": "^1.6.1",
-    "rolldown": "1.0.0-beta.21"
+    "rolldown": "1.0.0-beta.23"
   }
 }