@modern-js/app-tools 2.57.1-alpha.1 → 2.57.1-beta.0

package/dist/esm/commands/dev.js

@@ -4,22 +4,21 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
 import { ResolvedConfigContext } from "@modern-js/core";
-import { DEFAULT_DEV_HOST, SERVER_DIR, getMeta } from "@modern-js/utils";
+import { DEFAULT_DEV_HOST, SERVER_DIR, getMeta, logger } from "@modern-js/utils";
 import { createDevServer } from "@modern-js/server";
 import { applyPlugins } from "@modern-js/prod-server";
 import { loadServerPlugins } from "../utils/loadPlugins";
+import { registerCompiler } from "../utils/register";
 import { printInstructions } from "../utils/printInstructions";
 import { setServer } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
 var dev = function() {
-  var _ref = _async_to_generator(function(api, options) {
-    var devServerOptions, _normalizedConfig_source, _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, registerEsm, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes, meta, serverConfigPath, pluginInstances, serverOptions, _normalizedConfig_dev, app, host, server;
-    var _arguments = arguments;
+  var _ref = _async_to_generator(function(api, options, devServerOptions) {
+    var _normalizedConfig_source, _normalizedConfig_tools, _normalizedConfig_dev, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes, meta, serverConfigPath, pluginInstances, serverOptions, host, server, _ref2, server1, afterListen;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          devServerOptions = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : {};
           if (options.analyze) {
             process.env.BUNDLE_ANALYZE = "true";
           }
@@ -28,19 +27,9 @@ var dev = function() {
           hookRunners = api.useHookRunners();
           return [
             4,
-            import("../esm/register-esm.mjs")
+            registerCompiler(appContext.appDirectory, appContext.distDirectory, normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_source = normalizedConfig.source) === null || _normalizedConfig_source === void 0 ? void 0 : _normalizedConfig_source.alias)
           ];
         case 1:
-          registerEsm = _state.sent().registerEsm;
-          return [
-            4,
-            registerEsm({
-              appDir: appContext.appDirectory,
-              distDir: appContext.distDirectory,
-              alias: (_normalizedConfig_source = normalizedConfig.source) === null || _normalizedConfig_source === void 0 ? void 0 : _normalizedConfig_source.alias
-            })
-          ];
-        case 2:
           _state.sent();
           normalizedConfig = _object_spread_props(_object_spread({}, normalizedConfig), {
             cliOptions: options
@@ -56,7 +45,7 @@ var dev = function() {
               watch: true
             })
           ];
-        case 3:
+        case 2:
           _state.sent();
           meta = getMeta(metaName);
           serverConfigPath = path.resolve(appDirectory, SERVER_DIR, "".concat(meta, ".server"));
@@ -64,7 +53,7 @@ var dev = function() {
             4,
             hookRunners.beforeDev()
           ];
-        case 4:
+        case 3:
           _state.sent();
           if (!appContext.builder && !apiOnly) {
             throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
@@ -73,13 +62,13 @@ var dev = function() {
             4,
             generateRoutes(appContext)
           ];
-        case 5:
+        case 4:
           _state.sent();
           return [
             4,
             loadServerPlugins(api, appDirectory, metaName)
           ];
-        case 6:
+        case 5:
           pluginInstances = _state.sent();
           serverOptions = _object_spread({
             metaName,
@@ -101,19 +90,21 @@ var dev = function() {
             serverConfigFile,
             plugins: pluginInstances
           }, devServerOptions);
+          host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || DEFAULT_DEV_HOST;
           if (!apiOnly)
             return [
               3,
-              8
+              7
             ];
           return [
             4,
-            createDevServer(serverOptions, applyPlugins)
+            createDevServer(_object_spread_props(_object_spread({}, serverOptions), {
+              runCompile: false
+            }), (devServerOptions === null || devServerOptions === void 0 ? void 0 : devServerOptions.applyPlugins) || applyPlugins)
           ];
-        case 7:
-          app = _state.sent();
-          host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || DEFAULT_DEV_HOST;
-          app.listen({
+        case 6:
+          server = _state.sent().server;
+          server.listen({
             port,
             host
           }, function() {
@@ -121,28 +112,55 @@ var dev = function() {
           });
           return [
             3,
-            10
+            9
           ];
-        case 8:
+        case 7:
           return [
             4,
-            appContext.builder.startDevServer({
-              serverOptions,
-              applyPlugins
-            })
+            createDevServer(_object_spread_props(_object_spread({}, serverOptions), {
+              builder: appContext.builder
+            }), (devServerOptions === null || devServerOptions === void 0 ? void 0 : devServerOptions.applyPlugins) || applyPlugins)
           ];
+        case 8:
+          _ref2 = _state.sent(), server1 = _ref2.server, afterListen = _ref2.afterListen;
+          server1.listen({
+            port,
+            host
+          }, function() {
+            var _ref3 = _async_to_generator(function(err) {
+              return _ts_generator(this, function(_state2) {
+                switch (_state2.label) {
+                  case 0:
+                    if (err) {
+                      logger.error("Occur error %s, when start dev server", err);
+                    }
+                    logger.debug("listen dev server done");
+                    return [
+                      4,
+                      afterListen()
+                    ];
+                  case 1:
+                    _state2.sent();
+                    return [
+                      2
+                    ];
+                }
+              });
+            });
+            return function(err) {
+              return _ref3.apply(this, arguments);
+            };
+          }());
+          setServer(server1);
+          _state.label = 9;
         case 9:
-          server = _state.sent().server;
-          setServer(server);
-          _state.label = 10;
-        case 10:
           return [
             2
           ];
       }
     });
   });
-  return function dev2(api, options) {
+  return function dev2(api, options, devServerOptions) {
     return _ref.apply(this, arguments);
   };
 }();

package/dist/esm/commands/index.js

@@ -26,7 +26,7 @@ var devCommand = function() {
                   case 0:
                     return [
                       4,
-                      import("./dev.js")
+                      import("./dev")
                     ];
                   case 1:
                     dev = _state2.sent().dev;
@@ -152,7 +152,7 @@ var buildCommand = function() {
                   case 0:
                     return [
                       4,
-                      import("./build.js")
+                      import("./build")
                     ];
                   case 1:
                     build = _state2.sent().build;
@@ -265,7 +265,7 @@ var serverCommand = function(program, api) {
         case 0:
           return [
             4,
-            import("./serve.js")
+            import("./serve")
           ];
         case 1:
           start = _state.sent().start;
@@ -296,7 +296,7 @@ var deployCommand = function(program, api) {
               ];
             return [
               4,
-              import("./build.js")
+              import("./build")
             ];
           case 1:
             build = _state.sent().build;
@@ -310,7 +310,7 @@ var deployCommand = function(program, api) {
           case 3:
             return [
               4,
-              import("./deploy.js")
+              import("./deploy")
             ];
           case 4:
             deploy = _state.sent().deploy;
@@ -366,7 +366,7 @@ var inspectCommand = function(program, api) {
           case 0:
             return [
               4,
-              import("./inspect.js")
+              import("./inspect")
             ];
           case 1:
             inspect = _state.sent().inspect;

package/dist/esm/index.js

@@ -4,7 +4,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { lintPlugin } from "@modern-js/plugin-lint";
-import { cleanRequireCache, emptyDir, getCommand, getArgv, fs, NESTED_ROUTE_SPEC_FILE } from "@modern-js/utils";
+import { cleanRequireCache, emptyDir, getCommand, getArgv } from "@modern-js/utils";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import initializePlugin from "./plugins/initialize";
 import analyzePlugin from "./plugins/analyze";
@@ -52,7 +52,6 @@ var appTools = function() {
       api.setAppContext(_object_spread_props(_object_spread({}, appContext), {
         toolsType: "app-tools"
       }));
-      var nestedRoutes = {};
       var locale = getLocaleLanguage();
       i18n.changeLanguage({
         locale
@@ -226,46 +225,6 @@ var appTools = function() {
               ];
             });
           })();
-        },
-        modifyFileSystemRoutes: function modifyFileSystemRoutes(param) {
-          var entrypoint = param.entrypoint, routes = param.routes;
-          return _async_to_generator(function() {
-            return _ts_generator(this, function(_state) {
-              nestedRoutes[entrypoint.entryName] = routes;
-              return [
-                2,
-                {
-                  entrypoint,
-                  routes
-                }
-              ];
-            });
-          })();
-        },
-        beforeGenerateRoutes: function beforeGenerateRoutes(param) {
-          var entrypoint = param.entrypoint, code = param.code;
-          return _async_to_generator(function() {
-            var distDirectory;
-            return _ts_generator(this, function(_state) {
-              switch (_state.label) {
-                case 0:
-                  distDirectory = api.useAppContext().distDirectory;
-                  return [
-                    4,
-                    fs.outputJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutes)
-                  ];
-                case 1:
-                  _state.sent();
-                  return [
-                    2,
-                    {
-                      entrypoint,
-                      code
-                    }
-                  ];
-              }
-            });
-          })();
         }
       };
     }

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

@@ -12,7 +12,6 @@ import { getSelectedEntries } from "../../utils/getSelectedEntries";
 import { initialNormalizedConfig } from "../../config";
 import { createBuilderGenerator } from "../../builder";
 import { checkIsBuildCommands } from "./utils";
-import { compatibleRequire } from "@modern-js/utils";
 var debug = createDebugger("plugin-analyze");
 function analyze_default(param) {
   var bundler = param.bundler;
@@ -78,9 +77,9 @@ function analyze_default(param) {
                   return [
                     4,
                     Promise.all([
-                      compatibleRequire(path.join(__dirname, "./getBundleEntry.js")),
-                      compatibleRequire(path.join(__dirname, "./getServerRoutes.js")),
-                      compatibleRequire(path.join(__dirname, "./getHtmlTemplate.js"))
+                      import("./getBundleEntry"),
+                      import("./getServerRoutes"),
+                      import("./getHtmlTemplate")
                     ])
                   ];
                 case 5:

package/dist/esm/plugins/deploy/dependencies/index.js

@@ -10,7 +10,7 @@ import { parseNodeModulePath } from "mlly";
 import { linkPackage, writePackage, isFile, findEntryFiles, traceFiles as defaultTraceFiles, findPackageParents, resolveTracedPath, readDirRecursive } from "./utils";
 var handleDependencies = function() {
   var _ref = _async_to_generator(function(param) {
-    var appDir, serverRootDir, includeEntries, _param_traceFiles, traceFiles, entryFilter, modifyPackageJson, copyWholePackage, base, entryFiles, fileTrace, currentProjectModules, tracedFiles, _, tracedPackages, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, tracedFile, pkgName, tracedPackage, pkgJSON, tracedPackageVersion, shouldCopyWholePackage, _tracedPackageVersion_files, allFiles, err, multiVersionPkgs, singleVersionPackages, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, tracedPackage1, versions, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, version, projectPkgJson, _iteratorNormalCompletion3, _didIteratorError3, _iteratorError3, _loop, _iterator3, _step3, err, outputPkgPath, newPkgJson, finalPkgJson;
+    var appDir, serverRootDir, includeEntries, _param_traceFiles, traceFiles, entryFilter, modifyPackageJson, copyWholePackage, base, entryFiles, fileTrace, currentProjectModules, dependencySearchRoot, tracedFiles, _, tracedPackages, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, tracedFile, pkgName, tracedPackage, pkgJSON, tracedPackageVersion, shouldCopyWholePackage, _tracedPackageVersion_files, allFiles, err, multiVersionPkgs, singleVersionPackages, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, tracedPackage1, versions, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, version, projectPkgJson, _iteratorNormalCompletion3, _didIteratorError3, _iteratorError3, _loop, _iterator3, _step3, err, outputPkgPath, newPkgJson, finalPkgJson;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -29,6 +29,7 @@ var handleDependencies = function() {
         case 2:
           fileTrace = _state.sent();
           currentProjectModules = path.join(appDir, "node_modules");
+          dependencySearchRoot = path.resolve(appDir, "../../../../../../");
           _ = Object.fromEntries;
           return [
             4,
@@ -105,7 +106,7 @@ var handleDependencies = function() {
                       _state2.label = 6;
                     case 6:
                       packageJsonPath = _tmp;
-                      if (!packageJsonPath)
+                      if (!(packageJsonPath === null || packageJsonPath === void 0 ? void 0 : packageJsonPath.startsWith(dependencySearchRoot)))
                         return [
                           3,
                           8

package/dist/esm/plugins/deploy/dependencies/utils.js

@@ -346,7 +346,10 @@ var traceFiles = function() {
             4,
             nodeFileTrace(entryFiles, {
               base,
-              processCwd: serverRootDir
+              processCwd: serverRootDir,
+              analysis: {
+                evaluatePureExpressions: false
+              }
             })
           ];
         case 1:

package/dist/esm/utils/createServer.js

@@ -38,7 +38,7 @@ var createServer = function() {
             createDevServer(options, applyPlugins)
           ];
         case 1:
-          server = _state.sent();
+          server = _state.sent().server;
           return [
             2,
             server

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

@@ -19,7 +19,7 @@ function getBuilderEnvironments(normalizedConfig, appContext) {
   const serverEntries = {};
   for (const entry in entries) {
     const v = entries[entry];
-    serverEntries[entry] = v.map((entry2) => entry2.replace("index.jsx", "index.server.jsx"));
+    serverEntries[entry] = v.map((entry2) => entry2.replace("index.jsx", "index.server.jsx")).map((entry2) => entry2.replace("bootstrap.jsx", "bootstrap.server.jsx"));
   }
   const environments = {
     web: {

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

@@ -17,7 +17,7 @@ async function generateBuilder(options, bundlerType) {
   return builder;
 }
 async function applyBuilderPlugins(builder, options) {
-  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderPluginAdapterWorker } = await import("../shared/builderPlugins/index.js");
+  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderPluginAdapterWorker } = await import("../shared/builderPlugins");
   builder.addPlugins([
     builderPluginAdapterBasic(),
     builderPluginAdapterSSR(options),

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

@@ -1,9 +1,9 @@
 async function createBuilderGenerator(bundler) {
   if (bundler === "rspack") {
-    const { createRspackBuilderForModern } = await import("./builder-rspack/index.js");
+    const { createRspackBuilderForModern } = await import("./builder-rspack");
     return createRspackBuilderForModern;
   }
-  const { createWebpackBuilderForModern } = await import("./builder-webpack/index.js");
+  const { createWebpackBuilderForModern } = await import("./builder-webpack");
   return createWebpackBuilderForModern;
 }
 export {

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

@@ -24,7 +24,7 @@ function applyNodeCompat(isServiceWorker, chain) {
     ".node.ts",
     ".node.tsx",
     ".server.js",
-    ".server.ts",
+    ".server.jsx",
     ".server.ts",
     ".server.tsx"
   ];

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

@@ -3,7 +3,9 @@ import { logger } from "@modern-js/utils";
 import { loadServerPlugins } from "../utils/loadPlugins";
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
+import { registerCompiler } from "../utils/register";
 const build = async (api, options) => {
+  var _resolvedConfig_source;
   if (options === null || options === void 0 ? void 0 : options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
@@ -11,6 +13,7 @@ const build = async (api, options) => {
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
   await loadServerPlugins(api, appContext.appDirectory, appContext.metaName);
+  await registerCompiler(appContext.appDirectory, appContext.distDirectory, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.alias);
   const { apiOnly } = appContext;
   if (apiOnly) {
     const { appDirectory: appDirectory2, distDirectory: distDirectory2, serverConfigFile: serverConfigFile2 } = appContext;

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

@@ -1,27 +1,23 @@
 import path from "node:path";
 import { ResolvedConfigContext } from "@modern-js/core";
-import { DEFAULT_DEV_HOST, SERVER_DIR, getMeta } from "@modern-js/utils";
+import { DEFAULT_DEV_HOST, SERVER_DIR, getMeta, logger } from "@modern-js/utils";
 import { createDevServer } from "@modern-js/server";
 import { applyPlugins } from "@modern-js/prod-server";
 import { loadServerPlugins } from "../utils/loadPlugins";
+import { registerCompiler } from "../utils/register";
 import { printInstructions } from "../utils/printInstructions";
 import { setServer } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
-const dev = async (api, options, devServerOptions = {}) => {
-  var _normalizedConfig_source, _normalizedConfig_tools;
+const dev = async (api, options, devServerOptions) => {
+  var _normalizedConfig_source, _normalizedConfig_tools, _normalizedConfig_dev;
   if (options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
   let normalizedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
-  const { registerEsm } = await import("../esm/register-esm.mjs");
-  await registerEsm({
-    appDir: appContext.appDirectory,
-    distDir: appContext.distDirectory,
-    alias: (_normalizedConfig_source = normalizedConfig.source) === null || _normalizedConfig_source === void 0 ? void 0 : _normalizedConfig_source.alias
-  });
+  await registerCompiler(appContext.appDirectory, appContext.distDirectory, normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_source = normalizedConfig.source) === null || _normalizedConfig_source === void 0 ? void 0 : _normalizedConfig_source.alias);
   normalizedConfig = {
     ...normalizedConfig,
     cliOptions: options
@@ -64,20 +60,32 @@ const dev = async (api, options, devServerOptions = {}) => {
     plugins: pluginInstances,
     ...devServerOptions
   };
+  const host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || DEFAULT_DEV_HOST;
   if (apiOnly) {
-    var _normalizedConfig_dev;
-    const app = await createDevServer(serverOptions, applyPlugins);
-    const host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || DEFAULT_DEV_HOST;
-    app.listen({
+    const { server } = await createDevServer({
+      ...serverOptions,
+      runCompile: false
+    }, (devServerOptions === null || devServerOptions === void 0 ? void 0 : devServerOptions.applyPlugins) || applyPlugins);
+    server.listen({
       port,
       host
     }, () => {
       printInstructions(hookRunners, appContext, normalizedConfig);
     });
   } else {
-    const { server } = await appContext.builder.startDevServer({
-      serverOptions,
-      applyPlugins
+    const { server, afterListen } = await createDevServer({
+      ...serverOptions,
+      builder: appContext.builder
+    }, (devServerOptions === null || devServerOptions === void 0 ? void 0 : devServerOptions.applyPlugins) || applyPlugins);
+    server.listen({
+      port,
+      host
+    }, async (err) => {
+      if (err) {
+        logger.error("Occur error %s, when start dev server", err);
+      }
+      logger.debug("listen dev server done");
+      await afterListen();
     });
     setServer(server);
   }

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

@@ -5,7 +5,7 @@ const devCommand = async (program, api) => {
   const runner = api.useHookRunners();
   const devToolMetas = await runner.registerDev();
   const devProgram = program.command("dev").alias("start").usage("[options]").description(i18n.t(localeKeys.command.dev.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-e --entry [entry...]", i18n.t(localeKeys.command.dev.entry)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("--web-only", i18n.t(localeKeys.command.dev.webOnly)).action(async (options) => {
-    const { dev } = await import("./dev.js");
+    const { dev } = await import("./dev");
     await dev(api, options);
   });
   for (const meta of devToolMetas) {
@@ -28,7 +28,7 @@ const buildCommand = async (program, api) => {
   const runner = api.useHookRunners();
   const platformBuilders = await runner.registerBuildPlatform();
   const buildProgram = program.command("build").usage("[options]").description(i18n.t(localeKeys.command.build.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).action(async (options) => {
-    const { build } = await import("./build.js");
+    const { build } = await import("./build");
     await build(api, options);
   });
   for (const platformBuilder of platformBuilders) {
@@ -47,17 +47,17 @@ const buildCommand = async (program, api) => {
 };
 const serverCommand = (program, api) => {
   program.command("serve").usage("[options]").description(i18n.t(localeKeys.command.serve.describe)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(async () => {
-    const { start } = await import("./serve.js");
+    const { start } = await import("./serve");
     await start(api);
   });
 };
 const deployCommand = (program, api) => {
   program.command("deploy").usage("[options]").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-s --skip-build", i18n.t(localeKeys.command.shared.skipBuild)).description(i18n.t(localeKeys.command.deploy.describe)).action(async (options) => {
     if (!options.skipBuild) {
-      const { build } = await import("./build.js");
+      const { build } = await import("./build");
       await build(api);
     }
-    const { deploy } = await import("./deploy.js");
+    const { deploy } = await import("./deploy");
     await deploy(api, options);
     process.exit(0);
   });
@@ -72,7 +72,7 @@ const newCommand = (program, locale) => {
 };
 const inspectCommand = (program, api) => {
   program.command("inspect").description("inspect the internal configs").option(`--env <env>`, i18n.t(localeKeys.command.inspect.env), "development").option("--output <output>", i18n.t(localeKeys.command.inspect.output), "/").option("--verbose", i18n.t(localeKeys.command.inspect.verbose)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(async (options) => {
-    const { inspect } = await import("./inspect.js");
+    const { inspect } = await import("./inspect");
     inspect(api, options);
   });
 };

package/dist/esm-node/index.js

@@ -1,6 +1,6 @@
 import path from "path";
 import { lintPlugin } from "@modern-js/plugin-lint";
-import { cleanRequireCache, emptyDir, getCommand, getArgv, fs, NESTED_ROUTE_SPEC_FILE } from "@modern-js/utils";
+import { cleanRequireCache, emptyDir, getCommand, getArgv } from "@modern-js/utils";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import initializePlugin from "./plugins/initialize";
 import analyzePlugin from "./plugins/analyze";
@@ -47,7 +47,6 @@ const appTools = (options = {
       ...appContext,
       toolsType: "app-tools"
     });
-    const nestedRoutes = {};
     const locale = getLocaleLanguage();
     i18n.changeLanguage({
       locale
@@ -112,21 +111,6 @@ const appTools = (options = {
         cleanRequireCache([
           require.resolve("./plugins/analyze")
         ]);
-      },
-      async modifyFileSystemRoutes({ entrypoint, routes }) {
-        nestedRoutes[entrypoint.entryName] = routes;
-        return {
-          entrypoint,
-          routes
-        };
-      },
-      async beforeGenerateRoutes({ entrypoint, code }) {
-        const { distDirectory } = api.useAppContext();
-        await fs.outputJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutes);
-        return {
-          entrypoint,
-          code
-        };
       }
     };
   }

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

@@ -7,7 +7,6 @@ import { getSelectedEntries } from "../../utils/getSelectedEntries";
 import { initialNormalizedConfig } from "../../config";
 import { createBuilderGenerator } from "../../builder";
 import { checkIsBuildCommands } from "./utils";
-import { compatibleRequire } from "@modern-js/utils";
 const debug = createDebugger("plugin-analyze");
 var analyze_default = ({ bundler }) => ({
   name: "@modern-js/plugin-analyze",
@@ -45,9 +44,9 @@ var analyze_default = ({ bundler }) => ({
           return;
         }
         const [{ getBundleEntry }, { getServerRoutes }, { getHtmlTemplate }] = await Promise.all([
-          compatibleRequire(path.join(__dirname, "./getBundleEntry.js")),
-          compatibleRequire(path.join(__dirname, "./getServerRoutes.js")),
-          compatibleRequire(path.join(__dirname, "./getHtmlTemplate.js"))
+          import("./getBundleEntry"),
+          import("./getServerRoutes"),
+          import("./getHtmlTemplate")
         ]);
         const { entrypoints } = await hookRunners.modifyEntrypoints({
           entrypoints: await getBundleEntry(hookRunners, appContext, resolvedConfig)

package/dist/esm-node/plugins/deploy/dependencies/index.js

@@ -8,6 +8,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
   const entryFiles = await findEntryFiles(serverRootDir, entryFilter);
   const fileTrace = await traceFiles(entryFiles.concat(includeEntries), serverRootDir, base);
   const currentProjectModules = path.join(appDir, "node_modules");
+  const dependencySearchRoot = path.resolve(appDir, "../../../../../../");
   const tracedFiles = Object.fromEntries(await Promise.all([
     ...fileTrace.reasons.entries()
   ].map(async ([_path, reasons]) => {
@@ -38,7 +39,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
       const packageJsonPath = match ? path.join(match[0], "package.json") : await pkgUp({
         cwd: path.dirname(filePath)
       });
-      if (packageJsonPath) {
+      if (packageJsonPath === null || packageJsonPath === void 0 ? void 0 : packageJsonPath.startsWith(dependencySearchRoot)) {
         const packageJson = await fse.readJSON(packageJsonPath);
         pkgPath = baseDir = path.dirname(packageJsonPath);
         subpath = path.relative(baseDir, filePath);

package/dist/esm-node/plugins/deploy/dependencies/utils.js

@@ -101,7 +101,10 @@ const findPackageParents = (pkg, version, tracedFiles) => {
 const traceFiles = async (entryFiles, serverRootDir, base = "/") => {
   return await nodeFileTrace(entryFiles, {
     base,
-    processCwd: serverRootDir
+    processCwd: serverRootDir,
+    analysis: {
+      evaluatePureExpressions: false
+    }
   });
 };
 const resolveTracedPath = async (base, p) => fse.realpath(path.resolve(base, p));

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

@@ -15,7 +15,7 @@ const createServer = async (options) => {
   if (server) {
     server.close();
   }
-  server = await createDevServer(options, applyPlugins);
+  server = (await createDevServer(options, applyPlugins)).server;
   return server;
 };
 export {

package/dist/types/builder/index.d.ts

@@ -1 +1 @@
-export declare function createBuilderGenerator(bundler: 'webpack' | 'rspack'): Promise<typeof import("./builder-rspack/index.js").createRspackBuilderForModern>;
+export declare function createBuilderGenerator(bundler: 'webpack' | 'rspack'): Promise<typeof import("./builder-rspack").createRspackBuilderForModern>;