@modern-js/app-tools 2.53.1-alpha.4 → 2.54.1-alpha.0

package/dist/cjs/plugins/serverBuild.js

@@ -37,8 +37,14 @@ var import_utils = require("@modern-js/utils");
 var import_server_utils = require("@modern-js/server-utils");
 const TS_CONFIG_FILENAME = "tsconfig.json";
 function checkHasCache(appDir) {
-  const tsFilepath = import_path.default.resolve(appDir, "server", "cache.ts");
-  const jsfilepath = import_path.default.resolve(appDir, "server", "cache.js");
+  const tsFilepath = import_path.default.resolve(appDir, import_utils.SERVER_DIR, "cache.ts");
+  const jsfilepath = import_path.default.resolve(appDir, import_utils.SERVER_DIR, "cache.js");
+  return import_fs.default.existsSync(tsFilepath) || import_fs.default.existsSync(jsfilepath);
+}
+function checkHasConfig(appDir, metaName = "modern-js") {
+  const meta = (0, import_utils.getMeta)(metaName);
+  const tsFilepath = import_path.default.resolve(appDir, import_utils.SERVER_DIR, `${meta}.server.ts`);
+  const jsfilepath = import_path.default.resolve(appDir, import_utils.SERVER_DIR, `${meta}.server.js`);
   return import_fs.default.existsSync(tsFilepath) || import_fs.default.existsSync(jsfilepath);
 }
 var serverBuild_default = () => ({
@@ -46,8 +52,8 @@ var serverBuild_default = () => ({
   setup(api) {
     return {
       async afterBuild() {
-        const { appDirectory, distDirectory } = api.useAppContext();
-        if (!checkHasCache(appDirectory)) {
+        const { appDirectory, distDirectory, metaName } = api.useAppContext();
+        if (!checkHasCache(appDirectory) && !checkHasConfig(appDirectory, metaName)) {
           return;
         }
         const modernConfig = api.useResolvedConfigContext();

package/dist/cjs/utils/createServer.js

@@ -41,7 +41,7 @@ const createServer = async (options) => {
   if (server) {
     server.close();
   }
-  server = await (0, import_server.createDevServer)(options, import_prod_server.initProdMiddlewares);
+  server = await (0, import_server.createDevServer)(options, import_prod_server.applyPlugins);
   return server;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/utils/{getServerInternalPlugins.js → loadPlugins.js}

@@ -16,24 +16,31 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var getServerInternalPlugins_exports = {};
-__export(getServerInternalPlugins_exports, {
-  getServerInternalPlugins: () => getServerInternalPlugins
+var loadPlugins_exports = {};
+__export(loadPlugins_exports, {
+  getServerPlugins: () => getServerPlugins,
+  loadServerPlugins: () => loadServerPlugins
 });
-module.exports = __toCommonJS(getServerInternalPlugins_exports);
-async function getServerInternalPlugins(api) {
-  const hookRunners = api.useHookRunners();
-  const { plugins: serverPlugins } = await hookRunners.collectServerPlugins({
+module.exports = __toCommonJS(loadPlugins_exports);
+var import_prod_server = require("@modern-js/prod-server");
+async function getServerPlugins(api) {
+  const runner = api.useHookRunners();
+  const { plugins } = await runner._internalServerPlugins({
     plugins: []
   });
-  const serverInternalPlugins = serverPlugins.reduce((result, plugin) => Object.assign(result, plugin), {});
   api.setAppContext({
     ...api.useAppContext(),
-    serverInternalPlugins
+    serverPlugins: plugins
   });
-  return serverInternalPlugins;
+  return plugins;
+}
+async function loadServerPlugins(api, appDirectory) {
+  const plugins = await getServerPlugins(api);
+  const instances = (0, import_prod_server.loadServerPlugins)(plugins, appDirectory);
+  return instances;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getServerInternalPlugins
+  getServerPlugins,
+  loadServerPlugins
 });

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

@@ -2,10 +2,13 @@ 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 { isHtmlDisabled, createVirtualModule } from "@rsbuild/shared";
+import { isHtmlDisabled } from "@rsbuild/shared";
 import { MAIN_ENTRY_NAME, getEntryOptions, removeTailSlash } from "@modern-js/utils";
 import { template as lodashTemplate } from "@modern-js/utils/lodash";
 import { BottomTemplatePlugin } from "../bundlerPlugins";
+var createVirtualModule = function(content) {
+  return "data:text/javascript,".concat(content);
+};
 var builderPluginAdapterHtml = function(options) {
   return {
     name: "builder-plugin-adapter-modern-html",

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

@@ -5,7 +5,7 @@ import { isHtmlDisabled } from "@rsbuild/shared";
 import { mergeRsbuildConfig } from "@rsbuild/core";
 import { fs, isUseSSRBundle } from "@modern-js/utils";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
-import { getServerCombinedModueFile } from "../../../analyze/utils";
+import { getServerCombinedModueFile } from "../../../plugins/analyze/utils";
 var builderPluginAdapterSSR = function(options) {
   return {
     name: "builder-plugin-adapter-modern-ssr",
@@ -180,7 +180,7 @@ function applyFilterEntriesBySSRConfig(param) {
   }
   var _ref = serverConfig || {}, ssr = _ref.ssr, ssrByEntries = _ref.ssrByEntries;
   entryNames.forEach(function(name) {
-    if (!ssgEntries.includes(name) && (ssr && (ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]) === false || !ssr && !(ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]))) {
+    if (!ssgEntries.includes(name) && !name.includes("server-loaders") && (ssr && (ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]) === false || !ssr && !(ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]))) {
       chain.entryPoints.delete(name);
     }
   });

package/dist/esm/commands/build.js

@@ -4,6 +4,7 @@ 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 { 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";
@@ -21,15 +22,21 @@ var build = function() {
           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)
+            loadServerPlugins(api, appContext.appDirectory)
           ];
         case 1:
+          _state.sent();
+          return [
+            4,
+            registerCompiler(appContext.appDirectory, appContext.distDirectory, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.alias)
+          ];
+        case 2:
           _state.sent();
           apiOnly = appContext.apiOnly;
           if (!apiOnly)
             return [
               3,
-              6
+              7
             ];
           appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverConfigFile = appContext.serverConfigFile;
           return [
@@ -39,7 +46,7 @@ var build = function() {
               bundlerConfigs: void 0
             })
           ];
-        case 2:
+        case 3:
           _state.sent();
           return [
             4,
@@ -49,13 +56,13 @@ var build = function() {
               configFile: serverConfigFile
             })
           ];
-        case 3:
+        case 4:
           _state.sent();
           return [
             4,
             generateRoutes(appContext)
           ];
-        case 4:
+        case 5:
           _state.sent();
           return [
             4,
@@ -64,12 +71,12 @@ var build = function() {
               stats: void 0
             })
           ];
-        case 5:
+        case 6:
           _state.sent();
           return [
             2
           ];
-        case 6:
+        case 7:
           resolvedConfig = _object_spread_props(_object_spread({}, resolvedConfig), {
             cliOptions: options
           });
@@ -83,7 +90,7 @@ var build = function() {
               configFile: serverConfigFile1
             })
           ];
-        case 7:
+        case 8:
           _state.sent();
           logger.info("Starting production build...");
           if (!appContext.builder) {
@@ -93,7 +100,7 @@ var build = function() {
             4,
             appContext.builder.build()
           ];
-        case 8:
+        case 9:
           _state.sent();
           return [
             2

package/dist/esm/commands/deploy.js

@@ -1,6 +1,6 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
+import { getServerPlugins } from "../utils/loadPlugins";
 var deploy = function() {
   var _ref = _async_to_generator(function(api, options) {
     var hookRunners;
@@ -10,7 +10,7 @@ var deploy = function() {
           hookRunners = api.useHookRunners();
           return [
             4,
-            getServerInternalPlugins(api)
+            getServerPlugins(api)
           ];
         case 1:
           _state.sent();

package/dist/esm/commands/dev.js

@@ -2,19 +2,20 @@ 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 path from "node:path";
 import { ResolvedConfigContext } from "@modern-js/core";
-import { DEFAULT_DEV_HOST } from "@modern-js/utils";
+import { DEFAULT_DEV_HOST, SERVER_DIR, getMeta } from "@modern-js/utils";
 import { createDevServer } from "@modern-js/server";
-import { initProdMiddlewares } from "@modern-js/prod-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";
-import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 var dev = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var devServerOptions, _normalizedConfig_source, _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes, serverInternalPlugins, serverOptions, _normalizedConfig_dev, app, host, server;
+    var devServerOptions, _normalizedConfig_source, _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, 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) {
@@ -48,6 +49,8 @@ var dev = function() {
           ];
         case 2:
           _state.sent();
+          meta = getMeta(metaName);
+          serverConfigPath = path.resolve(appDirectory, SERVER_DIR, "".concat(meta, ".server"));
           return [
             4,
             hookRunners.beforeDev()
@@ -65,10 +68,10 @@ var dev = function() {
           _state.sent();
           return [
             4,
-            getServerInternalPlugins(api)
+            loadServerPlugins(api, appDirectory)
           ];
         case 5:
-          serverInternalPlugins = _state.sent();
+          pluginInstances = _state.sent();
           serverOptions = _object_spread({
             metaName,
             dev: _object_spread({
@@ -82,11 +85,12 @@ var dev = function() {
               lambdaDirectory: appContext.lambdaDirectory,
               sharedDirectory: appContext.sharedDirectory
             },
+            serverConfigPath,
             routes: serverRoutes,
             pwd: appDirectory,
             config: normalizedConfig,
             serverConfigFile,
-            internalPlugins: serverInternalPlugins
+            plugins: pluginInstances
           }, devServerOptions);
           if (!apiOnly)
             return [
@@ -95,7 +99,7 @@ var dev = function() {
             ];
           return [
             4,
-            createDevServer(serverOptions, initProdMiddlewares)
+            createDevServer(serverOptions, applyPlugins)
           ];
         case 6:
           app = _state.sent();
@@ -115,7 +119,7 @@ var dev = function() {
             4,
             appContext.builder.startDevServer({
               serverOptions,
-              initProdMiddlewares
+              applyPlugins
             })
           ];
         case 8: