@modern-js/app-tools 2.54.6 → 2.55.0

package/dist/esm/config/default.js

@@ -31,6 +31,7 @@ function createDefaultConfig(appContext) {
     entries: void 0,
     mainEntryName: MAIN_ENTRY_NAME,
     enableAsyncEntry: false,
+    enableCustomEntry: false,
     disableDefaultEntries: false,
     entriesDir: "./src",
     configDir: "./config",
@@ -94,6 +95,7 @@ function createLegacyDefaultConfig(appContext) {
     entries: void 0,
     mainEntryName: MAIN_ENTRY_NAME,
     enableAsyncEntry: false,
+    enableCustomEntry: false,
     disableDefaultEntries: false,
     entriesDir: "./src",
     configDir: "./config",

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

@@ -1,5 +1,5 @@
 function createSourceConfig(config) {
-  var _config_source = config.source, alias = _config_source.alias, envVars = _config_source.envVars, globalVars = _config_source.globalVars, include = _config_source.include, moduleScopes = _config_source.moduleScopes, preEntry = _config_source.preEntry, entries = _config_source.entries, mainEntryName = _config_source.mainEntryName, enableAsyncEntry = _config_source.enableAsyncEntry, disableDefaultEntries = _config_source.disableDefaultEntries, entriesDir = _config_source.entriesDir, configDir = _config_source.configDir;
+  var _config_source = config.source, alias = _config_source.alias, envVars = _config_source.envVars, globalVars = _config_source.globalVars, include = _config_source.include, moduleScopes = _config_source.moduleScopes, preEntry = _config_source.preEntry, entries = _config_source.entries, mainEntryName = _config_source.mainEntryName, enableAsyncEntry = _config_source.enableAsyncEntry, enableCustomEntry = _config_source.enableCustomEntry, disableDefaultEntries = _config_source.disableDefaultEntries, entriesDir = _config_source.entriesDir, configDir = _config_source.configDir;
   var builderGlobalVars = globalVars || {};
   var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
   try {
@@ -31,6 +31,7 @@ function createSourceConfig(config) {
     entries,
     mainEntryName,
     enableAsyncEntry,
+    enableCustomEntry,
     disableDefaultEntries,
     entriesDir,
     configDir,

package/dist/esm/hooks.js

@@ -1,16 +1,13 @@
 import { createAsyncWaterfall, createAsyncWorkflow, createParallelWorkflow } from "@modern-js/plugin";
 var hooks = {
-  modifyEntryExport: createAsyncWaterfall(),
-  modifyEntryImports: createAsyncWaterfall(),
-  modifyEntryRuntimePlugins: createAsyncWaterfall(),
-  modifyEntryRenderFunction: createAsyncWaterfall(),
-  modifyAsyncEntry: createAsyncWaterfall(),
+  _internalRuntimePlugins: createAsyncWaterfall(),
   modifyFileSystemRoutes: createAsyncWaterfall(),
   modifyServerRoutes: createAsyncWaterfall(),
   /** add entry point info to entrypoints array */
   modifyEntrypoints: createAsyncWaterfall(),
   /** add entry type */
   checkEntryPoint: createAsyncWaterfall(),
+  generateEntryCode: createAsyncWorkflow(),
   htmlPartials: createAsyncWaterfall(),
   beforeGenerateRoutes: createAsyncWaterfall(),
   addDefineTypes: createAsyncWaterfall(),

package/dist/esm/plugins/analyze/constants.js

@@ -1,23 +1,13 @@
 var INDEX_FILE_NAME = "index";
-var FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
-var ENTRY_POINT_FILE_NAME = "index.jsx";
-var ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
+var ENTRY_FILE_NAME = "entry";
 var HTML_PARTIALS_FOLDER = "html";
 var HTML_PARTIALS_EXTENSIONS = [
   ".htm",
   ".html",
   ".ejs"
 ];
-var APP_CONFIG_NAME = "config";
-var APP_INIT_EXPORTED = "init";
-var APP_INIT_IMPORTED = "appInit";
 export {
-  APP_CONFIG_NAME,
-  APP_INIT_EXPORTED,
-  APP_INIT_IMPORTED,
-  ENTRY_BOOTSTRAP_FILE_NAME,
-  ENTRY_POINT_FILE_NAME,
-  FILE_SYSTEM_ROUTES_FILE_NAME,
+  ENTRY_FILE_NAME,
   HTML_PARTIALS_EXTENSIONS,
   HTML_PARTIALS_FOLDER,
   INDEX_FILE_NAME

package/dist/esm/plugins/analyze/getFileSystemEntry.js

@@ -3,15 +3,26 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import fs from "fs";
 import path from "path";
 import { findExists, ensureAbsolutePath, JS_EXTENSIONS } from "@modern-js/utils";
-import { INDEX_FILE_NAME } from "./constants";
+import { ENTRY_FILE_NAME, INDEX_FILE_NAME } from "./constants";
 import { isDefaultExportFunction } from "./isDefaultExportFunction";
 var hasIndex = function(dir) {
   return findExists(JS_EXTENSIONS.map(function(ext) {
     return path.resolve(dir, "".concat(INDEX_FILE_NAME).concat(ext));
   }));
 };
+var hasEntry = function(dir) {
+  return findExists(JS_EXTENSIONS.map(function(ext) {
+    return path.resolve(dir, "".concat(ENTRY_FILE_NAME).concat(ext));
+  }));
+};
+var hasServerEntry = function(dir) {
+  return findExists(JS_EXTENSIONS.map(function(ext) {
+    return path.resolve(dir, "".concat(ENTRY_FILE_NAME, ".server").concat(ext));
+  }));
+};
 var isBundleEntry = function() {
-  var _ref = _async_to_generator(function(hookRunners, dir) {
+  var _ref = _async_to_generator(function(hookRunners, dir, enableCustomEntry) {
+    var entry, customEntry;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -23,27 +34,43 @@ var isBundleEntry = function() {
             })
           ];
         case 1:
+          entry = _state.sent().entry;
+          if (entry) {
+            return [
+              2,
+              entry
+            ];
+          }
+          customEntry = hasEntry(dir);
+          if (enableCustomEntry && customEntry) {
+            return [
+              2,
+              customEntry
+            ];
+          }
           return [
             2,
-            _state.sent().entry || hasIndex(dir)
+            hasIndex(dir)
           ];
       }
     });
   });
-  return function isBundleEntry2(hookRunners, dir) {
+  return function isBundleEntry2(hookRunners, dir, enableCustomEntry) {
     return _ref.apply(this, arguments);
   };
 }();
-var scanDir = function(hookRunners, dirs) {
+var scanDir = function(hookRunners, dirs, enableCustomEntry) {
   return Promise.all(dirs.map(function() {
     var _ref = _async_to_generator(function(dir) {
-      var indexFile, customBootstrap, entryName, entryFile;
+      var indexFile, customBootstrap, entryName, customEntryFile, customServerEntry, entryFile;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
             indexFile = hasIndex(dir);
             customBootstrap = isDefaultExportFunction(indexFile) ? indexFile : false;
             entryName = path.basename(dir);
+            customEntryFile = hasEntry(dir);
+            customServerEntry = hasServerEntry(dir);
             if (indexFile && !customBootstrap) {
               return [
                 2,
@@ -72,10 +99,26 @@ var scanDir = function(hookRunners, dirs) {
                 {
                   entryName,
                   isMainEntry: false,
-                  entry: entryFile,
+                  entry: enableCustomEntry ? customEntryFile || entryFile : entryFile,
+                  customServerEntry,
                   absoluteEntryDir: path.resolve(dir),
                   isAutoMount: true,
-                  customBootstrap
+                  customBootstrap,
+                  customEntry: enableCustomEntry ? Boolean(customEntryFile) : false
+                }
+              ];
+            }
+            if (enableCustomEntry && customEntryFile) {
+              return [
+                2,
+                {
+                  entryName,
+                  isMainEntry: false,
+                  entry: customEntryFile,
+                  customServerEntry,
+                  absoluteEntryDir: path.resolve(dir),
+                  isAutoMount: false,
+                  customEntry: Boolean(customEntryFile)
                 }
               ];
             }
@@ -90,12 +133,12 @@ var scanDir = function(hookRunners, dirs) {
 };
 var getFileSystemEntry = function() {
   var _ref = _async_to_generator(function(hookRunners, appContext, config) {
-    var appDirectory, _config_source, entriesDir, disableEntryDirs, disabledDirs, src, dirs;
+    var appDirectory, _config_source, entriesDir, disableEntryDirs, enableCustomEntry, disabledDirs, src, dirs;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           appDirectory = appContext.appDirectory;
-          _config_source = config.source, entriesDir = _config_source.entriesDir, disableEntryDirs = _config_source.disableEntryDirs;
+          _config_source = config.source, entriesDir = _config_source.entriesDir, disableEntryDirs = _config_source.disableEntryDirs, enableCustomEntry = _config_source.enableCustomEntry;
           disabledDirs = [];
           if (disableEntryDirs && Array.isArray(disableEntryDirs)) {
             disabledDirs = disableEntryDirs === null || disableEntryDirs === void 0 ? void 0 : disableEntryDirs.map(function(dir) {
@@ -115,7 +158,7 @@ var getFileSystemEntry = function() {
             ];
           return [
             4,
-            isBundleEntry(hookRunners, src)
+            isBundleEntry(hookRunners, src, enableCustomEntry)
           ];
         case 1:
           if (_state.sent()) {
@@ -123,7 +166,7 @@ var getFileSystemEntry = function() {
               2,
               scanDir(hookRunners, [
                 src
-              ])
+              ], enableCustomEntry)
             ];
           }
           dirs = [];
@@ -144,7 +187,7 @@ var getFileSystemEntry = function() {
                         ];
                       return [
                         4,
-                        isBundleEntry(hookRunners, file)
+                        isBundleEntry(hookRunners, file, enableCustomEntry)
                       ];
                     case 1:
                       _tmp = _state2.sent();
@@ -168,7 +211,7 @@ var getFileSystemEntry = function() {
           _state.sent();
           return [
             2,
-            scanDir(hookRunners, dirs)
+            scanDir(hookRunners, dirs, enableCustomEntry)
           ];
         case 3:
           throw Error("source.entriesDir accept a directory.");

package/dist/esm/plugins/analyze/index.js

@@ -4,28 +4,29 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
-import { createDebugger, findExists, fs, isApiOnly, minimist, isDevCommand, getArgv } from "@modern-js/utils";
+import { createDebugger, fs, isApiOnly, minimist, isDevCommand, getArgv } from "@modern-js/utils";
 import { printInstructions } from "../../utils/printInstructions";
-import { generateRoutes, getPathWithoutExt } from "../../utils/routes";
+import { generateRoutes } from "../../utils/routes";
 import { emitResolvedConfig } from "../../utils/config";
 import { getSelectedEntries } from "../../utils/getSelectedEntries";
 import { initialNormalizedConfig } from "../../config";
 import { createBuilderGenerator } from "../../builder";
-import { checkIsBuildCommands, parseModule, replaceWithAlias } from "./utils";
-import { APP_CONFIG_NAME, APP_INIT_EXPORTED, APP_INIT_IMPORTED } from "./constants";
-import { generateIndexCode } from "./generateCode";
+import { checkIsBuildCommands } from "./utils";
 var debug = createDebugger("plugin-analyze");
 function analyze_default(param) {
   var bundler = param.bundler;
   return {
     name: "@modern-js/plugin-analyze",
+    post: [
+      "@modern-js/runtime"
+    ],
     setup: function(api) {
       var pagesDir = [];
       var nestedRouteEntries = [];
       return {
         prepare: function prepare() {
           return _async_to_generator(function() {
-            var _resolvedConfig_source, appContext, resolvedConfig, hookRunners, apiOnly, routes, _ref, getBundleEntry, getServerRoutes, generateCode, getHtmlTemplate, entrypoints, _, _tmp, initialRoutes, routes1, importsStatemets, htmlTemplates, checkedEntries, entry, normalizedConfig, createBuilderForModern, builder;
+            var _resolvedConfig_source, appContext, resolvedConfig, hookRunners, apiOnly, routes, _ref, getBundleEntry, getServerRoutes, getHtmlTemplate, entrypoints, _, _tmp, initialRoutes, routes1, htmlTemplates, checkedEntries, entry, normalizedConfig, createBuilderForModern, builder;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -78,15 +79,14 @@ function analyze_default(param) {
                     Promise.all([
                       import("./getBundleEntry"),
                       import("./getServerRoutes"),
-                      import("./generateCode"),
                       import("./getHtmlTemplate")
                     ])
                   ];
                 case 5:
                   _ref = _sliced_to_array.apply(void 0, [
                     _state.sent(),
-                    4
-                  ]), getBundleEntry = _ref[0].getBundleEntry, getServerRoutes = _ref[1].getServerRoutes, generateCode = _ref[2].generateCode, getHtmlTemplate = _ref[3].getHtmlTemplate;
+                    3
+                  ]), getBundleEntry = _ref[0].getBundleEntry, getServerRoutes = _ref[1].getServerRoutes, getHtmlTemplate = _ref[2].getHtmlTemplate;
                   _ = hookRunners.modifyEntrypoints;
                   _tmp = {};
                   return [
@@ -129,12 +129,6 @@ function analyze_default(param) {
                   }).filter(function(entry2) {
                     return entry2 && !path.extname(entry2);
                   }).concat(nestedRouteEntries);
-                  return [
-                    4,
-                    generateCode(appContext, resolvedConfig, entrypoints, api)
-                  ];
-                case 9:
-                  importsStatemets = _state.sent().importsStatemets;
                   return [
                     4,
                     getHtmlTemplate(entrypoints, api, {
@@ -142,14 +136,14 @@ function analyze_default(param) {
                       config: resolvedConfig
                     })
                   ];
-                case 10:
+                case 9:
                   htmlTemplates = _state.sent();
                   debug("html templates: %o", htmlTemplates);
                   return [
                     4,
                     hookRunners.addDefineTypes()
                   ];
-                case 11:
+                case 10:
                   _state.sent();
                   debug("add Define Types");
                   checkedEntries = entrypoints.map(function(point) {
@@ -158,17 +152,17 @@ function analyze_default(param) {
                   if (!isDevCommand())
                     return [
                       3,
-                      13
+                      12
                     ];
                   entry = minimist(getArgv()).entry;
                   return [
                     4,
                     getSelectedEntries(typeof entry === "string" ? entry.split(",") : entry, entrypoints)
                   ];
-                case 12:
+                case 11:
                   checkedEntries = _state.sent();
-                  _state.label = 13;
-                case 13:
+                  _state.label = 12;
+                case 12:
                   appContext = _object_spread_props(_object_spread({}, api.useAppContext()), {
                     entrypoints,
                     checkedEntries,
@@ -182,6 +176,14 @@ function analyze_default(param) {
                       3,
                       16
                     ];
+                  return [
+                    4,
+                    hookRunners.generateEntryCode({
+                      entrypoints
+                    })
+                  ];
+                case 13:
+                  _state.sent();
                   normalizedConfig = api.useResolvedConfigContext();
                   return [
                     4,
@@ -291,26 +293,13 @@ function analyze_default(param) {
                           case 0:
                             bundlerConfigs = param2.bundlerConfigs;
                             hookRunners2 = api.useHookRunners();
-                            return [
-                              4,
-                              generateIndexCode({
-                                appContext,
-                                config: resolvedConfig,
-                                entrypoints,
-                                api,
-                                importsStatemets,
-                                bundlerConfigs
-                              })
-                            ];
-                          case 1:
-                            _state2.sent();
                             return [
                               4,
                               hookRunners2.beforeCreateCompiler({
                                 bundlerConfigs
                               })
                             ];
-                          case 2:
+                          case 1:
                             _state2.sent();
                             return [
                               2
@@ -375,99 +364,7 @@ function analyze_default(param) {
           return {
             resolved: config
           };
-        },
-        modifyEntryImports: (
-          // This logic is not in the router plugin to avoid having to include some dependencies in the utils package
-          function modifyEntryImports(param2) {
-            var entrypoint = param2.entrypoint, imports = param2.imports;
-            return _async_to_generator(function() {
-              var appContext, srcDirectory, internalSrcAlias, fileSystemRoutes, nestedRoutesEntry, rootLayoutPath, rootLayoutFile, rootLayoutBuffer, rootLayout, _ref, moduleExports, hasAppConfig, generateLayoutPath, hasAppInit;
-              return _ts_generator(this, function(_state) {
-                switch (_state.label) {
-                  case 0:
-                    appContext = api.useAppContext();
-                    srcDirectory = appContext.srcDirectory, internalSrcAlias = appContext.internalSrcAlias;
-                    fileSystemRoutes = entrypoint.fileSystemRoutes, nestedRoutesEntry = entrypoint.nestedRoutesEntry;
-                    if (!(fileSystemRoutes && nestedRoutesEntry))
-                      return [
-                        3,
-                        3
-                      ];
-                    rootLayoutPath = path.join(nestedRoutesEntry, "layout");
-                    rootLayoutFile = findExists([
-                      ".js",
-                      ".ts",
-                      ".jsx",
-                      ".tsx"
-                    ].map(function(ext) {
-                      return "".concat(rootLayoutPath).concat(ext);
-                    }));
-                    if (!rootLayoutFile)
-                      return [
-                        3,
-                        3
-                      ];
-                    return [
-                      4,
-                      fs.readFile(rootLayoutFile)
-                    ];
-                  case 1:
-                    rootLayoutBuffer = _state.sent();
-                    rootLayout = rootLayoutBuffer.toString();
-                    return [
-                      4,
-                      parseModule({
-                        source: rootLayout.toString(),
-                        filename: rootLayoutFile
-                      })
-                    ];
-                  case 2:
-                    _ref = _sliced_to_array.apply(void 0, [
-                      _state.sent(),
-                      2
-                    ]), moduleExports = _ref[1];
-                    hasAppConfig = moduleExports.some(function(e) {
-                      return e.n === APP_CONFIG_NAME;
-                    });
-                    generateLayoutPath = getPathWithoutExt(replaceWithAlias(srcDirectory, rootLayoutFile, internalSrcAlias));
-                    if (hasAppConfig) {
-                      imports.push({
-                        value: generateLayoutPath,
-                        specifiers: [
-                          {
-                            imported: APP_CONFIG_NAME
-                          }
-                        ]
-                      });
-                    }
-                    hasAppInit = moduleExports.some(function(e) {
-                      return e.n === APP_INIT_EXPORTED;
-                    });
-                    if (hasAppInit) {
-                      imports.push({
-                        value: generateLayoutPath,
-                        specifiers: [
-                          {
-                            imported: APP_INIT_EXPORTED,
-                            local: APP_INIT_IMPORTED
-                          }
-                        ]
-                      });
-                    }
-                    _state.label = 3;
-                  case 3:
-                    return [
-                      2,
-                      {
-                        entrypoint,
-                        imports
-                      }
-                    ];
-                }
-              });
-            })();
-          }
-        )
+        }
       };
     }
   };

package/dist/esm/plugins/analyze/templates.js

@@ -1,22 +1,6 @@
-import { APP_CONFIG_NAME } from "./constants";
-var index = function(param) {
-  var mountId = param.mountId, imports = param.imports, renderFunction2 = param.renderFunction, exportStatement = param.exportStatement;
-  return "\nconst IS_BROWSER = typeof window !== 'undefined' && window.name !== 'nodejs';\nconst IS_REACT18 = process.env.IS_REACT18 === 'true';\nconst MOUNT_ID = '".concat(mountId, "';\n\n").concat(imports, "\n\nlet AppWrapper = null;\n\nlet root = null;\n\nfunction render() {\n  ").concat(renderFunction2, "\n}\n\nAppWrapper = render();\n\n").concat(exportStatement, ";\n");
-};
-var renderFunction = function(param) {
-  var plugins = param.plugins, customBootstrap = param.customBootstrap, fileSystemRoutes = param.fileSystemRoutes, customRuntimeConfig = param.customRuntimeConfig;
-  var bootstrap = "bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM)";
-  var runtimePlugins = "...(runtimeConfig?.plugins || []),";
-  return "\n  const finalAppConfig = {\n    ...App.config,\n    ...typeof ".concat(APP_CONFIG_NAME, " === 'function' ? ").concat(APP_CONFIG_NAME, "() : {},\n  }\n\n  AppWrapper = createApp({\n    plugins: [\n     ").concat(plugins.map(function(param2) {
-    var name = param2.name, options = param2.options, args = param2.args;
-    return "".concat(name, "({...").concat(options, ", ...finalAppConfig?.").concat(args || name, "}),");
-  }).join("\n"), "\n       ").concat(customRuntimeConfig ? runtimePlugins : "", "\n    ]\n  })(").concat(fileSystemRoutes ? "" : "App", ")\n\n\n  if(!AppWrapper.init && typeof appInit !== 'undefined') {\n    AppWrapper.init = appInit;\n  }\n\n\n  if (IS_BROWSER) {\n    ").concat(customBootstrap ? "customBootstrap(AppWrapper, () => ".concat(bootstrap, ");") : "".concat(bootstrap, ";"), "\n  }\n\n  return AppWrapper\n");
-};
 var html = function(partials) {
   return "\n<!DOCTYPE html>\n<html>\n<head>\n\n  ".concat(partials.top.join("\n"), "\n\n  ").concat(partials.head.join("\n"), '\n\n</head>\n\n<body>\n  <div id="<%= mountId %>"><!--<?- html ?>--></div>\n  ').concat(partials.body.join("\n"), "\n  <!--<?- chunksMap.js ?>-->\n  <!--<?- SSRDataScript ?>-->\n  <!--<?- bottomTemplate ?>-->\n</body>\n\n</html>\n");
 };
 export {
-  html,
-  index,
-  renderFunction
+  html
 };

package/dist/esm/plugins/analyze/utils.js

@@ -3,10 +3,9 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import fs from "fs";
 import path from "path";
-import { isReact18, normalizeToPosixPath, getCommand, JS_EXTENSIONS } from "@modern-js/utils";
+import { normalizeToPosixPath, getCommand, JS_EXTENSIONS } from "@modern-js/utils";
 import { transform } from "esbuild";
 import { parse } from "es-module-lexer";
-import { FILE_SYSTEM_ROUTES_FILE_NAME } from "./constants";
 var walkDirectory = function(dir) {
   return fs.readdirSync(dir).reduce(function(previous, filename) {
     var filePath = path.join(dir, filename);
@@ -19,90 +18,6 @@ var walkDirectory = function(dir) {
     }
   }, []);
 };
-var getDefaultImports = function(param) {
-  var entrypoint = param.entrypoint, srcDirectory = param.srcDirectory, appDirectory = param.appDirectory, internalSrcAlias = param.internalSrcAlias, internalDirAlias = param.internalDirAlias, runtimeConfigFile = param.runtimeConfigFile, customRuntimeConfig = param.customRuntimeConfig;
-  var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes, customBootstrap = entrypoint.customBootstrap, entry = entrypoint.entry;
-  var imports = [
-    {
-      specifiers: [
-        {
-          local: "React"
-        }
-      ],
-      value: "react"
-    },
-    {
-      specifiers: [
-        {
-          local: "ReactDOM"
-        }
-      ],
-      value: isReact18(path.join(appDirectory)) ? "react-dom/client" : "react-dom"
-    },
-    {
-      specifiers: [
-        {
-          imported: "createApp"
-        },
-        {
-          imported: "bootstrap"
-        }
-      ],
-      value: "@modern-js/runtime"
-    },
-    customBootstrap && {
-      specifiers: [
-        {
-          local: "customBootstrap"
-        }
-      ],
-      value: normalizeToPosixPath(customBootstrap.replace(srcDirectory, internalSrcAlias))
-    }
-  ].filter(Boolean);
-  if (fileSystemRoutes) {
-    var route = {
-      specifiers: [
-        {
-          imported: "routes"
-        }
-      ],
-      value: normalizeToPosixPath("".concat(internalDirAlias, "/").concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME.replace(".js", "")))
-    };
-    if (fileSystemRoutes.globalApp) {
-      imports.push({
-        specifiers: [
-          {
-            local: "App"
-          }
-        ],
-        value: normalizeToPosixPath(fileSystemRoutes.globalApp.replace(srcDirectory, internalSrcAlias))
-      });
-    } else {
-      route.initialize = "const App = false;";
-    }
-    imports.push(route);
-  } else {
-    imports.push({
-      specifiers: [
-        {
-          local: "App"
-        }
-      ],
-      value: normalizeToPosixPath(entry.replace(srcDirectory, internalSrcAlias))
-    });
-  }
-  if (customRuntimeConfig) {
-    imports.push({
-      specifiers: [
-        {
-          local: "runtimeConfig"
-        }
-      ],
-      value: path.join(internalSrcAlias, runtimeConfigFile || "")
-    });
-  }
-  return imports;
-};
 var replaceWithAlias = function(base, filePath, alias) {
   if (filePath.includes(base)) {
     return normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
@@ -178,7 +93,6 @@ var isSubDirOrEqual = function(parent, child) {
 };
 export {
   checkIsBuildCommands,
-  getDefaultImports,
   getServerCombinedModueFile,
   isSubDirOrEqual,
   parseModule,

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

@@ -14,11 +14,28 @@ function createBuilderOptions(target, appContext) {
       ];
     }
   }
+  const serverEntries = {};
+  for (const entry in entries) {
+    const v = entries[entry];
+    serverEntries[entry] = v.map((entry2) => entry2.replace("index.jsx", "index.server.jsx"));
+  }
   return {
     cwd: appContext.appDirectory,
     target,
     frameworkConfigPath: appContext.configFile || void 0,
-    entry: entries
+    entry({ target: target2 }) {
+      if (target2 === "web") {
+        return entries;
+      }
+      if ([
+        "node",
+        "web-worker",
+        "service-worker"
+      ].includes(target2)) {
+        return serverEntries;
+      }
+      return entries;
+    }
   };
 }
 export {

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

@@ -1,4 +1,4 @@
-import { isHtmlDisabled } from "@rsbuild/shared";
+import { isHtmlDisabled } from "@modern-js/uni-builder";
 import { MAIN_ENTRY_NAME, getEntryOptions, removeTailSlash } from "@modern-js/utils";
 import { template as lodashTemplate } from "@modern-js/utils/lodash";
 import { BottomTemplatePlugin } from "../bundlerPlugins";

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

@@ -1,7 +1,7 @@
 import * as path from "path";
-import { isHtmlDisabled } from "@rsbuild/shared";
 import { mergeRsbuildConfig } from "@rsbuild/core";
 import { fs, isUseSSRBundle } from "@modern-js/utils";
+import { isHtmlDisabled } from "@modern-js/uni-builder";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
 import { getServerCombinedModueFile } from "../../../plugins/analyze/utils";
 const builderPluginAdapterSSR = (options) => ({

package/dist/esm-node/commands/index.js

@@ -1,5 +1,5 @@
 import { newAction, upgradeAction } from "@modern-js/utils";
-import { castArray } from "@rsbuild/shared";
+import { castArray } from "@modern-js/uni-builder";
 import { i18n, localeKeys } from "../locale";
 const devCommand = async (program, api) => {
   const runner = api.useHookRunners();