akfun 2.0.1 → 2.0.2

package/package.json

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

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

@@ -15,7 +15,7 @@ const catchVuePages = require('../utils/catchVuePages'); // 用于获取当前
 // 引入当前项目配置文件
 const projectConfig = require('../config/index');
 const babelConfig = require('../config/babel.config'); // Babel的配置文件
-const {buildBanner} = require("../utils/akfunParams");
+const { buildBanner } = require('../utils/akfunParams');
 const getJsEntries = require('../utils/jsEntries');
 const { isArray } = require('../utils/typeof');
 
@@ -58,9 +58,12 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
      */
     resolve: curWebpackConfig.resolve,
     externals: curWebpackConfig.ignoreNodeModules
-      ? [nodeExternals({
-        allowlist: curWebpackConfig.allowList ? curWebpackConfig.allowList : []
-      })].concat(curWebpackConfig.externals)
+      ? [
+          nodeExternals({
+            importType: 'commonjs',
+            allowlist: curWebpackConfig.allowList ? curWebpackConfig.allowList : []
+          })
+        ].concat(curWebpackConfig.externals)
       : curWebpackConfig.externals,
     module: {
       rules: [
@@ -166,9 +169,14 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
   if (curEnvConfig.ignoreNodeModules !== undefined) {
     const allowList = curEnvConfig.allowList || curWebpackConfig.allowList;
     const externals = curEnvConfig.externals || config.webpack.external || [];
-    webpackConfig.externals = curEnvConfig.ignoreNodeModules ? [nodeExternals({
-      allowlist: allowList || [],
-    })].concat(externals) : externals;
+    webpackConfig.externals = curEnvConfig.ignoreNodeModules
+      ? [
+          nodeExternals({
+            importType: 'commonjs',
+            allowlist: allowList || []
+          })
+        ].concat(externals)
+      : externals;
   }
   // 集成构建入口相关的配置（优先级更高）
   if (curEnvConfig.entry) {

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

@@ -37,7 +37,8 @@ module.exports = (akfunConfig) => {
       emitOnErrors: true,
       splitChunks: {
         cacheGroups: {
-          defaultVendors: { // 4.0: vendors
+          defaultVendors: {
+            // 4.0: vendors
             test: /node_modules\/(.*)/,
             name: 'vendor',
             chunks: 'initial',
@@ -55,7 +56,7 @@ module.exports = (akfunConfig) => {
     },
     plugins: [
       // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
-      new webpack.HotModuleReplacementPlugin(),
+      new webpack.HotModuleReplacementPlugin()
     ]
   });
 
@@ -68,7 +69,7 @@ module.exports = (akfunConfig) => {
   // 开启热更新能力
   const devClientPath = path.resolve(__dirname, '../dev-client'); // 从akfun中获取
   // add hot-reload related code to entry chunks
-  if (webpackDevConfig.entry) {
+  if (!curEnvConfig.closeHotReload && webpackDevConfig.entry) {
     Object.keys(webpackDevConfig.entry).forEach((name) => {
       webpackDevConfig.entry[name] = [devClientPath].concat(webpackDevConfig.entry[name]);
     });

package/src/webpack/webpack.library.conf.js

@@ -23,10 +23,10 @@ module.exports = (akfunConfig) => {
       publicPath: '',
       library: {
         type: 'umd', // 定义打包方式Universal Module Definition,同时支持在CommonJS、AMD和全局变量使用
-        name: curEnvConfig.libraryName,
+        name: curEnvConfig.libraryName
       },
       // 指定类库名,主要用于直接引用的方式(比如使用script 标签)
-      globalObject: 'this', // 定义全局变量,兼容node和浏览器运行，避免出现"window is not defined"的情况
+      globalObject: 'this' // 定义全局变量,兼容node和浏览器运行，避免出现"window is not defined"的情况
     },
     module: {
       rules: utils.styleLoaders({
@@ -34,7 +34,7 @@ module.exports = (akfunConfig) => {
         environment: 'prod'
       })
     },
-    devtool:  curEnvConfig.productionSourceMap ? curEnvConfig.devtool || 'source-map' : false, // 线上生成环境
+    devtool: curEnvConfig.productionSourceMap ? curEnvConfig.devtool || 'source-map' : false, // 线上生成环境
     optimization: {
       /**
        *  named 对调试更友好的可读的 id。
@@ -46,15 +46,15 @@ module.exports = (akfunConfig) => {
     plugins: [
       new MiniCssExtractPlugin({
         // filename: utils.assetsPath('index.css'),
-        filename: "[name].css",
-        chunkFilename: "[name].css",
+        filename: '[name].css',
+        chunkFilename: '[name].css',
         ignoreOrder: false
       }),
       new OptimizeCSSPlugin({
         cssProcessorOptions: {
           safe: true
         }
-      }),
+      })
     ]
   });
 

package/src/webpack/webpack.prod.conf.js

@@ -55,7 +55,8 @@ module.exports = (akfunConfig) => {
       emitOnErrors: true,
       splitChunks: {
         cacheGroups: {
-          defaultVendors: { // 4.0: vendors
+          defaultVendors: {
+            // 4.0: vendors
             test: /node_modules\/(.*)/,
             name: 'vendor',
             chunks: 'initial',
@@ -90,7 +91,7 @@ module.exports = (akfunConfig) => {
         cssProcessorOptions: {
           safe: true
         }
-      }),
+      })
     ]
   });
 
@@ -128,7 +129,7 @@ module.exports = (akfunConfig) => {
       })
     );
   }
-  
+
   // 是否开启
   if (curEnvConfig.openMonacoWebpackPlugin) {
     webpackProdConfig.plugins.push(new MonacoWebpackPlugin());