@qingtian/qtcli 1.0.6 → 1.0.8-beta.1

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

@@ -67,6 +67,11 @@ var qtConfig = envLoader.getQtConfig() || {
 var baseEntries = ((_a = qtConfig === null || qtConfig === void 0 ? void 0 : qtConfig.webpackConfig) === null || _a === void 0 ? void 0 : _a.entry) || {
     index: path.resolve(process.cwd(), './src/index.tsx'),
 };
+// build 模式下优先使用 buildOutput 配置，没有则回退到 output
+// 这样 dev 和 build 可以配置不同的 publicPath 等 output 参数
+var userOutput = ((_b = qtConfig === null || qtConfig === void 0 ? void 0 : qtConfig.webpackConfig) === null || _b === void 0 ? void 0 : _b.output) || {};
+var buildOutput = ((_c = qtConfig === null || qtConfig === void 0 ? void 0 : qtConfig.webpackConfig) === null || _c === void 0 ? void 0 : _c.buildOutput) || {};
+var effectiveOutput = isDev() ? userOutput : __assign(__assign({}, userOutput), buildOutput);
 // 定义基础配置
 var config = {
     entry: baseEntries,
@@ -338,7 +343,7 @@ var config = {
     },
     // 根据入口数量动态生成 HtmlWebpackPlugin 实例
     plugins: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], Object.keys(baseEntries).map(function (name) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d;
         var entryTemplate = path.resolve(process.cwd(), "./public/".concat(name, ".html"));
         var fallbackTemplate = path.resolve(process.cwd(), './public/index.html');
         var template = fs.existsSync(entryTemplate) ? entryTemplate : fallbackTemplate;
@@ -348,13 +353,13 @@ var config = {
             chunks: [name],
             inject: true,
             favicon: path.resolve(process.cwd(), './public/favicon.ico'),
-            publicPath: ((_b = (_a = qtConfig === null || qtConfig === void 0 ? void 0 : qtConfig.webpackConfig) === null || _a === void 0 ? void 0 : _a.output) === null || _b === void 0 ? void 0 : _b.publicPath) || (envConfig === null || envConfig === void 0 ? void 0 : envConfig.PUBLIC_URL) || '/',
-            meta: Array.isArray((_d = (_c = qtConfig === null || qtConfig === void 0 ? void 0 : qtConfig.config) === null || _c === void 0 ? void 0 : _c.htmlInject) === null || _d === void 0 ? void 0 : _d.head)
-                ? (_f = (_e = qtConfig === null || qtConfig === void 0 ? void 0 : qtConfig.config) === null || _e === void 0 ? void 0 : _e.htmlInject) === null || _f === void 0 ? void 0 : _f.head.filter(function (item) { return item.tag === 'meta'; }).map(function (item) { return item.attrs; })
+            publicPath: (effectiveOutput === null || effectiveOutput === void 0 ? void 0 : effectiveOutput.publicPath) || (envConfig === null || envConfig === void 0 ? void 0 : envConfig.PUBLIC_URL) || '/',
+            meta: Array.isArray((_b = (_a = qtConfig === null || qtConfig === void 0 ? void 0 : qtConfig.config) === null || _a === void 0 ? void 0 : _a.htmlInject) === null || _b === void 0 ? void 0 : _b.head)
+                ? (_d = (_c = qtConfig === null || qtConfig === void 0 ? void 0 : qtConfig.config) === null || _c === void 0 ? void 0 : _c.htmlInject) === null || _d === void 0 ? void 0 : _d.head.filter(function (item) { return item.tag === 'meta'; }).map(function (item) { return item.attrs; })
                 : [],
         });
     }), true), [
-        new InterpolateHtmlPlugin(HtmlWebpackPlugin, __assign({ PUBLIC_URL: (envConfig === null || envConfig === void 0 ? void 0 : envConfig.PUBLIC_URL) || ((_c = (_b = qtConfig === null || qtConfig === void 0 ? void 0 : qtConfig.webpackConfig) === null || _b === void 0 ? void 0 : _b.output) === null || _c === void 0 ? void 0 : _c.publicPath) || './' }, (((_e = (_d = qtConfig === null || qtConfig === void 0 ? void 0 : qtConfig.config) === null || _d === void 0 ? void 0 : _d.env) === null || _e === void 0 ? void 0 : _e[process.env.NODE_ENV || 'development']) || {})))
+        new InterpolateHtmlPlugin(HtmlWebpackPlugin, __assign({ PUBLIC_URL: (envConfig === null || envConfig === void 0 ? void 0 : envConfig.PUBLIC_URL) || (effectiveOutput === null || effectiveOutput === void 0 ? void 0 : effectiveOutput.publicPath) || './' }, (((_e = (_d = qtConfig === null || qtConfig === void 0 ? void 0 : qtConfig.config) === null || _d === void 0 ? void 0 : _d.env) === null || _e === void 0 ? void 0 : _e[process.env.NODE_ENV || 'development']) || {})))
     ], false), (Array.isArray((_g = (_f = qtConfig === null || qtConfig === void 0 ? void 0 : qtConfig.config) === null || _f === void 0 ? void 0 : _f.htmlInject) === null || _g === void 0 ? void 0 : _g.head)
         ? [
             new HtmlWebpackTagsPlugin({
@@ -415,5 +420,11 @@ var config = {
     },
 };
 // 合并 webpack 配置
-var finalConfig = (0, deepMerge_1.deepMerge)(config, qtConfig.webpackConfig || {});
+// 将 buildOutput 在 build 模式下合并到 output，然后从 webpackConfig 中移除 buildOutput 避免污染
+var mergeWebpackConfig = __assign({}, (qtConfig.webpackConfig || {}));
+if (!isDev() && mergeWebpackConfig.buildOutput) {
+    mergeWebpackConfig.output = __assign(__assign({}, (mergeWebpackConfig.output || {})), mergeWebpackConfig.buildOutput);
+}
+delete mergeWebpackConfig.buildOutput;
+var finalConfig = (0, deepMerge_1.deepMerge)(config, mergeWebpackConfig);
 exports.default = finalConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@qingtian/qtcli",
-    "version": "1.0.6",
+    "version": "1.0.8-beta.1",
     "description": "QTCli是一款基于node的前端工程化底座",
     "homepage": "https://gitee.com/fengrengame/qtnode#readme",
     "bugs": {