feat: support configFilePath in context (#130)

ice-lab · Apr 2, 2024 · 3a94a8e · 3a94a8e
1 parent 4901462
commit 3a94a8e
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 21 deletions.
diff --git a/packages/build-scripts/package.json b/packages/build-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-scripts",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "license": "MIT",
   "description": "scripts core",
   "main": "lib/index.js",

diff --git a/packages/build-scripts/src/Context.ts b/packages/build-scripts/src/Context.ts
@@ -48,7 +48,7 @@ import type {
   EmptyObject,
 } from './types.js';
 import type { Config } from '@jest/types';
-import { getUserConfig } from './utils/loadConfig.js';
+import { getUserConfig, resolveConfigFile } from './utils/loadConfig.js';
 import loadPkg from './utils/loadPkg.js';
 import { createLogger } from './utils/logger.js';
 import resolvePlugins from './utils/resolvePlugins.js';
@@ -95,6 +95,8 @@ class Context<T = {}, U = EmptyObject, K = EmptyObject> {
 
   configFile: string | string[];
 
+  configFilePath: string;
+
   private options: ContextOptions<U>;
 
   // 存放 config 配置的数组
@@ -190,12 +192,13 @@ class Context<T = {}, U = EmptyObject, K = EmptyObject> {
 
   resolveUserConfig = async (): Promise<UserConfig<K>> => {
     if (!this.userConfig) {
+      this.configFilePath = await resolveConfigFile(this.configFile, this.commandArgs, this.rootDir);
       this.userConfig = await getUserConfig<K>({
         rootDir: this.rootDir,
         commandArgs: this.commandArgs,
         pkg: this.pkg,
         logger: this.logger,
-        configFile: this.configFile,
+        configFilePath: this.configFilePath,
       });
     }
     return this.userConfig;

diff --git a/packages/build-scripts/src/utils/constant.ts b/packages/build-scripts/src/utils/constant.ts
@@ -8,6 +8,7 @@ export const PLUGIN_CONTEXT_KEY = [
   'originalUserConfig' as const,
   'pkg' as const,
   'extendsPluginAPI' as const,
+  'configFilePath' as const,
 ];
 
 export const VALIDATION_MAP = {

diff --git a/packages/build-scripts/src/utils/loadConfig.ts b/packages/build-scripts/src/utils/loadConfig.ts
@@ -46,37 +46,41 @@ export const mergeModeConfig = <K> (mode: string, userConfig: UserConfig<K>): Us
   return userConfig;
 };
 
+export const resolveConfigFile = async (configFile: string | string[], commandArgs: CommandArgs, rootDir: string) => {
+  const { config } = commandArgs;
+  let configPath = '';
+  if (config) {
+    configPath = path.isAbsolute(config)
+      ? config
+      : path.resolve(rootDir, config);
+  } else {
+    const [defaultUserConfig] = await fg(configFile, { cwd: rootDir, absolute: true });
+    configPath = defaultUserConfig;
+  }
+  return configPath;
+}
+
 export const getUserConfig = async <K extends EmptyObject>({
   rootDir,
   commandArgs,
   logger,
   pkg,
-  configFile,
+  configFilePath,
 }: {
   rootDir: string;
   commandArgs: CommandArgs;
   pkg: Json;
   logger: CreateLoggerReturns;
-  configFile: string | string[];
+  configFilePath: string;
 }): Promise<UserConfig<K>> => {
-  const { config } = commandArgs;
-  let configPath = '';
-  if (config) {
-    configPath = path.isAbsolute(config)
-      ? config
-      : path.resolve(rootDir, config);
-  } else {
-    const [defaultUserConfig] = await fg(configFile, { cwd: rootDir, absolute: true });
-    configPath = defaultUserConfig;
-  }
   let userConfig = {
     plugins: [] as PluginList,
   };
-  if (configPath && fs.existsSync(configPath)) {
+  if (configFilePath && fs.existsSync(configFilePath)) {
     try {
-      userConfig = await loadConfig(configPath, pkg, logger);
+      userConfig = await loadConfig(configFilePath, pkg, logger);
     } catch (err) {
-      logger.warn(`Fail to load config file ${configPath}`);
+      logger.warn(`Fail to load config file ${configFilePath}`);
 
       if (err instanceof Error) {
         logger.error(err.stack);
@@ -86,9 +90,9 @@ export const getUserConfig = async <K extends EmptyObject>({
 
       process.exit(1);
     }
-  } else if (configPath) {
+  } else if (configFilePath) {
     // If path was not found
-    logger.error(`config file${`(${configPath})` || ''} is not exist`);
+    logger.error(`config file${`(${configFilePath})` || ''} is not exist`);
     process.exit(1);
   } else {
     logger.debug(
@@ -164,4 +168,4 @@ async function executeTypescriptModule(code: string, filePath: string, isEsm = t
   fs.unlinkSync(tempFile);
 
   return userConfig;
-}
+}