@qingtian/qtcli 1.0.0 → 1.0.1

package/README.md

@@ -1,193 +1,193 @@
-# QTCli
-
-QTCli 是一款基于 Node.js 的前端工程化底座，提供了完整的项目构建、开发和部署解决方案。
-
-## 特性
-
-- 🚀 快速创建和初始化项目
-- 📦 内置 Webpack 构建配置
-- 🔥 支持 React + TypeScript 开发
-- 🎨 支持 Less、Sass、CSS Modules
-- 📱 支持移动端适配
-- 🔍 内置 ESLint、StyleLint 代码规范检查
-- 🛠 支持自定义配置和插件扩展
-
-## 安装
-
-```bash
-npm install -g qtcli
-```
-
-## 使用方法
-
-### 查看帮助
-
-```bash
-qtcli --help
-```
-
-### 初始化项目
-
-```bash
-qtcli init [options]
-```
-
-### 开发模式
-
-```bash
-qtcli dev [options]
-```
-
-### 构建项目
-
-```bash
-qtcli build [options]
-```
-
-### 全局选项
-
-- `-V, --version`: 显示版本号
-- `-D, --debug`: 启用调试模式
-- `-h, --help`: 显示帮助信息
-
-## 项目结构
-
-```
-my-project/
-├── src/                # 源代码目录
-├── public/            # 静态资源目录
-├── dist/              # 构建输出目录
-└── qt.conf.js         # 项目配置文件
-```
-
-## 配置说明
-
-在项目根目录创建 `qt.conf.js` 文件进行自定义配置：
-
-```javascript
-export default {
-  // 构建类型
-  buildType: 'WEB',
-
-  // 解决方案名称
-  solutionName: 'my-project',
-
-  // 构建模式
-  buildMode: {
-    development: 'DEVELOPMENT',
-    production: 'PRODUCTION',
-    test: 'TEST',
-    analyze: 'ANALYZE'
-  },
-
-  // 项目配置
-  config: {
-    // HTML 注入配置
-    htmlInject: {
-      head: [
-        // meta 标签
-        {
-          tag: 'meta',
-          attrs: {
-            charset: 'utf-8'
-          }
-        },
-        {
-          tag: 'meta',
-          attrs: {
-            name: 'viewport',
-            content: 'width=device-width, initial-scale=1'
-          }
-        },
-        // link 标签
-        {
-          tag: 'link',
-          attrs: {
-            rel: 'stylesheet',
-            href: '/static/css/global.css'
-          }
-        }
-      ],
-      body: [
-        // body 中的 script
-        {
-          tag: 'script',
-          attrs: {
-            src: '/static/js/init.js'
-          }
-        }
-      ]
-    },
-
-    // JavaScript 代码片段注入配置
-    jsInject: {
-      head: [
-        {
-          code: `window.APP_CONFIG = {
-            version: '1.0.0',
-            env: '${process.env.NODE_ENV}',
-            apiUrl: '${process.env.API_URL}'
-          };`
-        }
-      ],
-      body: [
-        {
-          code: `document.addEventListener('DOMContentLoaded', function() {
-            console.log('DOM loaded');
-          });`
-        }
-      ]
-    },
-
-    // 环境变量配置
-    env: {
-      development: {
-        NODE_ENV: 'development',
-        API_URL: 'http://dev-api.example.com'
-      },
-      production: {
-        NODE_ENV: 'production',
-        API_URL: 'http://api.example.com'
-      }
-    }
-  },
-
-  // webpack 配置
-  webpackConfig: {
-    // 开发服务器配置
-    devServer: {
-      port: 3000,
-      host: 'localhost'
-    },
-    // 解析配置
-    resolve: {
-      alias: {
-        '@components': './src/components',
-        '@utils': './src/utils'
-      }
-    },
-    // 模块规则
-    module: {
-      rules: []
-    },
-    // 插件配置
-    plugins: []
-  }
-}
-```
-
-## 开发环境要求
-
-- Node.js >= 14.0.0
-- npm >= 6.0.0
-
-## 作者
-
-- yujie.guo - 初始作者
-
-## 问题反馈
-
-如果你遇到任何问题或有任何建议，请通过以下方式联系我们：
-
-- 提交 Issue: [GitHub Issues](https://gitee.com/fengrengame/qtnode/issues)
-- 邮件联系: 296963166@qq.com
+# QTCli
+
+QTCli 是一款基于 Node.js 的前端工程化底座，提供了完整的项目构建、开发和部署解决方案。
+
+## 特性
+
+- 🚀 快速创建和初始化项目
+- 📦 内置 Webpack 构建配置
+- 🔥 支持 React + TypeScript 开发
+- 🎨 支持 Less、Sass、CSS Modules
+- 📱 支持移动端适配
+- 🔍 内置 ESLint、StyleLint 代码规范检查
+- 🛠 支持自定义配置和插件扩展
+
+## 安装
+
+```bash
+npm install -g qtcli
+```
+
+## 使用方法
+
+### 查看帮助
+
+```bash
+qtcli --help
+```
+
+### 初始化项目
+
+```bash
+qtcli init [options]
+```
+
+### 开发模式
+
+```bash
+qtcli dev [options]
+```
+
+### 构建项目
+
+```bash
+qtcli build [options]
+```
+
+### 全局选项
+
+- `-V, --version`: 显示版本号
+- `-D, --debug`: 启用调试模式
+- `-h, --help`: 显示帮助信息
+
+## 项目结构
+
+```
+my-project/
+├── src/                # 源代码目录
+├── public/            # 静态资源目录
+├── dist/              # 构建输出目录
+└── qt.conf.js         # 项目配置文件
+```
+
+## 配置说明
+
+在项目根目录创建 `qt.conf.js` 文件进行自定义配置：
+
+```javascript
+export default {
+  // 构建类型
+  buildType: 'WEB',
+
+  // 解决方案名称
+  solutionName: 'my-project',
+
+  // 构建模式
+  buildMode: {
+    development: 'DEVELOPMENT',
+    production: 'PRODUCTION',
+    test: 'TEST',
+    analyze: 'ANALYZE'
+  },
+
+  // 项目配置
+  config: {
+    // HTML 注入配置
+    htmlInject: {
+      head: [
+        // meta 标签
+        {
+          tag: 'meta',
+          attrs: {
+            charset: 'utf-8'
+          }
+        },
+        {
+          tag: 'meta',
+          attrs: {
+            name: 'viewport',
+            content: 'width=device-width, initial-scale=1'
+          }
+        },
+        // link 标签
+        {
+          tag: 'link',
+          attrs: {
+            rel: 'stylesheet',
+            href: '/static/css/global.css'
+          }
+        }
+      ],
+      body: [
+        // body 中的 script
+        {
+          tag: 'script',
+          attrs: {
+            src: '/static/js/init.js'
+          }
+        }
+      ]
+    },
+
+    // JavaScript 代码片段注入配置
+    jsInject: {
+      head: [
+        {
+          code: `window.APP_CONFIG = {
+            version: '1.0.0',
+            env: '${process.env.NODE_ENV}',
+            apiUrl: '${process.env.API_URL}'
+          };`
+        }
+      ],
+      body: [
+        {
+          code: `document.addEventListener('DOMContentLoaded', function() {
+            console.log('DOM loaded');
+          });`
+        }
+      ]
+    },
+
+    // 环境变量配置
+    env: {
+      development: {
+        NODE_ENV: 'development',
+        API_URL: 'http://dev-api.example.com'
+      },
+      production: {
+        NODE_ENV: 'production',
+        API_URL: 'http://api.example.com'
+      }
+    }
+  },
+
+  // webpack 配置
+  webpackConfig: {
+    // 开发服务器配置
+    devServer: {
+      port: 3000,
+      host: 'localhost'
+    },
+    // 解析配置
+    resolve: {
+      alias: {
+        '@components': './src/components',
+        '@utils': './src/utils'
+      }
+    },
+    // 模块规则
+    module: {
+      rules: []
+    },
+    // 插件配置
+    plugins: []
+  }
+}
+```
+
+## 开发环境要求
+
+- Node.js >= 14.0.0
+- npm >= 6.0.0
+
+## 作者
+
+- yujie.guo - 初始作者
+
+## 问题反馈
+
+如果你遇到任何问题或有任何建议，请通过以下方式联系我们：
+
+- 提交 Issue: [GitHub Issues](https://gitee.com/fengrengame/qtnode/issues)
+- 邮件联系: 296963166@qq.com

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@qingtian/qtcli",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "QTCli是一款基于node的前端工程化底座",
     "homepage": "https://gitee.com/fengrengame/qtnode#readme",
     "bugs": {
@@ -77,7 +77,6 @@
         "@types/react": "18.0.12",
         "@types/react-dom": "18.0.5",
         "autoprefixer": "10.4.7",
-        "babel-jest": "^27.4.2",
         "babel-loader": "^8.2.3",
         "babel-plugin-import": "1.13.8",
         "babel-plugin-named-asset-import": "^0.3.8",
@@ -113,9 +112,6 @@
         "husky": "8.0.3",
         "identity-obj-proxy": "^3.0.0",
         "inquirer": "8.0.0",
-        "jest": "^27.4.3",
-        "jest-resolve": "^27.4.2",
-        "jest-watch-typeahead": "^1.0.0",
         "less": "4.1.3",
         "less-loader": "11.0.0",
         "lint-staged": "15.5.1",
@@ -162,10 +158,11 @@
         "webpack-manifest-plugin": "^4.0.2",
         "webpack-merge": "5.8.0",
         "workbox-webpack-plugin": "^6.4.1",
-        "yamljs": "0.3.0"
+        "yamljs": "0.3.0",
+        "html-webpack-tags-plugin": "^3.0.0",
+        "@commitlint/cli": "^19.8.0"
     },
     "devDependencies": {
-        "@commitlint/cli": "^19.8.0",
         "@types/autoprefixer": "10.2.0",
         "@types/cli-progress": "3.11.5",
         "@types/colors": "1.2.1",
@@ -194,16 +191,10 @@
         "@types/webpack-dev-server": "4.7.2",
         "@types/webpack-merge": "5.0.0",
         "@types/yamljs": "0.2.34",
-        "commitlint-config-ali": "^1.1.0",
-        "eslint": "^8.56.0",
-        "eslint-config-ali": "^15.1.0",
-        "eslint-config-prettier": "^9.1.0",
-        "eslint-plugin-prettier": "^5.3.1",
-        "html-webpack-tags-plugin": "^3.0.0",
-        "husky": "^8.0.3",
-        "lint-staged": "^15.5.1",
-        "prettier": "^3.5.3",
-        "prettier-config-ali": "^1.3.4"
+        "babel-jest": "^27.4.2",
+        "jest": "^27.4.3",
+        "jest-resolve": "^27.4.2",
+        "jest-watch-typeahead": "^1.0.0"
     },
     "email": "296963166@qq.com"
 }

package/dist/qt.conf.js

@@ -1,6 +1,5 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
+module.exports = {
     buildType: 'WEB',
     solutionName: 'qtnode',
     buildMode: {
@@ -55,16 +54,14 @@ exports.default = {
         },
         // JavaScript 代码片段注入配置
         jsInject: {
-            head: [
-                {
+            head: [{
                     code: "window.APP_CONFIG = {\n                        version: '1.0.0',\n                        env: '".concat(process.env.NODE_ENV, "',\n                        apiUrl: '").concat(process.env.API_URL, "'\n                    };"),
                 },
                 {
                     code: "window.initGlobalConfig = function() {\n                        console.log('Global config initialized');\n                    };",
                 },
             ],
-            body: [
-                {
+            body: [{
                     code: "document.addEventListener('DOMContentLoaded', function() {\n                        console.log('DOM loaded');\n                        window.initGlobalConfig();\n                    });",
                 },
                 {
@@ -86,7 +83,9 @@ exports.default = {
     },
     // webpack 配置
     webpackConfig: {
-        devServer: {},
+        devServer: {
+            port: 3001,
+        },
         resolve: {
             alias: {
                 '@components': './src/components',

package/dist/src/utils/deepMerge.js

@@ -0,0 +1,52 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deepMerge = void 0;
+/**
+ * 深度合并对象
+ * @param target 目标对象
+ * @param source 源对象
+ * @returns 合并后的对象
+ */
+function deepMerge(target, source) {
+    var result = __assign({}, target);
+    for (var key in source) {
+        var sourceValue = source[key];
+        var targetValue = target[key];
+        if (sourceValue !== null && typeof sourceValue === 'object' && targetValue !== null && typeof targetValue === 'object') {
+            // 如果是数组，直接合并
+            if (Array.isArray(sourceValue)) {
+                result[key] = __spreadArray(__spreadArray([], targetValue, true), sourceValue, true);
+            }
+            else {
+                // 递归合并对象
+                result[key] = deepMerge(targetValue, sourceValue);
+            }
+        }
+        else if (sourceValue !== undefined) {
+            // 如果源对象的值不是 undefined，则使用源对象的值
+            result[key] = sourceValue;
+        }
+    }
+    return result;
+}
+exports.deepMerge = deepMerge;

package/dist/src/utils/formatOutput.js

@@ -114,11 +114,18 @@ var formatESLintMessages = function (results, severity) {
             var severityText = m.severity === 2 ? colors_1.default.red('error') : colors_1.default.yellow('warning');
             var location = colors_1.default.gray.underline("".concat(m.line, ":").concat(m.column));
             var ruleId = m.ruleId ? colors_1.default.cyan(" ".concat(m.ruleId)) : '';
-            return "".concat(severityText, " in ").concat(colors_1.default.white(r.filePath), "\n").concat(colors_1.default.gray(m.message)).concat(ruleId, " ").concat(location);
+            return "  ".concat(severityText, " ").concat(colors_1.default.gray(m.message)).concat(ruleId, " ").concat(location);
         });
-        return messages.join('\n');
+        return "".concat(colors_1.default.white(r.filePath), "\n").concat(messages.join('\n'));
     })
-        .join('\n');
+        .join('\n\n');
+};
+var getStatus = function (errorCount, warningCount) {
+    if (errorCount > 0)
+        return 'error';
+    if (warningCount > 0)
+        return 'warning';
+    return 'success';
 };
 exports.formatOutput = {
     build: function (output) { return __awaiter(void 0, void 0, void 0, function () {
@@ -175,12 +182,11 @@ exports.formatOutput = {
         });
     }); },
     eslint: function (output) { return __awaiter(void 0, void 0, void 0, function () {
-        var nodes, errorMessages, warningMessages, errorText, warningText, timeText, status;
+        var nodes, errorMessages, warningMessages, errorText, warningText, timeText;
         return __generator(this, function (_a) {
             nodes = [];
             errorMessages = output.errorCount > 0
-                ? formatESLintMessages(output.results, 2) ||
-                    "".concat(colors_1.default.red(String(output.errorCount)), " \u4E2A\u9519\u8BEF")
+                ? formatESLintMessages(output.results, 2)
                 : '无错误';
             nodes.push((0, exports.formatNode)({
                 type: 'process',
@@ -189,8 +195,7 @@ exports.formatOutput = {
                 status: output.errorCount > 0 ? 'error' : 'success',
             }));
             warningMessages = output.warningCount > 0
-                ? formatESLintMessages(output.results, 1) ||
-                    "".concat(colors_1.default.yellow(String(output.warningCount)), " \u4E2A\u8B66\u544A")
+                ? formatESLintMessages(output.results, 1)
                 : '无警告';
             nodes.push((0, exports.formatNode)({
                 type: 'process',
@@ -201,18 +206,11 @@ exports.formatOutput = {
             errorText = colors_1.default.red("".concat(output.errorCount, " \u9519\u8BEF"));
             warningText = colors_1.default.yellow("".concat(output.warningCount, " \u8B66\u544A"));
             timeText = output.time ? colors_1.default.green("\u8017\u65F6 ".concat((output.time / 1000).toFixed(2), "s")) : '';
-            status = 'success';
-            if (output.errorCount > 0) {
-                status = 'error';
-            }
-            else if (output.warningCount > 0) {
-                status = 'warning';
-            }
             nodes.push((0, exports.formatNode)({
                 type: 'process',
                 title: 'ESLint检查完成',
                 content: "".concat(errorText, " ").concat(warningText, " ").concat(timeText),
-                status: status,
+                status: getStatus(output.errorCount, output.warningCount),
             }));
             return [2 /*return*/, nodes.join('\n')];
         });

package/dist/src/utils/logger.js

@@ -29,12 +29,12 @@ var formatOutput_1 = require("../utils/formatOutput");
 var logStart = function () {
     console.log((0, formatOutput_1.formatNode)({
         type: 'start',
-        title: 'QTCli 工程底座',
+        title: "QTCli \u5DE5\u7A0B\u5E95\u5EA7 ".concat(pkg.version),
     }));
     console.log((0, formatOutput_1.formatNode)({
-        type: 'process3',
-        title: '版本',
-        content: pkg.version,
+        type: 'process',
+        title: '环境信息',
+        content: "\u5F53\u524D\u73AF\u5883: ".concat(process.env.NODE_ENV || 'development', "\nNode\u7248\u672C: ").concat(process.version),
     }));
 };
 exports.logStart = logStart;

package/dist/src/utils/teamData.js

@@ -0,0 +1,179 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var teamData = [
+    {
+        projectName: 'AC项目',
+        teams: [
+            {
+                teamName: '古墓丽影战队',
+                members: [
+                    { name: '刘茜苑', type: '战队队员' },
+                    { name: '黄孝文', type: '战队队员' },
+                    { name: '张大千', type: '战队队员' },
+                    { name: '李智', type: '战队队长' },
+                    { name: '辛义海', type: '战队队员' },
+                    { name: '郑全超', type: '战队队员' },
+                ],
+            },
+            {
+                teamName: '多维巡航者',
+                members: [
+                    { name: '苗凯', type: '战队队员' },
+                    { name: '王祥祥', type: '战队队员' },
+                    { name: '宋文婷', type: '战队队员' },
+                    { name: '刘帅鑫', type: '战队队员' },
+                    { name: '任晓青', type: '战队队员' },
+                    { name: '孔令贵', type: '战队队员' },
+                    { name: '赖楠楠', type: '战队队员' },
+                    { name: '赵文龙', type: '战队队员' },
+                    { name: '李冠华', type: '战队队员' },
+                    { name: '范亨举', type: '战队队长' },
+                    { name: '吴如军', type: '战队队员' },
+                    { name: '王海阔', type: '战队队员' },
+                ],
+            },
+            {
+                teamName: '方块空间战队',
+                members: [
+                    { name: '刘钰雪', type: '战队队长' },
+                    { name: '谭鑫鑫', type: '战队队员' },
+                    { name: '侯明江', type: '战队队员' },
+                ],
+            },
+            {
+                teamName: '三消数据战队',
+                members: [
+                    { name: '王杰', type: '战队队员' },
+                    { name: '李朋飞', type: '战队队员' },
+                    { name: '吴永辉', type: '战队队员' },
+                ],
+            },
+            {
+                teamName: '神威战队',
+                members: [
+                    { name: '张远波', type: '战队队员' },
+                    { name: '衣光辉', type: '战队队长' },
+                    { name: '刘军', type: '战队队员' },
+                    { name: '房佳龙', type: '战队队员' },
+                    { name: '王浩', type: '战队队员' },
+                    { name: '缪呈祥', type: '战队队员' },
+                    { name: '黄思灵', type: '战队队长' },
+                    { name: '郭宇杰', type: 'CEO' },
+                ],
+            },
+            {
+                teamName: '数据猎鹰战队',
+                members: [
+                    { name: '刘翀', type: '战队队员' },
+                ],
+            },
+        ],
+        members: [
+            { name: '袁旭道', type: 'Buddy' },
+            { name: '李强强', type: '军团指挥官' },
+            { name: '石军强', type: '军团指挥官' },
+        ],
+    },
+    {
+        projectName: 'EM项目',
+        teams: [
+            {
+                teamName: '财富开拓者战队',
+                members: [
+                    { name: '邓照', type: '战队队员' },
+                    { name: '马金涛', type: '战队队员' },
+                    { name: '陈守肖', type: '战队队员' },
+                    { name: '崔福权', type: '战队队员' },
+                    { name: '孙若尘', type: '战队长' },
+                    { name: '李阳阳', type: '战队队员' },
+                ],
+            },
+            {
+                teamName: '共鸣之声战队',
+                members: [
+                    { name: '黄海', type: '战队队员' },
+                    { name: '周浩', type: '战队队员' },
+                    { name: '王琛', type: '战队队员' },
+                    { name: '强敏', type: '战队队员' },
+                    { name: '陈璇', type: '战队队长' },
+                    { name: '钟勇飞', type: '战队队员' },
+                ],
+            },
+            {
+                teamName: '烈焰之笔战队',
+                members: [
+                    { name: '刘腾飞', type: '战队队员' },
+                    { name: '颜丙峰', type: '战队队员' },
+                    { name: '张超', type: '战队队员' },
+                    { name: '姜兆珍', type: '战队队员' },
+                    { name: '兰喆', type: '战队队员' },
+                    { name: '莫玉涛', type: '战队队员' },
+                    { name: '王伟', type: '战队队长' },
+                    { name: '唐杰', type: '战队队员' },
+                    { name: '麻俊鹏', type: '战队队员' },
+                    { name: '刘卜蔚', type: '战队队员' },
+                ],
+            },
+            {
+                teamName: '精算战鹰战队',
+                members: [
+                    { name: '郭维祎', type: '战队队员' },
+                    { name: '温绍琨', type: '战队队长' },
+                    { name: '马天', type: '战队队员' },
+                    { name: '孙峥嵘', type: '战队队员' },
+                    { name: '郝翌', type: '战队队员' },
+                ],
+            },
+            {
+                teamName: '成长守护者战队',
+                members: [
+                    { name: '单宝龙', type: '战队队员' },
+                    { name: '邵鹏', type: '战队队员' },
+                    { name: '竺文杰', type: '战队队长' },
+                    { name: '丁浩', type: '战队队员' },
+                    { name: '杨在茂', type: '战队队员' },
+                ],
+            },
+            {
+                teamName: '节日猎手战队',
+                members: [
+                    { name: '李子昂', type: '战队队员' },
+                    { name: '卢中原', type: '战队队员' },
+                    { name: '王圆凯', type: '战队队员' },
+                    { name: '赵文煊', type: '战队队长' },
+                    { name: '王鹏', type: '战队队员' },
+                    { name: '姚彦铭', type: '战队队员' },
+                    { name: '丁逸俊', type: '战队队员' },
+                    { name: '严学致', type: '战队队员' },
+                ],
+            },
+            {
+                teamName: '竞技之刃战队',
+                members: [
+                    { name: '王顺祥', type: '战队队员' },
+                    { name: '冯钦伟', type: '战队队员' },
+                    { name: '崔永祺', type: '战队队员' },
+                    { name: '李文超', type: '战队队长' },
+                    { name: '解志辉', type: '战队队员' },
+                    { name: '张胜杰', type: '战队队员' },
+                ],
+            },
+            {
+                teamName: '模块构造者战队',
+                members: [
+                    { name: '石军强', type: '军团指挥官' },
+                ],
+            },
+            {
+                teamName: '创世者战队',
+                members: [
+                    { name: '吴桥', type: '战队员' },
+                ],
+            },
+        ],
+        members: [
+            { name: '石军强', type: '军团指挥官' },
+        ],
+    },
+];
+exports.default = teamData;

package/dist/src/webpack/web/webpack.base.js

@@ -22,10 +22,11 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
 Object.defineProperty(exports, "__esModule", { value: true });
 var loader_1 = require("../../processEnv/loader");
 var manager_1 = require("../../processEnv/manager");
+var deepMerge_1 = require("../../utils/deepMerge");
 var DonePlugin_1 = __importDefault(require("../plugins/DonePlugin"));
 var FileListPlugin_1 = __importDefault(require("../plugins/FileListPlugin"));
 var InjectScriptPlugin_1 = __importDefault(require("../plugins/InjectScriptPlugin"));
@@ -405,7 +406,7 @@ var config = {
     ], false).filter(Boolean),
     resolve: {
         modules: ['node_modules', path.resolve(__dirname, '../../../node_modules')],
-        extensions: ['.jsx', '.js', '.tsx', '.ts', '.less', '.scss'],
+        extensions: ['.tsx', '.ts', '.jsx', '.js', '.less', '.scss'],
         alias: __assign({ '@': path.resolve(process.cwd(), './src'), react: path.resolve(process.cwd(), './node_modules/react') }, (_p = (_o = qtConfig === null || qtConfig === void 0 ? void 0 : qtConfig.webpackConfig) === null || _o === void 0 ? void 0 : _o.resolve) === null || _p === void 0 ? void 0 : _p.alias),
     },
     resolveLoader: {
@@ -413,7 +414,5 @@ var config = {
     },
 };
 // 合并 webpack 配置
-var finalConfig = __assign(__assign(__assign({}, config), (qtConfig.webpackConfig || {})), { 
-    // 确保某些配置不被覆盖
-    entry: config.entry, output: __assign(__assign({}, config.output), (((_q = qtConfig.webpackConfig) === null || _q === void 0 ? void 0 : _q.output) || {})), module: __assign(__assign({}, config.module), { rules: __spreadArray(__spreadArray([], (((_r = config.module) === null || _r === void 0 ? void 0 : _r.rules) || []), true), (((_t = (_s = qtConfig.webpackConfig) === null || _s === void 0 ? void 0 : _s.module) === null || _t === void 0 ? void 0 : _t.rules) || []), true) }), plugins: __spreadArray(__spreadArray([], (config.plugins || []), true), (((_u = qtConfig.webpackConfig) === null || _u === void 0 ? void 0 : _u.plugins) || []), true) });
+var finalConfig = (0, deepMerge_1.deepMerge)(config, qtConfig.webpackConfig || {});
 exports.default = finalConfig;

package/package.json

@@ -1,209 +1,203 @@
-{
-    "name": "@qingtian/qtcli",
-    "version": "1.0.0",
-    "description": "QTCli是一款基于node的前端工程化底座",
-    "homepage": "https://gitee.com/fengrengame/qtnode#readme",
-    "bugs": {
-        "url": "https://gitee.com/fengrengame/qtnode/issues"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://gitee.com/fengrengame/qtnode.git"
-    },
-    "license": "ISC",
-    "author": "yujie.guo",
-    "type": "commonjs",
-    "main": "./dist/bin/cli.js",
-    "bin": {
-        "qtcli": "./dist/bin/cli.js"
-    },
-    "files": [
-        "dist",
-        "README.md"
-    ],
-    "keywords": [
-        "cli",
-        "frontend",
-        "build-tool",
-        "webpack",
-        "react"
-    ],
-    "publishConfig": {
-        "registry": "https://registry.npmjs.org/"
-    },
-    "scripts": {
-        "build": "rimraf ./dist && tsc -p .",
-        "clean": "rimraf ./dist",
-        "f2elint-fix": "f2elint fix",
-        "f2elint-scan": "f2elint scan",
-        "lint": "eslint .",
-        "lint:fix": "eslint --fix .",
-        "prepare": "husky install",
-        "prepublishOnly": "npm run build",
-        "start": "node --max-old-space-size=8192 ./node_modules/.bin/ts-node ./bin/cli.ts"
-    },
-    "commitlint": {
-        "extends": [
-            "ali"
-        ]
-    },
-    "lint-staged": {
-        "*.{cjs,cts,js,jsx,mjs,mts,ts,tsx,vue}": "eslint --fix",
-        "*.{css,less,scss}": "stylelint --fix",
-        "*.{cjs,css,cts,html,js,json,jsx,less,md,mjs,mts,scss,ts,tsx,vue,yaml,yml}": "prettier --write"
-    },
-    "eslintConfig": {
-        "extends": [
-            "ali/typescript/node"
-        ]
-    },
-    "stylelint": {},
-    "dependencies": {
-        "@babel/cli": "7.24.6",
-        "@babel/core": "^7.16.0",
-        "@babel/plugin-proposal-class-properties": "7.18.6",
-        "@babel/plugin-proposal-decorators": "7.18.2",
-        "@babel/plugin-proposal-object-rest-spread": "7.20.7",
-        "@babel/plugin-syntax-flow": "7.24.6",
-        "@babel/plugin-transform-block-scoping": "7.27.0",
-        "@babel/plugin-transform-flow-strip-types": "7.24.6",
-        "@babel/plugin-transform-runtime": "7.18.5",
-        "@babel/plugin-transform-typescript": "7.24.6",
-        "@babel/preset-env": "7.18.2",
-        "@babel/preset-react": "7.17.12",
-        "@babel/preset-typescript": "7.17.12",
-        "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
-        "@svgr/webpack": "^5.5.0",
-        "@types/react": "18.0.12",
-        "@types/react-dom": "18.0.5",
-        "autoprefixer": "10.4.7",
-        "babel-jest": "^27.4.2",
-        "babel-loader": "^8.2.3",
-        "babel-plugin-import": "1.13.8",
-        "babel-plugin-named-asset-import": "^0.3.8",
-        "babel-preset-react-app": "^10.0.1",
-        "bfj": "^7.0.2",
-        "browserslist": "^4.18.1",
-        "camelcase": "^6.2.1",
-        "case-sensitive-paths-webpack-plugin": "^2.4.0",
-        "cli-progress": "3.12.0",
-        "colors": "1.4.0",
-        "commander": "12.1.0",
-        "commitlint-config-ali": "1.1.0",
-        "compressing": "1.10.0",
-        "compression-webpack-plugin": "10.0.0",
-        "copy-webpack-plugin": "11.0.0",
-        "core-js": "3.23.0",
-        "cross-env": "7.0.3",
-        "css-loader": "^6.5.1",
-        "css-minimizer-webpack-plugin": "^3.2.0",
-        "dotenv": "^10.0.0",
-        "dotenv-expand": "^5.1.0",
-        "eslint": "^8.3.0",
-        "eslint-config-ali": "15.1.0",
-        "eslint-config-prettier": "9.1.0",
-        "eslint-config-react-app": "^7.0.1",
-        "eslint-plugin-prettier": "5.2.6",
-        "eslint-webpack-plugin": "^3.1.1",
-        "extract-zip": "2.0.1",
-        "file-loader": "^6.2.0",
-        "fs-extra": "^10.0.0",
-        "glob-all": "3.3.1",
-        "html-webpack-plugin": "^5.5.0",
-        "husky": "8.0.3",
-        "identity-obj-proxy": "^3.0.0",
-        "inquirer": "8.0.0",
-        "jest": "^27.4.3",
-        "jest-resolve": "^27.4.2",
-        "jest-watch-typeahead": "^1.0.0",
-        "less": "4.1.3",
-        "less-loader": "11.0.0",
-        "lint-staged": "15.5.1",
-        "mini-css-extract-plugin": "^2.7.6",
-        "postcss": "^8.4.38",
-        "postcss-flexbugs-fixes": "^5.0.2",
-        "postcss-loader": "^6.2.1",
-        "postcss-normalize": "^10.0.1",
-        "postcss-preset-env": "^7.0.1",
-        "prettier": "3.5.3",
-        "prettier-config-ali": "1.3.2",
-        "progress": "2.0.3",
-        "progress-bar-webpack-plugin": "2.1.0",
-        "prompts": "^2.4.2",
-        "purgecss-webpack-plugin": "4.1.3",
-        "react": "^18.2.0",
-        "react-app-polyfill": "^3.0.0",
-        "react-dev-utils": "^12.0.1",
-        "react-dom": "^18.2.0",
-        "react-refresh": "^0.11.0",
-        "resolve": "^1.20.0",
-        "resolve-url-loader": "^4.0.0",
-        "rimraf": "5.0.7",
-        "sass": "1.70.0",
-        "sass-loader": "^12.3.0",
-        "semver": "^7.3.5",
-        "source-map-loader": "^3.0.0",
-        "speed-measure-webpack-plugin": "1.5.0",
-        "style-loader": "^3.3.1",
-        "stylelint": "16.19.1",
-        "stylelint-config-ali": "2.1.2",
-        "stylelint-prettier": "5.0.3",
-        "tailwindcss": "^3.0.2",
-        "terser-webpack-plugin": "^5.2.5",
-        "thread-loader": "3.0.4",
-        "ts-node": "10.9.2",
-        "typescript": "4.7.3",
-        "unzip": "0.1.11",
-        "url-loader": "4.1.1",
-        "webpack": "^5.64.4",
-        "webpack-bundle-analyzer": "4.5.0",
-        "webpack-cli": "4.9.2",
-        "webpack-dev-server": "^4.6.0",
-        "webpack-manifest-plugin": "^4.0.2",
-        "webpack-merge": "5.8.0",
-        "workbox-webpack-plugin": "^6.4.1",
-        "yamljs": "0.3.0"
-    },
-    "devDependencies": {
-        "@commitlint/cli": "^19.8.0",
-        "@types/autoprefixer": "10.2.0",
-        "@types/cli-progress": "3.11.5",
-        "@types/colors": "1.2.1",
-        "@types/commander": "2.12.2",
-        "@types/compression-webpack-plugin": "9.1.1",
-        "@types/copy-webpack-plugin": "10.1.0",
-        "@types/css-minimizer-webpack-plugin": "3.2.1",
-        "@types/extract-zip": "2.0.1",
-        "@types/glob": "^8.1.0",
-        "@types/html-webpack-plugin": "3.2.9",
-        "@types/inquirer": "9.0.7",
-        "@types/less": "3.0.6",
-        "@types/mini-css-extract-plugin": "2.5.1",
-        "@types/node": "14.18.47",
-        "@types/progress": "2.0.7",
-        "@types/progress-bar-webpack-plugin": "2.1.5",
-        "@types/react": "19.1.2",
-        "@types/react-dom": "19.1.2",
-        "@types/react-refresh": "0.14.6",
-        "@types/rimraf": "4.0.5",
-        "@types/speed-measure-webpack-plugin": "1.3.6",
-        "@types/typescript": "2.0.0",
-        "@types/unzip": "0.1.4",
-        "@types/webpack": "5.28.5",
-        "@types/webpack-bundle-analyzer": "4.7.0",
-        "@types/webpack-dev-server": "4.7.2",
-        "@types/webpack-merge": "5.0.0",
-        "@types/yamljs": "0.2.34",
-        "commitlint-config-ali": "^1.1.0",
-        "eslint": "^8.56.0",
-        "eslint-config-ali": "^15.1.0",
-        "eslint-config-prettier": "^9.1.0",
-        "eslint-plugin-prettier": "^5.3.1",
-        "html-webpack-tags-plugin": "^3.0.0",
-        "husky": "^8.0.3",
-        "lint-staged": "^15.5.1",
-        "prettier": "^3.5.3",
-        "prettier-config-ali": "^1.3.4"
-    },
-    "email": "296963166@qq.com"
-}
+{
+    "name": "@qingtian/qtcli",
+    "version": "1.0.1",
+    "description": "QTCli是一款基于node的前端工程化底座",
+    "homepage": "https://gitee.com/fengrengame/qtnode#readme",
+    "bugs": {
+        "url": "https://gitee.com/fengrengame/qtnode/issues"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://gitee.com/fengrengame/qtnode.git"
+    },
+    "license": "ISC",
+    "author": "yujie.guo",
+    "type": "commonjs",
+    "main": "./dist/bin/cli.js",
+    "bin": {
+        "qtcli": "./dist/bin/cli.js"
+    },
+    "files": [
+        "dist",
+        "README.md"
+    ],
+    "keywords": [
+        "cli",
+        "frontend",
+        "build-tool",
+        "webpack",
+        "react"
+    ],
+    "publishConfig": {
+        "registry": "https://registry.npmjs.org/"
+    },
+    "scripts": {
+        "build": "rimraf ./dist && tsc -p .",
+        "clean": "rimraf ./dist",
+        "f2elint-fix": "f2elint fix",
+        "f2elint-scan": "f2elint scan",
+        "lint": "eslint .",
+        "lint:fix": "eslint --fix .",
+        "prepare": "husky install",
+        "prepublishOnly": "npm run build",
+        "start": "node --max-old-space-size=8192 ./node_modules/.bin/ts-node ./bin/cli.ts"
+    },
+    "commitlint": {
+        "extends": [
+            "ali"
+        ]
+    },
+    "lint-staged": {
+        "*.{cjs,cts,js,jsx,mjs,mts,ts,tsx,vue}": "eslint --fix",
+        "*.{css,less,scss}": "stylelint --fix",
+        "*.{cjs,css,cts,html,js,json,jsx,less,md,mjs,mts,scss,ts,tsx,vue,yaml,yml}": "prettier --write"
+    },
+    "eslintConfig": {
+        "extends": [
+            "ali/typescript/node"
+        ]
+    },
+    "stylelint": {},
+    "dependencies": {
+        "@babel/cli": "7.24.6",
+        "@babel/core": "^7.16.0",
+        "@babel/plugin-proposal-class-properties": "7.18.6",
+        "@babel/plugin-proposal-decorators": "7.18.2",
+        "@babel/plugin-proposal-object-rest-spread": "7.20.7",
+        "@babel/plugin-syntax-flow": "7.24.6",
+        "@babel/plugin-transform-block-scoping": "7.27.0",
+        "@babel/plugin-transform-flow-strip-types": "7.24.6",
+        "@babel/plugin-transform-runtime": "7.18.5",
+        "@babel/plugin-transform-typescript": "7.24.6",
+        "@babel/preset-env": "7.18.2",
+        "@babel/preset-react": "7.17.12",
+        "@babel/preset-typescript": "7.17.12",
+        "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
+        "@svgr/webpack": "^5.5.0",
+        "@types/react": "18.0.12",
+        "@types/react-dom": "18.0.5",
+        "autoprefixer": "10.4.7",
+        "babel-loader": "^8.2.3",
+        "babel-plugin-import": "1.13.8",
+        "babel-plugin-named-asset-import": "^0.3.8",
+        "babel-preset-react-app": "^10.0.1",
+        "bfj": "^7.0.2",
+        "browserslist": "^4.18.1",
+        "camelcase": "^6.2.1",
+        "case-sensitive-paths-webpack-plugin": "^2.4.0",
+        "cli-progress": "3.12.0",
+        "colors": "1.4.0",
+        "commander": "12.1.0",
+        "commitlint-config-ali": "1.1.0",
+        "compressing": "1.10.0",
+        "compression-webpack-plugin": "10.0.0",
+        "copy-webpack-plugin": "11.0.0",
+        "core-js": "3.23.0",
+        "cross-env": "7.0.3",
+        "css-loader": "^6.5.1",
+        "css-minimizer-webpack-plugin": "^3.2.0",
+        "dotenv": "^10.0.0",
+        "dotenv-expand": "^5.1.0",
+        "eslint": "^8.3.0",
+        "eslint-config-ali": "15.1.0",
+        "eslint-config-prettier": "9.1.0",
+        "eslint-config-react-app": "^7.0.1",
+        "eslint-plugin-prettier": "5.2.6",
+        "eslint-webpack-plugin": "^3.1.1",
+        "extract-zip": "2.0.1",
+        "file-loader": "^6.2.0",
+        "fs-extra": "^10.0.0",
+        "glob-all": "3.3.1",
+        "html-webpack-plugin": "^5.5.0",
+        "husky": "8.0.3",
+        "identity-obj-proxy": "^3.0.0",
+        "inquirer": "8.0.0",
+        "less": "4.1.3",
+        "less-loader": "11.0.0",
+        "lint-staged": "15.5.1",
+        "mini-css-extract-plugin": "^2.7.6",
+        "postcss": "^8.4.38",
+        "postcss-flexbugs-fixes": "^5.0.2",
+        "postcss-loader": "^6.2.1",
+        "postcss-normalize": "^10.0.1",
+        "postcss-preset-env": "^7.0.1",
+        "prettier": "3.5.3",
+        "prettier-config-ali": "1.3.2",
+        "progress": "2.0.3",
+        "progress-bar-webpack-plugin": "2.1.0",
+        "prompts": "^2.4.2",
+        "purgecss-webpack-plugin": "4.1.3",
+        "react": "^18.2.0",
+        "react-app-polyfill": "^3.0.0",
+        "react-dev-utils": "^12.0.1",
+        "react-dom": "^18.2.0",
+        "react-refresh": "^0.11.0",
+        "resolve": "^1.20.0",
+        "resolve-url-loader": "^4.0.0",
+        "rimraf": "5.0.7",
+        "sass": "1.70.0",
+        "sass-loader": "^12.3.0",
+        "semver": "^7.3.5",
+        "source-map-loader": "^3.0.0",
+        "speed-measure-webpack-plugin": "1.5.0",
+        "style-loader": "^3.3.1",
+        "stylelint": "16.19.1",
+        "stylelint-config-ali": "2.1.2",
+        "stylelint-prettier": "5.0.3",
+        "tailwindcss": "^3.0.2",
+        "terser-webpack-plugin": "^5.2.5",
+        "thread-loader": "3.0.4",
+        "ts-node": "10.9.2",
+        "typescript": "4.7.3",
+        "unzip": "0.1.11",
+        "url-loader": "4.1.1",
+        "webpack": "^5.64.4",
+        "webpack-bundle-analyzer": "4.5.0",
+        "webpack-cli": "4.9.2",
+        "webpack-dev-server": "^4.6.0",
+        "webpack-manifest-plugin": "^4.0.2",
+        "webpack-merge": "5.8.0",
+        "workbox-webpack-plugin": "^6.4.1",
+        "yamljs": "0.3.0",
+
+        "html-webpack-tags-plugin": "^3.0.0",
+
+        "@commitlint/cli": "^19.8.0"
+
+    },
+    "devDependencies": {
+        "@types/autoprefixer": "10.2.0",
+        "@types/cli-progress": "3.11.5",
+        "@types/colors": "1.2.1",
+        "@types/commander": "2.12.2",
+        "@types/compression-webpack-plugin": "9.1.1",
+        "@types/copy-webpack-plugin": "10.1.0",
+        "@types/css-minimizer-webpack-plugin": "3.2.1",
+        "@types/extract-zip": "2.0.1",
+        "@types/glob": "^8.1.0",
+        "@types/html-webpack-plugin": "3.2.9",
+        "@types/inquirer": "9.0.7",
+        "@types/less": "3.0.6",
+        "@types/mini-css-extract-plugin": "2.5.1",
+        "@types/node": "14.18.47",
+        "@types/progress": "2.0.7",
+        "@types/progress-bar-webpack-plugin": "2.1.5",
+        "@types/react": "19.1.2",
+        "@types/react-dom": "19.1.2",
+        "@types/react-refresh": "0.14.6",
+        "@types/rimraf": "4.0.5",
+        "@types/speed-measure-webpack-plugin": "1.3.6",
+        "@types/typescript": "2.0.0",
+        "@types/unzip": "0.1.4",
+        "@types/webpack": "5.28.5",
+        "@types/webpack-bundle-analyzer": "4.7.0",
+        "@types/webpack-dev-server": "4.7.2",
+        "@types/webpack-merge": "5.0.0",
+        "@types/yamljs": "0.2.34",
+        "babel-jest": "^27.4.2",
+        "jest": "^27.4.3",
+        "jest-resolve": "^27.4.2",
+        "jest-watch-typeahead": "^1.0.0"
+    },
+    "email": "296963166@qq.com"
+}