@modern-js/app-tools 2.21.1 → 2.22.0

package/CHANGELOG.md

@@ -1,5 +1,57 @@
 # @modern-js/app-tools
 
+## 2.22.0
+
+### Minor Changes
+
+- 63cdea1: feat: ssr runtime need webpack.output.chunkLoadingGlobal pass to loadableReady
+  feat: ssr runtime 需要传递 webpack.output.chunnkLoadingGlobal 给 loadableReady
+
+### Patch Changes
+
+- 4a35eb4: fix: templateByEntries should have a higher priority than appContext.htmlTemplates
+  fix: templateByEntries 的优先级需要比 appContext.htmlTemplates 更高
+- 597a0bf: fix(app-tools): the hook `moidfyEntryImports` must run before `htmlPartials`,
+  builder onBeforeCreateCompiler hook would run in build mode, so we no need to run generateIndexCode twice.
+
+  fix(app-tools): 钩子 `moidfyEntryImports` 必须早于钩子 `htmlPartials` 运行,
+  builder onBeforeCreateCompiler 钩子也将在 build 模式运行, 我们不需要运行 generateIndexCode 函数两次.
+
+- 290e9f4: chore: write router manifest to final asset and support user insert some extra msgs.
+  chore: 将 router manifest 写入最终产物，并支持用户插入一些额外信息
+- Updated dependencies [3d48836]
+- Updated dependencies [4161b09]
+- Updated dependencies [9c3c231]
+- Updated dependencies [5050e8e]
+- Updated dependencies [850cde6]
+- Updated dependencies [4991c8a]
+- Updated dependencies [27618e4]
+- Updated dependencies [cb9e1ec]
+- Updated dependencies [ae3fcc2]
+- Updated dependencies [27618e4]
+- Updated dependencies [becfd36]
+- Updated dependencies [b647c68]
+- Updated dependencies [ea961e7]
+- Updated dependencies [02238e6]
+  - @modern-js/builder-webpack-provider@2.22.0
+  - @modern-js/builder-rspack-provider@2.22.0
+  - @modern-js/builder-shared@2.22.0
+  - @modern-js/plugin-data-loader@2.22.0
+  - @modern-js/utils@2.22.0
+  - @modern-js/builder@2.22.0
+  - @modern-js/prod-server@2.22.0
+  - @modern-js/builder-plugin-node-polyfill@2.22.0
+  - @modern-js/builder-plugin-esbuild@2.22.0
+  - @modern-js/core@2.22.0
+  - @modern-js/new-action@2.22.0
+  - @modern-js/upgrade@2.22.0
+  - @modern-js/plugin-i18n@2.22.0
+  - @modern-js/plugin-lint@2.22.0
+  - @modern-js/server@2.22.0
+  - @modern-js/node-bundle-require@2.22.0
+  - @modern-js/plugin@2.22.0
+  - @modern-js/types@2.22.0
+
 ## 2.21.1
 
 ### Patch Changes

package/dist/cjs/analyze/constants.js

@@ -10,28 +10,72 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  JS_EXTENSIONS: () => JS_EXTENSIONS,
-  INDEX_FILE_NAME: () => INDEX_FILE_NAME,
-  APP_FILE_NAME: () => APP_FILE_NAME,
-  PAGES_DIR_NAME: () => PAGES_DIR_NAME,
-  NESTED_ROUTES_DIR: () => NESTED_ROUTES_DIR,
-  FILE_SYSTEM_ROUTES_FILE_NAME: () => FILE_SYSTEM_ROUTES_FILE_NAME,
-  LOADER_EXPORT_NAME: () => LOADER_EXPORT_NAME,
-  TEMP_LOADERS_DIR: () => TEMP_LOADERS_DIR,
-  ENTRY_POINT_FILE_NAME: () => ENTRY_POINT_FILE_NAME,
-  ENTRY_BOOTSTRAP_FILE_NAME: () => ENTRY_BOOTSTRAP_FILE_NAME,
-  FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP: () => FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP,
-  FILE_SYSTEM_ROUTES_LAYOUT: () => FILE_SYSTEM_ROUTES_LAYOUT,
-  FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT: () => FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT,
-  FILE_SYSTEM_ROUTES_INDEX: () => FILE_SYSTEM_ROUTES_INDEX,
-  FILE_SYSTEM_ROUTES_IGNORED_REGEX: () => FILE_SYSTEM_ROUTES_IGNORED_REGEX,
-  HTML_PARTIALS_FOLDER: () => HTML_PARTIALS_FOLDER,
-  HTML_PARTIALS_EXTENSIONS: () => HTML_PARTIALS_EXTENSIONS,
-  FILE_SYSTEM_ROUTES_COMPONENTS_DIR: () => FILE_SYSTEM_ROUTES_COMPONENTS_DIR,
-  NESTED_ROUTE: () => NESTED_ROUTE,
-  APP_CONFIG_NAME: () => APP_CONFIG_NAME,
-  APP_INIT_EXPORTED: () => APP_INIT_EXPORTED,
-  APP_INIT_IMPORTED: () => APP_INIT_IMPORTED
+  JS_EXTENSIONS: function() {
+    return JS_EXTENSIONS;
+  },
+  INDEX_FILE_NAME: function() {
+    return INDEX_FILE_NAME;
+  },
+  APP_FILE_NAME: function() {
+    return APP_FILE_NAME;
+  },
+  PAGES_DIR_NAME: function() {
+    return PAGES_DIR_NAME;
+  },
+  NESTED_ROUTES_DIR: function() {
+    return NESTED_ROUTES_DIR;
+  },
+  FILE_SYSTEM_ROUTES_FILE_NAME: function() {
+    return FILE_SYSTEM_ROUTES_FILE_NAME;
+  },
+  LOADER_EXPORT_NAME: function() {
+    return LOADER_EXPORT_NAME;
+  },
+  TEMP_LOADERS_DIR: function() {
+    return TEMP_LOADERS_DIR;
+  },
+  ENTRY_POINT_FILE_NAME: function() {
+    return ENTRY_POINT_FILE_NAME;
+  },
+  ENTRY_BOOTSTRAP_FILE_NAME: function() {
+    return ENTRY_BOOTSTRAP_FILE_NAME;
+  },
+  FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP: function() {
+    return FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP;
+  },
+  FILE_SYSTEM_ROUTES_LAYOUT: function() {
+    return FILE_SYSTEM_ROUTES_LAYOUT;
+  },
+  FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT: function() {
+    return FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT;
+  },
+  FILE_SYSTEM_ROUTES_INDEX: function() {
+    return FILE_SYSTEM_ROUTES_INDEX;
+  },
+  FILE_SYSTEM_ROUTES_IGNORED_REGEX: function() {
+    return FILE_SYSTEM_ROUTES_IGNORED_REGEX;
+  },
+  HTML_PARTIALS_FOLDER: function() {
+    return HTML_PARTIALS_FOLDER;
+  },
+  HTML_PARTIALS_EXTENSIONS: function() {
+    return HTML_PARTIALS_EXTENSIONS;
+  },
+  FILE_SYSTEM_ROUTES_COMPONENTS_DIR: function() {
+    return FILE_SYSTEM_ROUTES_COMPONENTS_DIR;
+  },
+  NESTED_ROUTE: function() {
+    return NESTED_ROUTE;
+  },
+  APP_CONFIG_NAME: function() {
+    return APP_CONFIG_NAME;
+  },
+  APP_INIT_EXPORTED: function() {
+    return APP_INIT_EXPORTED;
+  },
+  APP_INIT_IMPORTED: function() {
+    return APP_INIT_IMPORTED;
+  }
 });
 const JS_EXTENSIONS = [
   ".js",

package/dist/cjs/analyze/generateCode.js

@@ -10,8 +10,15 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  createImportStatements: () => createImportStatements,
-  generateCode: () => generateCode
+  createImportStatements: function() {
+    return createImportStatements;
+  },
+  generateCode: function() {
+    return generateCode;
+  },
+  generateIndexCode: function() {
+    return generateIndexCode;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
@@ -70,11 +77,14 @@ const generateCode = async (appContext, config, entrypoints, api) => {
   const { internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
   const hookRunners = api.useHookRunners();
   const isV5 = (0, _utils.isRouterV5)(config);
-  const { mountId } = config.html;
   const getRoutes = isV5 ? _getClientRoutes.getClientRoutesLegacy : _getClientRoutes.getClientRoutes;
+  const importsStatemets = /* @__PURE__ */ new Map();
   await Promise.all(entrypoints.map(generateEntryCode));
+  return {
+    importsStatemets
+  };
   async function generateEntryCode(entrypoint) {
-    const { entryName, isAutoMount, customBootstrap, fileSystemRoutes } = entrypoint;
+    const { entryName, isAutoMount, fileSystemRoutes } = entrypoint;
     if (isAutoMount) {
       if (fileSystemRoutes) {
         var _config_output;
@@ -116,7 +126,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             process.exit(1);
           }
         }
-        const { code: code2 } = await hookRunners.beforeGenerateRoutes({
+        const { code } = await hookRunners.beforeGenerateRoutes({
           entrypoint,
           code: await _templates.fileSystemRoutes({
             routes,
@@ -129,20 +139,20 @@ const generateCode = async (appContext, config, entrypoints, api) => {
         });
         if (entrypoint.nestedRoutesEntry && (0, _utils.isUseSSRBundle)(config2)) {
           const routesServerFile = (0, _utils1.getServerLoadersFile)(internalDirectory, entryName);
-          const code3 = _templates.routesForServer({
+          const code2 = _templates.routesForServer({
             routes
           });
           await _utils.fs.ensureFile(routesServerFile);
-          await _utils.fs.writeFile(routesServerFile, code3);
+          await _utils.fs.writeFile(routesServerFile, code2);
         }
         const serverLoaderCombined = _templates.ssrLoaderCombinedModule(entrypoints, entrypoint, config2, appContext);
         if (serverLoaderCombined) {
           const serverLoaderFile = (0, _utils1.getServerCombinedModueFile)(internalDirectory, entryName);
           await _utils.fs.outputFile(serverLoaderFile, serverLoaderCombined);
         }
-        _utils.fs.outputFileSync(_path.default.resolve(internalDirectory, `./${entryName}/${_constants.FILE_SYSTEM_ROUTES_FILE_NAME}`), code2, "utf8");
+        _utils.fs.outputFileSync(_path.default.resolve(internalDirectory, `./${entryName}/${_constants.FILE_SYSTEM_ROUTES_FILE_NAME}`), code, "utf8");
       }
-      const { imports: importStatements } = await hookRunners.modifyEntryImports({
+      const { imports } = await hookRunners.modifyEntryImports({
         entrypoint,
         imports: (0, _utils1.getDefaultImports)({
           entrypoint,
@@ -152,9 +162,23 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           internalDirectory
         })
       });
+      importsStatemets.set(entryName, imports);
+      const entryFile = _path.default.resolve(internalDirectory, `./${entryName}/${_constants.ENTRY_POINT_FILE_NAME}`);
+      entrypoint.internalEntry = entryFile;
+    }
+  }
+};
+const generateIndexCode = async ({ appContext, api, entrypoints, config, importsStatemets, bundlerConfigs }) => {
+  const hookRunners = api.useHookRunners();
+  const { mountId } = config.html;
+  const { internalDirectory, packageName } = appContext;
+  await Promise.all(entrypoints.map(async (entrypoint) => {
+    const { entryName, isAutoMount, customBootstrap, fileSystemRoutes } = entrypoint;
+    if (isAutoMount) {
       const { plugins } = await hookRunners.modifyEntryRuntimePlugins({
         entrypoint,
-        plugins: []
+        plugins: [],
+        bundlerConfigs
       });
       const { code: renderFunction } = await hookRunners.modifyEntryRenderFunction({
         entrypoint,
@@ -168,31 +192,31 @@ const generateCode = async (appContext, config, entrypoints, api) => {
         entrypoint,
         exportStatement: "export default AppWrapper;"
       });
+      const imports = importsStatemets.get(entryName);
       const code = _templates.index({
         mountId,
-        imports: createImportStatements(importStatements),
+        imports: createImportStatements(imports),
         renderFunction,
         exportStatement
       });
       const entryFile = _path.default.resolve(internalDirectory, `./${entryName}/${_constants.ENTRY_POINT_FILE_NAME}`);
-      entrypoint.entry = entryFile;
       if (config.source.enableAsyncEntry) {
         let rawAsyncEntryCode = `import('./${_constants.ENTRY_BOOTSTRAP_FILE_NAME}');`;
         const ssr = (0, _utils.getEntryOptions)(entryName, config.server.ssr, config.server.ssrByEntries, packageName);
         if (ssr) {
           rawAsyncEntryCode = `
-          export const ${_utils.SERVER_RENDER_FUNCTION_NAME} = async (...args) => {
-            let entry = await ${rawAsyncEntryCode};
-            if (entry.default instanceof Promise){
-              entry = await entry.default;
-              return entry.default.${_utils.SERVER_RENDER_FUNCTION_NAME}.apply(null, args);
-            }
-            return entry.${_utils.SERVER_RENDER_FUNCTION_NAME}.apply(null, args);
-          };
-          if(typeof window!=='undefined'){
-            ${rawAsyncEntryCode}
+        export const ${_utils.SERVER_RENDER_FUNCTION_NAME} = async (...args) => {
+          let entry = await ${rawAsyncEntryCode};
+          if (entry.default instanceof Promise){
+            entry = await entry.default;
+            return entry.default.${_utils.SERVER_RENDER_FUNCTION_NAME}.apply(null, args);
           }
-          `;
+          return entry.${_utils.SERVER_RENDER_FUNCTION_NAME}.apply(null, args);
+        };
+        if(typeof window!=='undefined'){
+          ${rawAsyncEntryCode}
+        }
+        `;
         }
         const { code: asyncEntryCode } = await hookRunners.modifyAsyncEntry({
           entrypoint,
@@ -205,5 +229,5 @@ const generateCode = async (appContext, config, entrypoints, api) => {
         _utils.fs.outputFileSync(entryFile, code, "utf8");
       }
     }
-  }
+  }));
 };

package/dist/cjs/analyze/getBundleEntry.js

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

package/dist/cjs/analyze/getClientRoutes/getRoutes.js

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

package/dist/cjs/analyze/getClientRoutes/getRoutesLegacy.js

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

package/dist/cjs/analyze/getClientRoutes/index.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  getClientRoutes: () => _getRoutes.getClientRoutes,
-  getClientRoutesLegacy: () => _getRoutesLegacy.getClientRoutes
+  getClientRoutes: function() {
+    return _getRoutes.getClientRoutes;
+  },
+  getClientRoutesLegacy: function() {
+    return _getRoutesLegacy.getClientRoutes;
+  }
 });
 const _getRoutes = require("./getRoutes");
 const _getRoutesLegacy = require("./getRoutesLegacy");

package/dist/cjs/analyze/getClientRoutes/utils.js

@@ -10,10 +10,18 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  debug: () => debug,
-  findLayout: () => findLayout,
-  getRouteWeight: () => getRouteWeight,
-  shouldSkip: () => shouldSkip
+  debug: function() {
+    return debug;
+  },
+  findLayout: function() {
+    return findLayout;
+  },
+  getRouteWeight: function() {
+    return getRouteWeight;
+  },
+  shouldSkip: function() {
+    return shouldSkip;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));

package/dist/cjs/analyze/getFileSystemEntry.js

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

package/dist/cjs/analyze/getHtmlTemplate.js

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

package/dist/cjs/analyze/getServerRoutes.js

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

package/dist/cjs/analyze/index.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: () => _default
+  get: function() {
+    return _default;
+  }
 });
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _path = /* @__PURE__ */ _interop_require_wildcard._(require("path"));
@@ -18,6 +20,7 @@ const _config1 = require("../config");
 const _builder = require("../builder");
 const _utils1 = require("./utils");
 const _constants = require("./constants");
+const _generateCode = require("./generateCode");
 const debug = (0, _utils.createDebugger)("plugin-analyze");
 const _default = ({ bundler }) => {
   return {
@@ -76,7 +79,7 @@ const _default = ({ bundler }) => {
           nestedRouteEntries = entrypoints.map((point) => point.nestedRoutesEntry).filter(Boolean);
           pagesDir = entrypoints.map((point) => point.entry).filter((entry) => entry && !_path.extname(entry)).concat(nestedRouteEntries);
           originEntrypoints = (0, _lodash.cloneDeep)(entrypoints);
-          await generateCode(appContext, resolvedConfig, entrypoints, api);
+          const { importsStatemets } = await generateCode(appContext, resolvedConfig, entrypoints, api);
           const htmlTemplates = await getHtmlTemplate(entrypoints, api, {
             appContext,
             config: resolvedConfig
@@ -139,6 +142,14 @@ const _default = ({ bundler }) => {
               },
               async onBeforeCreateCompiler({ bundlerConfigs }) {
                 const hookRunners2 = api.useHookRunners();
+                await (0, _generateCode.generateIndexCode)({
+                  appContext,
+                  config: resolvedConfig,
+                  entrypoints,
+                  api,
+                  importsStatemets,
+                  bundlerConfigs
+                });
                 await hookRunners2.beforeCreateCompiler({
                   bundlerConfigs
                 });

package/dist/cjs/analyze/isDefaultExportFunction.js

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

package/dist/cjs/analyze/makeLegalIdentifier.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "makeLegalIdentifier", {
   enumerable: true,
-  get: () => makeLegalIdentifier
+  get: function() {
+    return makeLegalIdentifier;
+  }
 });
 const reservedWords = "break case class catch const continue debugger default delete do else export extends finally for function if import in instanceof let new return super switch this throw try typeof var void while with yield enum await implements package protected static interface private public";
 const builtins = "arguments Infinity NaN undefined null true false eval uneval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Symbol Error EvalError InternalError RangeError ReferenceError SyntaxError TypeError URIError Number Math Date String RegExp Array Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array Map Set WeakMap WeakSet SIMD ArrayBuffer DataView JSON Promise Generator GeneratorFunction Reflect Proxy Intl";

package/dist/cjs/analyze/nestedRoutes.js

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

package/dist/cjs/analyze/templates.js

@@ -10,12 +10,24 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  index: () => index,
-  renderFunction: () => renderFunction,
-  html: () => html,
-  routesForServer: () => routesForServer,
-  fileSystemRoutes: () => fileSystemRoutes,
-  ssrLoaderCombinedModule: () => ssrLoaderCombinedModule
+  index: function() {
+    return index;
+  },
+  renderFunction: function() {
+    return renderFunction;
+  },
+  html: function() {
+    return html;
+  },
+  routesForServer: function() {
+    return routesForServer;
+  },
+  fileSystemRoutes: function() {
+    return fileSystemRoutes;
+  },
+  ssrLoaderCombinedModule: function() {
+    return ssrLoaderCombinedModule;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));

package/dist/cjs/analyze/utils.js

@@ -10,14 +10,30 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  walkDirectory: () => walkDirectory,
-  getDefaultImports: () => getDefaultImports,
-  isPageComponentFile: () => isPageComponentFile,
-  replaceWithAlias: () => replaceWithAlias,
-  parseModule: () => parseModule,
-  hasLoader: () => hasLoader,
-  getServerLoadersFile: () => getServerLoadersFile,
-  getServerCombinedModueFile: () => getServerCombinedModueFile
+  walkDirectory: function() {
+    return walkDirectory;
+  },
+  getDefaultImports: function() {
+    return getDefaultImports;
+  },
+  isPageComponentFile: function() {
+    return isPageComponentFile;
+  },
+  replaceWithAlias: function() {
+    return replaceWithAlias;
+  },
+  parseModule: function() {
+    return parseModule;
+  },
+  hasLoader: function() {
+    return hasLoader;
+  },
+  getServerLoadersFile: function() {
+    return getServerLoadersFile;
+  },
+  getServerCombinedModueFile: function() {
+    return getServerCombinedModueFile;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _fs = /* @__PURE__ */ _interop_require_default._(require("fs"));

package/dist/cjs/builder/builder-rspack/adapterCopy.js

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

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "createRspackBuilderForModern", {
   enumerable: true,
-  get: () => createRspackBuilderForModern
+  get: function() {
+    return createRspackBuilderForModern;
+  }
 });
 const _builderrspackprovider = require("@modern-js/builder-rspack-provider");
 const _generator = require("../generator");

package/dist/cjs/builder/builder-webpack/adapterModern.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "builderPluginAdapterModern", {
   enumerable: true,
-  get: () => builderPluginAdapterModern
+  get: function() {
+    return builderPluginAdapterModern;
+  }
 });
 const _path = require("path");
 const _createCopyPattern = require("./createCopyPattern");

package/dist/cjs/builder/builder-webpack/createCopyPattern.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  createPublicPattern: () => createPublicPattern,
-  createUploadPattern: () => createUploadPattern
+  createPublicPattern: function() {
+    return createPublicPattern;
+  },
+  createUploadPattern: function() {
+    return createUploadPattern;
+  }
 });
 const _utils = require("@modern-js/utils");
 const _shared = require("../shared");

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

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

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

@@ -4,20 +4,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "createBuilderOptions", {
   enumerable: true,
-  get: () => createBuilderOptions
+  get: function() {
+    return createBuilderOptions;
+  }
 });
 function createBuilderOptions(target, appContext) {
   const entries = {};
   const { entrypoints = [], checkedEntries } = appContext;
-  for (const { entryName, entry } of entrypoints) {
+  for (const { entryName, internalEntry, entry } of entrypoints) {
     if (checkedEntries && !checkedEntries.includes(entryName)) {
       continue;
     }
+    const finalEntry = internalEntry || entry;
     if (entryName in entries) {
-      entries[entryName].push(entry);
+      entries[entryName].push(finalEntry);
     } else {
       entries[entryName] = [
-        entry
+        finalEntry
       ];
     }
   }