@modern-js/app-tools 2.3.1-alpha.2 → 2.5.0

package/dist/{js/treeshaking/builder → esm/builder/builder-webpack}/index.js

@@ -199,133 +199,60 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import { createBuilder } from "@modern-js/builder";
 import { builderWebpackProvider } from "@modern-js/builder-webpack-provider";
-import { applyOptionsChain, isProd, isSSR, isUseSSRBundle } from "@modern-js/utils";
+import { applyOptionsChain } from "@modern-js/utils";
+import { createCopyPattern } from "../shared";
+import { generateBuilder } from "../generator";
 import { PluginCompatModern } from "./builderPlugins/compatModern";
-import { createCopyPattern } from "./share";
-function getBuilderTargets(normalizedConfig) {
-    var targets = [
-        "web"
-    ];
-    var useNodeTarget = isProd() ? isUseSSRBundle(normalizedConfig) : isSSR(normalizedConfig);
-    if (useNodeTarget) {
-        targets.push("node");
-    }
-    return targets;
-}
-function createBuilderForModern(_) {
-    return _createBuilderForModern.apply(this, arguments);
-}
-function _createBuilderForModern() {
-    _createBuilderForModern = _asyncToGenerator(function(param) {
-        var normalizedConfig, appContext, compatPluginConfig, builderConfig, webpackProvider, target, builderOptions, builder;
-        return __generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    normalizedConfig = param.normalizedConfig, appContext = param.appContext, compatPluginConfig = param.compatPluginConfig;
-                    builderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
-                    webpackProvider = builderWebpackProvider({
-                        builderConfig: builderConfig
-                    });
-                    target = getBuilderTargets(normalizedConfig);
-                    builderOptions = createBuilderOptions(target, appContext);
-                    return [
-                        4,
-                        createBuilder(webpackProvider, builderOptions)
-                    ];
-                case 1:
-                    builder = _state.sent();
-                    return [
-                        4,
-                        applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig)
-                    ];
-                case 2:
-                    _state.sent();
-                    return [
-                        2,
-                        builder
-                    ];
-            }
-        });
+function createWebpackBuilderForModern(options) {
+    return generateBuilder(options, builderWebpackProvider, {
+        modifyBuilderConfig: function modifyBuilderConfig(config) {
+            modifyOutputConfig(config, options.appContext);
+        },
+        modifyBuilderInstance: function modifyBuilderInstance(builder) {
+            return _asyncToGenerator(function() {
+                return __generator(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            return [
+                                4,
+                                applyBuilderPlugins(builder, options)
+                            ];
+                        case 1:
+                            _state.sent();
+                            return [
+                                2
+                            ];
+                    }
+                });
+            })();
+        }
     });
-    return _createBuilderForModern.apply(this, arguments);
 }
-function createBuilderProviderConfig(normalizedConfig, appContext) {
-    var createOutputConfig = function createOutputConfig(config, appContext2) {
-        var defaultCopyPattern = createCopyPattern(appContext2, config, "upload");
-        var copy = config.output.copy;
+function modifyOutputConfig(config, appContext) {
+    var createOutputConfig = function createOutputConfig(config2, appContext2) {
+        var defaultCopyPattern = createCopyPattern(appContext2, config2, "upload");
+        var copy = config2.output.copy;
         var copyOptions = Array.isArray(copy) ? copy : copy === null || copy === void 0 ? void 0 : copy.patterns;
         var builderCopy = _toConsumableArray(copyOptions || []).concat([
             defaultCopyPattern
         ]);
-        return _objectSpreadProps(_objectSpread({}, config.output), {
-            copy: builderCopy,
-            cleanDistPath: false
+        return _objectSpreadProps(_objectSpread({}, config2.output), {
+            copy: builderCopy
         });
     };
-    var output = createOutputConfig(normalizedConfig, appContext);
-    var htmlConfig = _objectSpread({}, normalizedConfig.html);
-    if (!htmlConfig.template) {
-        htmlConfig.templateByEntries = _objectSpread({}, htmlConfig.templateByEntries, appContext.htmlTemplates);
-    }
-    return _objectSpreadProps(_objectSpread({}, normalizedConfig), {
-        output: output,
-        dev: _objectSpreadProps(_objectSpread({}, normalizedConfig.dev), {
-            port: appContext.port
-        }),
-        html: htmlConfig
-    });
-}
-function createBuilderOptions(target, appContext) {
-    var entries = {};
-    var _entrypoints = appContext.entrypoints, entrypoints = _entrypoints === void 0 ? [] : _entrypoints, checkedEntries = appContext.checkedEntries;
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = entrypoints[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var _value = _step.value, entryName = _value.entryName, entry = _value.entry;
-            if (checkedEntries && !checkedEntries.includes(entryName)) {
-                continue;
-            }
-            if (entryName in entries) {
-                entries[entryName].push(entry);
-            } else {
-                entries[entryName] = [
-                    entry
-                ];
-            }
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
-        try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-            }
-        } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
-            }
-        }
-    }
-    return {
-        cwd: appContext.appDirectory,
-        target: target,
-        configPath: appContext.configFile || void 0,
-        entry: entries,
-        framework: appContext.metaName
-    };
+    config.output = createOutputConfig(config, appContext);
 }
-function applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig) {
+function applyBuilderPlugins(builder, options) {
     return _applyBuilderPlugins.apply(this, arguments);
 }
 function _applyBuilderPlugins() {
-    _applyBuilderPlugins = _asyncToGenerator(function(builder, normalizedConfig, appContext, compatPluginConfig) {
-        var builderPluginNodePolyfill, _tools, esbuildOptions, builderPluginEsbuild;
+    _applyBuilderPlugins = _asyncToGenerator(function(builder, options) {
+        var normalizedConfig, PluginNodePolyfill, _normalizedConfig_tools, esbuildOptions, PluginEsbuild;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
+                    normalizedConfig = options.normalizedConfig;
                     if (!!normalizedConfig.output.disableNodePolyfill) return [
                         3,
                         2
@@ -335,9 +262,9 @@ function _applyBuilderPlugins() {
                         import("@modern-js/builder-plugin-node-polyfill")
                     ];
                 case 1:
-                    builderPluginNodePolyfill = _state.sent().builderPluginNodePolyfill;
+                    PluginNodePolyfill = _state.sent().PluginNodePolyfill;
                     builder.addPlugins([
-                        builderPluginNodePolyfill()
+                        PluginNodePolyfill()
                     ]);
                     _state.label = 2;
                 case 2:
@@ -345,15 +272,15 @@ function _applyBuilderPlugins() {
                         3,
                         4
                     ];
-                    _tools = normalizedConfig.tools, esbuildOptions = _tools.esbuild;
+                    _normalizedConfig_tools = normalizedConfig.tools, esbuildOptions = _normalizedConfig_tools.esbuild;
                     return [
                         4,
                         import("@modern-js/builder-plugin-esbuild")
                     ];
                 case 3:
-                    builderPluginEsbuild = _state.sent().builderPluginEsbuild;
+                    PluginEsbuild = _state.sent().PluginEsbuild;
                     builder.addPlugins([
-                        builderPluginEsbuild({
+                        PluginEsbuild({
                             loader: false,
                             minimize: applyOptionsChain({}, esbuildOptions)
                         })
@@ -361,7 +288,7 @@ function _applyBuilderPlugins() {
                     _state.label = 4;
                 case 4:
                     builder.addPlugins([
-                        PluginCompatModern(appContext, normalizedConfig, compatPluginConfig)
+                        PluginCompatModern(options)
                     ]);
                     return [
                         2
@@ -371,4 +298,4 @@ function _applyBuilderPlugins() {
     });
     return _applyBuilderPlugins.apply(this, arguments);
 }
-export { createBuilderForModern, createBuilderOptions, createBuilderProviderConfig };
+export { createWebpackBuilderForModern };

package/dist/{js/treeshaking/builder/webpackPlugins/routerPlugin.js → esm/builder/builder-webpack/webpackPlugins/RouterPlugin.js}

@@ -215,6 +215,9 @@ var RouterPlugin = /*#__PURE__*/ function() {
                 if (target === "node" || Array.isArray(target) && target.includes("node")) {
                     return;
                 }
+                if (target === "webworker" || Array.isArray(target) && target.includes("webworker")) {
+                    return;
+                }
                 var webpack = compiler.webpack;
                 var Compilation = webpack.Compilation, sources = webpack.sources;
                 var RawSource = sources.RawSource;
@@ -232,7 +235,7 @@ var RouterPlugin = /*#__PURE__*/ function() {
                         name: PLUGIN_NAME,
                         stage: PROCESS_ASSETS_STAGE_REPORT
                     }, /*#__PURE__*/ _asyncToGenerator(function() {
-                        var stats, publicPath, routeAssets, namedChunkGroups, assetsByChunkName, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, name, chunkGroup, manifest, injectedContent, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, file, asset, newContent, filename;
+                        var stats, publicPath, routeAssets, namedChunkGroups, assetsByChunkName, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, name, chunkGroup, manifest, injectedContent, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, file, asset, newContent, filename;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -252,7 +255,7 @@ var RouterPlugin = /*#__PURE__*/ function() {
                                     _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                                     try {
                                         for(_iterator = Object.entries(namedChunkGroups)[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                                            _value = _slicedToArray(_step.value, 2), name = _value[0], chunkGroup = _value[1];
+                                            _step_value = _slicedToArray(_step.value, 2), name = _step_value[0], chunkGroup = _step_value[1];
                                             if (assetsByChunkName[name]) {
                                                 routeAssets[name] = {
                                                     chunkIds: chunkGroup.chunks,
@@ -340,4 +343,4 @@ var RouterPlugin = /*#__PURE__*/ function() {
     ]);
     return RouterPlugin;
 }();
-export { RouterPlugin as default };
+export { RouterPlugin };

package/dist/esm/builder/builder-webpack/webpackPlugins/index.js

@@ -0,0 +1 @@
+export * from "./RouterPlugin";

package/dist/esm/builder/generator/createBuilderOptions.js

@@ -0,0 +1,41 @@
+function createBuilderOptions(target, appContext) {
+    var entries = {};
+    var _appContext_entrypoints = appContext.entrypoints, entrypoints = _appContext_entrypoints === void 0 ? [] : _appContext_entrypoints, checkedEntries = appContext.checkedEntries;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = entrypoints[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _step_value = _step.value, entryName = _step_value.entryName, entry = _step_value.entry;
+            if (checkedEntries && !checkedEntries.includes(entryName)) {
+                continue;
+            }
+            if (entryName in entries) {
+                entries[entryName].push(entry);
+            } else {
+                entries[entryName] = [
+                    entry
+                ];
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return {
+        cwd: appContext.appDirectory,
+        target: target,
+        configPath: appContext.configFile || void 0,
+        entry: entries,
+        framework: appContext.metaName
+    };
+}
+export { createBuilderOptions };

package/dist/esm/builder/generator/createBuilderProviderConfig.js

@@ -0,0 +1,70 @@
+function _defineProperty(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _objectSpreadProps(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+function createBuilderProviderConfig(resolveConfig, appContext, modifyBuilderConfig) {
+    var htmlConfig = _objectSpread({}, resolveConfig.html);
+    if (!htmlConfig.template) {
+        htmlConfig.templateByEntries = _objectSpread({}, htmlConfig.templateByEntries, appContext.htmlTemplates);
+    }
+    var config = _objectSpreadProps(_objectSpread({}, resolveConfig), {
+        dev: _objectSpreadProps(_objectSpread({}, resolveConfig.dev), {
+            port: appContext.port
+        }),
+        html: htmlConfig,
+        output: _objectSpreadProps(_objectSpread({}, resolveConfig.output), {
+            cleanDistPath: false
+        })
+    });
+    modifyBuilderConfig === null || modifyBuilderConfig === void 0 ? void 0 : modifyBuilderConfig(config);
+    return config;
+}
+export { createBuilderProviderConfig };

package/dist/esm/builder/generator/getBuilderTargets.js

@@ -0,0 +1,16 @@
+import { isProd, isServiceWorker, isSSR, isUseSSRBundle } from "@modern-js/utils";
+function getBuilderTargets(normalizedConfig) {
+    var targets = [
+        "web"
+    ];
+    var useNodeTarget = isProd() ? isUseSSRBundle(normalizedConfig) : isSSR(normalizedConfig);
+    if (useNodeTarget) {
+        targets.push("node");
+    }
+    var useWorkerTarget = isProd() ? isServiceWorker(normalizedConfig) : false;
+    if (useWorkerTarget) {
+        targets.push("service-worker");
+    }
+    return targets;
+}
+export { getBuilderTargets };

package/dist/esm/builder/generator/index.js

@@ -0,0 +1,199 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import { createBuilder } from "@modern-js/builder";
+import { createBuilderProviderConfig } from "./createBuilderProviderConfig";
+import { getBuilderTargets } from "./getBuilderTargets";
+import { createBuilderOptions } from "./createBuilderOptions";
+function generateBuilder(options, generateProvider, utils) {
+    return _generateBuilder.apply(this, arguments);
+}
+function _generateBuilder() {
+    _generateBuilder = _asyncToGenerator(function(options, generateProvider, utils) {
+        var normalizedConfig, appContext, _ref, modifyBuilderConfig, modifyBuilderInstance, builderConfig, provider, target, builderOptions, builder;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    normalizedConfig = options.normalizedConfig, appContext = options.appContext;
+                    _ref = utils || {}, modifyBuilderConfig = _ref.modifyBuilderConfig, modifyBuilderInstance = _ref.modifyBuilderInstance;
+                    builderConfig = createBuilderProviderConfig(normalizedConfig, appContext, modifyBuilderConfig);
+                    provider = generateProvider({
+                        builderConfig: builderConfig
+                    });
+                    target = getBuilderTargets(normalizedConfig);
+                    builderOptions = createBuilderOptions(target, appContext);
+                    return [
+                        4,
+                        createBuilder(provider, builderOptions)
+                    ];
+                case 1:
+                    builder = _state.sent();
+                    return [
+                        4,
+                        applyBuilderPlugins(builder, options)
+                    ];
+                case 2:
+                    _state.sent();
+                    return [
+                        4,
+                        modifyBuilderInstance === null || modifyBuilderInstance === void 0 ? void 0 : modifyBuilderInstance(builder)
+                    ];
+                case 3:
+                    _state.sent();
+                    return [
+                        2,
+                        builder
+                    ];
+            }
+        });
+    });
+    return _generateBuilder.apply(this, arguments);
+}
+function applyBuilderPlugins(builder, options) {
+    return _applyBuilderPlugins.apply(this, arguments);
+}
+function _applyBuilderPlugins() {
+    _applyBuilderPlugins = _asyncToGenerator(function(builder, options) {
+        var builderPluginAdapterModern;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    return [
+                        4,
+                        import("../shared/builderPlugins/adapterModern")
+                    ];
+                case 1:
+                    builderPluginAdapterModern = _state.sent().builderPluginAdapterModern;
+                    builder.addPlugins([
+                        builderPluginAdapterModern(options)
+                    ]);
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return _applyBuilderPlugins.apply(this, arguments);
+}
+export { generateBuilder };