akfun 5.1.10 → 5.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akfun",
-  "version": "5.1.10",
+  "version": "5.1.11",
   "description": "前端脚手架：支持Vue技术栈和react技术栈",
   "keywords": [
     "前端工程",

package/src/dev-server.js

@@ -92,15 +92,17 @@ module.exports = function (akfunConfig, _consoleTag) {
   // serve webpack bundle output
   app.use(devMiddleware);
 
-  // 启动 webpack-hot-middleware，也就是我们常说的 Hot-reload
-  const hotMiddleware = require('webpack-hot-middleware')(compiler, {
-    log: false,
-    heartbeat: 2000
-  });
+  if (!curEnvConfig.closeHotReload) {
+    // 启动 webpack-hot-middleware，也就是我们常说的 Hot-reload
+    const hotMiddleware = require('webpack-hot-middleware')(compiler, {
+      log: false,
+      heartbeat: 2000
+    });
 
-  // enable hot-reload and state-preserving
-  // compilation error display
-  app.use(hotMiddleware);
+    // enable hot-reload and state-preserving
+    // compilation error display
+    app.use(hotMiddleware);
+  }
 
   const afterCreateServerAction = (isHttps, port) => {
     spinner.succeed(`${consoleTag}调试模式已开启！`);

package/src/webpack/webpack.base.conf.js

@@ -29,7 +29,7 @@ const BannerPack = new webpack.BannerPlugin({
 /**
  * webpack.base.conf.js
  * 主要用于设置 rules 和 通用插件
- * _curEnvConfig: 执行环境中的配置，比如：dev、build、build2lib等；
+ * _curEnvConfig: 执行环境中的配置，用于记录 dev、build、build2lib 等对应的配置内容；
  * _akfunConfig：完整的配置对象
  */
 module.exports = (_curEnvConfig, _akfunConfig) => {
@@ -74,15 +74,7 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
      * 当webpack试图去加载模块的时候，它默认是查找以 .js 结尾的文件的
      */
     resolve: curWebpackConfig.resolve,
-    externals: curWebpackConfig.ignoreNodeModules
-      ? [
-          nodeExternals({
-            importType: 'commonjs',
-            additionalModuleDirs: curWebpackConfig.additionalModuleDirs || [],
-            allowlist: curWebpackConfig.allowList ? curWebpackConfig.allowList : []
-          })
-        ].concat(curWebpackConfig.externals)
-      : curWebpackConfig.externals,
+    externals: {},
     module: {
       rules: [
         {
@@ -208,28 +200,37 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
       new ProgressBarPlugin()
     ]
   };
+
+  let ignoreNodeModules = curWebpackConfig.ignoreNodeModules;
   // 优先使用执行环境中的配置
   if (curEnvConfig.ignoreNodeModules !== undefined) {
-    const allowList = curEnvConfig.allowList || curWebpackConfig.allowList;
-    const externals = curEnvConfig.externals || curWebpackConfig.external || [];
-    webpackConfig.externals = curEnvConfig.ignoreNodeModules
-      ? [
-          nodeExternals({
-            importType: 'commonjs',
-            additionalModuleDirs:
-              curEnvConfig.additionalModuleDirs || curWebpackConfig.additionalModuleDirs || [],
-            allowlist: allowList || []
-          })
-        ].concat(externals)
-      : externals;
+    ignoreNodeModules = curEnvConfig.ignoreNodeModules;
   }
+
+  // allowList 需要开启 ignoreNodeModules 后有效
+  const allowList = curEnvConfig.allowList || curWebpackConfig.allowList;
+  // 用户手动添加要剔除的依赖
+  const externals = curEnvConfig.externals || curWebpackConfig.external || [];
+
+  // 设置要剔除的依赖
+  webpackConfig.externals = ignoreNodeModules
+    ? [
+        nodeExternals({
+          importType: 'commonjs',
+          additionalModuleDirs:
+            curEnvConfig.additionalModuleDirs || curWebpackConfig.additionalModuleDirs || [],
+          allowlist: allowList || []
+        })
+      ].concat(externals)
+    : externals;
+
   // 集成构建入口相关的配置（优先级更高）
   if (curEnvConfig.entry) {
     webpackConfig.entry = curEnvConfig.entry; // 会覆盖config.webpack.entry的配置
   }
   // 多页面多模板支持能力
   let entryConfig = webpackConfig.entry || {}; // 获取构建入口配置
-  const entryFiles = (entryConfig && Object.keys(entryConfig)) || [];
+  const entryFiles = Object.keys(entryConfig);
 
   if (
     !webpackConfig.entry ||

package/src/webpack/webpack.dev.conf.js

@@ -81,10 +81,10 @@ module.exports = (akfunConfig) => {
     });
   }
 
-  // 开启热更新能力
-  const devClientPath = path.resolve(__dirname, '../dev-client'); // 从akfun中获取
-  // add hot-reload related code to entry chunks
   if (!curEnvConfig.closeHotReload && webpackDevConfig.entry) {
+    // 开启热更新能力
+    const devClientPath = path.resolve(__dirname, '../dev-client'); // 从akfun中获取
+    // add hot-reload related code to entry chunks
     Object.keys(webpackDevConfig.entry).forEach((name) => {
       webpackDevConfig.entry[name] = [devClientPath].concat(webpackDevConfig.entry[name]);
     });