@modern-js/app-tools 2.48.5 → 2.49.0

package/dist/cjs/commands/build.js

@@ -25,13 +25,16 @@ var import_core = require("@modern-js/core");
 var import_utils = require("@modern-js/utils");
 var import_routes = require("../utils/routes");
 var import_config = require("../utils/config");
+var import_register = require("../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";
   }
   let resolvedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
+  await (0, import_register.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/cjs/commands/dev.js

@@ -23,25 +23,29 @@ __export(dev_exports, {
 module.exports = __toCommonJS(dev_exports);
 var import_core = require("@modern-js/core");
 var import_utils = require("@modern-js/utils");
+var import_server = require("@modern-js/server");
+var import_prod_server = require("@modern-js/prod-server");
+var import_register = require("../utils/register");
 var import_printInstructions = require("../utils/printInstructions");
 var import_createServer = require("../utils/createServer");
 var import_routes = require("../utils/routes");
 var import_config = require("../utils/config");
 var import_getServerInternalPlugins = require("../utils/getServerInternalPlugins");
 const dev = async (api, options, devServerOptions = {}) => {
-  var _normalizedConfig_tools;
+  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 (0, import_register.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
   };
   import_core.ResolvedConfigContext.set(normalizedConfig);
-  const { appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName } = appContext;
+  const { appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes } = appContext;
   await (0, import_config.buildServerConfig)({
     appDirectory,
     distDirectory,
@@ -55,6 +59,7 @@ const dev = async (api, options, devServerOptions = {}) => {
   await (0, import_routes.generateRoutes)(appContext);
   const serverInternalPlugins = await (0, import_getServerInternalPlugins.getServerInternalPlugins)(api);
   const serverOptions = {
+    metaName,
     dev: {
       port,
       https: normalizedConfig.dev.https,
@@ -62,37 +67,32 @@ const dev = async (api, options, devServerOptions = {}) => {
       ...(_normalizedConfig_tools = normalizedConfig.tools) === null || _normalizedConfig_tools === void 0 ? void 0 : _normalizedConfig_tools.devServer
     },
     appContext: {
-      metaName,
-      appDirectory: appContext.appDirectory,
-      sharedDirectory: appContext.sharedDirectory,
+      appDirectory,
       apiDirectory: appContext.apiDirectory,
-      lambdaDirectory: appContext.lambdaDirectory
+      lambdaDirectory: appContext.lambdaDirectory,
+      sharedDirectory: appContext.sharedDirectory
     },
+    routes: serverRoutes,
     pwd: appDirectory,
     config: normalizedConfig,
     serverConfigFile,
-    internalPlugins: (0, import_createServer.injectDataLoaderPlugin)(serverInternalPlugins),
+    internalPlugins: serverInternalPlugins,
     ...devServerOptions
   };
   if (apiOnly) {
     var _normalizedConfig_dev;
-    const app = await (0, import_createServer.createServer)({
-      ...serverOptions,
-      compiler: null
-    });
+    const app = await (0, import_server.createDevServer)(serverOptions, import_prod_server.initProdMiddlewares);
     const host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || import_utils.DEFAULT_DEV_HOST;
     app.listen({
       port,
       host
-    }, async (err) => {
-      if (err) {
-        throw err;
-      }
+    }, () => {
       (0, import_printInstructions.printInstructions)(hookRunners, appContext, normalizedConfig);
     });
   } else {
     const { server } = await appContext.builder.startDevServer({
-      serverOptions
+      serverOptions,
+      initProdMiddlewares: import_prod_server.initProdMiddlewares
     });
     (0, import_createServer.setServer)(server);
   }

package/dist/cjs/commands/serve.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var serve_exports = {};
 __export(serve_exports, {
@@ -32,21 +22,25 @@ __export(serve_exports, {
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("@modern-js/utils");
-var import_prod_server = __toESM(require("@modern-js/prod-server"));
+var import_prod_server = require("@modern-js/prod-server");
 var import_printInstructions = require("../utils/printInstructions");
-var import_createServer = require("../utils/createServer");
 var import_getServerInternalPlugins = require("../utils/getServerInternalPlugins");
 const start = async (api) => {
   var _userConfig_source, _userConfig_output_distPath;
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
   const hookRunners = api.useHookRunners();
-  const { appDirectory, port, serverConfigFile, metaName } = appContext;
+  const { distDirectory, appDirectory, port, serverConfigFile, metaName, serverRoutes } = appContext;
   import_utils.logger.info(`Starting production server...`);
   const apiOnly = await (0, import_utils.isApiOnly)(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir, appContext.apiDirectory);
+  let runMode;
+  if (apiOnly) {
+    runMode = "apiOnly";
+  }
   const serverInternalPlugins = await (0, import_getServerInternalPlugins.getServerInternalPlugins)(api);
-  const app = await (0, import_prod_server.default)({
-    pwd: appDirectory,
+  const app = await (0, import_prod_server.createProdServer)({
+    metaName,
+    pwd: distDirectory,
     config: {
       ...userConfig,
       dev: userConfig.dev,
@@ -55,20 +49,18 @@ const start = async (api) => {
         ...userConfig.output || {}
       }
     },
+    routes: serverRoutes,
     appContext: {
-      metaName,
+      appDirectory,
       sharedDirectory: (0, import_utils.getTargetDir)(appContext.sharedDirectory, appContext.appDirectory, appContext.distDirectory),
       apiDirectory: (0, import_utils.getTargetDir)(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),
       lambdaDirectory: (0, import_utils.getTargetDir)(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory)
     },
     serverConfigFile,
-    internalPlugins: (0, import_createServer.injectDataLoaderPlugin)(serverInternalPlugins),
-    apiOnly
+    internalPlugins: serverInternalPlugins,
+    runMode
   });
-  app.listen(port, async (err) => {
-    if (err) {
-      throw err;
-    }
+  app.listen(port, async () => {
     await (0, import_printInstructions.printInstructions)(hookRunners, appContext, userConfig);
   });
 };

package/dist/cjs/utils/createServer.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,25 +15,17 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var createServer_exports = {};
 __export(createServer_exports, {
   closeServer: () => closeServer,
   createServer: () => createServer,
   getServer: () => getServer,
-  injectDataLoaderPlugin: () => injectDataLoaderPlugin,
   setServer: () => setServer
 });
 module.exports = __toCommonJS(createServer_exports);
 var import_server = require("@modern-js/server");
+var import_prod_server = require("@modern-js/prod-server");
 let server = null;
 const getServer = () => server;
 const setServer = (newServer) => {
@@ -43,33 +33,21 @@ const setServer = (newServer) => {
 };
 const closeServer = async () => {
   if (server) {
-    await server.close();
+    server.close();
     server = null;
   }
 };
 const createServer = async (options) => {
   if (server) {
-    await server.close();
+    server.close();
   }
-  server = new import_server.Server(options);
-  const app = await server.init();
-  return app;
-};
-const injectDataLoaderPlugin = (internalPlugins) => {
-  const DataLoaderPlugin = require.resolve("@modern-js/plugin-data-loader/server");
-  return {
-    ...internalPlugins,
-    "@modern-js/plugin-data-loader": {
-      path: DataLoaderPlugin,
-      forced: true
-    }
-  };
+  server = await (0, import_server.createDevServer)(options, import_prod_server.initProdMiddlewares);
+  return server;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   closeServer,
   createServer,
   getServer,
-  injectDataLoaderPlugin,
   setServer
 });

package/dist/cjs/utils/env.js

@@ -21,10 +21,10 @@ __export(env_exports, {
   getAutoInjectEnv: () => getAutoInjectEnv
 });
 module.exports = __toCommonJS(env_exports);
-var import_utils = require("@modern-js/utils");
+var import_universal = require("@modern-js/utils/universal");
 function getAutoInjectEnv(appContext) {
   const { metaName } = appContext;
-  const prefix = `${(0, import_utils.cutNameByHyphen)(metaName)}_`.toUpperCase();
+  const prefix = `${(0, import_universal.cutNameByHyphen)(metaName)}_`.toUpperCase();
   const envReg = new RegExp(`^${prefix}`);
   return Object.keys(process.env).reduce((prev, key) => {
     const value = process.env[key];

package/dist/cjs/utils/register.js

@@ -0,0 +1,103 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var register_exports = {};
+__export(register_exports, {
+  registerCompiler: () => registerCompiler
+});
+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 TS_CONFIG_FILENAME = `tsconfig.json`;
+  const tsconfigPath = import_node_path.default.resolve(appDir, TS_CONFIG_FILENAME);
+  const isTsProject = await import_utils.fs.pathExists(tsconfigPath);
+  const aliasConfig = (0, import_utils.getAliasConfig)(alias, {
+    appDirectory: appDir,
+    tsconfigPath
+  });
+  const { paths = {}, absoluteBaseUrl = "./" } = aliasConfig;
+  const tsPaths = Object.keys(paths).reduce((o, key) => {
+    let tsPath = paths[key];
+    if (typeof tsPath === "string" && import_node_path.default.isAbsolute(tsPath)) {
+      tsPath = import_node_path.default.relative(absoluteBaseUrl, tsPath);
+    }
+    if (typeof tsPath === "string") {
+      tsPath = [
+        tsPath
+      ];
+    }
+    return {
+      ...o,
+      [`${key}`]: tsPath
+    };
+  }, {});
+  let tsConfig = {};
+  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/",
+          `(?:^|/)${distDir}/`
+        ],
+        ...tsNodeOptions
+      });
+    }
+  } 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 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") {
+      tsConfigPaths.register({
+        baseUrl: absoluteBaseUrl || "./",
+        paths: tsPaths
+      });
+    }
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  registerCompiler
+});

package/dist/esm/commands/build.js

@@ -6,9 +6,10 @@ import { ResolvedConfigContext } from "@modern-js/core";
 import { logger } from "@modern-js/utils";
 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:
@@ -18,11 +19,17 @@ var build = function() {
           resolvedConfig = api.useResolvedConfigContext();
           appContext = api.useAppContext();
           hookRunners = api.useHookRunners();
+          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 1:
+          _state.sent();
           apiOnly = appContext.apiOnly;
           if (!apiOnly)
             return [
               3,
-              5
+              6
             ];
           appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverConfigFile = appContext.serverConfigFile;
           return [
@@ -32,7 +39,7 @@ var build = function() {
               bundlerConfigs: void 0
             })
           ];
-        case 1:
+        case 2:
           _state.sent();
           return [
             4,
@@ -42,13 +49,13 @@ var build = function() {
               configFile: serverConfigFile
             })
           ];
-        case 2:
+        case 3:
           _state.sent();
           return [
             4,
             generateRoutes(appContext)
           ];
-        case 3:
+        case 4:
           _state.sent();
           return [
             4,
@@ -57,12 +64,12 @@ var build = function() {
               stats: void 0
             })
           ];
-        case 4:
+        case 5:
           _state.sent();
           return [
             2
           ];
-        case 5:
+        case 6:
           resolvedConfig = _object_spread_props(_object_spread({}, resolvedConfig), {
             cliOptions: options
           });
@@ -76,7 +83,7 @@ var build = function() {
               configFile: serverConfigFile1
             })
           ];
-        case 6:
+        case 7:
           _state.sent();
           logger.info("Starting production build...");
           if (!appContext.builder) {
@@ -86,7 +93,7 @@ var build = function() {
             4,
             appContext.builder.build()
           ];
-        case 7:
+        case 8:
           _state.sent();
           return [
             2

package/dist/esm/commands/dev.js

@@ -4,14 +4,17 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { ResolvedConfigContext } from "@modern-js/core";
 import { DEFAULT_DEV_HOST } from "@modern-js/utils";
+import { createDevServer } from "@modern-js/server";
+import { initProdMiddlewares } from "@modern-js/prod-server";
+import { registerCompiler } from "../utils/register";
 import { printInstructions } from "../utils/printInstructions";
-import { setServer, createServer, injectDataLoaderPlugin } from "../utils/createServer";
+import { setServer } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 var dev = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var devServerOptions, _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverInternalPlugins, serverOptions, _normalizedConfig_dev, app, host, server;
+    var devServerOptions, _normalizedConfig_source, _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes, serverInternalPlugins, serverOptions, _normalizedConfig_dev, app, host, server;
     var _arguments = arguments;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
@@ -23,11 +26,17 @@ var dev = function() {
           normalizedConfig = api.useResolvedConfigContext();
           appContext = api.useAppContext();
           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)
+          ];
+        case 1:
+          _state.sent();
           normalizedConfig = _object_spread_props(_object_spread({}, normalizedConfig), {
             cliOptions: options
           });
           ResolvedConfigContext.set(normalizedConfig);
-          appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, port = appContext.port, apiOnly = appContext.apiOnly, serverConfigFile = appContext.serverConfigFile, metaName = appContext.metaName;
+          appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, port = appContext.port, apiOnly = appContext.apiOnly, serverConfigFile = appContext.serverConfigFile, metaName = appContext.metaName, serverRoutes = appContext.serverRoutes;
           return [
             4,
             buildServerConfig({
@@ -37,13 +46,13 @@ var dev = function() {
               watch: true
             })
           ];
-        case 1:
+        case 2:
           _state.sent();
           return [
             4,
             hookRunners.beforeDev()
           ];
-        case 2:
+        case 3:
           _state.sent();
           if (!appContext.builder && !apiOnly) {
             throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
@@ -52,81 +61,68 @@ var dev = function() {
             4,
             generateRoutes(appContext)
           ];
-        case 3:
+        case 4:
           _state.sent();
           return [
             4,
             getServerInternalPlugins(api)
           ];
-        case 4:
+        case 5:
           serverInternalPlugins = _state.sent();
           serverOptions = _object_spread({
+            metaName,
             dev: _object_spread({
               port,
               https: normalizedConfig.dev.https,
               host: normalizedConfig.dev.host
             }, (_normalizedConfig_tools = normalizedConfig.tools) === null || _normalizedConfig_tools === void 0 ? void 0 : _normalizedConfig_tools.devServer),
             appContext: {
-              metaName,
-              appDirectory: appContext.appDirectory,
-              sharedDirectory: appContext.sharedDirectory,
+              appDirectory,
               apiDirectory: appContext.apiDirectory,
-              lambdaDirectory: appContext.lambdaDirectory
+              lambdaDirectory: appContext.lambdaDirectory,
+              sharedDirectory: appContext.sharedDirectory
             },
+            routes: serverRoutes,
             pwd: appDirectory,
             config: normalizedConfig,
             serverConfigFile,
-            internalPlugins: injectDataLoaderPlugin(serverInternalPlugins)
+            internalPlugins: serverInternalPlugins
           }, devServerOptions);
           if (!apiOnly)
             return [
               3,
-              6
+              7
             ];
           return [
             4,
-            createServer(_object_spread_props(_object_spread({}, serverOptions), {
-              compiler: null
-            }))
+            createDevServer(serverOptions, initProdMiddlewares)
           ];
-        case 5:
+        case 6:
           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() {
-            var _ref2 = _async_to_generator(function(err) {
-              return _ts_generator(this, function(_state2) {
-                if (err) {
-                  throw err;
-                }
-                printInstructions(hookRunners, appContext, normalizedConfig);
-                return [
-                  2
-                ];
-              });
-            });
-            return function(err) {
-              return _ref2.apply(this, arguments);
-            };
-          }());
+            printInstructions(hookRunners, appContext, normalizedConfig);
+          });
           return [
             3,
-            8
+            9
           ];
-        case 6:
+        case 7:
           return [
             4,
             appContext.builder.startDevServer({
-              serverOptions
+              serverOptions,
+              initProdMiddlewares
             })
           ];
-        case 7:
+        case 8:
           server = _state.sent().server;
           setServer(server);
-          _state.label = 8;
-        case 8:
+          _state.label = 9;
+        case 9:
           return [
             2
           ];