akfun 1.5.19 → 1.6.0

package/module/index.js

@@ -129,7 +129,7 @@ let argv = yargs
   )
   .command(
     'build',
-    '构建生产环境的代码',
+    '构建生产环境代码',
     (yargs) => {
       yargs
         .reset()
@@ -142,7 +142,7 @@ let argv = yargs
   )
   .command(
     'build2lib',
-    '构建第三方功能包',
+    '构建lib库',
     (yargs) => {
       yargs
         .reset()
@@ -155,7 +155,7 @@ let argv = yargs
   )
   .command(
     'build2esm',
-    '构建esm功能包',
+    '构建esm模块',
     (yargs) => {
       yargs
         .reset()

package/module/inspect.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const getCurWebpackConfig = require('../src/utils/getCurWebpackConfig.js'); // 用于获取当前webpack配置的方法
 
 // 根据当前配置文件内容创建指定名称的文件
-const createConfigJs = function (fileCont, fileName) {
+const createConfigJs = function (fileName, fileCont) {
   let filePath = path.resolve(process.cwd(), fileName);
 
   fs.writeFile(filePath, JSON.stringify(fileCont, null, 2), (err) => {
@@ -21,18 +21,18 @@ module.exports = (type) => {
   const spinner = ora(  '[akfun]正在获取当前环境的配置数据...').start();
   if (type === 'dev') {
     const devConfig = getCurWebpackConfig(type);
-    createConfigJs(devConfig, 'current-akfun-dev-config.js');
+    createConfigJs('current-akfun-dev-config.js', devConfig);
     spinner.succeed(  '[akfun]当前配置数据已输出至akfun-dev-config.js中！');
   } else if (type === 'lib') {
     const libraryConfig = getCurWebpackConfig(type);
-    createConfigJs(libraryConfig, 'current-akfun-build2lib-config.js');
+    createConfigJs('current-akfun-build2lib-config.js', libraryConfig);
     spinner.succeed(  '[akfun]当前配置数据已输出至akfun-build2lib-config.js中！');
   } else if (type === 'build') {
     const prodConfig = getCurWebpackConfig(type);
     // 默认输出生产环境的配置文件
-    createConfigJs(prodConfig, 'current-akfun-build-config.js');
+    createConfigJs('current-akfun-build-config.js', prodConfig);
     spinner.succeed(  '[akfun]当前配置数据已输出至akfun-build-config.js中！');
   } else {
-    console.log(`不能识别type=${type}。`)
+    console.log(`不能识别type=${type}。`);
   }
 };

package/module/main.js

@@ -2,11 +2,24 @@
 const buildAction = require('../src/build.js'); // 构建脚本：生产环境
 const devAction = require('../src/dev-server.js'); // 构建脚本：开发环境
 const build2esm = require('../src/build2esm.js'); // 构建esm输出模块
+const inspect = require('./inspect.js');
+const gitClone = require('../src/utils/gitClone.js');
+const createFile = require('../src/utils/createFile');
+const {resolve} = require('../src/utils/pathUtils');
+const getConfigObj = require('../src/utils/getConfigObj');
+const deepMergeConfig = require('../src/utils/deepMergeConfig');
 const getCurWebpackConfig = require('../src/utils/getCurWebpackConfig.js'); // 用于获取当前webpack配置的方法
 
 module.exports = {
   dev: devAction,
   build: buildAction,
   build2esm,
+  inspect,
+  gitClone,
+  createFile,
+  resolve,
+  getConfigObj,
+  deepMergeConfig,
+  getCurWebpackConfig,
   curWebpackBaseConfPath: getCurWebpackConfig('base'),
 };

package/package.json

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

package/src/config/default.config.js

@@ -1,4 +1,3 @@
-'use strict';
 // 统一路径解析：
 const { resolve } = require('../utils/pathUtils');
 

package/src/initData/config/akfun.config.js

@@ -22,7 +22,7 @@ module.exports = {
     },
     resolve: {
       // webpack的resolve配置
-      extensions: ['.js', '.jsx', '.vue', 'json'], // 用于配置webpack在尝试过程中用到的后缀列表
+      extensions: ['.js', '.jsx', '.ts', '.tsx', '.vue', 'json'], // 用于配置webpack在尝试过程中用到的后缀列表
       alias: {
         '@': resolve('src'),
         $components: resolve('src/components'),
@@ -31,6 +31,8 @@ module.exports = {
         $utils: resolve('src/utils')
       }
     },
+    createDeclaration: false, // 打包时是否创建ts声明文件
+    ignoreNodeModules: false, // 打包时是否忽略 node_modules
     externals: [], // 从输出的 bundle 中排除依赖
     template: resolve('src/index.html'), // 默认使用的页面模板
     sassResources: []

package/src/utils/getCurWebpackConfig.js

@@ -1,16 +1,16 @@
 /**
  * 用于获取当前项目配置文件
  */
-module.exports = (type) => {
+module.exports = (type, akfunConfig) => {
   let curConfig = {};
   if (type === 'dev') {
-    curConfig = require('../webpack/webpack.dev.conf')();
+    curConfig = require('../webpack/webpack.dev.conf')(akfunConfig);
   } else if (type === 'lib') {
-    curConfig = require('../webpack/webpack.library.conf')();
+    curConfig = require('../webpack/webpack.library.conf')(akfunConfig);
   } else if (type === 'build') {
-    curConfig = require('../webpack/webpack.prod.conf')();
+    curConfig = require('../webpack/webpack.prod.conf')(akfunConfig);
   } else if (type === 'base') {
-    curConfig = require('../webpack/webpack.base.conf')();
+    curConfig = require('../webpack/webpack.base.conf')(akfunConfig);
   }
   return curConfig;
 };