wip: integrate core plugin (vite:define)

hi-ogawa · Nov 11, 2024 · 8d5f500 · 8d5f500
1 parent d716a08
commit 8d5f500
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
@@ -964,6 +964,7 @@ export async function resolveConfig(
     process.env.NODE_ENV = defaultNodeEnv
   }
 
+  // TODO: should we make `command == "build"` on rolldown dev?
   const configEnv: ConfigEnv = {
     mode,
     command,

diff --git a/packages/vite/src/node/server/environments/rolldown.ts b/packages/vite/src/node/server/environments/rolldown.ts
@@ -39,9 +39,8 @@ export function rolldownDevHandleConfig(config: UserConfig): UserConfig {
       noDiscovery: true,
       include: [],
     },
-    define: {
-      // TODO: use vite:define plugin
-      'process.env.NODE_ENV': "'development'",
+    experimental: {
+      enableNativePlugin: true,
     },
     environments: {
       client: {
@@ -224,8 +223,14 @@ class RolldownEnvironment extends DevEnvironment {
     // all plugins are shared like Vite 6 `sharedConfigBuild`.
     let plugins = this._plugins!
     plugins = plugins.filter(
-      // TODO: reuse core plugins
-      (p) => !(p.name?.startsWith('vite:') || p.name === 'alias'),
+      (p) =>
+        !(
+          typeof p.name === 'number' ||
+          p.name?.startsWith('vite:') ||
+          p.name === 'alias'
+        ) ||
+        // enable some core plugins
+        p.name === 'vite:define',
     )
     plugins = plugins.map((p) => injectEnvironmentToHooks(this as any, p))
 
@@ -240,7 +245,6 @@ class RolldownEnvironment extends DevEnvironment {
         mainFields: this.config.resolve.mainFields,
         symlinks: !this.config.resolve.preserveSymlinks,
       },
-      define: this.config.define,
       plugins: [
         viterollEntryPlugin(this.config, this.rolldownDevOptions),
         // TODO: how to use jsx-dev-runtime?

diff --git a/playground/rolldown-dev-ssr/vite.config.ts b/playground/rolldown-dev-ssr/vite.config.ts
@@ -25,6 +25,7 @@ export default defineConfig({
   },
   experimental: {
     rolldownDev: { hmr: true, reactRefresh: true },
+    enableNativePlugin: true,
   },
   plugins: [
     {