@modern-js/app-tools 2.7.0 → 2.7.1-alpha.0

package/dist/{esm/builder/shared/builderPlugins/adapterModern.js → js/treeshaking/builder/builderPlugins/compatModern.js}

@@ -1,3 +1,11 @@
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _arrayWithoutHoles(arr) {
+    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+}
 function _defineProperty(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -11,6 +19,12 @@ function _defineProperty(obj, key, value) {
     }
     return obj;
 }
+function _iterableToArray(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _nonIterableSpread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
 function _objectSpread(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
@@ -50,57 +64,32 @@ function _objectSpreadProps(target, source) {
     }
     return target;
 }
+function _toConsumableArray(arr) {
+    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+import { join } from "path";
 import { mergeBuilderConfig } from "@modern-js/builder-shared";
-import { getEntryOptions } from "@modern-js/utils";
-import HtmlWebpackPlugin from "@modern-js/builder-webpack-provider/html-webpack-plugin";
 import { template as lodashTemplate } from "@modern-js/utils/lodash";
-import { HtmlAsyncChunkPlugin } from "../bundlerPlugins/HtmlAsyncChunkPlugin";
-import { BottomTemplatePlugin } from "../bundlerPlugins/HtmlBottomTemplate";
-var isStreamingSSR = function(userConfig) {
-    var isStreaming = function(ssr) {
-        return ssr && typeof ssr === "object" && ssr.mode === "stream";
-    };
-    var server = userConfig.server;
-    if (isStreaming(server.ssr)) {
-        return true;
-    }
-    if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
-        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-        try {
-            for(var _iterator = Object.keys(server.ssrByEntries)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                var name = _step.value;
-                if (isStreaming(server.ssrByEntries[name])) {
-                    return true;
-                }
-            }
-        } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-        } finally{
-            try {
-                if (!_iteratorNormalCompletion && _iterator.return != null) {
-                    _iterator.return();
-                }
-            } finally{
-                if (_didIteratorError) {
-                    throw _iteratorError;
-                }
-            }
-        }
-    }
-    return false;
-};
-var builderPluginAdapterModern = function(options) {
+import HtmlWebpackPlugin from "@modern-js/builder-webpack-provider/html-webpack-plugin";
+import { getEntryOptions } from "@modern-js/utils";
+import { BottomTemplatePlugin } from "../webpackPlugins/htmlBottomTemplate";
+import { HtmlAsyncChunkPlugin } from "../webpackPlugins/htmlAsyncChunkPlugin";
+import { createCopyPattern } from "../share";
+import RouterPlugin from "../webpackPlugins/routerPlugin";
+var PluginCompatModern = function(appContext, modernConfig, options) {
     return {
-        name: "builder-plugin-adapter-modern",
+        name: "builder-plugin-compat-modern",
         setup: function setup(api) {
-            var isHtmlEnabled = function isHtmlEnabled(config, target) {
-                var _config_tools;
-                return ((_config_tools = config.tools) === null || _config_tools === void 0 ? void 0 : _config_tools.htmlPlugin) !== false && target !== "node" && target !== "service-worker" && target !== "web-worker";
-            };
-            var normalizedConfig = options.normalizedConfig, appContext = options.appContext;
             api.modifyBuilderConfig(function(config) {
-                if (isStreamingSSR(normalizedConfig)) {
+                if (isStreamingSSR(modernConfig)) {
                     return mergeBuilderConfig(config, {
                         html: {
                             inject: "body"
@@ -109,44 +98,70 @@ var builderPluginAdapterModern = function(options) {
                 }
                 return config;
             });
-            api.modifyBundlerChain(function(chain, param) {
+            api.modifyWebpackChain(function(chain, param) {
                 var target = param.target, CHAIN_ID = param.CHAIN_ID, isProd = param.isProd;
-                var builderConfig = api.getNormalizedConfig();
+                var isHtmlEnabled = function isHtmlEnabled(config, target2) {
+                    var ref;
+                    return ((ref = config.tools) === null || ref === void 0 ? void 0 : ref.htmlPlugin) !== false && target2 !== "node" && target2 !== "web-worker";
+                };
+                var ref;
+                var builderNormalizedConfig = api.getNormalizedConfig();
                 if (target === "node") {
                     chain.name("server");
-                } else if (target === "service-worker") {
-                    chain.name("service-worker");
-                } else if (target === "web-worker") {
-                    chain.name("worker");
                 } else if (target === "modern-web") {
                     chain.name("modern");
                 } else {
                     chain.name("client");
                 }
-                if (target === "node" || target === "service-worker") {
-                    applyNodeCompat(target, chain, normalizedConfig, isProd);
+                chain.resolve.modules.add("node_modules").add(join(api.context.rootPath, "node_modules"));
+                if (target === "node") {
+                    applyNodeCompat(chain, modernConfig, isProd);
                 }
-                if (isHtmlEnabled(builderConfig, target)) {
-                    applyBottomHtmlPlugin({
+                if (isHtmlEnabled(builderNormalizedConfig, target)) {
+                    applyBottomHtmlWebpackPlugin({
                         api: api,
                         chain: chain,
-                        modernConfig: normalizedConfig,
+                        CHAIN_ID: CHAIN_ID,
                         appContext: appContext,
-                        CHAIN_ID: CHAIN_ID
+                        modernConfig: modernConfig
                     });
                     applyAsyncChunkHtmlPlugin({
                         chain: chain,
-                        modernConfig: normalizedConfig,
-                        CHAIN_ID: CHAIN_ID
+                        CHAIN_ID: CHAIN_ID,
+                        modernConfig: modernConfig
                     });
                 }
-                if (target !== "node" && target !== "web-worker" && target !== "service-worker") {
+                if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
+                    var defaultCopyPattern = createCopyPattern(appContext, modernConfig, "public", chain);
+                    chain.plugin(CHAIN_ID.PLUGIN.COPY).tap(function(args) {
+                        var ref;
+                        return [
+                            {
+                                patterns: _toConsumableArray(((ref = args[0]) === null || ref === void 0 ? void 0 : ref.patterns) || []).concat([
+                                    defaultCopyPattern
+                                ])
+                            }
+                        ];
+                    });
+                }
+                var entrypoints = appContext.entrypoints;
+                var existNestedRoutes = entrypoints.some(function(entrypoint) {
+                    return entrypoint.nestedRoutesEntry;
+                });
+                var routerConfig = modernConfig === null || modernConfig === void 0 ? void 0 : (ref = modernConfig.runtime) === null || ref === void 0 ? void 0 : ref.router;
+                var routerManifest = Boolean(routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.manifest);
+                if (existNestedRoutes || routerManifest) {
+                    chain.plugin("route-plugin").use(RouterPlugin);
+                }
+                if (target !== "node") {
                     var bareServerModuleReg = /\.(server|node)\.[tj]sx?$/;
                     chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
                     chain.module.rule("bare-server-module").test(bareServerModuleReg).use("server-module-loader").loader(require.resolve("../loaders/serverModuleLoader"));
                 }
             });
-            applyCallbacks(api, options);
+            if (options) {
+                applyCallbacks(api, options);
+            }
         }
     };
 };
@@ -160,58 +175,11 @@ function applyCallbacks(api, options) {
     options.onDevCompileDone && api.onDevCompileDone(options.onDevCompileDone);
     options.onExit && api.onExit(options.onExit);
 }
-function applyBottomHtmlPlugin(param) {
-    var api = param.api, chain = param.chain, modernConfig = param.modernConfig, appContext = param.appContext, CHAIN_ID = param.CHAIN_ID;
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        var _loop = function() {
-            var entryName = _step.value;
-            var baseTemplateParams = _objectSpread({
-                entryName: entryName,
-                title: getEntryOptions(entryName, modernConfig.html.title, modernConfig.html.titleByEntries, appContext.packageName),
-                mountId: modernConfig.html.mountId
-            }, getEntryOptions(entryName, modernConfig.html.templateParameters, modernConfig.html.templateParametersByEntries, appContext.packageName));
-            chain.plugin("".concat(CHAIN_ID.PLUGIN.HTML, "-").concat(entryName)).tap(function(args) {
-                return [
-                    _objectSpreadProps(_objectSpread({}, args[0] || {}), {
-                        __internal__: true,
-                        bottomTemplate: appContext.htmlTemplates["__".concat(entryName, "-bottom__")] && lodashTemplate(appContext.htmlTemplates["__".concat(entryName, "-bottom__")])(baseTemplateParams)
-                    })
-                ];
-            });
-        };
-        for(var _iterator = Object.keys(api.context.entry)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)_loop();
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
-        try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-            }
-        } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
-            }
-        }
-    }
-    chain.plugin(CHAIN_ID.PLUGIN.BOTTOM_TEMPLATE).use(BottomTemplatePlugin, [
-        HtmlWebpackPlugin
-    ]);
-}
-function applyAsyncChunkHtmlPlugin(param) {
-    var chain = param.chain, modernConfig = param.modernConfig, CHAIN_ID = param.CHAIN_ID;
-    if (isStreamingSSR(modernConfig)) {
-        chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(HtmlAsyncChunkPlugin, [
-            HtmlWebpackPlugin
-        ]);
-    }
-}
-function applyNodeCompat(target, chain, modernConfig, isProd) {
+function applyNodeCompat(chain, modernConfig, isProd) {
     var filterEntriesBySSRConfig = function filterEntriesBySSRConfig(isProd2, chain2, serverConfig, outputConfig) {
-        var _outputConfig_ssg;
+        var ref;
         var entries = chain2.entryPoints.entries();
-        if (isProd2 && ((outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg) === true || typeof (outputConfig === null || outputConfig === void 0 ? void 0 : (_outputConfig_ssg = outputConfig.ssg) === null || _outputConfig_ssg === void 0 ? void 0 : _outputConfig_ssg[0]) === "function")) {
+        if (isProd2 && ((outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg) === true || typeof (outputConfig === null || outputConfig === void 0 ? void 0 : (ref = outputConfig.ssg) === null || ref === void 0 ? void 0 : ref[0]) === "function")) {
             return;
         }
         if (typeof entries === "undefined") {
@@ -230,14 +198,14 @@ function applyNodeCompat(target, chain, modernConfig, isProd) {
                 }
             });
         }
-        var _ref = serverConfig || {}, ssr = _ref.ssr, ssrByEntries = _ref.ssrByEntries;
+        var ref1 = serverConfig || {}, ssr = ref1.ssr, ssrByEntries = ref1.ssrByEntries;
         entryNames.forEach(function(name) {
             if (!ssgEntries.includes(name) && (ssr && (ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]) === false || !ssr && !(ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]))) {
                 chain2.entryPoints.delete(name);
             }
         });
     };
-    var nodeExts = [
+    for(var _i = 0, _iter = [
         ".node.js",
         ".node.jsx",
         ".node.ts",
@@ -246,19 +214,33 @@ function applyNodeCompat(target, chain, modernConfig, isProd) {
         ".server.ts",
         ".server.ts",
         ".server.tsx"
-    ];
-    var webWorkerExts = [
-        ".worker.js",
-        ".worker.jsx",
-        ".worker.ts",
-        ".worker.tsx"
-    ];
+    ]; _i < _iter.length; _i++){
+        var ext = _iter[_i];
+        chain.resolve.extensions.prepend(ext);
+    }
+    filterEntriesBySSRConfig(isProd, chain, modernConfig.server, modernConfig.output);
+}
+function applyBottomHtmlWebpackPlugin(param) {
+    var api = param.api, chain = param.chain, modernConfig = param.modernConfig, appContext = param.appContext, CHAIN_ID = param.CHAIN_ID;
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
-        for(var _iterator = nodeExts[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var ext = _step.value;
-            chain.resolve.extensions.prepend(ext);
-        }
+        var _loop = function() {
+            var entryName = _step.value;
+            var baseTemplateParams = _objectSpread({
+                entryName: entryName,
+                title: getEntryOptions(entryName, modernConfig.html.title, modernConfig.html.titleByEntries, appContext.packageName),
+                mountId: modernConfig.html.mountId
+            }, getEntryOptions(entryName, modernConfig.html.templateParameters, modernConfig.html.templateParametersByEntries, appContext.packageName));
+            chain.plugin("".concat(CHAIN_ID.PLUGIN.HTML, "-").concat(entryName)).tap(function(args) {
+                return [
+                    _objectSpreadProps(_objectSpread({}, args[0] || {}), {
+                        __internal__: true,
+                        bottomTemplate: appContext.htmlTemplates["__".concat(entryName, "-bottom__")] && lodashTemplate(appContext.htmlTemplates["__".concat(entryName, "-bottom__")])(baseTemplateParams)
+                    })
+                ];
+            });
+        };
+        for(var _iterator = Object.keys(api.context.entry)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)_loop();
     } catch (err) {
         _didIteratorError = true;
         _iteratorError = err;
@@ -273,28 +255,50 @@ function applyNodeCompat(target, chain, modernConfig, isProd) {
             }
         }
     }
-    if (target === "service-worker") {
-        var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+    chain.plugin(CHAIN_ID.PLUGIN.BOTTOM_TEMPLATE).use(BottomTemplatePlugin, [
+        HtmlWebpackPlugin
+    ]);
+}
+var isStreamingSSR = function(userConfig) {
+    var isStreaming = function(ssr) {
+        return ssr && typeof ssr === "object" && ssr.mode === "stream";
+    };
+    var server = userConfig.server;
+    if (isStreaming(server.ssr)) {
+        return true;
+    }
+    if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
         try {
-            for(var _iterator1 = webWorkerExts[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
-                var ext1 = _step1.value;
-                chain.resolve.extensions.prepend(ext1);
+            for(var _iterator = Object.keys(server.ssrByEntries)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var name = _step.value;
+                if (isStreaming(server.ssrByEntries[name])) {
+                    return true;
+                }
             }
         } catch (err) {
-            _didIteratorError1 = true;
-            _iteratorError1 = err;
+            _didIteratorError = true;
+            _iteratorError = err;
         } finally{
             try {
-                if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-                    _iterator1.return();
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
                 }
             } finally{
-                if (_didIteratorError1) {
-                    throw _iteratorError1;
+                if (_didIteratorError) {
+                    throw _iteratorError;
                 }
             }
         }
     }
-    filterEntriesBySSRConfig(isProd, chain, modernConfig.server, modernConfig.output);
+    return false;
+};
+function applyAsyncChunkHtmlPlugin(param) {
+    var chain = param.chain, modernConfig = param.modernConfig, CHAIN_ID = param.CHAIN_ID;
+    if (isStreamingSSR(modernConfig)) {
+        chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(HtmlAsyncChunkPlugin, [
+            HtmlWebpackPlugin
+        ]);
+    }
 }
-export { applyCallbacks, builderPluginAdapterModern };
+export { PluginCompatModern };