@modern-js/app-tools 2.21.1 → 2.22.0

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "createBuilderProviderConfig", {
   enumerable: true,
-  get: () => createBuilderProviderConfig
+  get: function() {
+    return createBuilderProviderConfig;
+  }
 });
 function createBuilderProviderConfig(resolveConfig, appContext, modifyBuilderConfig) {
   const htmlConfig = {
@@ -12,8 +14,8 @@ function createBuilderProviderConfig(resolveConfig, appContext, modifyBuilderCon
   };
   if (!htmlConfig.template) {
     htmlConfig.templateByEntries = {
-      ...htmlConfig.templateByEntries,
-      ...appContext.htmlTemplates
+      ...appContext.htmlTemplates,
+      ...htmlConfig.templateByEntries
     };
   }
   const config = {

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "getBuilderTargets", {
   enumerable: true,
-  get: () => getBuilderTargets
+  get: function() {
+    return getBuilderTargets;
+  }
 });
 const _utils = require("@modern-js/utils");
 function getBuilderTargets(normalizedConfig) {

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "generateBuilder", {
   enumerable: true,
-  get: () => generateBuilder
+  get: function() {
+    return generateBuilder;
+  }
 });
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _builder = require("@modern-js/builder");

package/dist/cjs/builder/index.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "createBuilderGenerator", {
   enumerable: true,
-  get: () => createBuilderGenerator
+  get: function() {
+    return createBuilderGenerator;
+  }
 });
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _utils = require("@modern-js/utils");

package/dist/cjs/builder/shared/builderPlugins/adapterBasic.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  builderPluginAdapterBasic: () => builderPluginAdapterBasic,
-  applyCallbacks: () => applyCallbacks
+  builderPluginAdapterBasic: function() {
+    return builderPluginAdapterBasic;
+  },
+  applyCallbacks: function() {
+    return applyCallbacks;
+  }
 });
 const builderPluginAdapterBasic = (options) => ({
   name: "builder-plugin-adapter-modern-basic",

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "builderPluginAdapterHtml", {
   enumerable: true,
-  get: () => builderPluginAdapterHtml
+  get: function() {
+    return builderPluginAdapterHtml;
+  }
 });
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _buildershared = require("@modern-js/builder-shared");

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "builderPluginAdapterSSR", {
   enumerable: true,
-  get: () => builderPluginAdapterSSR
+  get: function() {
+    return builderPluginAdapterSSR;
+  }
 });
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _path = /* @__PURE__ */ _interop_require_wildcard._(require("path"));

package/dist/cjs/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "HtmlAsyncChunkPlugin", {
   enumerable: true,
-  get: () => HtmlAsyncChunkPlugin
+  get: function() {
+    return HtmlAsyncChunkPlugin;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 class HtmlAsyncChunkPlugin {

package/dist/cjs/builder/shared/bundlerPlugins/HtmlBottomTemplate.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "BottomTemplatePlugin", {
   enumerable: true,
-  get: () => BottomTemplatePlugin
+  get: function() {
+    return BottomTemplatePlugin;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 class BottomTemplatePlugin {

package/dist/cjs/builder/shared/bundlerPlugins/RouterPlugin.js

@@ -4,10 +4,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "RouterPlugin", {
   enumerable: true,
-  get: () => RouterPlugin
+  get: function() {
+    return RouterPlugin;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
+const _lodash = require("@modern-js/utils/lodash");
 const _utils = require("@modern-js/utils");
 const _constants = require("@modern-js/utils/universal/constants");
 const PLUGIN_NAME = "ModernjsRoutePlugin";
@@ -50,10 +53,15 @@ class RouterPlugin {
         if (!namedChunkGroups) {
           return;
         }
+        const prevManifestAsset = compilation.getAsset(_utils.ROUTE_MANIFEST_FILE);
+        const prevManifestStr = prevManifestAsset ? prevManifestAsset.source.source().toString() : JSON.stringify({
+          routeAssets: {}
+        });
+        const prevManifest = JSON.parse(prevManifestStr);
         for (const [name, chunkGroup] of Object.entries(namedChunkGroups)) {
           const assets = chunkGroup.assets.map((asset) => {
-            const filename2 = asset.name;
-            return publicPath ? normalizePath(publicPath) + filename2 : filename2;
+            const filename = asset.name;
+            return publicPath ? normalizePath(publicPath) + filename : filename;
           });
           const referenceCssAssets = assets.filter((asset) => /\.css$/.test(asset));
           routeAssets[name] = {
@@ -61,6 +69,14 @@ class RouterPlugin {
             assets,
             referenceCssAssets
           };
+          if (prevManifest.routeAssets[name]) {
+            (0, _lodash.mergeWith)(routeAssets[name], prevManifest.routeAssets[name], (obj, source) => {
+              if (Array.isArray(obj)) {
+                return obj.concat(source);
+              }
+              return Object.assign(source, obj);
+            });
+          }
         }
         const manifest = {
           routeAssets
@@ -102,9 +118,16 @@ class RouterPlugin {
             void 0
           );
         }
-        const filename = _path.default.join(outputPath, _utils.ROUTE_MANIFEST_FILE);
-        await _utils.fs.ensureFile(filename);
-        await _utils.fs.writeFile(filename, JSON.stringify(manifest, null, 2));
+        if (prevManifestAsset) {
+          compilation.updateAsset(
+            _utils.ROUTE_MANIFEST_FILE,
+            new RawSource(JSON.stringify(manifest, null, 2)),
+            // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
+            void 0
+          );
+        } else {
+          compilation.emitAsset(_utils.ROUTE_MANIFEST_FILE, new RawSource(JSON.stringify(manifest, null, 2)));
+        }
       });
     });
   }

package/dist/cjs/builder/shared/createCopyInfo.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "createCopyInfo", {
   enumerable: true,
-  get: () => createCopyInfo
+  get: function() {
+    return createCopyInfo;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));

package/dist/cjs/builder/shared/loaders/serverModuleLoader.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: () => _default
+  get: function() {
+    return _default;
+  }
 });
 function loader() {
   return `module.exports = {}`;

package/dist/cjs/commands/build.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "build", {
   enumerable: true,
-  get: () => build
+  get: function() {
+    return build;
+  }
 });
 const _core = require("@modern-js/core");
 const _utils = require("@modern-js/utils");

package/dist/cjs/commands/deploy.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "deploy", {
   enumerable: true,
-  get: () => deploy
+  get: function() {
+    return deploy;
+  }
 });
 const deploy = async (api, options) => {
   const hookRunners = api.useHookRunners();

package/dist/cjs/commands/dev.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "dev", {
   enumerable: true,
-  get: () => dev
+  get: function() {
+    return dev;
+  }
 });
 const _core = require("@modern-js/core");
 const _utils = require("@modern-js/utils");

package/dist/cjs/commands/inspect.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "inspect", {
   enumerable: true,
-  get: () => inspect
+  get: function() {
+    return inspect;
+  }
 });
 const _path = require("path");
 const inspect = async (api, options) => {

package/dist/cjs/commands/serve.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "start", {
   enumerable: true,
-  get: () => start
+  get: function() {
+    return start;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _utils = require("@modern-js/utils");

package/dist/cjs/config/default.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  createDefaultConfig: () => createDefaultConfig,
-  createLegacyDefaultConfig: () => createLegacyDefaultConfig
+  createDefaultConfig: function() {
+    return createDefaultConfig;
+  },
+  createLegacyDefaultConfig: function() {
+    return createLegacyDefaultConfig;
+  }
 });
 const _builderwebpackprovider = require("@modern-js/builder-webpack-provider");
 const _env = require("../utils/env");

package/dist/cjs/config/initialize/index.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "initialNormalizedConfig", {
   enumerable: true,
-  get: () => initialNormalizedConfig
+  get: function() {
+    return initialNormalizedConfig;
+  }
 });
 const _inits = require("./inits");
 function initialNormalizedConfig(config, appContext, bundler) {

package/dist/cjs/config/initialize/inits.js

@@ -10,9 +10,15 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  initHtmlConfig: () => initHtmlConfig,
-  initSourceConfig: () => initSourceConfig,
-  initToolsConfig: () => initToolsConfig
+  initHtmlConfig: function() {
+    return initHtmlConfig;
+  },
+  initSourceConfig: function() {
+    return initSourceConfig;
+  },
+  initToolsConfig: function() {
+    return initToolsConfig;
+  }
 });
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _path = /* @__PURE__ */ _interop_require_wildcard._(require("path"));

package/dist/cjs/config/legacy/createHtmlConfig.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "createHtmlConfig", {
   enumerable: true,
-  get: () => createHtmlConfig
+  get: function() {
+    return createHtmlConfig;
+  }
 });
 function createHtmlConfig(config) {
   const { disableHtmlFolder, favicon, faviconByEntries, inject, injectByEntries, meta, metaByEntries, mountId, title, titleByEntries, templateParameters, templateParametersByEntries, crossorigin } = config.output;

package/dist/cjs/config/legacy/createOutputConfig.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "createOutputConfig", {
   enumerable: true,
-  get: () => createOutputConfig
+  get: function() {
+    return createOutputConfig;
+  }
 });
 function createOutputConfig(config) {
   const { assetPrefix, copy, cssModuleLocalIdentName, cssPath, jsPath, htmlPath, mediaPath, enableTsLoader, path, disableInlineRuntimeChunk, disableCssExtract, disableMinimize, disableSourceMap, disableTsChecker, enableCssModuleTSDeclaration, enableInlineScripts, enableInlineStyles, polyfill, dataUriLimit, disableAssetsCache, enableLatestDecorators, disableCssModuleExtension, ssg, disableNodePolyfill } = config.output;

package/dist/cjs/config/legacy/createSourceConfig.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "createSourceConfig", {
   enumerable: true,
-  get: () => createSourceConfig
+  get: function() {
+    return createSourceConfig;
+  }
 });
 function createSourceConfig(config) {
   const { alias, envVars, globalVars, include, moduleScopes, preEntry, entries, enableAsyncEntry, disableDefaultEntries, entriesDir, configDir } = config.source;

package/dist/cjs/config/legacy/createToolsConfig.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "createToolsConfig", {
   enumerable: true,
-  get: () => createToolsConfig
+  get: function() {
+    return createToolsConfig;
+  }
 });
 function createToolsConfig(config) {
   const { autoprefixer, babel, minifyCss, terser, webpack, webpackChain, tsLoader, styledComponents, sass, postcss, less, htmlPlugin, devServer, tailwindcss, jest, esbuild } = config.tools;

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

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  transformNormalizedConfig: () => transformNormalizedConfig,
-  checkIsLegacyConfig: () => checkIsLegacyConfig
+  transformNormalizedConfig: function() {
+    return transformNormalizedConfig;
+  },
+  checkIsLegacyConfig: function() {
+    return checkIsLegacyConfig;
+  }
 });
 const _createToolsConfig = require("./createToolsConfig");
 const _createSourceConfig = require("./createSourceConfig");

package/dist/cjs/defineConfig.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  defineConfig: () => defineConfig,
-  defineLegacyConfig: () => defineLegacyConfig
+  defineConfig: function() {
+    return defineConfig;
+  },
+  defineLegacyConfig: function() {
+    return defineLegacyConfig;
+  }
 });
 const defineConfig = (config) => config;
 var _config_autoLoadPlugins;

package/dist/cjs/exports/server.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "defineConfig", {
   enumerable: true,
-  get: () => _config.defineServerConfig
+  get: function() {
+    return _config.defineServerConfig;
+  }
 });
 const _config = require("../utils/config");

package/dist/cjs/hooks.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "hooks", {
   enumerable: true,
-  get: () => hooks
+  get: function() {
+    return hooks;
+  }
 });
 const _plugin = require("@modern-js/plugin");
 const hooks = {

package/dist/cjs/index.js

@@ -10,10 +10,18 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  mergeConfig: () => _core.mergeConfig,
-  devCommand: () => devCommand,
-  buildCommand: () => buildCommand,
-  default: () => _default
+  mergeConfig: function() {
+    return _core.mergeConfig;
+  },
+  devCommand: function() {
+    return devCommand;
+  },
+  buildCommand: function() {
+    return buildCommand;
+  },
+  default: function() {
+    return _default;
+  }
 });
 const _export_star = require("@swc/helpers/_/_export_star");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");

package/dist/cjs/initialize/index.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: () => _default
+  get: function() {
+    return _default;
+  }
 });
 const _utils = require("@modern-js/utils");
 const _schema = require("../schema");

package/dist/cjs/locale/en.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "EN_LOCALE", {
   enumerable: true,
-  get: () => EN_LOCALE
+  get: function() {
+    return EN_LOCALE;
+  }
 });
 const EN_LOCALE = {
   command: {

package/dist/cjs/locale/index.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  i18n: () => i18n,
-  localeKeys: () => localeKeys
+  i18n: function() {
+    return i18n;
+  },
+  localeKeys: function() {
+    return localeKeys;
+  }
 });
 const _plugini18n = require("@modern-js/plugin-i18n");
 const _zh = require("./zh");

package/dist/cjs/locale/zh.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "ZH_LOCALE", {
   enumerable: true,
-  get: () => ZH_LOCALE
+  get: function() {
+    return ZH_LOCALE;
+  }
 });
 const ZH_LOCALE = {
   command: {

package/dist/cjs/schema/Schema.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "Schema", {
   enumerable: true,
-  get: () => Schema
+  get: function() {
+    return Schema;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _lodash = require("@modern-js/utils/lodash");

package/dist/cjs/schema/index.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  legacySchema: () => _legacy.default,
-  schema: () => schema
+  legacySchema: function() {
+    return _legacy.default;
+  },
+  schema: function() {
+    return schema;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _utils = require("@modern-js/utils");

package/dist/cjs/schema/legacy.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: () => _default
+  get: function() {
+    return _default;
+  }
 });
 const _utils = require("@modern-js/utils");
 const _Schema = require("./Schema");

package/dist/cjs/utils/config.js

@@ -10,10 +10,18 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  defineServerConfig: () => defineServerConfig,
-  buildServerConfig: () => buildServerConfig,
-  safeReplacer: () => safeReplacer,
-  emitResolvedConfig: () => emitResolvedConfig
+  defineServerConfig: function() {
+    return defineServerConfig;
+  },
+  buildServerConfig: function() {
+    return buildServerConfig;
+  },
+  safeReplacer: function() {
+    return safeReplacer;
+  },
+  emitResolvedConfig: function() {
+    return emitResolvedConfig;
+  }
 });
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _path = /* @__PURE__ */ _interop_require_wildcard._(require("path"));

package/dist/cjs/utils/createServer.js

@@ -10,11 +10,21 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  getServer: () => getServer,
-  setServer: () => setServer,
-  closeServer: () => closeServer,
-  createServer: () => createServer,
-  injectDataLoaderPlugin: () => injectDataLoaderPlugin
+  getServer: function() {
+    return getServer;
+  },
+  setServer: function() {
+    return setServer;
+  },
+  closeServer: function() {
+    return closeServer;
+  },
+  createServer: function() {
+    return createServer;
+  },
+  injectDataLoaderPlugin: function() {
+    return injectDataLoaderPlugin;
+  }
 });
 const _server = require("@modern-js/server");
 let server = null;

package/dist/cjs/utils/env.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "getAutoInjectEnv", {
   enumerable: true,
-  get: () => getAutoInjectEnv
+  get: function() {
+    return getAutoInjectEnv;
+  }
 });
 function getAutoInjectEnv(appContext) {
   const { metaName } = appContext;

package/dist/cjs/utils/generateWatchFiles.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  addServerConfigToDeps: () => addServerConfigToDeps,
-  generateWatchFiles: () => generateWatchFiles
+  addServerConfigToDeps: function() {
+    return addServerConfigToDeps;
+  },
+  generateWatchFiles: function() {
+    return generateWatchFiles;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));

package/dist/cjs/utils/getSelectedEntries.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "getSelectedEntries", {
   enumerable: true,
-  get: () => getSelectedEntries
+  get: function() {
+    return getSelectedEntries;
+  }
 });
 const _utils = require("@modern-js/utils");
 const _locale = require("../locale");

package/dist/cjs/utils/getServerInternalPlugins.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "getServerInternalPlugins", {
   enumerable: true,
-  get: () => getServerInternalPlugins
+  get: function() {
+    return getServerInternalPlugins;
+  }
 });
 async function getServerInternalPlugins(api) {
   const hookRunners = api.useHookRunners();