@modern-js/app-tools 2.48.5 → 2.49.0

package/dist/esm/commands/serve.js

@@ -3,20 +3,19 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { logger, isApiOnly, getTargetDir } from "@modern-js/utils";
-import server from "@modern-js/prod-server";
+import { createProdServer } from "@modern-js/prod-server";
 import { printInstructions } from "../utils/printInstructions";
-import { injectDataLoaderPlugin } from "../utils/createServer";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 var start = function() {
   var _ref = _async_to_generator(function(api) {
-    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, metaName, apiOnly, serverInternalPlugins, app;
+    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hookRunners, distDirectory, appDirectory, port, serverConfigFile, metaName, serverRoutes, apiOnly, runMode, serverInternalPlugins, app;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           appContext = api.useAppContext();
           userConfig = api.useResolvedConfigContext();
           hookRunners = api.useHookRunners();
-          appDirectory = appContext.appDirectory, port = appContext.port, serverConfigFile = appContext.serverConfigFile, metaName = appContext.metaName;
+          distDirectory = appContext.distDirectory, appDirectory = appContext.appDirectory, port = appContext.port, serverConfigFile = appContext.serverConfigFile, metaName = appContext.metaName, serverRoutes = appContext.serverRoutes;
           logger.info("Starting production server...");
           return [
             4,
@@ -24,6 +23,9 @@ var start = function() {
           ];
         case 1:
           apiOnly = _state.sent();
+          if (apiOnly) {
+            runMode = "apiOnly";
+          }
           return [
             4,
             getServerInternalPlugins(api)
@@ -32,51 +34,45 @@ var start = function() {
           serverInternalPlugins = _state.sent();
           return [
             4,
-            server({
-              pwd: appDirectory,
+            createProdServer({
+              metaName,
+              pwd: distDirectory,
               config: _object_spread_props(_object_spread({}, userConfig), {
                 dev: userConfig.dev,
                 output: _object_spread({
                   path: (_userConfig_output_distPath = userConfig.output.distPath) === null || _userConfig_output_distPath === void 0 ? void 0 : _userConfig_output_distPath.root
                 }, userConfig.output || {})
               }),
+              routes: serverRoutes,
               appContext: {
-                metaName,
+                appDirectory,
                 sharedDirectory: getTargetDir(appContext.sharedDirectory, appContext.appDirectory, appContext.distDirectory),
                 apiDirectory: getTargetDir(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),
                 lambdaDirectory: getTargetDir(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory)
               },
               serverConfigFile,
-              internalPlugins: injectDataLoaderPlugin(serverInternalPlugins),
-              apiOnly
+              internalPlugins: serverInternalPlugins,
+              runMode
             })
           ];
         case 3:
           app = _state.sent();
-          app.listen(port, function() {
-            var _ref2 = _async_to_generator(function(err) {
-              return _ts_generator(this, function(_state2) {
-                switch (_state2.label) {
-                  case 0:
-                    if (err) {
-                      throw err;
-                    }
-                    return [
-                      4,
-                      printInstructions(hookRunners, appContext, userConfig)
-                    ];
-                  case 1:
-                    _state2.sent();
-                    return [
-                      2
-                    ];
-                }
-              });
+          app.listen(port, /* @__PURE__ */ _async_to_generator(function() {
+            return _ts_generator(this, function(_state2) {
+              switch (_state2.label) {
+                case 0:
+                  return [
+                    4,
+                    printInstructions(hookRunners, appContext, userConfig)
+                  ];
+                case 1:
+                  _state2.sent();
+                  return [
+                    2
+                  ];
+              }
             });
-            return function(err) {
-              return _ref2.apply(this, arguments);
-            };
-          }());
+          }));
           return [
             2
           ];

package/dist/esm/utils/createServer.js

@@ -1,8 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { Server } from "@modern-js/server";
+import { createDevServer } from "@modern-js/server";
+import { initProdMiddlewares } from "@modern-js/prod-server";
 var server = null;
 var getServer = function() {
   return server;
@@ -13,26 +12,13 @@ var setServer = function(newServer) {
 var closeServer = function() {
   var _ref = _async_to_generator(function() {
     return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          if (!server)
-            return [
-              3,
-              2
-            ];
-          return [
-            4,
-            server.close()
-          ];
-        case 1:
-          _state.sent();
-          server = null;
-          _state.label = 2;
-        case 2:
-          return [
-            2
-          ];
+      if (server) {
+        server.close();
+        server = null;
       }
+      return [
+        2
+      ];
     });
   });
   return function closeServer2() {
@@ -41,33 +27,21 @@ var closeServer = function() {
 }();
 var createServer = function() {
   var _ref = _async_to_generator(function(options) {
-    var app;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          if (!server)
-            return [
-              3,
-              2
-            ];
+          if (server) {
+            server.close();
+          }
           return [
             4,
-            server.close()
+            createDevServer(options, initProdMiddlewares)
           ];
         case 1:
-          _state.sent();
-          _state.label = 2;
-        case 2:
-          server = new Server(options);
-          return [
-            4,
-            server.init()
-          ];
-        case 3:
-          app = _state.sent();
+          server = _state.sent();
           return [
             2,
-            app
+            server
           ];
       }
     });
@@ -76,19 +50,9 @@ var createServer = function() {
     return _ref.apply(this, arguments);
   };
 }();
-var injectDataLoaderPlugin = function(internalPlugins) {
-  var DataLoaderPlugin = require.resolve("@modern-js/plugin-data-loader/server");
-  return _object_spread_props(_object_spread({}, internalPlugins), {
-    "@modern-js/plugin-data-loader": {
-      path: DataLoaderPlugin,
-      forced: true
-    }
-  });
-};
 export {
   closeServer,
   createServer,
   getServer,
-  injectDataLoaderPlugin,
   setServer
 };

package/dist/esm/utils/env.js

@@ -1,4 +1,4 @@
-import { cutNameByHyphen } from "@modern-js/utils";
+import { cutNameByHyphen } from "@modern-js/utils/universal";
 function getAutoInjectEnv(appContext) {
   var metaName = appContext.metaName;
   var prefix = "".concat(cutNameByHyphen(metaName), "_").toUpperCase();

package/dist/esm/utils/register.js

@@ -0,0 +1,129 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+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 { fs, getAliasConfig, readTsConfigByFile } from "@modern-js/utils";
+var registerCompiler = function() {
+  var _ref = _async_to_generator(function() {
+    var appDir, distDir, alias, TS_CONFIG_FILENAME, tsconfigPath, isTsProject, aliasConfig, _aliasConfig_paths, paths, _aliasConfig_absoluteBaseUrl, absoluteBaseUrl, tsPaths, tsConfig, tsNode, tsNodeOptions, error, esbuildRegister, tsConfigPaths, loaderRes;
+    var _arguments = arguments;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          appDir = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : process.cwd(), distDir = _arguments.length > 1 ? _arguments[1] : void 0, alias = _arguments.length > 2 ? _arguments[2] : void 0;
+          TS_CONFIG_FILENAME = "tsconfig.json";
+          tsconfigPath = path.resolve(appDir, TS_CONFIG_FILENAME);
+          return [
+            4,
+            fs.pathExists(tsconfigPath)
+          ];
+        case 1:
+          isTsProject = _state.sent();
+          aliasConfig = getAliasConfig(alias, {
+            appDirectory: appDir,
+            tsconfigPath
+          });
+          _aliasConfig_paths = aliasConfig.paths, paths = _aliasConfig_paths === void 0 ? {} : _aliasConfig_paths, _aliasConfig_absoluteBaseUrl = aliasConfig.absoluteBaseUrl, absoluteBaseUrl = _aliasConfig_absoluteBaseUrl === void 0 ? "./" : _aliasConfig_absoluteBaseUrl;
+          tsPaths = Object.keys(paths).reduce(function(o, key) {
+            var tsPath = paths[key];
+            if (typeof tsPath === "string" && path.isAbsolute(tsPath)) {
+              tsPath = path.relative(absoluteBaseUrl, tsPath);
+            }
+            if (typeof tsPath === "string") {
+              tsPath = [
+                tsPath
+              ];
+            }
+            return _object_spread_props(_object_spread({}, o), _define_property({}, "".concat(key), tsPath));
+          }, {});
+          tsConfig = {};
+          if (isTsProject) {
+            tsConfig = readTsConfigByFile(tsconfigPath);
+          }
+          _state.label = 2;
+        case 2:
+          _state.trys.push([
+            2,
+            4,
+            ,
+            6
+          ]);
+          return [
+            4,
+            import("ts-node")
+          ];
+        case 3:
+          tsNode = _state.sent();
+          tsNodeOptions = tsConfig["ts-node"];
+          if (isTsProject) {
+            tsNode.register(_object_spread({
+              project: tsconfigPath,
+              scope: true,
+              // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
+              files: true,
+              transpileOnly: true,
+              ignore: [
+                "(?:^|/)node_modules/",
+                "(?:^|/)".concat(distDir, "/")
+              ]
+            }, tsNodeOptions));
+          }
+          return [
+            3,
+            6
+          ];
+        case 4:
+          error = _state.sent();
+          return [
+            4,
+            import("esbuild-register/dist/node")
+          ];
+        case 5:
+          esbuildRegister = _state.sent();
+          esbuildRegister.register({
+            tsconfigRaw: isTsProject ? tsConfig : void 0,
+            hookIgnoreNodeModules: true,
+            hookMatcher: function(fileName) {
+              return !fileName.startsWith(distDir);
+            }
+          });
+          return [
+            3,
+            6
+          ];
+        case 6:
+          return [
+            4,
+            import("@modern-js/utils/tsconfig-paths")
+          ];
+        case 7:
+          tsConfigPaths = _state.sent();
+          return [
+            4,
+            fs.pathExists(appDir)
+          ];
+        case 8:
+          if (_state.sent()) {
+            loaderRes = tsConfigPaths.loadConfig(appDir);
+            if (loaderRes.resultType === "success") {
+              tsConfigPaths.register({
+                baseUrl: absoluteBaseUrl || "./",
+                paths: tsPaths
+              });
+            }
+          }
+          return [
+            2
+          ];
+      }
+    });
+  });
+  return function registerCompiler2() {
+    return _ref.apply(this, arguments);
+  };
+}();
+export {
+  registerCompiler
+};

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

@@ -2,13 +2,16 @@ 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";
 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 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,24 +1,28 @@
 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";
 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 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
   };
   ResolvedConfigContext.set(normalizedConfig);
-  const { appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName } = appContext;
+  const { appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes } = appContext;
   await buildServerConfig({
     appDirectory,
     distDirectory,
@@ -32,6 +36,7 @@ const dev = async (api, options, devServerOptions = {}) => {
   await generateRoutes(appContext);
   const serverInternalPlugins = await getServerInternalPlugins(api);
   const serverOptions = {
+    metaName,
     dev: {
       port,
       https: normalizedConfig.dev.https,
@@ -39,37 +44,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: injectDataLoaderPlugin(serverInternalPlugins),
+    internalPlugins: serverInternalPlugins,
     ...devServerOptions
   };
   if (apiOnly) {
     var _normalizedConfig_dev;
-    const app = await createServer({
-      ...serverOptions,
-      compiler: null
-    });
+    const app = await createDevServer(serverOptions, initProdMiddlewares);
     const host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || DEFAULT_DEV_HOST;
     app.listen({
       port,
       host
-    }, async (err) => {
-      if (err) {
-        throw err;
-      }
+    }, () => {
       printInstructions(hookRunners, appContext, normalizedConfig);
     });
   } else {
     const { server } = await appContext.builder.startDevServer({
-      serverOptions
+      serverOptions,
+      initProdMiddlewares
     });
     setServer(server);
   }

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

@@ -1,19 +1,23 @@
 import { logger, isApiOnly, getTargetDir } from "@modern-js/utils";
-import server from "@modern-js/prod-server";
+import { createProdServer } from "@modern-js/prod-server";
 import { printInstructions } from "../utils/printInstructions";
-import { injectDataLoaderPlugin } from "../utils/createServer";
 import { getServerInternalPlugins } from "../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;
   logger.info(`Starting production server...`);
   const apiOnly = await 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 getServerInternalPlugins(api);
-  const app = await server({
-    pwd: appDirectory,
+  const app = await createProdServer({
+    metaName,
+    pwd: distDirectory,
     config: {
       ...userConfig,
       dev: userConfig.dev,
@@ -22,20 +26,18 @@ const start = async (api) => {
         ...userConfig.output || {}
       }
     },
+    routes: serverRoutes,
     appContext: {
-      metaName,
+      appDirectory,
       sharedDirectory: getTargetDir(appContext.sharedDirectory, appContext.appDirectory, appContext.distDirectory),
       apiDirectory: getTargetDir(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),
       lambdaDirectory: getTargetDir(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory)
     },
     serverConfigFile,
-    internalPlugins: injectDataLoaderPlugin(serverInternalPlugins),
-    apiOnly
+    internalPlugins: serverInternalPlugins,
+    runMode
   });
-  app.listen(port, async (err) => {
-    if (err) {
-      throw err;
-    }
+  app.listen(port, async () => {
     await printInstructions(hookRunners, appContext, userConfig);
   });
 };

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

@@ -1,4 +1,5 @@
-import { Server } from "@modern-js/server";
+import { createDevServer } from "@modern-js/server";
+import { initProdMiddlewares } from "@modern-js/prod-server";
 let server = null;
 const getServer = () => server;
 const setServer = (newServer) => {
@@ -6,32 +7,20 @@ 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 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 createDevServer(options, initProdMiddlewares);
+  return server;
 };
 export {
   closeServer,
   createServer,
   getServer,
-  injectDataLoaderPlugin,
   setServer
 };

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

@@ -1,4 +1,4 @@
-import { cutNameByHyphen } from "@modern-js/utils";
+import { cutNameByHyphen } from "@modern-js/utils/universal";
 function getAutoInjectEnv(appContext) {
   const { metaName } = appContext;
   const prefix = `${cutNameByHyphen(metaName)}_`.toUpperCase();

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

@@ -0,0 +1,69 @@
+import path from "node:path";
+import { fs, getAliasConfig, readTsConfigByFile } from "@modern-js/utils";
+const registerCompiler = async (appDir = process.cwd(), distDir, alias) => {
+  const TS_CONFIG_FILENAME = `tsconfig.json`;
+  const tsconfigPath = path.resolve(appDir, TS_CONFIG_FILENAME);
+  const isTsProject = await fs.pathExists(tsconfigPath);
+  const aliasConfig = 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" && path.isAbsolute(tsPath)) {
+      tsPath = path.relative(absoluteBaseUrl, tsPath);
+    }
+    if (typeof tsPath === "string") {
+      tsPath = [
+        tsPath
+      ];
+    }
+    return {
+      ...o,
+      [`${key}`]: tsPath
+    };
+  }, {});
+  let tsConfig = {};
+  if (isTsProject) {
+    tsConfig = readTsConfigByFile(tsconfigPath);
+  }
+  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/",
+          `(?:^|/)${distDir}/`
+        ],
+        ...tsNodeOptions
+      });
+    }
+  } catch (error) {
+    const esbuildRegister = await import("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");
+  if (await fs.pathExists(appDir)) {
+    const loaderRes = tsConfigPaths.loadConfig(appDir);
+    if (loaderRes.resultType === "success") {
+      tsConfigPaths.register({
+        baseUrl: absoluteBaseUrl || "./",
+        paths: tsPaths
+      });
+    }
+  }
+};
+export {
+  registerCompiler
+};

package/dist/types/utils/createServer.d.ts

@@ -1,12 +1,7 @@
-import { Server, ModernDevServerOptions } from '@modern-js/server';
-import type { InternalPlugins } from '@modern-js/types';
-export declare const getServer: () => Server | null;
+/// <reference types="node" />
+import type { Server } from 'node:http';
+import { ModernDevServerOptions } from '@modern-js/server';
+export declare const getServer: () => Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | null;
 export declare const setServer: (newServer: Server) => void;
 export declare const closeServer: () => Promise<void>;
 export declare const createServer: (options: ModernDevServerOptions) => Promise<Server>;
-export declare const injectDataLoaderPlugin: (internalPlugins: InternalPlugins) => {
-    '@modern-js/plugin-data-loader': {
-        path: string;
-        forced: boolean;
-    };
-};

package/dist/types/utils/register.d.ts

@@ -0,0 +1,3 @@
+import { Alias } from '@modern-js/utils';
+import { ChainedConfig } from '@rsbuild/shared';
+export declare const registerCompiler: (appDir: string | undefined, distDir: string, alias?: ChainedConfig<Alias>) => Promise<void>;