feat(kkt): Override webpack config support promise.

kktjs · Jan 22, 2021 · deba4bc · deba4bc · vercel · Jan 22, 2021
1 parent b9f35e5
commit deba4bc
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/core/src/overrides/paths.ts b/core/src/overrides/paths.ts
@@ -6,6 +6,11 @@ export type OverridePaths = Paths & {
   _oldPaths: OverridePaths;
 };
 
+/**
+ * Override Paths
+ * @param {ParsedArgs | undefined} argvs
+ * @param {Record<string, string>} opts
+ */
 export const overridePaths = (
   argvs = undefined as ParsedArgs | undefined,
   opts: Record<string, string> = {},

diff --git a/core/src/scripts/build.ts b/core/src/scripts/build.ts
@@ -19,9 +19,14 @@ export default async function build(argvs: ParsedArgs) {
       // Source maps are resource heavy and can cause out of memory issue for large source files.
       const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
       const webpackConf = miniCssExtractPlugin(webpackConfig('production'));
+      const overrideWebpackConf = await overridesHandle(webpackConf, 'production', {
+        ...argvs,
+        shouldUseSourceMap,
+        paths,
+        kktrc,
+      });
       // override config in memory
-      require.cache[require.resolve(webpackConfigPath)].exports = (env: string) =>
-        overridesHandle(webpackConf, env, { ...argvs, shouldUseSourceMap, paths, kktrc });
+      require.cache[require.resolve(webpackConfigPath)].exports = (env: string) => overrideWebpackConf;
     }
 
     // run original script

diff --git a/core/src/scripts/start.ts b/core/src/scripts/start.ts
@@ -38,14 +38,19 @@ export default async function build(argvs: ParsedArgs) {
     const overridesHandle = (kktrc.default || kktrc) as KKTRC['default'];
     if (overridesHandle && typeof overridesHandle === 'function') {
       const webpackConf = miniCssExtractPlugin(webpackConfig('development'));
+      await overridePaths(undefined, { proxySetup });
+      if (kktrc && kktrc.proxySetup && typeof kktrc.proxySetup === 'function') {
+        cacheData({ proxySetup: kktrc.proxySetup });
+      }
+      const overrideWebpackConf = await overridesHandle(webpackConf, 'development', {
+        ...argvs,
+        shouldUseSourceMap,
+        paths,
+        devServerConfigHandle,
+        kktrc,
+      });
       // override config in memory
-      require.cache[require.resolve(webpackConfigPath)].exports = (env: string) => {
-        overridePaths(undefined, { proxySetup });
-        if (kktrc && kktrc.proxySetup && typeof kktrc.proxySetup === 'function') {
-          cacheData({ proxySetup: kktrc.proxySetup });
-        }
-        return overridesHandle(webpackConf, env, { ...argvs, shouldUseSourceMap, paths, devServerConfigHandle, kktrc });
-      };
+      require.cache[require.resolve(webpackConfigPath)].exports = (env: string) => overrideWebpackConf;
     }
 
     // run original script

diff --git a/core/src/utils/loaderConf.ts b/core/src/utils/loaderConf.ts
@@ -43,7 +43,7 @@ export type DevServerConfigFunction = (
 export type KKTRC = {
   proxySetup?: (app: express.Application) => MockerAPIOptions;
   devServer?: (config: WebpackDevServer.Configuration) => WebpackDevServer.Configuration;
-  default?: (conf: Configuration, evn: string, options: LoaderConfOptions) => Configuration;
+  default?: (conf: Configuration, evn: string, options: LoaderConfOptions) => Configuration | Promise<Configuration>;
 };
 
 export async function loaderConf(rcPath: string): Promise<KKTRC> {

diff --git a/core/src/utils/path.ts b/core/src/utils/path.ts
@@ -66,7 +66,7 @@ const reactDevUtils = path.join(require.resolve('react-dev-utils/package.json'),
 const paths: Paths = require(`${reactScripts}/config/paths`);
 
 /**
- * overrides proxySetup path
+ * Overrides proxySetup path
  * `<root path>/node_modules/kkt/lib/utils/proxySetup.js`
  */
 const proxySetup = path.resolve(__dirname, './proxySetup.js');