@modern-js/app-tools 2.58.1 → 2.58.3

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

@@ -33,12 +33,12 @@ __export(analyze_exports, {
 module.exports = __toCommonJS(analyze_exports);
 var path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
+var import_builder = require("../../builder");
+var import_config = require("../../config");
+var import_config2 = require("../../utils/config");
+var import_getSelectedEntries = require("../../utils/getSelectedEntries");
 var import_printInstructions = require("../../utils/printInstructions");
 var import_routes = require("../../utils/routes");
-var import_config = require("../../utils/config");
-var import_getSelectedEntries = require("../../utils/getSelectedEntries");
-var import_config2 = require("../../config");
-var import_builder = require("../../builder");
 var import_utils2 = require("./utils");
 const debug = (0, import_utils.createDebugger)("plugin-analyze");
 var analyze_default = ({ bundler }) => ({
@@ -77,9 +77,9 @@ var analyze_default = ({ bundler }) => ({
           return;
         }
         const [{ getBundleEntry }, { getServerRoutes }, { getHtmlTemplate }] = await Promise.all([
-          Promise.resolve().then(() => __toESM(require("./getBundleEntry"))),
-          Promise.resolve().then(() => __toESM(require("./getServerRoutes"))),
-          Promise.resolve().then(() => __toESM(require("./getHtmlTemplate")))
+          import("./getBundleEntry.js"),
+          import("./getServerRoutes.js"),
+          import("./getHtmlTemplate.js")
         ]);
         const { entrypoints } = await hookRunners.modifyEntrypoints({
           entrypoints: await getBundleEntry(hookRunners, appContext, resolvedConfig)
@@ -147,7 +147,7 @@ var analyze_default = ({ bundler }) => ({
             await hookRunners2.afterBuild({
               stats
             });
-            await (0, import_config.emitResolvedConfig)(appContext.appDirectory, normalizedConfig);
+            await (0, import_config2.emitResolvedConfig)(appContext.appDirectory, normalizedConfig);
           });
           builder.onDevCompileDone(async ({ isFirstCompile }) => {
             const hookRunners2 = api.useHookRunners();
@@ -186,7 +186,7 @@ var analyze_default = ({ bundler }) => ({
       },
       resolvedConfig({ resolved }) {
         const appContext = api.useAppContext();
-        const config = (0, import_config2.initialNormalizedConfig)(resolved, appContext, bundler);
+        const config = (0, import_config.initialNormalizedConfig)(resolved, appContext, bundler);
         return {
           resolved: config
         };

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

@@ -39,8 +39,8 @@ module.exports = __toCommonJS(utils_exports);
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_esbuild = require("esbuild");
 var import_es_module_lexer = require("es-module-lexer");
+var import_esbuild = require("esbuild");
 const walkDirectory = (dir) => import_fs.default.readdirSync(dir).reduce((previous, filename) => {
   const filePath = import_path.default.join(dir, filename);
   if (import_fs.default.statSync(filePath).isDirectory()) {

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

@@ -34,8 +34,8 @@ __export(dependencies_exports, {
 module.exports = __toCommonJS(dependencies_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
-var import_pkg_types = require("pkg-types");
 var import_mlly = require("mlly");
+var import_pkg_types = require("pkg-types");
 var import_utils2 = require("./utils");
 var import_nft = require("@vercel/nft");
 const handleDependencies = async ({ appDir, serverRootDir, includeEntries, traceFiles = import_utils2.traceFiles, entryFilter, modifyPackageJson, copyWholePackage, traceOptions }) => {
@@ -219,6 +219,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
     name: `${projectPkgJson.name || "modernjs-project"}-prod`,
     version: projectPkgJson.version || "0.0.0",
     private: true,
+    type: projectPkgJson.type || "commonjs",
     dependencies: Object.fromEntries([
       ...Object.values(tracedPackages).map((pkg) => [
         pkg.name,

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

@@ -39,11 +39,11 @@ __export(utils_exports, {
   writePackage: () => writePackage
 });
 module.exports = __toCommonJS(utils_exports);
-var import_path = __toESM(require("path"));
 var import_node_os = __toESM(require("node:os"));
+var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_mlly = require("mlly");
 var import_nft = require("@vercel/nft");
+var import_mlly = require("mlly");
 function applyPublicCondition(pkg) {
   var _pkg_publishConfig;
   if (pkg === null || pkg === void 0 ? void 0 : (_pkg_publishConfig = pkg.publishConfig) === null || _pkg_publishConfig === void 0 ? void 0 : _pkg_publishConfig.exports) {
@@ -143,6 +143,17 @@ const traceFiles = async ({ entryFiles, serverRootDir, base = "/", traceOptions
   return await (0, import_nft.nodeFileTrace)(entryFiles, {
     base,
     processCwd: serverRootDir,
+    resolve: async (id, parent, job, isCjs) => {
+      if (id.startsWith("@modern-js/prod-server")) {
+        return require.resolve(id, {
+          paths: [
+            require.resolve("@modern-js/app-tools")
+          ]
+        });
+      } else {
+        return (0, import_nft.resolve)(id, parent, job, isCjs);
+      }
+    },
     ...traceOptions
   });
 };

package/dist/cjs/plugins/deploy/index.js

@@ -22,10 +22,10 @@ __export(deploy_exports, {
 });
 module.exports = __toCommonJS(deploy_exports);
 var import_std_env = require("std-env");
-var import_utils = require("./utils");
+var import_netlify = require("./platforms/netlify");
 var import_node = require("./platforms/node");
 var import_vercel = require("./platforms/vercel");
-var import_netlify = require("./platforms/netlify");
+var import_utils = require("./utils");
 const deployPresets = {
   node: import_node.createNodePreset,
   vercel: import_vercel.createVercelPreset,

package/dist/cjs/plugins/deploy/platforms/netlify-entry.js

@@ -0,0 +1,3 @@
+"use strict";
+const { handler } = require("./netlify-handler");
+module.exports.default = handler;

package/dist/cjs/plugins/deploy/platforms/netlify-entry.mjs

@@ -0,0 +1 @@
+export { handler as default } from './netlify-handler.cjs';

package/dist/cjs/plugins/deploy/platforms/{netlifyEntry.js → netlify-handler.js}

@@ -53,9 +53,11 @@ async function createHandler() {
   return requestHandler;
 }
 createHandler();
-module.exports.default = async (request, context) => {
-  if (!requestHandler) {
-    await createHandler();
+module.exports = {
+  handler: async (request, context) => {
+    if (!requestHandler) {
+      await createHandler();
+    }
+    return requestHandler(request, context);
   }
-  return requestHandler(request, context);
 };

package/dist/cjs/plugins/deploy/platforms/netlify.js

@@ -34,8 +34,8 @@ module.exports = __toCommonJS(netlify_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
 var import_routes = require("../../../utils/routes");
-var import_utils2 = require("../utils");
 var import_dependencies = require("../dependencies");
+var import_utils2 = require("../utils");
 async function cleanDistDirectory(dir) {
   try {
     const items = await import_utils.fs.readdir(dir);
@@ -50,11 +50,13 @@ async function cleanDistDirectory(dir) {
   }
 }
 const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
-  const { appDirectory, distDirectory, entrypoints, serverPlugins } = appContext;
+  const { appDirectory, distDirectory, entrypoints, serverPlugins, moduleType } = appContext;
+  const isEsmProject = moduleType === "module";
   const plugins = serverPlugins.map((plugin) => plugin.name);
   const netlifyOutput = import_node_path.default.join(appDirectory, ".netlify");
   const funcsDirectory = import_node_path.default.join(netlifyOutput, "functions");
   const entryFilePath = import_node_path.default.join(funcsDirectory, "index.js");
+  const handlerFilePath = import_node_path.default.join(funcsDirectory, "netlify-handler.cjs");
   return {
     async prepare() {
       await import_utils.fs.remove(netlifyOutput);
@@ -103,7 +105,9 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
           prefix: modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_bff = modernConfig.bff) === null || _modernConfig_bff === void 0 ? void 0 : _modernConfig_bff.prefix
         },
         output: {
-          path: "."
+          distPath: {
+            root: "."
+          }
         }
       };
       const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
@@ -114,10 +118,15 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
       const pluginsCode = `[${plugins.map((plugin, index) => {
         return `plugin_${index}()`;
       }).join(",")}]`;
-      let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./netlifyEntry.js"))).toString();
+      let handlerCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./netlify-handler.js"))).toString();
       const serverAppContext = (0, import_utils2.serverAppContenxtTemplate)(appContext);
-      entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
-      await import_utils.fs.writeFile(entryFilePath, entryCode);
+      handlerCode = handlerCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+      await import_utils.fs.writeFile(handlerFilePath, handlerCode);
+      if (isEsmProject) {
+        await import_utils.fs.copy(import_node_path.default.join(__dirname, "./netlify-entry.mjs"), entryFilePath);
+      } else {
+        await import_utils.fs.copy(import_node_path.default.join(__dirname, "./netlify-entry.js"), entryFilePath);
+      }
     },
     async end() {
       if (process.env.NODE_ENV !== "development") {

package/dist/cjs/plugins/deploy/platforms/node.js

@@ -33,10 +33,11 @@ __export(node_exports, {
 module.exports = __toCommonJS(node_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
-var import_utils2 = require("../utils");
 var import_dependencies = require("../dependencies");
+var import_utils2 = require("../utils");
 const createNodePreset = (appContext, config) => {
-  const { appDirectory, distDirectory, serverPlugins } = appContext;
+  const { appDirectory, distDirectory, serverPlugins, moduleType } = appContext;
+  const isEsmProject = moduleType === "module";
   const plugins = serverPlugins.map((plugin) => plugin.name);
   const outputDirectory = import_node_path.default.join(appDirectory, ".output");
   const staticDirectory = import_node_path.default.join(outputDirectory, "static");
@@ -58,7 +59,9 @@ const createNodePreset = (appContext, config) => {
           prefix: config === null || config === void 0 ? void 0 : (_config_bff = config.bff) === null || _config_bff === void 0 ? void 0 : _config_bff.prefix
         },
         output: {
-          path: "."
+          distPath: {
+            root: "."
+          }
         }
       };
       const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
@@ -69,10 +72,16 @@ const createNodePreset = (appContext, config) => {
       const pluginsCode = `[${plugins.map((plugin, index) => {
         return `plugin_${index}()`;
       }).join(",")}]`;
-      let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./nodeEntry.js"))).toString();
+      let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./node-entry.js"))).toString();
       const serverAppContext = (0, import_utils2.serverAppContenxtTemplate)(appContext);
       entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
-      await import_utils.fs.writeFile(entryFilePath, entryCode);
+      if (isEsmProject) {
+        const cjsEntryFilePath = import_node_path.default.join(outputDirectory, "index.cjs");
+        await import_utils.fs.writeFile(cjsEntryFilePath, entryCode);
+        await import_utils.fs.writeFile(entryFilePath, `import('./index.cjs');`);
+      } else {
+        await import_utils.fs.writeFile(entryFilePath, entryCode);
+      }
     },
     async end() {
       console.log("Static directory:", import_utils.chalk.blue(import_node_path.default.relative(appDirectory, staticDirectory)));

package/dist/cjs/plugins/deploy/platforms/vercel-entry.js

@@ -0,0 +1,3 @@
+"use strict";
+const { handler } = require("./vercel-handler.cjs");
+module.exports = handler;

package/dist/cjs/plugins/deploy/platforms/vercel-entry.mjs

@@ -0,0 +1,3 @@
+import { handler } from './vercel-handler.cjs';
+
+export default handler;

package/dist/cjs/plugins/deploy/platforms/{vercelEntry.js → vercel-handler.js}

@@ -53,9 +53,12 @@ async function createHandler() {
   return requestHandler;
 }
 createHandler();
-module.exports = async (req, res) => {
+const handler = async (req, res) => {
   if (!requestHandler) {
     await createHandler();
   }
   return requestHandler(req, res);
 };
+module.exports = {
+  handler
+};

package/dist/cjs/plugins/deploy/platforms/vercel.js

@@ -34,15 +34,17 @@ module.exports = __toCommonJS(vercel_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
 var import_routes = require("../../../utils/routes");
-var import_utils2 = require("../utils");
 var import_dependencies = require("../dependencies");
+var import_utils2 = require("../utils");
 const createVercelPreset = (appContext, modernConfig, needModernServer) => {
-  const { appDirectory, distDirectory, entrypoints, serverPlugins } = appContext;
+  const { appDirectory, distDirectory, entrypoints, serverPlugins, moduleType } = appContext;
+  const isEsmProject = moduleType === "module";
   const plugins = serverPlugins.map((plugin) => plugin.name);
   const vercelOutput = import_node_path.default.join(appDirectory, ".vercel");
   const outputDirectory = import_node_path.default.join(vercelOutput, "output");
   const funcsDirectory = import_node_path.default.join(outputDirectory, "functions", "index.func");
   const entryFilePath = import_node_path.default.join(funcsDirectory, "index.js");
+  const handlerFilePath = import_node_path.default.join(funcsDirectory, "vercel-handler.cjs");
   return {
     async prepare() {
       await import_utils.fs.remove(vercelOutput);
@@ -118,7 +120,9 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
           prefix: modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_bff = modernConfig.bff) === null || _modernConfig_bff === void 0 ? void 0 : _modernConfig_bff.prefix
         },
         output: {
-          path: "."
+          distPath: {
+            root: "."
+          }
         }
       };
       const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
@@ -130,9 +134,14 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
         return `plugin_${index}()`;
       }).join(",")}]`;
       const serverAppContext = (0, import_utils2.serverAppContenxtTemplate)(appContext);
-      let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./vercelEntry.js"))).toString();
-      entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
-      await import_utils.fs.writeFile(entryFilePath, entryCode);
+      let handlerCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./vercel-handler.js"))).toString();
+      handlerCode = handlerCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+      await import_utils.fs.writeFile(handlerFilePath, handlerCode);
+      if (isEsmProject) {
+        await import_utils.fs.copy(import_node_path.default.join(__dirname, "./vercel-entry.mjs"), entryFilePath);
+      } else {
+        await import_utils.fs.copy(import_node_path.default.join(__dirname, "./vercel-entry.js"), entryFilePath);
+      }
     },
     async end() {
       if (!needModernServer) {

package/dist/cjs/plugins/serverBuild.js

@@ -31,10 +31,10 @@ __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_path = __toESM(require("path"));
 var import_server_utils = require("@modern-js/server-utils");
+var import_utils = require("@modern-js/utils");
 const TS_CONFIG_FILENAME = "tsconfig.json";
 function checkHasCache(appDir) {
   const tsFilepath = import_path.default.resolve(appDir, import_utils.SERVER_DIR, "cache.ts");

package/dist/cjs/utils/config.js

@@ -40,7 +40,7 @@ var import_flatted = require("flatted");
 const defineServerConfig = (config) => config;
 const buildServerConfig = async ({ appDirectory, distDirectory, configFile, options, watch }) => {
   const configFilePath = await (0, import_utils.getServerConfig)(appDirectory, configFile);
-  const getOutputFile = async (filepath) => path.resolve(distDirectory, `${filepath.replace(new RegExp(import_utils.CONFIG_FILE_EXTENSIONS.join("|")), "")}.js`);
+  const getOutputFile = async (filepath) => path.resolve(distDirectory, `${filepath.replace(new RegExp(import_utils.CONFIG_FILE_EXTENSIONS.join("|")), "")}.cjs`);
   if (configFilePath) {
     const configHelperFilePath = path.normalize(path.join(distDirectory, "./config-helper.js"));
     const helperCode = `

package/dist/cjs/utils/createServer.js

@@ -24,8 +24,8 @@ __export(createServer_exports, {
   setServer: () => setServer
 });
 module.exports = __toCommonJS(createServer_exports);
-var import_server = require("@modern-js/server");
 var import_prod_server = require("@modern-js/prod-server");
+var import_server = require("@modern-js/server");
 let server = null;
 const getServer = () => server;
 const setServer = (newServer) => {

package/dist/cjs/utils/loadPlugins.js

@@ -37,7 +37,7 @@ async function getServerPlugins(api, metaName = "modern-js") {
 }
 async function loadServerPlugins(api, appDirectory, metaName) {
   const plugins = await getServerPlugins(api, metaName);
-  const instances = (0, import_prod_server.loadServerPlugins)(plugins, appDirectory);
+  const instances = await (0, import_prod_server.loadServerPlugins)(plugins, appDirectory);
   return instances;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/utils/register.js

@@ -33,7 +33,15 @@ __export(register_exports, {
 module.exports = __toCommonJS(register_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
-const registerCompiler = async (appDir = process.cwd(), distDir, alias) => {
+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, distDir, alias) => {
   const TS_CONFIG_FILENAME = `tsconfig.json`;
   const tsconfigPath = import_node_path.default.resolve(appDir, TS_CONFIG_FILENAME);
   const isTsProject = await import_utils.fs.pathExists(tsconfigPath);
@@ -44,6 +52,17 @@ 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);
     }
@@ -61,32 +80,40 @@ const registerCompiler = async (appDir = process.cwd(), distDir, alias) => {
   if (isTsProject) {
     tsConfig = (0, import_utils.readTsConfigByFile)(tsconfigPath);
   }
-  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
+  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
       });
     }
-  } 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)
+  } else {
+    await registerEsbuild({
+      isTsProject,
+      tsConfig,
+      distDir
     });
   }
-  const tsConfigPaths = await Promise.resolve().then(() => __toESM(require("@modern-js/utils/tsconfig-paths")));
+  const tsConfigPaths = (await import("@modern-js/utils/tsconfig-paths")).default;
   if (await import_utils.fs.pathExists(appDir)) {
     const loaderRes = tsConfigPaths.loadConfig(appDir);
     if (loaderRes.resultType === "success") {

package/dist/types/builder/builder-rspack/adapterCopy.d.ts

@@ -1,3 +1,3 @@
-import { RsbuildPlugin } from '@modern-js/uni-builder';
-import { BuilderOptions } from '../shared';
+import type { RsbuildPlugin } from '@modern-js/uni-builder';
+import { type BuilderOptions } from '../shared';
 export declare const builderPluginAdpaterCopy: (options: BuilderOptions<'rspack'>) => RsbuildPlugin;

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

@@ -1,2 +1,2 @@
-import { BuilderOptions } from '../shared';
+import type { BuilderOptions } from '../shared';
 export declare function createRspackBuilderForModern(options: BuilderOptions<'rspack'>): Promise<import("@modern-js/uni-builder").UniBuilderInstance>;

package/dist/types/builder/builder-webpack/adapterModern.d.ts

@@ -1,5 +1,5 @@
-import { RsbuildPlugin } from '@modern-js/uni-builder';
-import { BuilderOptions } from '../shared';
+import type { RsbuildPlugin } from '@modern-js/uni-builder';
+import type { BuilderOptions } from '../shared';
 /**
  * Provides default configuration consistent with modern.js v1
  */

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

@@ -1,2 +1,2 @@
-import { BuilderOptions } from '../shared';
+import type { BuilderOptions } from '../shared';
 export declare function createWebpackBuilderForModern(options: BuilderOptions<'webpack'>): Promise<import("@modern-js/uni-builder").UniBuilderInstance>;

package/dist/types/builder/generator/createBuilderProviderConfig.d.ts

@@ -1,2 +1,2 @@
-import type { Bundler, IAppContext, AppNormalizedConfig } from '../../types';
+import type { AppNormalizedConfig, Bundler, IAppContext } from '../../types';
 export declare function createBuilderProviderConfig<B extends Bundler>(resolveConfig: AppNormalizedConfig<B>, appContext: IAppContext): Omit<AppNormalizedConfig<B>, 'plugins'>;

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

@@ -1,6 +1,6 @@
-import { type UniBuilderInstance, type BundlerType } from '@modern-js/uni-builder';
-import { BuilderOptions } from '../shared';
-import { Bundler } from '../../types';
+import { type BundlerType, type UniBuilderInstance } from '@modern-js/uni-builder';
+import type { Bundler } from '../../types';
+import type { BuilderOptions } from '../shared';
 /**
  * @param options BuilderOptions
  * @param bundlerType BundlerType

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

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

package/dist/types/builder/shared/builderPlugins/adapterHtml.d.ts

@@ -1,4 +1,4 @@
 import type { RsbuildPlugin } from '@rsbuild/core';
-import { Bundler } from '../../../types';
+import type { Bundler } from '../../../types';
 import type { BuilderOptions } from '../types';
 export declare const builderPluginAdapterHtml: <B extends Bundler>(options: BuilderOptions<B>) => RsbuildPlugin;

package/dist/types/builder/shared/builderPlugins/adapterSSR.d.ts

@@ -1,4 +1,4 @@
-import { RsbuildPlugin } from '@rsbuild/core';
+import { type RsbuildPlugin } from '@rsbuild/core';
 import type { Bundler } from '../../../types';
 import type { BuilderOptions } from '../types';
 export declare const builderPluginAdapterSSR: <B extends Bundler>(options: BuilderOptions<B>) => RsbuildPlugin;

package/dist/types/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.d.ts

@@ -1,4 +1,4 @@
-import type { Rspack, webpack, HtmlWebpackPlugin } from '@modern-js/uni-builder';
+import type { HtmlWebpackPlugin, Rspack, webpack } from '@modern-js/uni-builder';
 export declare class HtmlAsyncChunkPlugin {
     name: string;
     htmlWebpackPlugin: typeof HtmlWebpackPlugin;

package/dist/types/builder/shared/bundlerPlugins/HtmlBottomTemplate.d.ts

@@ -1,4 +1,4 @@
-import type { Rspack, webpack, HtmlWebpackPlugin } from '@modern-js/uni-builder';
+import type { HtmlWebpackPlugin, Rspack, webpack } from '@modern-js/uni-builder';
 export declare class BottomTemplatePlugin {
     htmlWebpackPlugin: typeof HtmlWebpackPlugin;
     bottomTemplateReg: RegExp;

package/dist/types/builder/shared/bundlerPlugins/RouterPlugin.d.ts

@@ -1,4 +1,4 @@
-import type { Rspack, webpack, HtmlWebpackPlugin } from '@modern-js/uni-builder';
+import type { HtmlWebpackPlugin, Rspack, webpack } from '@modern-js/uni-builder';
 import type { ScriptLoading } from '@rsbuild/core';
 export interface RouteAssets {
     [routeId: string]: {

package/dist/types/builder/shared/createCopyInfo.d.ts

@@ -1,4 +1,4 @@
-import { AppNormalizedConfig, IAppContext } from '../../types';
+import type { AppNormalizedConfig, IAppContext } from '../../types';
 export declare function createCopyInfo(appContext: IAppContext, config: AppNormalizedConfig<'shared'>): {
     configDir: string;
     uploadDir: string;

package/dist/types/builder/shared/loaders/serverModuleLoader.d.ts

@@ -1,3 +1,3 @@
-import type { webpack, Rspack } from '@modern-js/uni-builder';
+import type { Rspack, webpack } from '@modern-js/uni-builder';
 declare function loader(this: webpack.LoaderContext<void> | Rspack.LoaderContext): string;
 export default loader;

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

@@ -1,4 +1,4 @@
-import type { Bundler, AppNormalizedConfig, IAppContext } from '../../types';
+import type { AppNormalizedConfig, Bundler, IAppContext } from '../../types';
 export type BuilderOptions<B extends Bundler> = {
     normalizedConfig: AppNormalizedConfig<B>;
     appContext: IAppContext;

package/dist/types/commands/build.d.ts

@@ -1,4 +1,4 @@
-import { PluginAPI } from '@modern-js/core';
-import type { BuildOptions } from '../utils/types';
+import { type PluginAPI } from '@modern-js/core';
 import type { AppTools } from '../types';
+import type { BuildOptions } from '../utils/types';
 export declare const build: (api: PluginAPI<AppTools<'shared'>>, options?: BuildOptions) => Promise<void>;

package/dist/types/commands/dev.d.ts

@@ -1,7 +1,7 @@
-import { PluginAPI } from '@modern-js/core';
-import { ApplyPlugins } from '@modern-js/server';
-import { DevOptions } from '../utils/types';
+import { type PluginAPI } from '@modern-js/core';
+import { type ApplyPlugins } from '@modern-js/server';
 import type { AppTools } from '../types';
+import type { DevOptions } from '../utils/types';
 export interface ExtraServerOptions {
     applyPlugins?: ApplyPlugins;
 }

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

@@ -1,6 +1,6 @@
-import { PluginAPI } from '@modern-js/core';
-import { Command } from '@modern-js/utils';
-import { AppTools } from '../types';
+import type { PluginAPI } from '@modern-js/core';
+import { type Command } from '@modern-js/utils';
+import type { AppTools } from '../types';
 export declare const devCommand: (program: Command, api: PluginAPI<AppTools<'shared'>>) => Promise<void>;
 export declare const buildCommand: (program: Command, api: PluginAPI<AppTools<'shared'>>) => Promise<void>;
 export declare const serverCommand: (program: Command, api: PluginAPI<AppTools<'shared'>>) => void;

package/dist/types/commands/inspect.d.ts

@@ -1,4 +1,4 @@
 import type { PluginAPI } from '@modern-js/core';
-import type { InspectOptions } from '../utils/types';
 import type { AppTools } from '../types';
+import type { InspectOptions } from '../utils/types';
 export declare const inspect: (api: PluginAPI<AppTools<'shared'>>, options: InspectOptions) => Promise<import("@rsbuild/core").InspectConfigResult<"rspack">>;

package/dist/types/config/default.d.ts

@@ -1,3 +1,3 @@
-import { IAppContext, AppUserConfig, AppLegacyUserConfig } from '../types';
+import type { AppLegacyUserConfig, AppUserConfig, IAppContext } from '../types';
 export declare function createDefaultConfig(appContext: IAppContext): AppUserConfig<'webpack'> | AppUserConfig<'rspack'>;
 export declare function createLegacyDefaultConfig(appContext: IAppContext): AppLegacyUserConfig;