@modern-js/plugin-testing 2.48.6 → 2.49.0

package/dist/cjs/cli/bff/app.js

@@ -1,7 +1,9 @@
 "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)
@@ -15,6 +17,14 @@ 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 app_exports = {};
 __export(app_exports, {
@@ -25,36 +35,39 @@ __export(app_exports, {
 });
 module.exports = __toCommonJS(app_exports);
 var import_async_hooks = require("async_hooks");
+var import_node_path = __toESM(require("node:path"));
 var import_prod_server = require("@modern-js/prod-server");
 const store = new import_async_hooks.AsyncLocalStorage();
 const isInHandler = () => Boolean(store.getStore());
-let server = null;
+let server;
 const createApp = async (pwd, config, plugins, routes) => {
   if (!server) {
     config.output.path = "./";
-    server = new import_prod_server.Server({
-      apiOnly: true,
+    server = await (0, import_prod_server.createProdServer)({
       pwd,
       config,
       internalPlugins: plugins,
-      routes
+      routes,
+      appContext: {
+        apiDirectory: import_node_path.default.join(pwd, "api"),
+        lambdaDirectory: import_node_path.default.join(pwd, "api", "lambda")
+      }
     });
-    await server.init();
   }
-  const app = server.getRequestHandler();
+  const app = server.getRequestListener();
   return app;
 };
 const getApp = () => {
   if (!server) {
     throw new Error("please createApp first");
   }
-  return server.getRequestHandler();
+  return server.getRequestListener();
 };
 const closeServer = async () => {
   if (!server) {
     throw new Error("please createApp first");
   }
-  await server.close();
+  server.close();
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/cli/bff/index.js

@@ -32,15 +32,14 @@ __export(bff_exports, {
   testingBffPlugin: () => testingBffPlugin
 });
 module.exports = __toCommonJS(bff_exports);
-var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_base = require("../../base");
 var import_constant = require("./constant");
 var import_utils2 = require("./utils");
-const setJestConfigForBFF = async ({ pwd, userConfig, plugins, routes, utils }) => {
+const setJestConfigForBFF = async ({ pwd, userConfig, plugins, routes, utils, appContext }) => {
   var _userConfig_source;
   const bffConfig = {
-    rootDir: import_path.default.join(pwd, "./api"),
+    rootDir: appContext.apiDirectory,
     setupFilesAfterEnv: [
       require.resolve("./setup")
     ],
@@ -56,7 +55,8 @@ const setJestConfigForBFF = async ({ pwd, userConfig, plugins, routes, utils })
         appDir: pwd,
         modernUserConfig: userConfig,
         plugins,
-        routes
+        routes,
+        appContext
       }
     }
   };
@@ -140,7 +140,8 @@ const testingBffPlugin = () => ({
           routes: appContext.serverRoutes,
           // Todo need use collect server internalPlugins
           plugins: appContext.serverInternalPlugins,
-          utils
+          utils,
+          appContext
         });
         return next(utils);
       }

package/dist/esm/cli/bff/app.js

@@ -1,12 +1,13 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { AsyncLocalStorage } from "async_hooks";
-import { Server } from "@modern-js/prod-server";
+import path from "node:path";
+import { createProdServer } from "@modern-js/prod-server";
 var store = new AsyncLocalStorage();
 var isInHandler = function() {
   return Boolean(store.getStore());
 };
-var server = null;
+var server;
 var createApp = function() {
   var _ref = _async_to_generator(function(pwd, config, plugins, routes) {
     var app;
@@ -19,22 +20,24 @@ var createApp = function() {
               2
             ];
           config.output.path = "./";
-          server = new Server({
-            apiOnly: true,
-            pwd,
-            config,
-            internalPlugins: plugins,
-            routes
-          });
           return [
             4,
-            server.init()
+            createProdServer({
+              pwd,
+              config,
+              internalPlugins: plugins,
+              routes,
+              appContext: {
+                apiDirectory: path.join(pwd, "api"),
+                lambdaDirectory: path.join(pwd, "api", "lambda")
+              }
+            })
           ];
         case 1:
-          _state.sent();
+          server = _state.sent();
           _state.label = 2;
         case 2:
-          app = server.getRequestHandler();
+          app = server.getRequestListener();
           return [
             2,
             app
@@ -50,26 +53,18 @@ var getApp = function() {
   if (!server) {
     throw new Error("please createApp first");
   }
-  return server.getRequestHandler();
+  return server.getRequestListener();
 };
 var closeServer = function() {
   var _ref = _async_to_generator(function() {
     return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          if (!server) {
-            throw new Error("please createApp first");
-          }
-          return [
-            4,
-            server.close()
-          ];
-        case 1:
-          _state.sent();
-          return [
-            2
-          ];
+      if (!server) {
+        throw new Error("please createApp first");
       }
+      server.close();
+      return [
+        2
+      ];
     });
   });
   return function closeServer2() {

package/dist/esm/cli/bff/index.js

@@ -2,20 +2,19 @@ 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 _ts_generator } from "@swc/helpers/_/_ts_generator";
-import path from "path";
 import { isApiOnly } from "@modern-js/utils";
 import { getModuleNameMapper, DEFAULT_RESOLVER_PATH } from "../../base";
 import { bff_info_key } from "./constant";
 import { isBFFProject } from "./utils";
 var setJestConfigForBFF = function() {
   var _ref = _async_to_generator(function(param) {
-    var pwd, userConfig, plugins, routes, utils, _userConfig_source, bffConfig, jestConfig, alias, aliasMapper, moduleNameMapper, transform, apiOnly, mergedModuleNameMapper, resolver, configFields, commonConfig;
+    var pwd, userConfig, plugins, routes, utils, appContext, _userConfig_source, bffConfig, jestConfig, alias, aliasMapper, moduleNameMapper, transform, apiOnly, mergedModuleNameMapper, resolver, configFields, commonConfig;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          pwd = param.pwd, userConfig = param.userConfig, plugins = param.plugins, routes = param.routes, utils = param.utils;
+          pwd = param.pwd, userConfig = param.userConfig, plugins = param.plugins, routes = param.routes, utils = param.utils, appContext = param.appContext;
           bffConfig = {
-            rootDir: path.join(pwd, "./api"),
+            rootDir: appContext.apiDirectory,
             setupFilesAfterEnv: [
               require.resolve("./setup")
             ],
@@ -30,7 +29,8 @@ var setJestConfigForBFF = function() {
               appDir: pwd,
               modernUserConfig: userConfig,
               plugins,
-              routes
+              routes,
+              appContext
             })
           };
           jestConfig = utils.jestConfig;
@@ -131,7 +131,8 @@ var testingBffPlugin = function() {
                       routes: appContext.serverRoutes,
                       // Todo need use collect server internalPlugins
                       plugins: appContext.serverInternalPlugins,
-                      utils
+                      utils,
+                      appContext
                     })
                   ];
                 case 1:

package/dist/esm-node/cli/bff/app.js

@@ -1,34 +1,37 @@
 import { AsyncLocalStorage } from "async_hooks";
-import { Server } from "@modern-js/prod-server";
+import path from "node:path";
+import { createProdServer } from "@modern-js/prod-server";
 const store = new AsyncLocalStorage();
 const isInHandler = () => Boolean(store.getStore());
-let server = null;
+let server;
 const createApp = async (pwd, config, plugins, routes) => {
   if (!server) {
     config.output.path = "./";
-    server = new Server({
-      apiOnly: true,
+    server = await createProdServer({
       pwd,
       config,
       internalPlugins: plugins,
-      routes
+      routes,
+      appContext: {
+        apiDirectory: path.join(pwd, "api"),
+        lambdaDirectory: path.join(pwd, "api", "lambda")
+      }
     });
-    await server.init();
   }
-  const app = server.getRequestHandler();
+  const app = server.getRequestListener();
   return app;
 };
 const getApp = () => {
   if (!server) {
     throw new Error("please createApp first");
   }
-  return server.getRequestHandler();
+  return server.getRequestListener();
 };
 const closeServer = async () => {
   if (!server) {
     throw new Error("please createApp first");
   }
-  await server.close();
+  server.close();
 };
 export {
   closeServer,

package/dist/esm-node/cli/bff/index.js

@@ -1,12 +1,11 @@
-import path from "path";
 import { isApiOnly } from "@modern-js/utils";
 import { getModuleNameMapper, DEFAULT_RESOLVER_PATH } from "../../base";
 import { bff_info_key } from "./constant";
 import { isBFFProject } from "./utils";
-const setJestConfigForBFF = async ({ pwd, userConfig, plugins, routes, utils }) => {
+const setJestConfigForBFF = async ({ pwd, userConfig, plugins, routes, utils, appContext }) => {
   var _userConfig_source;
   const bffConfig = {
-    rootDir: path.join(pwd, "./api"),
+    rootDir: appContext.apiDirectory,
     setupFilesAfterEnv: [
       require.resolve("./setup")
     ],
@@ -22,7 +21,8 @@ const setJestConfigForBFF = async ({ pwd, userConfig, plugins, routes, utils })
         appDir: pwd,
         modernUserConfig: userConfig,
         plugins,
-        routes
+        routes,
+        appContext
       }
     }
   };
@@ -106,7 +106,8 @@ const testingBffPlugin = () => ({
           routes: appContext.serverRoutes,
           // Todo need use collect server internalPlugins
           plugins: appContext.serverInternalPlugins,
-          utils
+          utils,
+          appContext
         });
         return next(utils);
       }

package/dist/types/cli/bff/app.d.ts

@@ -1,9 +1,7 @@
 /// <reference types="node" />
-/// <reference types="node/http" />
-/// <reference types="@modern-js/prod-server/src/type" />
 import { InternalPlugins } from '@modern-js/types';
 export declare const isInHandler: () => boolean;
-declare const createApp: (pwd: string, config: any, plugins: InternalPlugins, routes: any[]) => Promise<(req: import("http").IncomingMessage, res: import("http").ServerResponse, next?: (() => void) | undefined) => void>;
-declare const getApp: () => (req: import("http").IncomingMessage, res: import("http").ServerResponse, next?: (() => void) | undefined) => void;
+declare const createApp: (pwd: string, config: any, plugins: InternalPlugins, routes: any[]) => Promise<(req: import("http").IncomingMessage, res: import("http").ServerResponse) => Promise<void>>;
+declare const getApp: () => (req: import("http").IncomingMessage, res: import("http").ServerResponse) => Promise<void>;
 declare const closeServer: () => Promise<void>;
 export { createApp, getApp, closeServer };

package/dist/types/cli/bff/index.d.ts

@@ -1,14 +1,15 @@
-import type { CliPlugin } from '@modern-js/core';
+import type { CliPlugin, IAppContext } from '@modern-js/core';
 import { InternalPlugins } from '@modern-js/types';
 import { UserConfig } from '../../base/config';
 import { TestConfigOperator } from '../../base';
 import type { Hooks } from '../../base/hook';
-export declare const setJestConfigForBFF: ({ pwd, userConfig, plugins, routes, utils, }: {
+export declare const setJestConfigForBFF: ({ pwd, userConfig, plugins, routes, utils, appContext, }: {
     pwd: string;
     userConfig: any;
     plugins: InternalPlugins;
     routes: any[];
     utils: TestConfigOperator;
+    appContext: IAppContext;
 }) => Promise<void>;
 export declare const testingBffPlugin: () => CliPlugin<{
     hooks: Hooks;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.48.6",
+  "version": "2.49.0",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -116,7 +116,7 @@
     "@modern-js-reduck/plugin-effects": "^1.1.10",
     "@modern-js-reduck/plugin-immutable": "^1.1.10",
     "@modern-js-reduck/store": "^1.1.10",
-    "@rsbuild/babel-preset": "0.6.1",
+    "@rsbuild/babel-preset": "0.6.3",
     "@testing-library/jest-dom": "^5.16.1",
     "@testing-library/react": "^13.4.0",
     "@types/testing-library__jest-dom": "^5.14.3",
@@ -131,17 +131,17 @@
     "ts-jest": "^29.1.0",
     "yargs": "^17.0.1",
     "@swc/helpers": "0.5.3",
-    "@modern-js/babel-compiler": "2.48.6",
-    "@modern-js/utils": "2.48.6",
-    "@modern-js/plugin": "2.48.6",
-    "@modern-js/types": "2.48.6",
-    "@modern-js/bff-core": "2.48.6",
-    "@modern-js/prod-server": "2.48.6"
+    "@modern-js/babel-compiler": "2.49.0",
+    "@modern-js/plugin": "2.49.0",
+    "@modern-js/types": "2.49.0",
+    "@modern-js/utils": "2.49.0",
+    "@modern-js/prod-server": "2.49.0",
+    "@modern-js/bff-core": "2.49.0"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17",
-    "@modern-js/runtime": "^2.48.6"
+    "@modern-js/runtime": "^2.49.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -156,10 +156,10 @@
     "@types/node": "^14",
     "@types/yargs": "^17.0.2",
     "typescript": "^5",
-    "@modern-js/core": "2.48.6",
-    "@modern-js/runtime": "2.48.6",
-    "@scripts/build": "2.48.6",
-    "@scripts/jest-config": "2.48.6"
+    "@modern-js/core": "2.49.0",
+    "@modern-js/runtime": "2.49.0",
+    "@scripts/build": "2.49.0",
+    "@scripts/jest-config": "2.49.0"
   },
   "sideEffects": false,
   "publishConfig": {