@modern-js/app-tools 2.42.2-alpha.0 → 2.43.0

package/dist/cjs/analyze/generateCode.js

@@ -85,7 +85,7 @@ ${initialize || ""}`);
 ${initialize || ""}`).join("\n");
 };
 const generateCode = async (appContext, config, entrypoints, api) => {
-  const { internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
+  const { internalDirectory, srcDirectory, appDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
   const hookRunners = api.useHookRunners();
   const isV5 = (0, import_utils.isRouterV5)(config);
   const getRoutes = isV5 ? import_getClientRoutes.getClientRoutesLegacy : import_getClientRoutes.getClientRoutes;
@@ -176,9 +176,9 @@ const generateCode = async (appContext, config, entrypoints, api) => {
         imports: (0, import_utils2.getDefaultImports)({
           entrypoint,
           srcDirectory,
+          appDirectory,
           internalSrcAlias,
-          internalDirAlias,
-          internalDirectory
+          internalDirAlias
         })
       });
       importsStatemets.set(entryName, imports);

package/dist/cjs/analyze/nestedRoutes.js

@@ -143,6 +143,7 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
   const items = await import_utils.fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
+    const itemPathWithAlias = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
     const extname = path.extname(item);
     const itemWithoutExt = item.slice(0, -extname.length);
     const isDirectory2 = (await import_utils.fs.stat(itemPath)).isDirectory();
@@ -158,45 +159,45 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.LAYOUT_LOADER_FILE) {
       if (!route.loader) {
-        route.loader = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+        route.loader = itemPathWithAlias;
       }
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.LAYOUT_CLIENT_LOADER) {
-      route.clientData = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+      route.clientData = itemPathWithAlias;
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.LAYOUT_DATA_FILE) {
-      route.data = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+      route.data = itemPathWithAlias;
       if (await (0, import_utils2.hasAction)(itemPath)) {
-        route.action = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+        route.action = itemPathWithAlias;
       }
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.LAYOUT_CONFIG_FILE) {
       if (!route.config) {
-        route.config = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+        route.config = itemPathWithAlias;
       }
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.LAYOUT_FILE) {
-      route._component = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+      route._component = itemPathWithAlias;
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.PAGE_LOADER_FILE) {
-      pageLoaderFile = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+      pageLoaderFile = itemPathWithAlias;
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.PAGE_CLIENT_LOADER) {
-      pageClientData = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+      pageClientData = itemPathWithAlias;
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.PAGE_DATA_FILE) {
-      pageData = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+      pageData = itemPathWithAlias;
       if (await (0, import_utils2.hasAction)(itemPath)) {
-        pageAction = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+        pageAction = itemPathWithAlias;
       }
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.PAGE_CONFIG_FILE) {
-      pageConfigFile = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+      pageConfigFile = itemPathWithAlias;
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.PAGE_FILE) {
       var _route_children1;
       pageRoute = createIndexRoute({
-        _component: (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name)
+        _component: itemPathWithAlias
       }, rootDir, itemPath, entryName, isMainEntry);
       if (pageLoaderFile) {
         pageRoute.loader = pageLoaderFile;
@@ -216,10 +217,10 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
       (_route_children1 = route.children) === null || _route_children1 === void 0 ? void 0 : _route_children1.push(pageRoute);
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.SPLATE_LOADER_FILE) {
-      splatLoaderFile = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+      splatLoaderFile = itemPathWithAlias;
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.SPLATE_CLIENT_DATA) {
-      splatClientData = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+      splatClientData = itemPathWithAlias;
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.SPLATE_CONFIG_FILE) {
       if (!route.config) {
@@ -227,15 +228,15 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
       }
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.SPLATE_DATA_FILE) {
-      splatData = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+      splatData = itemPathWithAlias;
       if (await (0, import_utils2.hasAction)(itemPath)) {
-        splatAction = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+        splatAction = itemPathWithAlias;
       }
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.SPLATE_FILE) {
       var _route_children2;
       splatRoute = createRoute({
-        _component: (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name),
+        _component: itemPathWithAlias,
         path: "*"
       }, rootDir, itemPath, entryName, isMainEntry);
       if (splatLoaderFile) {
@@ -256,10 +257,10 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
       (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(splatRoute);
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.LOADING_FILE) {
-      route.loading = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+      route.loading = itemPathWithAlias;
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.ERROR_FILE) {
-      route.error = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+      route.error = itemPathWithAlias;
     }
   }
   let finalRoute = createRoute(route, rootDir, path.join(dirname, `${import_constants.NESTED_ROUTE.LAYOUT_FILE}.ts`), entryName, isMainEntry);

package/dist/cjs/analyze/utils.js

@@ -61,7 +61,7 @@ const walkDirectory = (dir) => import_fs.default.readdirSync(dir).reduce((previo
     ];
   }
 }, []);
-const getDefaultImports = ({ entrypoint, srcDirectory, internalSrcAlias, internalDirAlias, internalDirectory }) => {
+const getDefaultImports = ({ entrypoint, srcDirectory, appDirectory, internalSrcAlias, internalDirAlias }) => {
   const { entryName, fileSystemRoutes, customBootstrap, entry } = entrypoint;
   const imports = [
     {
@@ -78,7 +78,7 @@ const getDefaultImports = ({ entrypoint, srcDirectory, internalSrcAlias, interna
           local: "ReactDOM"
         }
       ],
-      value: (0, import_utils.isReact18)(import_path.default.join(internalDirectory, "../../")) ? "react-dom/client" : "react-dom"
+      value: (0, import_utils.isReact18)(import_path.default.join(appDirectory)) ? "react-dom/client" : "react-dom"
     },
     {
       specifiers: [

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

@@ -73,7 +73,7 @@ function applyBottomHtmlPlugin({ api, chain, options, CHAIN_ID, HtmlBundlerPlugi
       }
     ]);
   }
-  chain.plugin(CHAIN_ID.PLUGIN.BOTTOM_TEMPLATE).use(import_bundlerPlugins.BottomTemplatePlugin, [
+  chain.plugin("bottom-template").use(import_bundlerPlugins.BottomTemplatePlugin, [
     HtmlBundlerPlugin
   ]);
 }

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

@@ -53,7 +53,7 @@ const builderPluginAdapterSSR = (options) => ({
     api.modifyBundlerChain(async (chain, { target, CHAIN_ID, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
       const builderConfig = api.getNormalizedConfig();
       const { normalizedConfig: normalizedConfig2 } = options;
-      applyRouterPlugin(chain, CHAIN_ID.PLUGIN.ROUTER_MANIFEST, options, HtmlBundlerPlugin);
+      applyRouterPlugin(chain, "route-plugin", options, HtmlBundlerPlugin);
       if ((0, import_utils.isSSR)(normalizedConfig2)) {
         await applySSRLoaderEntry(chain, options, isServer);
         applySSRDataLoader(chain, options);

package/dist/cjs/index.js

@@ -46,6 +46,7 @@ var import_analyze = __toESM(require("./analyze"));
 var import_initialize = __toESM(require("./initialize"));
 var import_hooks = require("./hooks");
 var import_locale = require("./locale");
+var import_serverBuild = __toESM(require("./plugins/serverBuild"));
 var import_restart = require("./utils/restart");
 var import_generateWatchFiles = require("./utils/generateWatchFiles");
 var import_core = require("@modern-js/core");
@@ -118,6 +119,7 @@ const appTools = (options = {
     (0, import_analyze.default)({
       bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
     }),
+    (0, import_serverBuild.default)(),
     (0, import_plugin_lint.lintPlugin)()
   ],
   setup: (api) => {

package/dist/cjs/plugins/serverBuild.js

@@ -0,0 +1,74 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var serverBuild_exports = {};
+__export(serverBuild_exports, {
+  default: () => serverBuild_default
+});
+module.exports = __toCommonJS(serverBuild_exports);
+var import_path = __toESM(require("path"));
+var import_fs = __toESM(require("fs"));
+var import_utils = require("@modern-js/utils");
+var import_server_utils = require("@modern-js/server-utils");
+const TS_CONFIG_FILENAME = "tsconfig.json";
+var serverBuild_default = () => ({
+  name: "@modern-js/server-build",
+  setup(api) {
+    return {
+      async afterBuild() {
+        const { appDirectory, distDirectory } = api.useAppContext();
+        const modernConfig = api.useResolvedConfigContext();
+        const distDir = import_path.default.resolve(distDirectory);
+        const serverDir = import_path.default.resolve(appDirectory, import_utils.SERVER_DIR);
+        const sharedDir = import_path.default.resolve(appDirectory, import_utils.SHARED_DIR);
+        const tsconfigPath = import_path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
+        const sourceDirs = [];
+        if (import_fs.default.existsSync(serverDir)) {
+          sourceDirs.push(serverDir);
+          if (import_fs.default.existsSync(sharedDir)) {
+            sourceDirs.push(sharedDir);
+          }
+        }
+        const { server } = modernConfig;
+        const { alias } = modernConfig.source;
+        const { babel } = modernConfig.tools;
+        if (sourceDirs.length > 0) {
+          await (0, import_server_utils.compile)(appDirectory, {
+            server,
+            alias,
+            babelConfig: babel
+          }, {
+            sourceDirs,
+            distDir,
+            tsconfigPath
+          });
+        }
+      }
+    };
+  }
+});

package/dist/esm/analyze/generateCode.js

@@ -94,7 +94,7 @@ var createImportStatements = function(statements) {
 };
 var generateCode = function() {
   var _ref = _async_to_generator(function(appContext, config, entrypoints, api) {
-    var internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, getRoutes, importsStatemets, oldVersion;
+    var internalDirectory, srcDirectory, appDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, getRoutes, importsStatemets, oldVersion;
     function generateEntryCode(entrypoint) {
       return _generateEntryCode.apply(this, arguments);
     }
@@ -265,9 +265,9 @@ var generateCode = function() {
                   imports: getDefaultImports({
                     entrypoint,
                     srcDirectory,
+                    appDirectory,
                     internalSrcAlias,
-                    internalDirAlias,
-                    internalDirectory
+                    internalDirAlias
                   })
                 })
               ];
@@ -289,7 +289,7 @@ var generateCode = function() {
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          internalDirectory = appContext.internalDirectory, srcDirectory = appContext.srcDirectory, internalDirAlias = appContext.internalDirAlias, internalSrcAlias = appContext.internalSrcAlias, packageName = appContext.packageName;
+          internalDirectory = appContext.internalDirectory, srcDirectory = appContext.srcDirectory, appDirectory = appContext.appDirectory, internalDirAlias = appContext.internalDirAlias, internalSrcAlias = appContext.internalSrcAlias, packageName = appContext.packageName;
           hookRunners = api.useHookRunners();
           isV5 = isRouterV5(config);
           getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;

package/dist/esm/analyze/nestedRoutes.js

@@ -70,7 +70,7 @@ var optimizeRoute = function(routeTree) {
 };
 var walk = function() {
   var _ref = _async_to_generator(function(dirname, rootDir, alias, entryName, isMainEntry, oldVersion) {
-    var _finalRoute_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, pageConfigFile, pageClientData, pageData, pageAction, splatLoaderFile, splatRoute, splatConfigFile, splatClientData, splatData, splatAction, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory1, childRoute, _route_children, _route_children1, _route_children2, err, finalRoute, childRoutes, childRoute1, _$path, optimizedRoutes;
+    var _finalRoute_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, pageConfigFile, pageClientData, pageData, pageAction, splatLoaderFile, splatRoute, splatConfigFile, splatClientData, splatData, splatAction, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, itemPathWithAlias, extname, itemWithoutExt, isDirectory1, childRoute, _route_children, _route_children1, _route_children2, err, finalRoute, childRoutes, childRoute1, _$path, optimizedRoutes;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -150,6 +150,7 @@ var walk = function() {
             ];
           item = _step.value;
           itemPath = path.join(dirname, item);
+          itemPathWithAlias = replaceWithAlias(alias.basename, itemPath, alias.name);
           extname = path.extname(item);
           itemWithoutExt = item.slice(0, -extname.length);
           return [
@@ -183,65 +184,65 @@ var walk = function() {
           }
           if (itemWithoutExt === NESTED_ROUTE.LAYOUT_LOADER_FILE) {
             if (!route.loader) {
-              route.loader = replaceWithAlias(alias.basename, itemPath, alias.name);
+              route.loader = itemPathWithAlias;
             }
           }
           if (itemWithoutExt === NESTED_ROUTE.LAYOUT_CLIENT_LOADER) {
-            route.clientData = replaceWithAlias(alias.basename, itemPath, alias.name);
+            route.clientData = itemPathWithAlias;
           }
           if (!(itemWithoutExt === NESTED_ROUTE.LAYOUT_DATA_FILE))
             return [
               3,
               10
             ];
-          route.data = replaceWithAlias(alias.basename, itemPath, alias.name);
+          route.data = itemPathWithAlias;
           return [
             4,
             hasAction(itemPath)
           ];
         case 9:
           if (_state.sent()) {
-            route.action = replaceWithAlias(alias.basename, itemPath, alias.name);
+            route.action = itemPathWithAlias;
           }
           _state.label = 10;
         case 10:
           if (itemWithoutExt === NESTED_ROUTE.LAYOUT_CONFIG_FILE) {
             if (!route.config) {
-              route.config = replaceWithAlias(alias.basename, itemPath, alias.name);
+              route.config = itemPathWithAlias;
             }
           }
           if (itemWithoutExt === NESTED_ROUTE.LAYOUT_FILE) {
-            route._component = replaceWithAlias(alias.basename, itemPath, alias.name);
+            route._component = itemPathWithAlias;
           }
           if (itemWithoutExt === NESTED_ROUTE.PAGE_LOADER_FILE) {
-            pageLoaderFile = replaceWithAlias(alias.basename, itemPath, alias.name);
+            pageLoaderFile = itemPathWithAlias;
           }
           if (itemWithoutExt === NESTED_ROUTE.PAGE_CLIENT_LOADER) {
-            pageClientData = replaceWithAlias(alias.basename, itemPath, alias.name);
+            pageClientData = itemPathWithAlias;
           }
           if (!(itemWithoutExt === NESTED_ROUTE.PAGE_DATA_FILE))
             return [
               3,
               12
             ];
-          pageData = replaceWithAlias(alias.basename, itemPath, alias.name);
+          pageData = itemPathWithAlias;
           return [
             4,
             hasAction(itemPath)
           ];
         case 11:
           if (_state.sent()) {
-            pageAction = replaceWithAlias(alias.basename, itemPath, alias.name);
+            pageAction = itemPathWithAlias;
           }
           _state.label = 12;
         case 12:
           if (itemWithoutExt === NESTED_ROUTE.PAGE_CONFIG_FILE) {
-            pageConfigFile = replaceWithAlias(alias.basename, itemPath, alias.name);
+            pageConfigFile = itemPathWithAlias;
           }
           if (itemWithoutExt === NESTED_ROUTE.PAGE_FILE) {
             ;
             pageRoute = createIndexRoute({
-              _component: replaceWithAlias(alias.basename, itemPath, alias.name)
+              _component: itemPathWithAlias
             }, rootDir, itemPath, entryName, isMainEntry);
             if (pageLoaderFile) {
               pageRoute.loader = pageLoaderFile;
@@ -261,10 +262,10 @@ var walk = function() {
             (_route_children1 = route.children) === null || _route_children1 === void 0 ? void 0 : _route_children1.push(pageRoute);
           }
           if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {
-            splatLoaderFile = replaceWithAlias(alias.basename, itemPath, alias.name);
+            splatLoaderFile = itemPathWithAlias;
           }
           if (itemWithoutExt === NESTED_ROUTE.SPLATE_CLIENT_DATA) {
-            splatClientData = replaceWithAlias(alias.basename, itemPath, alias.name);
+            splatClientData = itemPathWithAlias;
           }
           if (itemWithoutExt === NESTED_ROUTE.SPLATE_CONFIG_FILE) {
             if (!route.config) {
@@ -276,21 +277,21 @@ var walk = function() {
               3,
               14
             ];
-          splatData = replaceWithAlias(alias.basename, itemPath, alias.name);
+          splatData = itemPathWithAlias;
           return [
             4,
             hasAction(itemPath)
           ];
         case 13:
           if (_state.sent()) {
-            splatAction = replaceWithAlias(alias.basename, itemPath, alias.name);
+            splatAction = itemPathWithAlias;
           }
           _state.label = 14;
         case 14:
           if (itemWithoutExt === NESTED_ROUTE.SPLATE_FILE) {
             ;
             splatRoute = createRoute({
-              _component: replaceWithAlias(alias.basename, itemPath, alias.name),
+              _component: itemPathWithAlias,
               path: "*"
             }, rootDir, itemPath, entryName, isMainEntry);
             if (splatLoaderFile) {
@@ -311,10 +312,10 @@ var walk = function() {
             (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(splatRoute);
           }
           if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
-            route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
+            route.loading = itemPathWithAlias;
           }
           if (itemWithoutExt === NESTED_ROUTE.ERROR_FILE) {
-            route.error = replaceWithAlias(alias.basename, itemPath, alias.name);
+            route.error = itemPathWithAlias;
           }
           _state.label = 15;
         case 15:

package/dist/esm/analyze/utils.js

@@ -21,7 +21,7 @@ var walkDirectory = function(dir) {
   }, []);
 };
 var getDefaultImports = function(param) {
-  var entrypoint = param.entrypoint, srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, internalDirAlias = param.internalDirAlias, internalDirectory = param.internalDirectory;
+  var entrypoint = param.entrypoint, srcDirectory = param.srcDirectory, appDirectory = param.appDirectory, internalSrcAlias = param.internalSrcAlias, internalDirAlias = param.internalDirAlias;
   var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes, customBootstrap = entrypoint.customBootstrap, entry = entrypoint.entry;
   var imports = [
     {
@@ -38,7 +38,7 @@ var getDefaultImports = function(param) {
           local: "ReactDOM"
         }
       ],
-      value: isReact18(path.join(internalDirectory, "../../")) ? "react-dom/client" : "react-dom"
+      value: isReact18(path.join(appDirectory)) ? "react-dom/client" : "react-dom"
     },
     {
       specifiers: [

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

@@ -114,7 +114,7 @@ function applyBottomHtmlPlugin(param) {
       }
     }
   }
-  chain.plugin(CHAIN_ID.PLUGIN.BOTTOM_TEMPLATE).use(BottomTemplatePlugin, [
+  chain.plugin("bottom-template").use(BottomTemplatePlugin, [
     HtmlBundlerPlugin
   ]);
 }

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

@@ -29,7 +29,7 @@ var builderPluginAdapterSSR = function(options) {
                 target = param.target, CHAIN_ID = param.CHAIN_ID, isProd = param.isProd, HtmlBundlerPlugin = param.HtmlPlugin, isServer = param.isServer;
                 builderConfig = api.getNormalizedConfig();
                 normalizedConfig2 = options.normalizedConfig;
-                applyRouterPlugin(chain, CHAIN_ID.PLUGIN.ROUTER_MANIFEST, options, HtmlBundlerPlugin);
+                applyRouterPlugin(chain, "route-plugin", options, HtmlBundlerPlugin);
                 if (!isSSR(normalizedConfig2))
                   return [
                     3,

package/dist/esm/index.js

@@ -11,6 +11,7 @@ import analyzePlugin from "./analyze";
 import initializePlugin from "./initialize";
 import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
+import serverBuildPlugin from "./plugins/serverBuild";
 import { restart } from "./utils/restart";
 import { generateWatchFiles } from "./utils/generateWatchFiles";
 import { mergeConfig } from "@modern-js/core";
@@ -293,6 +294,7 @@ var appTools = function() {
       analyzePlugin({
         bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
       }),
+      serverBuildPlugin(),
       lintPlugin()
     ],
     setup: function(api) {

package/dist/esm/plugins/serverBuild.js

@@ -0,0 +1,70 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import path from "path";
+import fs from "fs";
+import { SERVER_DIR, SHARED_DIR } from "@modern-js/utils";
+import { compile } from "@modern-js/server-utils";
+var TS_CONFIG_FILENAME = "tsconfig.json";
+function serverBuild_default() {
+  return {
+    name: "@modern-js/server-build",
+    setup: function setup(api) {
+      return {
+        afterBuild: function afterBuild() {
+          return _async_to_generator(function() {
+            var _api_useAppContext, appDirectory, distDirectory, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, sourceDirs, server, alias, babel;
+            return _ts_generator(this, function(_state) {
+              switch (_state.label) {
+                case 0:
+                  _api_useAppContext = api.useAppContext(), appDirectory = _api_useAppContext.appDirectory, distDirectory = _api_useAppContext.distDirectory;
+                  modernConfig = api.useResolvedConfigContext();
+                  distDir = path.resolve(distDirectory);
+                  serverDir = path.resolve(appDirectory, SERVER_DIR);
+                  sharedDir = path.resolve(appDirectory, SHARED_DIR);
+                  tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
+                  sourceDirs = [];
+                  if (fs.existsSync(serverDir)) {
+                    sourceDirs.push(serverDir);
+                    if (fs.existsSync(sharedDir)) {
+                      sourceDirs.push(sharedDir);
+                    }
+                  }
+                  server = modernConfig.server;
+                  alias = modernConfig.source.alias;
+                  babel = modernConfig.tools.babel;
+                  if (!(sourceDirs.length > 0))
+                    return [
+                      3,
+                      2
+                    ];
+                  return [
+                    4,
+                    compile(appDirectory, {
+                      server,
+                      alias,
+                      babelConfig: babel
+                    }, {
+                      sourceDirs,
+                      distDir,
+                      tsconfigPath
+                    })
+                  ];
+                case 1:
+                  _state.sent();
+                  _state.label = 2;
+                case 2:
+                  return [
+                    2
+                  ];
+              }
+            });
+          })();
+        }
+      };
+    }
+  };
+}
+;
+export {
+  serverBuild_default as default
+};

package/dist/esm-node/analyze/generateCode.js

@@ -50,7 +50,7 @@ ${initialize || ""}`);
 ${initialize || ""}`).join("\n");
 };
 const generateCode = async (appContext, config, entrypoints, api) => {
-  const { internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
+  const { internalDirectory, srcDirectory, appDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
   const hookRunners = api.useHookRunners();
   const isV5 = isRouterV5(config);
   const getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
@@ -141,9 +141,9 @@ const generateCode = async (appContext, config, entrypoints, api) => {
         imports: getDefaultImports({
           entrypoint,
           srcDirectory,
+          appDirectory,
           internalSrcAlias,
-          internalDirAlias,
-          internalDirectory
+          internalDirAlias
         })
       });
       importsStatemets.set(entryName, imports);

package/dist/esm-node/analyze/nestedRoutes.js

@@ -108,6 +108,7 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
   const items = await fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
+    const itemPathWithAlias = replaceWithAlias(alias.basename, itemPath, alias.name);
     const extname = path.extname(item);
     const itemWithoutExt = item.slice(0, -extname.length);
     const isDirectory2 = (await fs.stat(itemPath)).isDirectory();
@@ -123,45 +124,45 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
     }
     if (itemWithoutExt === NESTED_ROUTE.LAYOUT_LOADER_FILE) {
       if (!route.loader) {
-        route.loader = replaceWithAlias(alias.basename, itemPath, alias.name);
+        route.loader = itemPathWithAlias;
       }
     }
     if (itemWithoutExt === NESTED_ROUTE.LAYOUT_CLIENT_LOADER) {
-      route.clientData = replaceWithAlias(alias.basename, itemPath, alias.name);
+      route.clientData = itemPathWithAlias;
     }
     if (itemWithoutExt === NESTED_ROUTE.LAYOUT_DATA_FILE) {
-      route.data = replaceWithAlias(alias.basename, itemPath, alias.name);
+      route.data = itemPathWithAlias;
       if (await hasAction(itemPath)) {
-        route.action = replaceWithAlias(alias.basename, itemPath, alias.name);
+        route.action = itemPathWithAlias;
       }
     }
     if (itemWithoutExt === NESTED_ROUTE.LAYOUT_CONFIG_FILE) {
       if (!route.config) {
-        route.config = replaceWithAlias(alias.basename, itemPath, alias.name);
+        route.config = itemPathWithAlias;
       }
     }
     if (itemWithoutExt === NESTED_ROUTE.LAYOUT_FILE) {
-      route._component = replaceWithAlias(alias.basename, itemPath, alias.name);
+      route._component = itemPathWithAlias;
     }
     if (itemWithoutExt === NESTED_ROUTE.PAGE_LOADER_FILE) {
-      pageLoaderFile = replaceWithAlias(alias.basename, itemPath, alias.name);
+      pageLoaderFile = itemPathWithAlias;
     }
     if (itemWithoutExt === NESTED_ROUTE.PAGE_CLIENT_LOADER) {
-      pageClientData = replaceWithAlias(alias.basename, itemPath, alias.name);
+      pageClientData = itemPathWithAlias;
     }
     if (itemWithoutExt === NESTED_ROUTE.PAGE_DATA_FILE) {
-      pageData = replaceWithAlias(alias.basename, itemPath, alias.name);
+      pageData = itemPathWithAlias;
       if (await hasAction(itemPath)) {
-        pageAction = replaceWithAlias(alias.basename, itemPath, alias.name);
+        pageAction = itemPathWithAlias;
       }
     }
     if (itemWithoutExt === NESTED_ROUTE.PAGE_CONFIG_FILE) {
-      pageConfigFile = replaceWithAlias(alias.basename, itemPath, alias.name);
+      pageConfigFile = itemPathWithAlias;
     }
     if (itemWithoutExt === NESTED_ROUTE.PAGE_FILE) {
       var _route_children1;
       pageRoute = createIndexRoute({
-        _component: replaceWithAlias(alias.basename, itemPath, alias.name)
+        _component: itemPathWithAlias
       }, rootDir, itemPath, entryName, isMainEntry);
       if (pageLoaderFile) {
         pageRoute.loader = pageLoaderFile;
@@ -181,10 +182,10 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
       (_route_children1 = route.children) === null || _route_children1 === void 0 ? void 0 : _route_children1.push(pageRoute);
     }
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {
-      splatLoaderFile = replaceWithAlias(alias.basename, itemPath, alias.name);
+      splatLoaderFile = itemPathWithAlias;
     }
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_CLIENT_DATA) {
-      splatClientData = replaceWithAlias(alias.basename, itemPath, alias.name);
+      splatClientData = itemPathWithAlias;
     }
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_CONFIG_FILE) {
       if (!route.config) {
@@ -192,15 +193,15 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
       }
     }
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_DATA_FILE) {
-      splatData = replaceWithAlias(alias.basename, itemPath, alias.name);
+      splatData = itemPathWithAlias;
       if (await hasAction(itemPath)) {
-        splatAction = replaceWithAlias(alias.basename, itemPath, alias.name);
+        splatAction = itemPathWithAlias;
       }
     }
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_FILE) {
       var _route_children2;
       splatRoute = createRoute({
-        _component: replaceWithAlias(alias.basename, itemPath, alias.name),
+        _component: itemPathWithAlias,
         path: "*"
       }, rootDir, itemPath, entryName, isMainEntry);
       if (splatLoaderFile) {
@@ -221,10 +222,10 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
       (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(splatRoute);
     }
     if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
-      route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
+      route.loading = itemPathWithAlias;
     }
     if (itemWithoutExt === NESTED_ROUTE.ERROR_FILE) {
-      route.error = replaceWithAlias(alias.basename, itemPath, alias.name);
+      route.error = itemPathWithAlias;
     }
   }
   let finalRoute = createRoute(route, rootDir, path.join(dirname, `${NESTED_ROUTE.LAYOUT_FILE}.ts`), entryName, isMainEntry);

package/dist/esm-node/analyze/utils.js

@@ -18,7 +18,7 @@ const walkDirectory = (dir) => fs.readdirSync(dir).reduce((previous, filename) =
     ];
   }
 }, []);
-const getDefaultImports = ({ entrypoint, srcDirectory, internalSrcAlias, internalDirAlias, internalDirectory }) => {
+const getDefaultImports = ({ entrypoint, srcDirectory, appDirectory, internalSrcAlias, internalDirAlias }) => {
   const { entryName, fileSystemRoutes, customBootstrap, entry } = entrypoint;
   const imports = [
     {
@@ -35,7 +35,7 @@ const getDefaultImports = ({ entrypoint, srcDirectory, internalSrcAlias, interna
           local: "ReactDOM"
         }
       ],
-      value: isReact18(path.join(internalDirectory, "../../")) ? "react-dom/client" : "react-dom"
+      value: isReact18(path.join(appDirectory)) ? "react-dom/client" : "react-dom"
     },
     {
       specifiers: [

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

@@ -50,7 +50,7 @@ function applyBottomHtmlPlugin({ api, chain, options, CHAIN_ID, HtmlBundlerPlugi
       }
     ]);
   }
-  chain.plugin(CHAIN_ID.PLUGIN.BOTTOM_TEMPLATE).use(BottomTemplatePlugin, [
+  chain.plugin("bottom-template").use(BottomTemplatePlugin, [
     HtmlBundlerPlugin
   ]);
 }

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

@@ -20,7 +20,7 @@ const builderPluginAdapterSSR = (options) => ({
     api.modifyBundlerChain(async (chain, { target, CHAIN_ID, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
       const builderConfig = api.getNormalizedConfig();
       const { normalizedConfig: normalizedConfig2 } = options;
-      applyRouterPlugin(chain, CHAIN_ID.PLUGIN.ROUTER_MANIFEST, options, HtmlBundlerPlugin);
+      applyRouterPlugin(chain, "route-plugin", options, HtmlBundlerPlugin);
       if (isSSR(normalizedConfig2)) {
         await applySSRLoaderEntry(chain, options, isServer);
         applySSRDataLoader(chain, options);

package/dist/esm-node/index.js

@@ -7,6 +7,7 @@ import analyzePlugin from "./analyze";
 import initializePlugin from "./initialize";
 import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
+import serverBuildPlugin from "./plugins/serverBuild";
 import { restart } from "./utils/restart";
 import { generateWatchFiles } from "./utils/generateWatchFiles";
 import { mergeConfig } from "@modern-js/core";
@@ -79,6 +80,7 @@ const appTools = (options = {
     analyzePlugin({
       bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
     }),
+    serverBuildPlugin(),
     lintPlugin()
   ],
   setup: (api) => {

package/dist/esm-node/plugins/serverBuild.js

@@ -0,0 +1,44 @@
+import path from "path";
+import fs from "fs";
+import { SERVER_DIR, SHARED_DIR } from "@modern-js/utils";
+import { compile } from "@modern-js/server-utils";
+const TS_CONFIG_FILENAME = "tsconfig.json";
+var serverBuild_default = () => ({
+  name: "@modern-js/server-build",
+  setup(api) {
+    return {
+      async afterBuild() {
+        const { appDirectory, distDirectory } = api.useAppContext();
+        const modernConfig = api.useResolvedConfigContext();
+        const distDir = path.resolve(distDirectory);
+        const serverDir = path.resolve(appDirectory, SERVER_DIR);
+        const sharedDir = path.resolve(appDirectory, SHARED_DIR);
+        const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
+        const sourceDirs = [];
+        if (fs.existsSync(serverDir)) {
+          sourceDirs.push(serverDir);
+          if (fs.existsSync(sharedDir)) {
+            sourceDirs.push(sharedDir);
+          }
+        }
+        const { server } = modernConfig;
+        const { alias } = modernConfig.source;
+        const { babel } = modernConfig.tools;
+        if (sourceDirs.length > 0) {
+          await compile(appDirectory, {
+            server,
+            alias,
+            babelConfig: babel
+          }, {
+            sourceDirs,
+            distDir,
+            tsconfigPath
+          });
+        }
+      }
+    };
+  }
+});
+export {
+  serverBuild_default as default
+};

package/dist/types/analyze/utils.d.ts

@@ -1,12 +1,12 @@
 import type { Entrypoint } from '@modern-js/types';
 import type { ImportStatement } from '../types';
 export declare const walkDirectory: (dir: string) => string[];
-export declare const getDefaultImports: ({ entrypoint, srcDirectory, internalSrcAlias, internalDirAlias, internalDirectory, }: {
+export declare const getDefaultImports: ({ entrypoint, srcDirectory, appDirectory, internalSrcAlias, internalDirAlias, }: {
     entrypoint: Entrypoint;
     srcDirectory: string;
+    appDirectory: string;
     internalSrcAlias: string;
     internalDirAlias: string;
-    internalDirectory: string;
 }) => ImportStatement[];
 export declare const isPageComponentFile: (filePath: string) => boolean;
 export declare const replaceWithAlias: (base: string, filePath: string, alias: string) => string;

package/dist/types/plugins/serverBuild.d.ts

@@ -0,0 +1,3 @@
+import { CliPlugin, AppTools } from '../types';
+declare const _default: () => CliPlugin<AppTools>;
+export default _default;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.42.2-alpha.0",
+  "version": "2.43.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -68,28 +68,29 @@
   "dependencies": {
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
-    "@babel/types": "^7.22.15",
+    "@babel/types": "^7.23.0",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.17.19",
     "@swc/helpers": "0.5.3",
-    "@modern-js/builder": "2.42.1",
-    "@modern-js/builder-plugin-esbuild": "2.42.1",
-    "@modern-js/builder-plugin-node-polyfill": "2.42.1",
-    "@modern-js/builder-webpack-provider": "2.42.1",
-    "@modern-js/core": "2.42.1",
-    "@modern-js/node-bundle-require": "2.42.1",
-    "@modern-js/plugin": "2.42.1",
-    "@modern-js/plugin-i18n": "2.42.1",
-    "@modern-js/new-action": "2.42.1",
-    "@modern-js/plugin-data-loader": "2.42.1",
-    "@modern-js/types": "2.42.1",
-    "@modern-js/plugin-lint": "2.42.1",
-    "@modern-js/builder-shared": "2.42.1",
-    "@modern-js/upgrade": "2.42.1",
-    "@modern-js/utils": "2.42.1",
-    "@modern-js/server": "2.42.1",
-    "@modern-js/prod-server": "2.42.1",
-    "@modern-js/server-core": "2.42.1"
+    "@modern-js/builder": "2.43.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.43.0",
+    "@modern-js/builder-plugin-esbuild": "2.43.0",
+    "@modern-js/builder-shared": "2.43.0",
+    "@modern-js/builder-webpack-provider": "2.43.0",
+    "@modern-js/core": "2.43.0",
+    "@modern-js/new-action": "2.43.0",
+    "@modern-js/plugin": "2.43.0",
+    "@modern-js/node-bundle-require": "2.43.0",
+    "@modern-js/plugin-data-loader": "2.43.0",
+    "@modern-js/plugin-i18n": "2.43.0",
+    "@modern-js/plugin-lint": "2.43.0",
+    "@modern-js/prod-server": "2.43.0",
+    "@modern-js/server": "2.43.0",
+    "@modern-js/server-utils": "2.43.0",
+    "@modern-js/types": "2.43.0",
+    "@modern-js/upgrade": "2.43.0",
+    "@modern-js/utils": "2.43.0",
+    "@modern-js/server-core": "2.43.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "7.18.5",
@@ -97,14 +98,14 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "webpack": "^5.88.1",
-    "@modern-js/builder-plugin-swc": "2.42.1",
-    "@scripts/build": "2.42.1",
-    "@modern-js/builder-rspack-provider": "2.42.1",
-    "@scripts/jest-config": "2.42.1"
+    "webpack": "^5.89.0",
+    "@modern-js/builder-plugin-swc": "2.43.0",
+    "@modern-js/builder-rspack-provider": "2.43.0",
+    "@scripts/build": "2.43.0",
+    "@scripts/jest-config": "2.43.0"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.42.1"
+    "@modern-js/builder-rspack-provider": "^2.43.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {