@modern-js/app-tools 2.57.2-alpha.0 → 2.58.1-alpha.0

package/dist/cjs/utils/register.js

@@ -33,14 +33,6 @@ __export(register_exports, {
 module.exports = __toCommonJS(register_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
-const registerEsbuild = async ({ isTsProject, tsConfig, distDir }) => {
-  const esbuildRegister = await import("esbuild-register/dist/node");
-  esbuildRegister.register({
-    tsconfigRaw: isTsProject ? tsConfig : void 0,
-    hookIgnoreNodeModules: true,
-    hookMatcher: (fileName) => !fileName.startsWith(distDir)
-  });
-};
 const registerCompiler = async (appDir = process.cwd(), distDir, alias) => {
   const TS_CONFIG_FILENAME = `tsconfig.json`;
   const tsconfigPath = import_node_path.default.resolve(appDir, TS_CONFIG_FILENAME);
@@ -52,17 +44,6 @@ const registerCompiler = async (appDir = process.cwd(), distDir, alias) => {
   const { paths = {}, absoluteBaseUrl = "./" } = aliasConfig;
   const tsPaths = Object.keys(paths).reduce((o, key) => {
     let tsPath = paths[key];
-    if (typeof tsPath === "string" && key.startsWith("@") && tsPath.startsWith("@")) {
-      try {
-        tsPath = require.resolve(tsPath, {
-          paths: [
-            process.cwd(),
-            ...module.paths
-          ]
-        });
-      } catch {
-      }
-    }
     if (typeof tsPath === "string" && import_node_path.default.isAbsolute(tsPath)) {
       tsPath = import_node_path.default.relative(absoluteBaseUrl, tsPath);
     }
@@ -80,40 +61,32 @@ const registerCompiler = async (appDir = process.cwd(), distDir, alias) => {
   if (isTsProject) {
     tsConfig = (0, import_utils.readTsConfigByFile)(tsconfigPath);
   }
-  const { MODERN_NODE_LOADER } = process.env;
-  if (MODERN_NODE_LOADER !== "esbuild") {
-    try {
-      const tsNode = await import("ts-node");
-      const tsNodeOptions = tsConfig["ts-node"];
-      if (isTsProject) {
-        tsNode.register({
-          project: tsconfigPath,
-          scope: true,
-          // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
-          files: true,
-          transpileOnly: true,
-          ignore: [
-            "(?:^|/)node_modules/",
-            `(?:^|/)${import_node_path.default.relative(appDir, distDir)}/`
-          ],
-          ...tsNodeOptions
-        });
-      }
-    } catch (error) {
-      await registerEsbuild({
-        isTsProject,
-        tsConfig,
-        distDir
+  try {
+    const tsNode = await Promise.resolve().then(() => __toESM(require("ts-node")));
+    const tsNodeOptions = tsConfig["ts-node"];
+    if (isTsProject) {
+      tsNode.register({
+        project: tsconfigPath,
+        scope: true,
+        // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
+        files: true,
+        transpileOnly: true,
+        ignore: [
+          "(?:^|/)node_modules/",
+          `(?:^|/)${import_node_path.default.relative(appDir, distDir)}/`
+        ],
+        ...tsNodeOptions
       });
     }
-  } else {
-    await registerEsbuild({
-      isTsProject,
-      tsConfig,
-      distDir
+  } catch (error) {
+    const esbuildRegister = await Promise.resolve().then(() => __toESM(require("esbuild-register/dist/node")));
+    esbuildRegister.register({
+      tsconfigRaw: isTsProject ? tsConfig : void 0,
+      hookIgnoreNodeModules: true,
+      hookMatcher: (fileName) => !fileName.startsWith(distDir)
     });
   }
-  const tsConfigPaths = (await import("@modern-js/utils/tsconfig-paths")).default;
+  const tsConfigPaths = await Promise.resolve().then(() => __toESM(require("@modern-js/utils/tsconfig-paths")));
   if (await import_utils.fs.pathExists(appDir)) {
     const loaderRes = tsConfigPaths.loadConfig(appDir);
     if (loaderRes.resultType === "success") {

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

@@ -1,5 +1,6 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
+import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import fs from "@modern-js/utils/fs-extra";
@@ -61,7 +62,7 @@ var builderPluginAdpaterCopy = function(options) {
         return _transformHtmlFiles.apply(this, arguments);
       }
       function _transformHtmlFiles() {
-        _transformHtmlFiles = /** tramsform public/*.html manaully */
+        _transformHtmlFiles = /** transform public/*.html manaully */
         _async_to_generator(function() {
           var _normalizedConfig_output_distPath, normalizedConfig, publicDir, HTML_REGEXP, filepaths;
           return _ts_generator(this, function(_state) {
@@ -99,7 +100,7 @@ var builderPluginAdpaterCopy = function(options) {
                             ];
                           case 1:
                             content = _state2.sent();
-                            if (!publicPath)
+                            if (!(publicPath && typeof publicPath === "string"))
                               return [
                                 3,
                                 3
@@ -115,7 +116,7 @@ var builderPluginAdpaterCopy = function(options) {
                               5
                             ];
                           case 3:
-                            logger.warn("Expect get a string from `publicPath`, but receive `undefined`.");
+                            logger.warn("Expect get a string from `publicPath`, but receive `".concat(typeof publicPath === "undefined" ? "undefined" : _type_of(publicPath), "`."));
                             return [
                               4,
                               fs.writeFile(file, content.replace(/<%=\s*assetPrefix\s*%>/g, removeTailSlash("/")))

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

@@ -38,6 +38,8 @@ function getBuilderEnvironments(normalizedConfig, appContext) {
     var v = entries[entry1];
     serverEntries[entry1] = v.map(function(entry2) {
       return entry2.replace("index.jsx", "index.server.jsx");
+    }).map(function(entry2) {
+      return entry2.replace("bootstrap.jsx", "bootstrap.server.jsx");
     });
   }
   var environments = {

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

@@ -54,7 +54,7 @@ function _applyBuilderPlugins() {
         case 0:
           return [
             4,
-            import("../shared/builderPlugins/index.js")
+            import("../shared/builderPlugins")
           ];
         case 1:
           _ref = _state.sent(), builderPluginAdapterBasic = _ref.builderPluginAdapterBasic, builderPluginAdapterHtml = _ref.builderPluginAdapterHtml, builderPluginAdapterSSR = _ref.builderPluginAdapterSSR, builderPluginAdapterWorker = _ref.builderPluginAdapterWorker;

package/dist/esm/builder/index.js

@@ -16,7 +16,7 @@ function _createBuilderGenerator() {
             ];
           return [
             4,
-            import("./builder-rspack/index.js")
+            import("./builder-rspack")
           ];
         case 1:
           createRspackBuilderForModern = _state.sent().createRspackBuilderForModern;
@@ -27,7 +27,7 @@ function _createBuilderGenerator() {
         case 2:
           return [
             4,
-            import("./builder-webpack/index.js")
+            import("./builder-webpack")
           ];
         case 3:
           createWebpackBuilderForModern = _state.sent().createWebpackBuilderForModern;

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

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

package/dist/esm/commands/build.js

@@ -7,9 +7,10 @@ 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";
 var build = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var resolvedConfig, appContext, hookRunners, apiOnly, appDirectory, distDirectory, serverConfigFile, distDirectory1, appDirectory1, serverConfigFile1;
+    var _resolvedConfig_source, resolvedConfig, appContext, hookRunners, apiOnly, appDirectory, distDirectory, serverConfigFile, distDirectory1, appDirectory1, serverConfigFile1;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -24,12 +25,18 @@ var build = function() {
             loadServerPlugins(api, appContext.appDirectory, appContext.metaName)
           ];
         case 1:
+          _state.sent();
+          return [
+            4,
+            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)
+          ];
+        case 2:
           _state.sent();
           apiOnly = appContext.apiOnly;
           if (!apiOnly)
             return [
               3,
-              6
+              7
             ];
           appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverConfigFile = appContext.serverConfigFile;
           return [
@@ -39,7 +46,7 @@ var build = function() {
               bundlerConfigs: void 0
             })
           ];
-        case 2:
+        case 3:
           _state.sent();
           return [
             4,
@@ -49,13 +56,13 @@ var build = function() {
               configFile: serverConfigFile
             })
           ];
-        case 3:
+        case 4:
           _state.sent();
           return [
             4,
             generateRoutes(appContext)
           ];
-        case 4:
+        case 5:
           _state.sent();
           return [
             4,
@@ -64,12 +71,12 @@ var build = function() {
               stats: void 0
             })
           ];
-        case 5:
+        case 6:
           _state.sent();
           return [
             2
           ];
-        case 6:
+        case 7:
           resolvedConfig = _object_spread_props(_object_spread({}, resolvedConfig), {
             cliOptions: options
           });
@@ -83,7 +90,7 @@ var build = function() {
               configFile: serverConfigFile1
             })
           ];
-        case 7:
+        case 8:
           _state.sent();
           logger.info("Starting production build...");
           if (!appContext.builder) {
@@ -93,7 +100,7 @@ var build = function() {
             4,
             appContext.builder.build()
           ];
-        case 8:
+        case 9:
           _state.sent();
           return [
             2

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;
@@ -358,7 +358,7 @@ var newCommand = function(program, locale) {
   }());
 };
 var inspectCommand = function(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(function() {
+  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(function() {
     var _ref = _async_to_generator(function(options) {
       var inspect;
       return _ts_generator(this, function(_state) {
@@ -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:
@@ -203,11 +202,16 @@ function analyze_default(param) {
                   builder = _state.sent();
                   builder.onBeforeBuild(function() {
                     var _ref2 = _async_to_generator(function(param2) {
-                      var bundlerConfigs, hookRunners2;
+                      var bundlerConfigs, isFirstCompile, hookRunners2;
                       return _ts_generator(this, function(_state2) {
                         switch (_state2.label) {
                           case 0:
-                            bundlerConfigs = param2.bundlerConfigs;
+                            bundlerConfigs = param2.bundlerConfigs, isFirstCompile = param2.isFirstCompile;
+                            if (!isFirstCompile) {
+                              return [
+                                2
+                              ];
+                            }
                             hookRunners2 = api.useHookRunners();
                             return [
                               4,