fix(@kkt/ssr):优化代码

kktjs · Apr 7, 2022 · 5be472b · 5be472b
1 parent 50c4b74
commit 5be472b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/core/src/overrides/overridesWebpackDevServerUtils.ts b/core/src/overrides/overridesWebpackDevServerUtils.ts
@@ -4,12 +4,12 @@
 
 import { reactDevUtils } from "./pathUtils"
 import webpack from "webpack"
-const WebpackDevServerUtilsPath = `${reactDevUtils}/WebpackDevServerUtils`
+import chalk from 'chalk';
 
+const WebpackDevServerUtilsPath = `${reactDevUtils}/WebpackDevServerUtils`
 const WebpackDevServerUtils = require(`${WebpackDevServerUtilsPath}`)
 const clearConsole = require(`${reactDevUtils}/clearConsole`)
 const formatWebpackMessages = require(`${reactDevUtils}/formatWebpackMessages`)
-const chalk = require('chalk');
 
 export interface Urls {
   lanUrlForConfig?: string | undefined;

diff --git a/core/src/utils/ProcessingConfig.ts b/core/src/utils/ProcessingConfig.ts
@@ -6,7 +6,7 @@ import CreateTemporaryAsset from "./plugins/CreateTemporaryAsset"
 import { restOutPut } from "./output"
 import { getWbpackBarPlugins, restWebpackManifestPlugin, clearHtmlTemp, addServerPlugins, AddDefinePlugin } from "./plugins"
 
-export type GetWebpackConfig = (
+export type ProcessingConfigProps = (
   newConfig: webpack.Configuration,
   type: "server" | "client",
   overrides: OverridesProps,
@@ -16,7 +16,7 @@ export type GetWebpackConfig = (
 ) => webpack.Configuration
 
 
-const getWebpackConfig: GetWebpackConfig = (newConfig, type, overrides, nodeExternals, split, options) => {
+const processingConfig: ProcessingConfigProps = (newConfig, type, overrides, nodeExternals, split, options) => {
   const isDev = process.env.NODE_ENV === "development"
   /** 入口 */
   newConfig.entry = overrides[`${type}_path`]
@@ -100,4 +100,4 @@ const getWebpackConfig: GetWebpackConfig = (newConfig, type, overrides, nodeExte
   return newConfig
 }
 
-export default getWebpackConfig
+export default processingConfig
diff --git a/core/src/utils/getWebpackConfig.ts b/core/src/utils/getWebpackConfig.ts
@@ -8,7 +8,7 @@ import fs from 'fs';
 import { OptionsProps } from "../interface"
 import { loaderConf } from "../overrides"
 import { restDevModuleRuleCss, removeSourceMapLoader } from "./module"
-import getWebpackConfig from "./ProcessingConfig"
+import processingConfig from "./ProcessingConfig"
 
 const { choosePort } = require('react-dev-utils/WebpackDevServerUtils');
 
@@ -49,7 +49,7 @@ export default async (env: "development" | "production", options: OptionsProps,)
     // 控制 client 是否使用 ssr，默认情况下使用
     if (!original) {
 
-      newConfigClient = getWebpackConfig(configClient, "client", overrides, options.clientNodeExternals, options.clientIsChunk, options)
+      newConfigClient = processingConfig(configClient, "client", overrides, options.clientNodeExternals, options.clientIsChunk, options)
     }
     if (!original) {
       // 去除 source-map-loader
@@ -69,7 +69,7 @@ export default async (env: "development" | "production", options: OptionsProps,)
 
     const configServer = configFactory(env);
 
-    let newConfigServer = getWebpackConfig(configServer, "server", overrides, options.serverNodeExternals, options.serverIsChunk, options)
+    let newConfigServer = processingConfig(configServer, "server", overrides, options.serverNodeExternals, options.serverIsChunk, options)
 
     newConfigServer.devtool = false
     newConfigServer.target = "node14"

diff --git a/core/src/utils/index.ts b/core/src/utils/index.ts
@@ -2,6 +2,8 @@ export * from "./module"
 export * from "./plugins"
 export * from "./output"
 
+export { default as getWebpackConfig } from "./getWebpackConfig"
+export { default as processingConfig } from "./ProcessingConfig"
 type BoolenValue = boolean | undefined | "false" | "true"
 
 export const getBoolean = (one: BoolenValue, two: BoolenValue, defaultValue: boolean = false) => {