akfun 5.0.1 → 5.0.3

package/package.json

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

package/src/config/rollup.config.js

@@ -31,6 +31,7 @@ module.exports = function (fileName, akfunConfig) {
   const curConfig = akfunConfig || projectConfig;
   const build2esm = curConfig.build2esm || {};
   const curWebpackConfig = curConfig.webpack || {};
+  const buildType = build2esm.type || 'ts';
   // 获取用户配置的构建入口文件
   let rollupInput = resolveToCurrentRoot('src/main.js');
   if (build2esm.input) {
@@ -70,9 +71,10 @@ module.exports = function (fileName, akfunConfig) {
       nodeResolve({
         extensions: curConfig.webpack.resolve.extensions
       }),
-      typescript(),
+      buildType === 'ts' ? typescript() : undefined,
       babel(babelConfig), // 备注，需要先babel()再commjs()
       // jsx( {factory: 'React.createElement'} ),
+      buildType === 'ts' ? jsx( {factory: 'React.createElement'} ) : undefined,
       vue(),
       commonjs(),
       postcss({

package/src/dev-server.js

@@ -50,6 +50,23 @@ module.exports = function (akfunConfig, _consoleTag) {
   // 获取开发环境的webpack基本配置
   const webpackConfig = getDevWebpackConfig(config);
 
+  // Define HTTP proxies to your custom API backend
+  // https://github.com/chimurai/http-proxy-middleware
+  // 使用 config.dev.proxyTable 的配置作为 proxyTable 的代理配置
+  // 备注：需放connect-history-api-fallback前面，避免get请求的代理失效
+  const proxyTable = config.dev.proxyTable;
+  if (proxyTable && JSON.stringify(proxyTable) !== '{}') {
+    // 将 proxyTable 中的请求配置挂在到启动的 express 服务上
+    // proxy api requests
+    Object.keys(proxyTable).forEach((context) => {
+      let options = proxyTable[context];
+      if (typeof options === 'string') {
+        options = { target: options };
+      }
+      app.use(context, createProxyMiddleware(options));
+    });
+  }
+
   // 使用 connect-history-api-fallback 匹配资源，如果不匹配就可以重定向到指定地址
   // handle fallback for HTML5 history API
   // 备注：需放express.static前面，避免失效
@@ -81,22 +98,6 @@ module.exports = function (akfunConfig, _consoleTag) {
   // compilation error display
   app.use(hotMiddleware);
 
-  // Define HTTP proxies to your custom API backend
-  // https://github.com/chimurai/http-proxy-middleware
-  // 使用 config.dev.proxyTable 的配置作为 proxyTable 的代理配置
-  const proxyTable = config.dev.proxyTable;
-  if (proxyTable && JSON.stringify(proxyTable) !== '{}') {
-    // 将 proxyTable 中的请求配置挂在到启动的 express 服务上
-    // proxy api requests
-    Object.keys(proxyTable).forEach((context) => {
-      let options = proxyTable[context];
-      if (typeof options === 'string') {
-        options = { target: options };
-      }
-      app.use(context, createProxyMiddleware(options));
-    });
-  }
-
   const afterCreateServerAction = (isHttps, port) => {
     spinner.succeed(`${consoleTag}调试模式已开启！`);
 

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

@@ -77,6 +77,7 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
       ? [
         nodeExternals({
           importType: 'commonjs',
+          additionalModuleDirs: curWebpackConfig.additionalModuleDirs || [],
           allowlist: curWebpackConfig.allowList ? curWebpackConfig.allowList : []
         })
       ].concat(curWebpackConfig.externals)
@@ -214,6 +215,7 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
       ? [
         nodeExternals({
           importType: 'commonjs',
+          additionalModuleDirs: curEnvConfig.additionalModuleDirs || curWebpackConfig.additionalModuleDirs || [],
           allowlist: allowList || []
         })
       ].concat(externals)