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

package/dist/esm/commands/build.js

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

package/dist/esm/commands/dev.js

@@ -4,21 +4,22 @@ 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, logger } from "@modern-js/utils";
+import { DEFAULT_DEV_HOST, SERVER_DIR, getMeta } 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, 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;
+  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;
     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";
           }
@@ -27,9 +28,19 @@ var dev = function() {
           hookRunners = api.useHookRunners();
           return [
             4,
-            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)
+            import("../esm/register-esm.mjs")
           ];
         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
@@ -45,7 +56,7 @@ var dev = function() {
               watch: true
             })
           ];
-        case 2:
+        case 3:
           _state.sent();
           meta = getMeta(metaName);
           serverConfigPath = path.resolve(appDirectory, SERVER_DIR, "".concat(meta, ".server"));
@@ -53,7 +64,7 @@ var dev = function() {
             4,
             hookRunners.beforeDev()
           ];
-        case 3:
+        case 4:
           _state.sent();
           if (!appContext.builder && !apiOnly) {
             throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
@@ -62,13 +73,13 @@ var dev = function() {
             4,
             generateRoutes(appContext)
           ];
-        case 4:
+        case 5:
           _state.sent();
           return [
             4,
             loadServerPlugins(api, appDirectory, metaName)
           ];
-        case 5:
+        case 6:
           pluginInstances = _state.sent();
           serverOptions = _object_spread({
             metaName,
@@ -90,21 +101,19 @@ 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,
-              7
+              8
             ];
           return [
             4,
-            createDevServer(_object_spread_props(_object_spread({}, serverOptions), {
-              runCompile: false
-            }), (devServerOptions === null || devServerOptions === void 0 ? void 0 : devServerOptions.applyPlugins) || applyPlugins)
+            createDevServer(serverOptions, applyPlugins)
           ];
-        case 6:
-          server = _state.sent().server;
-          server.listen({
+        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({
             port,
             host
           }, function() {
@@ -112,55 +121,28 @@ var dev = function() {
           });
           return [
             3,
-            9
+            10
           ];
-        case 7:
+        case 8:
           return [
             4,
-            createDevServer(_object_spread_props(_object_spread({}, serverOptions), {
-              builder: appContext.builder
-            }), (devServerOptions === null || devServerOptions === void 0 ? void 0 : devServerOptions.applyPlugins) || applyPlugins)
+            appContext.builder.startDevServer({
+              serverOptions,
+              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, devServerOptions) {
+  return function dev2(api, options) {
     return _ref.apply(this, arguments);
   };
 }();

package/dist/esm/commands/index.js

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

package/dist/esm/custom-loader.mjs

@@ -0,0 +1,41 @@
+import { pathToFileURL } from 'url';
+import { resolve as tsNodeResolve } from 'ts-node/esm';
+import * as tsConfigPaths from 'tsconfig-paths';
+import fs from 'fs/promises'
+import { getAliasConfig } from '@modern-js/utils';
+import path from 'path'
+
+
+let matchPath;
+export function initialize({ appDir, alias }){
+  const TS_CONFIG_FILENAME = `tsconfig.json`;
+  const aliasConfig = getAliasConfig(alias, {
+    appDirectory: appDir,
+    tsconfigPath: path.resolve(appDir, TS_CONFIG_FILENAME),
+  });
+  const { paths = {}, absoluteBaseUrl = './' } = aliasConfig;
+  const tsPaths = Object.keys(paths).reduce((o, key) => {
+    let tsPath = paths[key];
+    if (typeof tsPath === 'string' && path.isAbsolute(tsPath)) {
+      tsPath = path.relative(absoluteBaseUrl, tsPath);
+    }
+    if (typeof tsPath === 'string') {
+      tsPath = [tsPath];
+    }
+    return {
+      ...o,
+      [`${key}`]: tsPath,
+    };
+  }, {});
+
+  matchPath = tsConfigPaths.createMatchPath(absoluteBaseUrl, tsPaths);
+}
+
+export function resolve(specifier, context, defaultResolve) {
+  const match = matchPath(specifier);
+  return match
+    ? tsNodeResolve(pathToFileURL(match).href, context, defaultResolve)
+    : tsNodeResolve(specifier, context, defaultResolve);
+}
+
+export { transformSource, load } from 'ts-node/esm';

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 } from "@modern-js/utils";
+import { cleanRequireCache, emptyDir, getCommand, getArgv, fs, NESTED_ROUTE_SPEC_FILE } from "@modern-js/utils";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import initializePlugin from "./plugins/initialize";
 import analyzePlugin from "./plugins/analyze";
@@ -52,6 +52,7 @@ var appTools = function() {
       api.setAppContext(_object_spread_props(_object_spread({}, appContext), {
         toolsType: "app-tools"
       }));
+      var nestedRoutes = {};
       var locale = getLocaleLanguage();
       i18n.changeLanguage({
         locale
@@ -225,6 +226,46 @@ 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,6 +12,7 @@ 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;
@@ -77,9 +78,9 @@ function analyze_default(param) {
                   return [
                     4,
                     Promise.all([
-                      import("./getBundleEntry"),
-                      import("./getServerRoutes"),
-                      import("./getHtmlTemplate")
+                      compatibleRequire(path.join(__dirname, "./getBundleEntry.js")),
+                      compatibleRequire(path.join(__dirname, "./getServerRoutes.js")),
+                      compatibleRequire(path.join(__dirname, "./getHtmlTemplate.js"))
                     ])
                   ];
                 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, 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;
+    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;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -29,7 +29,6 @@ var handleDependencies = function() {
         case 2:
           fileTrace = _state.sent();
           currentProjectModules = path.join(appDir, "node_modules");
-          dependencySearchRoot = path.resolve(appDir, "../../../../../../");
           _ = Object.fromEntries;
           return [
             4,
@@ -106,7 +105,7 @@ var handleDependencies = function() {
                       _state2.label = 6;
                     case 6:
                       packageJsonPath = _tmp;
-                      if (!(packageJsonPath === null || packageJsonPath === void 0 ? void 0 : packageJsonPath.startsWith(dependencySearchRoot)))
+                      if (!packageJsonPath)
                         return [
                           3,
                           8

package/dist/esm/register-esm.mjs

@@ -0,0 +1,22 @@
+import { register } from 'node:module';
+import path from 'node:path';
+
+export const registerEsm = async ({
+  appDir,
+  distDir,
+  alias
+}) => {
+  // These can be overridden by ts-node options in tsconfig.json
+  process.env.TS_NODE_TRANSPILE_ONLY = true;
+  process.env.TS_NODE_PROJECT = path.join(appDir, 'tsconfig.json');
+  process.env.TS_NODE_SCOPE = true;
+  process.env.TS_NODE_FILES = true;
+  process.env.TS_NODE_IGNORE = `(?:^|/)node_modules/,(?:^|/)${path.relative(appDir, distDir)}/`
+  register('./custom-loader.mjs', import.meta.url, {
+    data: {
+      appDir,
+      distDir,
+      alias
+    }
+  });
+};

package/dist/esm/utils/createServer.js

@@ -38,7 +38,7 @@ var createServer = function() {
             createDevServer(options, applyPlugins)
           ];
         case 1:
-          server = _state.sent().server;
+          server = _state.sent();
           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")).map((entry2) => entry2.replace("bootstrap.jsx", "bootstrap.server.jsx"));
+    serverEntries[entry] = v.map((entry2) => entry2.replace("index.jsx", "index.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");
+  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderPluginAdapterWorker } = await import("../shared/builderPlugins/index.js");
   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");
+    const { createRspackBuilderForModern } = await import("./builder-rspack/index.js");
     return createRspackBuilderForModern;
   }
-  const { createWebpackBuilderForModern } = await import("./builder-webpack");
+  const { createWebpackBuilderForModern } = await import("./builder-webpack/index.js");
   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.jsx",
+    ".server.ts",
     ".server.ts",
     ".server.tsx"
   ];

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

@@ -3,9 +3,7 @@ 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";
   }
@@ -13,7 +11,6 @@ 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,23 +1,27 @@
 import path from "node:path";
 import { ResolvedConfigContext } from "@modern-js/core";
-import { DEFAULT_DEV_HOST, SERVER_DIR, getMeta, logger } from "@modern-js/utils";
+import { DEFAULT_DEV_HOST, SERVER_DIR, getMeta } 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, _normalizedConfig_dev;
+const dev = async (api, options, devServerOptions = {}) => {
+  var _normalizedConfig_source, _normalizedConfig_tools;
   if (options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
   let normalizedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
-  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);
+  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
+  });
   normalizedConfig = {
     ...normalizedConfig,
     cliOptions: options
@@ -60,32 +64,20 @@ 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) {
-    const { server } = await createDevServer({
-      ...serverOptions,
-      runCompile: false
-    }, (devServerOptions === null || devServerOptions === void 0 ? void 0 : devServerOptions.applyPlugins) || applyPlugins);
-    server.listen({
+    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({
       port,
       host
     }, () => {
       printInstructions(hookRunners, appContext, normalizedConfig);
     });
   } else {
-    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();
+    const { server } = await appContext.builder.startDevServer({
+      serverOptions,
+      applyPlugins
     });
     setServer(server);
   }