akfun 3.1.8 → 3.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akfun",
-  "version": "3.1.8",
+  "version": "3.2.1",
   "description": "前端脚手架：支持Vue技术栈和react技术栈",
   "keywords": [
     "前端工程",
@@ -73,6 +73,7 @@
     "@rollup/plugin-image": "^2.1.1",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.1.3",
+    "@rollup/plugin-typescript": "^8.3.1",
     "@typescript-eslint/eslint-plugin": "^5.10.2",
     "@typescript-eslint/parser": "^5.10.2",
     "@vue/compiler-sfc": "^3.2.29",

package/src/config/rollup.config.js

@@ -1,6 +1,8 @@
 // rollup.config.js
 const { babel } = require('@rollup/plugin-babel');
 const { nodeResolve } = require('@rollup/plugin-node-resolve'); // 支持node中的文件导入
+// const jsx = require('rollup-plugin-jsx'); // 用于处理jsx
+const typescript = require('@rollup/plugin-typescript'); // 支持ts
 const commonjs = require('@rollup/plugin-commonjs'); // 识别cmd模块
 const vue = require('rollup-plugin-vue');
 const json = require('@rollup/plugin-json'); // 识别json类型文件
@@ -17,30 +19,37 @@ const nested = require('postcss-nested');
 const postcssPresetEnv = require('postcss-preset-env');
 // css代码压缩
 const cssnano = require('cssnano');
+// const { externals } = require('rollup-plugin-node-externals');
 const { resolveToCurrentRoot, resolveToCurrentDist } = require('../utils/pathUtils'); // 统一路径解析
 const babelConfig = require('./babel.config'); // Babel的配置文件
-const curProjectConfig = require('./index'); // 引入当前项目配置文件
-const {buildBanner} = require("../utils/akfunParams");
+const projectConfig = require('./index'); // 引入当前项目配置文件
+const { buildBanner } = require('../utils/akfunParams');
 
-module.exports = function(fileName, akfunConfig) {
+module.exports = function (fileName, akfunConfig) {
   const curConfig = akfunConfig || curProjectConfig;
+  const build2esm = curConfig.build2esm || {};
   // 获取用户配置的构建入口文件
   let rollupInput = resolveToCurrentRoot('src/main.js');
-  if (curConfig.build2esm && curConfig.build2esm.input) {
-    rollupInput = curConfig.build2esm.input;
+  if (build2esm.input) {
+    rollupInput = build2esm.input;
   }
   let curFileName = fileName || 'index'; // 默认以"index.esm.js"输出
   // 获取用户配置的构建输出文件名
-  if (curConfig.build2esm && curConfig.build2esm.fileName) {
-    curFileName = curConfig.build2esm.fileName;
+  if (build2esm.fileName) {
+    curFileName = build2esm.fileName;
   }
   // 增加babel配置
   babelConfig.babelHelpers = 'runtime';
 
   return {
     banner: buildBanner,
+    // format: build2esm.format || 'esm', // 生成包的格式
     input: rollupInput,
-    // external：将模块视为外部模块，不会打包在库中（在akfun.config.js中配置）
+    /**
+     * external：（在akfun.config.js中配置）
+     * 需要一个 id 并返回 true（外部引用）或 false（不是外部的引用）， 或者 Array 应该保留在bundle的外部引用的模块ID。
+     */
+    external: build2esm.external || [],
     plugins: [
       alias({
         resolve: curConfig.webpack.resolve.extensions,
@@ -50,7 +59,9 @@ module.exports = function(fileName, akfunConfig) {
       nodeResolve({
         extensions: curConfig.webpack.resolve.extensions
       }),
+      typescript(),
       babel(babelConfig), // 备注，需要先babel()再commjs()
+      // jsx( {factory: 'React.createElement'} ),
       vue(),
       commonjs(),
       postcss({

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

@@ -101,8 +101,8 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
               }
             }
           ],
-          include: curProjectDir, // [resolve('src')],
-          exclude: /node_modules/
+          // exclude: /node_modules/,
+          include: curProjectDir // [resolve('src')],
         },
         {
           test: /\.(jsx?)$/,
@@ -112,8 +112,8 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
               options: babelConfig
             }
           ],
-          include: curProjectDir, // [resolve('src')],
-          exclude: /node_modules/
+          // exclude: /node_modules/,
+          include: curProjectDir // [resolve('src')],
         },
         {
           // 图片资源
@@ -163,8 +163,8 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
         {
           test: /\.(js|ts|tsx|jsx|vue|css|html)$/,
           loader: 'params-replace-loader',
+          // exclude: [/node_modules/, resolve('src/mock/data')], // 排除不需要进行校验的文件夹
           include: curProjectDir, // [resolve('src')],
-          exclude: [/node_modules/, resolve('src/mock/data')], // 排除不需要进行校验的文件夹
           options: config.envParams
         },
         {
@@ -243,7 +243,7 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
         // context: resolve('src'),
         extensions: ['ts', 'tsx'],
         // include: curProjectDir, // [resolve('src')],
-        exclude: 'node_modules',
+        // exclude: 'node_modules',
         cache: true,
         fix: config.settings.enableESLintFix || false,
         formatter: require('eslint-friendly-formatter'),
@@ -255,7 +255,7 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
       new ESLintPlugin({
         extensions: ['js', 'jsx'],
         // include: curProjectDir, // [resolve('src')],
-        exclude: 'node_modules',
+        // exclude: 'node_modules',
         cache: true,
         fix: config.settings.enableESLintFix || false,
         formatter: require('eslint-friendly-formatter'),
@@ -267,7 +267,7 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
       new ESLintPlugin({
         extensions: ['vue'],
         // include: curProjectDir, // [resolve('src')],
-        exclude: 'node_modules',
+        // exclude: 'node_modules',
         cache: true,
         fix: config.settings.enableESLintFix || false,
         formatter: require('eslint-friendly-formatter'),