@doracli/webpack 0.0.4 → 0.0.5

package/lib/cjs/index.js

@@ -1031,7 +1031,7 @@ var webpackEntryWholeMw = function webpackEntryWholeMw() {
  * - 1. multiple 变成多入口，多出口 的 entry格式
  * - 2. 上下文一定要拆分过
  */
-var multipleToInOutMw = function multipleToInOutMw() {
+var multipleToInOutMw = function multipleToInOutMw(outputOptions) {
   return function (ctx) {
     return function (next) {
       return function () {
@@ -1040,11 +1040,11 @@ var multipleToInOutMw = function multipleToInOutMw() {
           multiple = _ctx$getDoraConfig.multiple;
         if (!multiple || !multiple.length) return next();
         var entry = {};
-        var output = {
+        var output = _objectSpread2({
           // 使用 hash 避免冲突
           filename: '[name]/[chunkhash].js',
           path: path.join(ctx.envParams.workRootDir, ((_ctx$configCtx$getDor = ctx.configCtx.getDoraConfig().output) === null || _ctx$configCtx$getDor === void 0 ? void 0 : _ctx$configCtx$getDor.path) || 'dist')
-        };
+        }, outputOptions);
         multiple.forEach(function (module) {
           if (!module.name) {
             helper.cLog.warn('init', 'undefined', 'multiple 配置必须有 name 字段');
@@ -1123,7 +1123,7 @@ var CompilerStatusPlugin = /*#__PURE__*/function () {
           var json = stats.toJson({
             errors: true
           });
-          helper.cLog.error('pack', 'failed', "(".concat(((_json$errors = json.errors) === null || _json$errors === void 0 ? void 0 : _json$errors.length) || 0, " errors, ").concat(time, " ms)"));
+          helper.cLog.error('pack', 'failed', "(".concat(((_json$errors = json.errors) === null || _json$errors === void 0 ? void 0 : _json$errors.length) || 0, " errors, ").concat(time, " ms)"), json.errors);
         } else {
           var _json$warnings;
           var _json = stats.toJson({
@@ -1277,7 +1277,7 @@ var webpackReactPluginMw = function webpackReactPluginMw(options) {
  * 替换 React 相关的插件配置
  * @returns
  */
-var webpackMultipleReactPluginMw = function webpackMultipleReactPluginMw() {
+var webpackMultipleReactPluginMw = function webpackMultipleReactPluginMw(options) {
   return function (ctx) {
     return function (next) {
       return /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
@@ -1286,7 +1286,7 @@ var webpackMultipleReactPluginMw = function webpackMultipleReactPluginMw() {
           while (1) switch (_context2.n) {
             case 0:
               plugins = getReactPluginsPreset(ctx.envParams, {
-                cssFilename: '[name]/[chunkhash].css'
+                cssFilename: (options === null || options === void 0 ? void 0 : options.cssFilename) || '[name]/[chunkhash].css'
               });
               ctx.updateWebpackConfig({
                 plugins: plugins
@@ -1537,7 +1537,7 @@ var htmlRouteGeneratorMw = /*#__PURE__*/function () {
                      * - 单页面应用会拦截到 index
                      */
                     targetModuleName = htmlAssetManager.assetList.find(function (moduleName) {
-                      return new RegExp("^".concat(utils.uri.pathJoin(htmlAssetManager.publicPath, moduleName === 'index' ? '' : moduleName), "(/)?")).test(req.url || '');
+                      return new RegExp("^".concat(utils.uriPathJoin(htmlAssetManager.publicPath, moduleName === 'index' ? '' : moduleName), "(/)?")).test(req.url || '');
                     });
                     if (!targetModuleName) {
                       _context.n = 2;
@@ -1574,7 +1574,7 @@ var htmlRouteGeneratorMw = /*#__PURE__*/function () {
                     res.end(htmlStr);
                     return _context.a(2);
                   case 2:
-                    if (!new RegExp("^".concat(utils.uri.pathJoin(htmlAssetManager.publicPath, 'assetMap'), "(/)?$")).test(req.url || '')) {
+                    if (!new RegExp("^".concat(utils.uriPathJoin('assetMap'), "(/)?$")).test(req.url || '')) {
                       _context.n = 3;
                       break;
                     }
@@ -1582,7 +1582,7 @@ var htmlRouteGeneratorMw = /*#__PURE__*/function () {
                     res.end(JSON.stringify(htmlAssetManager.getAssetMap()));
                     return _context.a(2);
                   case 3:
-                    if (!new RegExp("^".concat(utils.uri.pathJoin(htmlAssetManager.publicPath), "(/)?$")).test(req.url || '')) {
+                    if (!new RegExp("^".concat(utils.uriPathJoin(htmlAssetManager.publicPath), "(/)?$")).test(req.url || '')) {
                       _context.n = 4;
                       break;
                     }
@@ -1590,9 +1590,9 @@ var htmlRouteGeneratorMw = /*#__PURE__*/function () {
                     dynamicHtml = new helper.DynamicHtml();
                     dynamicHtml.addHeadTags(["\n            <style>\n      .item {\n        margin: 8px 0;\n        background-color: #6790ff;\n        border-radius: 4px;\n      }\n      .item a {\n        display: block;\n        padding: 4px 8px;\n        color: #fff;\n        font-size: 18px;\n        text-decoration: none;\n      }\n            </style>\n          "]);
                     dynamicHtml.addBodyTags(htmlAssetManager.assetList.map(function (name) {
-                      return "<div class=\"item\">\n                <a href=\"".concat(utils.uri.pathJoin(htmlAssetManager.publicPath, name), "\">\n                  ").concat(name, "\n                </a>\n              </div>");
+                      return "<div class=\"item\">\n                <a href=\"".concat(utils.uriPathJoin(htmlAssetManager.publicPath, name), "\">\n                  ").concat(name, "\n                </a>\n              </div>");
                     }));
-                    dynamicHtml.addBodyTags(["<div class=\"item\"><a href=\"".concat(utils.uri.pathJoin(htmlAssetManager.publicPath, 'assetMap'), "\">\u8D44\u6E90</a></div>")]);
+                    dynamicHtml.addBodyTags(["<div class=\"item\"><a href=\"".concat(utils.uriPathJoin(htmlAssetManager.publicPath, 'assetMap'), "\">\u8D44\u6E90</a></div>")]);
                     res.end(dynamicHtml.generateHtmlTemplate('server 页面'));
                     return _context.a(2);
                   case 4:
@@ -1723,6 +1723,7 @@ var splitDoraConfig = function splitDoraConfig(configCtx) {
   });
 };
 
+exports.webpack = webpack;
 exports.Compiler = Compiler;
 exports.Ctx = Ctx;
 exports.babelLoader = babelLoader;

package/lib/esm/index.js

@@ -1,4 +1,5 @@
 import webpack from 'webpack';
+export { default as webpack } from 'webpack';
 import WebpackDevServer from 'webpack-dev-server';
 import { isObject, isArray, noop, get, obj } from '@cclr/lang';
 import openBrowser from '@dorabag/open-browser';
@@ -11,7 +12,7 @@ import TerserPlugin from 'terser-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import WebpackBundleAnalyzer from 'webpack-bundle-analyzer';
 import WebpackBarPlugin from 'webpackbar';
-import { uri, deepCompareJson } from '@cclr/utils';
+import { uri, uriPathJoin, deepCompareJson } from '@cclr/utils';
 
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
@@ -1028,7 +1029,7 @@ var webpackEntryWholeMw = function webpackEntryWholeMw() {
  * - 1. multiple 变成多入口，多出口 的 entry格式
  * - 2. 上下文一定要拆分过
  */
-var multipleToInOutMw = function multipleToInOutMw() {
+var multipleToInOutMw = function multipleToInOutMw(outputOptions) {
   return function (ctx) {
     return function (next) {
       return function () {
@@ -1037,11 +1038,11 @@ var multipleToInOutMw = function multipleToInOutMw() {
           multiple = _ctx$getDoraConfig.multiple;
         if (!multiple || !multiple.length) return next();
         var entry = {};
-        var output = {
+        var output = _objectSpread2({
           // 使用 hash 避免冲突
           filename: '[name]/[chunkhash].js',
           path: join(ctx.envParams.workRootDir, ((_ctx$configCtx$getDor = ctx.configCtx.getDoraConfig().output) === null || _ctx$configCtx$getDor === void 0 ? void 0 : _ctx$configCtx$getDor.path) || 'dist')
-        };
+        }, outputOptions);
         multiple.forEach(function (module) {
           if (!module.name) {
             cLog.warn('init', 'undefined', 'multiple 配置必须有 name 字段');
@@ -1120,7 +1121,7 @@ var CompilerStatusPlugin = /*#__PURE__*/function () {
           var json = stats.toJson({
             errors: true
           });
-          cLog.error('pack', 'failed', "(".concat(((_json$errors = json.errors) === null || _json$errors === void 0 ? void 0 : _json$errors.length) || 0, " errors, ").concat(time, " ms)"));
+          cLog.error('pack', 'failed', "(".concat(((_json$errors = json.errors) === null || _json$errors === void 0 ? void 0 : _json$errors.length) || 0, " errors, ").concat(time, " ms)"), json.errors);
         } else {
           var _json$warnings;
           var _json = stats.toJson({
@@ -1274,7 +1275,7 @@ var webpackReactPluginMw = function webpackReactPluginMw(options) {
  * 替换 React 相关的插件配置
  * @returns
  */
-var webpackMultipleReactPluginMw = function webpackMultipleReactPluginMw() {
+var webpackMultipleReactPluginMw = function webpackMultipleReactPluginMw(options) {
   return function (ctx) {
     return function (next) {
       return /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
@@ -1283,7 +1284,7 @@ var webpackMultipleReactPluginMw = function webpackMultipleReactPluginMw() {
           while (1) switch (_context2.n) {
             case 0:
               plugins = getReactPluginsPreset(ctx.envParams, {
-                cssFilename: '[name]/[chunkhash].css'
+                cssFilename: (options === null || options === void 0 ? void 0 : options.cssFilename) || '[name]/[chunkhash].css'
               });
               ctx.updateWebpackConfig({
                 plugins: plugins
@@ -1534,7 +1535,7 @@ var htmlRouteGeneratorMw = /*#__PURE__*/function () {
                      * - 单页面应用会拦截到 index
                      */
                     targetModuleName = htmlAssetManager.assetList.find(function (moduleName) {
-                      return new RegExp("^".concat(uri.pathJoin(htmlAssetManager.publicPath, moduleName === 'index' ? '' : moduleName), "(/)?")).test(req.url || '');
+                      return new RegExp("^".concat(uriPathJoin(htmlAssetManager.publicPath, moduleName === 'index' ? '' : moduleName), "(/)?")).test(req.url || '');
                     });
                     if (!targetModuleName) {
                       _context.n = 2;
@@ -1571,7 +1572,7 @@ var htmlRouteGeneratorMw = /*#__PURE__*/function () {
                     res.end(htmlStr);
                     return _context.a(2);
                   case 2:
-                    if (!new RegExp("^".concat(uri.pathJoin(htmlAssetManager.publicPath, 'assetMap'), "(/)?$")).test(req.url || '')) {
+                    if (!new RegExp("^".concat(uriPathJoin('assetMap'), "(/)?$")).test(req.url || '')) {
                       _context.n = 3;
                       break;
                     }
@@ -1579,7 +1580,7 @@ var htmlRouteGeneratorMw = /*#__PURE__*/function () {
                     res.end(JSON.stringify(htmlAssetManager.getAssetMap()));
                     return _context.a(2);
                   case 3:
-                    if (!new RegExp("^".concat(uri.pathJoin(htmlAssetManager.publicPath), "(/)?$")).test(req.url || '')) {
+                    if (!new RegExp("^".concat(uriPathJoin(htmlAssetManager.publicPath), "(/)?$")).test(req.url || '')) {
                       _context.n = 4;
                       break;
                     }
@@ -1587,9 +1588,9 @@ var htmlRouteGeneratorMw = /*#__PURE__*/function () {
                     dynamicHtml = new DynamicHtml();
                     dynamicHtml.addHeadTags(["\n            <style>\n      .item {\n        margin: 8px 0;\n        background-color: #6790ff;\n        border-radius: 4px;\n      }\n      .item a {\n        display: block;\n        padding: 4px 8px;\n        color: #fff;\n        font-size: 18px;\n        text-decoration: none;\n      }\n            </style>\n          "]);
                     dynamicHtml.addBodyTags(htmlAssetManager.assetList.map(function (name) {
-                      return "<div class=\"item\">\n                <a href=\"".concat(uri.pathJoin(htmlAssetManager.publicPath, name), "\">\n                  ").concat(name, "\n                </a>\n              </div>");
+                      return "<div class=\"item\">\n                <a href=\"".concat(uriPathJoin(htmlAssetManager.publicPath, name), "\">\n                  ").concat(name, "\n                </a>\n              </div>");
                     }));
-                    dynamicHtml.addBodyTags(["<div class=\"item\"><a href=\"".concat(uri.pathJoin(htmlAssetManager.publicPath, 'assetMap'), "\">\u8D44\u6E90</a></div>")]);
+                    dynamicHtml.addBodyTags(["<div class=\"item\"><a href=\"".concat(uriPathJoin(htmlAssetManager.publicPath, 'assetMap'), "\">\u8D44\u6E90</a></div>")]);
                     res.end(dynamicHtml.generateHtmlTemplate('server 页面'));
                     return _context.a(2);
                   case 4:

package/lib/type/index.d.ts

@@ -1,6 +1,7 @@
-import * as http from 'http';
 import * as webpack from 'webpack';
 import webpack__default, { Configuration, Stats, Compiler as Compiler$1 } from 'webpack';
+export { Compilation, ExternalModule, Module, Compiler as WebpackCompiler, WebpackPluginInstance, default as webpack } from 'webpack';
+import * as http from 'http';
 import WebpackDevServer, { Configuration as Configuration$1 } from 'webpack-dev-server';
 import { TPlainObject, TAny } from '@cclr/lang';
 import { CompilerBase, ConfigCtx, HtmlAssetManager } from '@doracli/helper';
@@ -164,7 +165,10 @@ declare const webpackEntryWholeMw: () => TOnionFun<Ctx>;
  * - 1. multiple 变成多入口，多出口 的 entry格式
  * - 2. 上下文一定要拆分过
  */
-declare const multipleToInOutMw: () => TOnionFun<Ctx>;
+declare const multipleToInOutMw: (outputOptions?: {
+    /** default: [name]/[chunkhash].js */
+    filename: string;
+}) => TOnionFun<Ctx>;
 
 /**
  * webpack dev server 配置 中间件
@@ -200,7 +204,10 @@ declare const webpackReactPluginMw: (options?: IReactPluginsPresetOptions) => TO
  * 替换 React 相关的插件配置
  * @returns
  */
-declare const webpackMultipleReactPluginMw: () => TOnionFun<Ctx>;
+declare const webpackMultipleReactPluginMw: (options?: {
+    /** default: [name]/[chunkhash].css */
+    cssFilename?: string;
+}) => TOnionFun<Ctx>;
 /**
  * 添加 HtmlWebpackPlugin 插件配置
  * @returns

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@doracli/webpack",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "use webpack",
   "author": "cclr <18843152354@163.com>",
   "homepage": "",
@@ -25,21 +25,21 @@
   "scripts": {
     "test": "vitest",
     "g:test": "vitest run",
-    "build": "ccf build"
+    "build": "drr build"
   },
   "dependencies": {
     "@dorabag/open-browser": "^1.0.16"
   },
   "devDependencies": {
-    "@cclr/lang": "^0.1.44",
-    "@cclr/utils": "^0.1.44",
+    "@cclr/lang": "^0.1.49",
+    "@cclr/utils": "^0.1.49",
     "@dorabag/config-loader": "^1.0.16",
     "@dorabag/file-pro": "^1.0.10",
     "@dorabag/open-browser": "^1.0.7",
     "@dorabag/srv-tool": "^1.0.16",
-    "@doracli/helper": "^0.0.4",
-    "@doracli/preset-babel": "^0.0.4",
-    "@doracli/type": "^0.0.4",
+    "@doracli/helper": "^0.0.5",
+    "@doracli/preset-babel": "^0.0.5",
+    "@doracli/type": "^0.0.5",
     "babel-loader": "^10.0.0",
     "css-loader": "^7.1.2",
     "html-webpack-plugin": "^5.6.5",
@@ -50,14 +50,14 @@
     "postcss": "^8.5.6",
     "postcss-loader": "^8.2.0",
     "postcss-preset-env": "^10.5.0",
-    "sass": "^1.97.0",
+    "sass": "^1.97.1",
     "sass-loader": "^16.0.6",
     "style-loader": "^4.0.0",
     "terser-webpack-plugin": "^5.3.16",
-    "webpack": "^5.104.0",
+    "webpack": "^5.104.1",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-dev-server": "^5.2.2",
     "webpackbar": "^7.0.0"
   },
-  "gitHead": "a978bb7e7b32c192b1eb527dae5f25bbe1a2af86"
+  "gitHead": "ac4c6829b2cec621ecf66b6324843773e8b5141f"
 }