fix(cli/eject): fix the component path not right (#2896)

SoonIter · web-flow · commit 324386d2a8b5 · 2025-12-16T18:47:49.000+08:00
diff --git a/packages/core/src/node/PluginDriver.ts b/packages/core/src/node/PluginDriver.ts
@@ -112,6 +112,7 @@ export class PluginDriver {
   }
 
   private async normalizeConfig() {
+    this.#config.root ??= 'docs';
     this.#config.ssg ??= true;
     this.#config.llms ??= false;
     this.#config.base = addTrailingSlash(
diff --git a/packages/core/src/node/constants.ts b/packages/core/src/node/constants.ts
@@ -33,6 +33,7 @@ export const PACKAGE_ROOT = path.dirname(
   require.resolve('@rspress/core/package.json'),
 );
 export const DEFAULT_THEME = path.join(PACKAGE_ROOT, 'dist/theme');
+export const EJECTED_THEME = path.join(PACKAGE_ROOT, 'dist/eject-theme');
 export const TEMPLATE_PATH = path.join(PACKAGE_ROOT, 'index.html');
 
 export const CSR_CLIENT_ENTRY = path.join(
diff --git a/packages/core/src/node/eject.ts b/packages/core/src/node/eject.ts
@@ -1,11 +1,8 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { fileURLToPath } from 'node:url';
 import { logger } from '@rspress/shared/logger';
 import picocolors from 'picocolors';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+import { EJECTED_THEME } from './constants';
 
 // For testing purposes, allow overriding the theme path
 let _themeComponentsPathOverride: string | undefined;
@@ -23,7 +20,7 @@ function getThemeComponentsPath(): string {
   if (_themeComponentsPathOverride) {
     return _themeComponentsPathOverride;
   }
-  return path.join(__dirname, 'eject-theme/components');
+  return path.join(EJECTED_THEME, 'components');
 }
 
 /**
diff --git a/packages/core/src/node/initRsbuild.ts b/packages/core/src/node/initRsbuild.ts
@@ -1,5 +1,6 @@
 import { createRequire } from 'node:module';
 import path from 'node:path';
+import { cwd } from 'node:process';
 import { fileURLToPath } from 'node:url';
 import type {
   RsbuildConfig,
@@ -89,7 +90,9 @@ async function createInternalBuildConfig(
   routeService: RouteService,
   pluginDriver: PluginDriver,
 ): Promise<RsbuildConfig> {
-  const CUSTOM_THEME_DIR = config.themeDir!;
+  const CUSTOM_THEME_DIR = path.isAbsolute(config.themeDir!)
+    ? config.themeDir!
+    : path.join(cwd(), config.themeDir!);
   const outDir = config?.outDir ?? OUTPUT_DIR;
 
   const base = config?.base ?? '';
@@ -363,7 +366,7 @@ async function createInternalBuildConfig(
         chain.resolve.extensions.prepend('.md').prepend('.mdx').prepend('.mjs');
 
         chain.module
-          .rule('css-virtual-module')
+          .rule('rspress-css-virtual-module')
           .test(/\.rspress[\\/]runtime[\\/]virtual-global-styles/)
           .merge({ sideEffects: true });
 
@@ -499,8 +502,7 @@ export async function initRsbuild(
   enableSSG: boolean,
   extraRsbuildConfig?: RsbuildConfig,
 ): Promise<RsbuildInstance> {
-  const cwd = process.cwd();
-  const userDocRoot = path.resolve(rootDir || config?.root || cwd);
+  const userDocRoot = path.resolve(rootDir || config.root!);
 
   hintBuilderPluginsBreakingChange(config);
 

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ export class PluginDriver {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`private async normalizeConfig() {`
	`115`	`+ this.#config.root ??= 'docs';`
`115`	`116`	`this.#config.ssg ??= true;`
`116`	`117`	`this.#config.llms ??= false;`
`117`	`118`	`this.#config.base = addTrailingSlash(`