@modern-js/app-tools 2.12.0 → 2.13.1

package/dist/esm/builder/builder-rspack/index.js

@@ -1,174 +1,6 @@
-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 { builderRspackProvider } from "@modern-js/builder-rspack-provider";
 import { generateBuilder } from "../generator";
 function createRspackBuilderForModern(options) {
-    return generateBuilder(options, builderRspackProvider, {
-        modifyBuilderInstance: function modifyBuilderInstance(builder) {
-            return _asyncToGenerator(function() {
-                return __generator(this, function(_state) {
-                    applyBuilderPlugins(builder, options);
-                    return [
-                        2
-                    ];
-                });
-            })();
-        }
-    });
-}
-function applyBuilderPlugins(builder, options) {
-    return _applyBuilderPlugins.apply(this, arguments);
-}
-function _applyBuilderPlugins() {
-    _applyBuilderPlugins = _asyncToGenerator(function(builder, options) {
-        var normalizedConfig, builderPluginNodePolyfill;
-        return __generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    normalizedConfig = options.normalizedConfig;
-                    if (!!normalizedConfig.output.disableNodePolyfill) return [
-                        3,
-                        2
-                    ];
-                    return [
-                        4,
-                        import("@modern-js/builder-plugin-node-polyfill")
-                    ];
-                case 1:
-                    builderPluginNodePolyfill = _state.sent().builderPluginNodePolyfill;
-                    builder.addPlugins([
-                        builderPluginNodePolyfill()
-                    ]);
-                    _state.label = 2;
-                case 2:
-                    return [
-                        2
-                    ];
-            }
-        });
-    });
-    return _applyBuilderPlugins.apply(this, arguments);
+    return generateBuilder(options, builderRspackProvider);
 }
 export { createRspackBuilderForModern };

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

@@ -247,42 +247,27 @@ function applyBuilderPlugins(builder, options) {
 }
 function _applyBuilderPlugins() {
     _applyBuilderPlugins = _asyncToGenerator(function(builder, options) {
-        var normalizedConfig, builderPluginNodePolyfill, _normalizedConfig_tools, esbuildOptions, builderPluginEsbuild;
+        var normalizedConfig, _normalizedConfig_tools, esbuildOptions, builderPluginEsbuild;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
                     normalizedConfig = options.normalizedConfig;
-                    if (!!normalizedConfig.output.disableNodePolyfill) return [
-                        3,
-                        2
-                    ];
-                    return [
-                        4,
-                        import("@modern-js/builder-plugin-node-polyfill")
-                    ];
-                case 1:
-                    builderPluginNodePolyfill = _state.sent().builderPluginNodePolyfill;
-                    builder.addPlugins([
-                        builderPluginNodePolyfill()
-                    ]);
-                    _state.label = 2;
-                case 2:
                     if (!normalizedConfig.tools.esbuild) return [
                         3,
-                        4
+                        2
                     ];
                     _normalizedConfig_tools = normalizedConfig.tools, esbuildOptions = _normalizedConfig_tools.esbuild;
                     return [
                         4,
                         import("@modern-js/builder-plugin-esbuild")
                     ];
-                case 3:
+                case 1:
                     builderPluginEsbuild = _state.sent().builderPluginEsbuild;
                     builder.addPlugins([
                         builderPluginEsbuild(esbuildOptions)
                     ]);
-                    _state.label = 4;
-                case 4:
+                    _state.label = 2;
+                case 2:
                     builder.addPlugins([
                         builderPluginCompatModern(options)
                     ]);

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

@@ -175,7 +175,7 @@ function applyBuilderPlugins(builder, options) {
 }
 function _applyBuilderPlugins() {
     _applyBuilderPlugins = _asyncToGenerator(function(builder, options) {
-        var _ref, builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR;
+        var _ref, builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, normalizedConfig, builderPluginNodePolyfill;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -190,6 +190,22 @@ function _applyBuilderPlugins() {
                         builderPluginAdapterSSR(options),
                         builderPluginAdapterHtml(options)
                     ]);
+                    normalizedConfig = options.normalizedConfig;
+                    if (!!normalizedConfig.output.disableNodePolyfill) return [
+                        3,
+                        3
+                    ];
+                    return [
+                        4,
+                        import("@modern-js/builder-plugin-node-polyfill")
+                    ];
+                case 2:
+                    builderPluginNodePolyfill = _state.sent().builderPluginNodePolyfill;
+                    builder.addPlugins([
+                        builderPluginNodePolyfill()
+                    ]);
+                    _state.label = 3;
+                case 3:
                     return [
                         2
                     ];

package/dist/esm/builder/shared/builderPlugins/adapterHtml.js

@@ -1,3 +1,32 @@
+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);
+        });
+    };
+}
 function _defineProperty(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -50,7 +79,103 @@ function _objectSpreadProps(target, source) {
     }
     return target;
 }
-import { getEntryOptions } from "@modern-js/utils";
+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 { createVirtualModule } from "@modern-js/builder-shared";
+import { getEntryOptions, removeTailSlash } from "@modern-js/utils";
 import { template as lodashTemplate } from "@modern-js/utils/lodash";
 import { BottomTemplatePlugin } from "../bundlerPlugins";
 function isHtmlEnabled(config, target) {
@@ -59,24 +184,101 @@ function isHtmlEnabled(config, target) {
 }
 var builderPluginAdapterHtml = function(options) {
     return {
-        name: "builder-plugin-adpater-modern-html",
+        name: "builder-plugin-adapter-modern-html",
         setup: function setup(api) {
-            api.modifyBundlerChain(function(chain, param) {
-                var CHAIN_ID = param.CHAIN_ID, target = param.target, HtmlBundlerPlugin = param.HtmlPlugin;
-                var builderConfig = api.getNormalizedConfig();
-                if (isHtmlEnabled(builderConfig, target)) {
-                    applyBottomHtmlPlugin({
-                        api: api,
-                        options: options,
-                        chain: chain,
-                        CHAIN_ID: CHAIN_ID,
-                        HtmlBundlerPlugin: HtmlBundlerPlugin
+            api.modifyBundlerChain(function() {
+                var _ref = _asyncToGenerator(function(chain, param) {
+                    var CHAIN_ID, target, HtmlBundlerPlugin, builderConfig;
+                    return __generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                CHAIN_ID = param.CHAIN_ID, target = param.target, HtmlBundlerPlugin = param.HtmlPlugin;
+                                builderConfig = api.getNormalizedConfig();
+                                if (!isHtmlEnabled(builderConfig, target)) return [
+                                    3,
+                                    2
+                                ];
+                                applyBottomHtmlPlugin({
+                                    api: api,
+                                    options: options,
+                                    chain: chain,
+                                    CHAIN_ID: CHAIN_ID,
+                                    HtmlBundlerPlugin: HtmlBundlerPlugin
+                                });
+                                return [
+                                    4,
+                                    injectAssetPrefix({
+                                        api: api,
+                                        chain: chain
+                                    })
+                                ];
+                            case 1:
+                                _state.sent();
+                                _state.label = 2;
+                            case 2:
+                                return [
+                                    2
+                                ];
+                        }
                     });
-                }
-            });
+                });
+                return function(chain, _) {
+                    return _ref.apply(this, arguments);
+                };
+            }());
         }
     };
 };
+function injectAssetPrefix(_) {
+    return _injectAssetPrefix.apply(this, arguments);
+}
+function _injectAssetPrefix() {
+    _injectAssetPrefix = _asyncToGenerator(function(param) {
+        var api, chain, entries, entryNames, assetPrefix, code, isRspack, fileName, _ref, RspackVirtualModulePlugin;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    api = param.api, chain = param.chain;
+                    entries = chain.entryPoints.entries() || {};
+                    entryNames = Object.keys(entries);
+                    assetPrefix = removeTailSlash(chain.output.get("publicPath") || "");
+                    code = "window.__assetPrefix__ = '".concat(assetPrefix, "';");
+                    isRspack = api.context.bundlerType === "rspack";
+                    if (!isRspack) return [
+                        3,
+                        2
+                    ];
+                    fileName = "rspack-asset-prefix";
+                    return [
+                        4,
+                        import("rspack-plugin-virtual-module")
+                    ];
+                case 1:
+                    _ref = _state.sent(), RspackVirtualModulePlugin = _ref.default;
+                    entryNames.forEach(function(entryName) {
+                        entries[entryName].prepend(fileName);
+                        chain.plugin("rspack-asset-prefix").use(RspackVirtualModulePlugin, [
+                            _defineProperty({}, fileName, code)
+                        ]);
+                    });
+                    return [
+                        3,
+                        3
+                    ];
+                case 2:
+                    entryNames.forEach(function(entryName) {
+                        entries[entryName].prepend(createVirtualModule(code));
+                    });
+                    _state.label = 3;
+                case 3:
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return _injectAssetPrefix.apply(this, arguments);
+}
 function applyBottomHtmlPlugin(param) {
     var api = param.api, chain = param.chain, options = param.options, CHAIN_ID = param.CHAIN_ID, HtmlBundlerPlugin = param.HtmlBundlerPlugin;
     var modernConfig = options.normalizedConfig, appContext = options.appContext;

package/dist/esm/builder/shared/builderPlugins/adapterSSR.js

@@ -122,6 +122,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
+import * as path from "path";
 import { mergeBuilderConfig } from "@modern-js/builder-shared";
 import { isSSR, fs } from "@modern-js/utils";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
@@ -162,6 +163,7 @@ var builderPluginAdapterSSR = function(options) {
                                 ];
                             case 1:
                                 _state.sent();
+                                applySSRDataLoader(chain, options);
                                 _state.label = 2;
                             case 2:
                                 if ([
@@ -354,4 +356,12 @@ function _applySSRLoaderEntry() {
     });
     return _applySSRLoaderEntry.apply(this, arguments);
 }
+function applySSRDataLoader(chain, options) {
+    var normalizedConfig = options.normalizedConfig, appContext = options.appContext;
+    var appDirectory = appContext.appDirectory;
+    var _normalizedConfig_source = normalizedConfig.source, _normalizedConfig_source_entriesDir = _normalizedConfig_source.entriesDir, entriesDir = _normalizedConfig_source_entriesDir === void 0 ? "./src" : _normalizedConfig_source_entriesDir;
+    var absolutePath = path.resolve(appDirectory, entriesDir);
+    var reg = new RegExp("".concat(absolutePath, ".*\\.loader\\.[t|j]s$"));
+    chain.module.rule("ssr-data-loader").test(reg).use("data-loader").loader(require.resolve("@modern-js/plugin-data-loader/loader")).end();
+}
 export { builderPluginAdapterSSR };

package/dist/esm/config/legacy/index.js

@@ -7,7 +7,7 @@ function transformNormalizedConfig(config) {
     var output = createOutputConfig(config);
     var source = createSourceConfig(config);
     var tools = createToolsConfig(config);
-    var bff = config.bff, dev = config.dev, deploy = config.deploy, runtime = config.runtime, runtimeByEntries = config.runtimeByEntries, server = config.server, cliOptions = config.cliOptions, plugins = config.plugins, testing = config.testing;
+    var bff = config.bff, dev = config.dev, deploy = config.deploy, runtime = config.runtime, runtimeByEntries = config.runtimeByEntries, server = config.server, cliOptions = config.cliOptions, plugins = config.plugins, testing = config.testing, autoLoadPlugins = config.autoLoadPlugins;
     return {
         source: source,
         html: html,
@@ -26,7 +26,7 @@ function transformNormalizedConfig(config) {
         security: {},
         _raw: {},
         experiments: {},
-        autoLoadPlugins: true,
+        autoLoadPlugins: autoLoadPlugins,
         performance: {
             removeMomentLocale: true
         }

package/dist/esm/defineConfig.js

@@ -53,9 +53,11 @@ function _objectSpreadProps(target, source) {
 var defineConfig = function(config) {
     return config;
 };
+var _config_autoLoadPlugins;
 var defineLegacyConfig = function(config) {
     return _objectSpreadProps(_objectSpread({}, config), {
-        legacy: true
+        legacy: true,
+        autoLoadPlugins: (_config_autoLoadPlugins = config.autoLoadPlugins) !== null && _config_autoLoadPlugins !== void 0 ? _config_autoLoadPlugins : true
     });
 };
 export { defineConfig, defineLegacyConfig };

package/dist/esm/index.js

@@ -178,13 +178,14 @@ import path from "path";
 import lintPlugin from "@modern-js/plugin-lint";
 import { cleanRequireCache, emptyDir, Import, getCommand } from "@modern-js/utils";
 import { castArray } from "@modern-js/utils/lodash";
+import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import analyzePlugin from "./analyze";
 import initializePlugin from "./initialize";
 import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
-import { getLocaleLanguage } from "./utils/language";
 import { restart } from "./utils/restart";
 import { generateWatchFiles } from "./utils/generateWatchFiles";
+import { mergeConfig } from "@modern-js/core";
 export * from "./defineConfig";
 export * from "./types";
 var upgradeModel = Import.lazy("@modern-js/upgrade", require);
@@ -711,4 +712,4 @@ var src_default = function() {
         }
     };
 };
-export { buildCommand, src_default as default, devCommand };
+export { buildCommand, src_default as default, devCommand, mergeConfig };

package/dist/esm/initialize/index.js

@@ -181,10 +181,21 @@ var initialize_default = function(param) {
     var bundler = param.bundler;
     return {
         name: "@modern-js/plugin-initialize",
+        post: [
+            "@modern-js/plugin-ssr",
+            "@modern-js/plugin-document",
+            "@modern-js/plugin-state",
+            "@modern-js/plugin-router",
+            "@modern-js/plugin-router-v5",
+            "@modern-js/plugin-polyfill"
+        ],
         setup: function setup(api) {
             var config = function() {
                 var appContext = api.useAppContext();
                 var userConfig = api.useConfigContext();
+                api.setAppContext(_objectSpreadProps(_objectSpread({}, appContext), {
+                    bundlerType: bundler
+                }));
                 return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext, bundler);
             };
             var validateSchema = function() {
@@ -198,7 +209,7 @@ var initialize_default = function(param) {
                 resolvedConfig: function resolvedConfig(param) {
                     var resolved = param.resolved;
                     return _asyncToGenerator(function() {
-                        var _resolved_output_distPath, appContext, userConfig, port, normalizedConfig;
+                        var _resolved_output_distPath, appContext, userConfig, port, normalizedConfig, _normalizedConfig_autoLoadPlugins;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -220,7 +231,7 @@ var initialize_default = function(param) {
                                     resolved.server = _objectSpreadProps(_objectSpread({}, normalizedConfig.server || {}), {
                                         port: port
                                     });
-                                    resolved.autoLoadPlugins = normalizedConfig.autoLoadPlugins || false;
+                                    resolved.autoLoadPlugins = (_normalizedConfig_autoLoadPlugins = normalizedConfig.autoLoadPlugins) !== null && _normalizedConfig_autoLoadPlugins !== void 0 ? _normalizedConfig_autoLoadPlugins : false;
                                     stabilizeConfig(resolved, normalizedConfig, [
                                         "source",
                                         "bff",

package/dist/esm/locale/index.js

@@ -2,7 +2,7 @@ import { I18n } from "@modern-js/plugin-i18n";
 import { ZH_LOCALE } from "./zh";
 import { EN_LOCALE } from "./en";
 var i18n = new I18n();
-var localeKeys = i18n.init("zh", {
+var localeKeys = i18n.init("en", {
     zh: ZH_LOCALE,
     en: EN_LOCALE
 });