@modern-js/plugin-testing 2.52.0 → 2.54.0

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

@@ -43,10 +43,11 @@ let server;
 const createApp = async (pwd, config, plugins, routes) => {
   if (!server) {
     config.output.path = "./";
+    const pluginInstances = (0, import_prod_server.loadServerPlugins)(plugins, pwd);
     server = await (0, import_prod_server.createProdServer)({
       pwd,
       config,
-      internalPlugins: plugins,
+      plugins: pluginInstances,
       routes,
       appContext: {
         apiDirectory: import_node_path.default.join(pwd, "api"),

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

@@ -138,8 +138,7 @@ const testingBffPlugin = () => ({
           pwd,
           userConfig,
           routes: appContext.serverRoutes,
-          // Todo need use collect server internalPlugins
-          plugins: appContext.serverInternalPlugins,
+          plugins: appContext.serverPlugins,
           utils,
           appContext
         });

package/dist/cjs/cli/test.js

@@ -35,9 +35,17 @@ var import_path = __toESM(require("path"));
 var import_babel_compiler = require("@modern-js/babel-compiler");
 var import_base = require("../base");
 const test = async (api) => {
-  var _userConfig_tools, _userConfig_tools1;
+  var _runner__internalServerPlugins, _userConfig_tools, _userConfig_tools1;
   const userConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
+  const runner = api.useHookRunners();
+  const { plugins = [] } = await ((_runner__internalServerPlugins = runner._internalServerPlugins) === null || _runner__internalServerPlugins === void 0 ? void 0 : _runner__internalServerPlugins.call(runner, {
+    plugins: []
+  })) || {};
+  api.setAppContext({
+    ...api.useAppContext(),
+    serverPlugins: plugins
+  });
   userConfig.testing = userConfig.testing || {};
   const jest = userConfig.testing.jest || (userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_tools = userConfig.tools) === null || _userConfig_tools === void 0 ? void 0 : _userConfig_tools.jest);
   if (Array.isArray(jest)) {

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

@@ -2,7 +2,7 @@ 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 path from "node:path";
-import { createProdServer } from "@modern-js/prod-server";
+import { createProdServer, loadServerPlugins } from "@modern-js/prod-server";
 var store = new AsyncLocalStorage();
 var isInHandler = function() {
   return Boolean(store.getStore());
@@ -10,7 +10,7 @@ var isInHandler = function() {
 var server;
 var createApp = function() {
   var _ref = _async_to_generator(function(pwd, config, plugins, routes) {
-    var app;
+    var pluginInstances, app;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -20,12 +20,13 @@ var createApp = function() {
               2
             ];
           config.output.path = "./";
+          pluginInstances = loadServerPlugins(plugins, pwd);
           return [
             4,
             createProdServer({
               pwd,
               config,
-              internalPlugins: plugins,
+              plugins: pluginInstances,
               routes,
               appContext: {
                 apiDirectory: path.join(pwd, "api"),

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

@@ -129,8 +129,7 @@ var testingBffPlugin = function() {
                       pwd,
                       userConfig,
                       routes: appContext.serverRoutes,
-                      // Todo need use collect server internalPlugins
-                      plugins: appContext.serverInternalPlugins,
+                      plugins: appContext.serverPlugins,
                       utils,
                       appContext
                     })

package/dist/esm/cli/test.js

@@ -1,16 +1,30 @@
 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 "path";
 import { compiler } from "@modern-js/babel-compiler";
 import { runTest } from "../base";
 var test = function() {
   var _ref = _async_to_generator(function(api) {
-    var _userConfig_tools, _userConfig_tools1, userConfig, appContext, jest, runtimeExportsPath;
+    var _runner__internalServerPlugins, _userConfig_tools, _userConfig_tools1, userConfig, appContext, runner, _ref2, _ref_plugins, plugins, jest, runtimeExportsPath;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           userConfig = api.useResolvedConfigContext();
           appContext = api.useAppContext();
+          runner = api.useHookRunners();
+          return [
+            4,
+            (_runner__internalServerPlugins = runner._internalServerPlugins) === null || _runner__internalServerPlugins === void 0 ? void 0 : _runner__internalServerPlugins.call(runner, {
+              plugins: []
+            })
+          ];
+        case 1:
+          _ref2 = _state.sent() || {}, _ref_plugins = _ref2.plugins, plugins = _ref_plugins === void 0 ? [] : _ref_plugins;
+          api.setAppContext(_object_spread_props(_object_spread({}, api.useAppContext()), {
+            serverPlugins: plugins
+          }));
           userConfig.testing = userConfig.testing || {};
           jest = userConfig.testing.jest || (userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_tools = userConfig.tools) === null || _userConfig_tools === void 0 ? void 0 : _userConfig_tools.jest);
           if (Array.isArray(jest)) {
@@ -36,13 +50,13 @@ var test = function() {
               ]
             })
           ];
-        case 1:
+        case 2:
           _state.sent();
           return [
             4,
             runTest(api, userConfig.testing)
           ];
-        case 2:
+        case 3:
           _state.sent();
           return [
             2

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

@@ -1,16 +1,17 @@
 import { AsyncLocalStorage } from "async_hooks";
 import path from "node:path";
-import { createProdServer } from "@modern-js/prod-server";
+import { createProdServer, loadServerPlugins } from "@modern-js/prod-server";
 const store = new AsyncLocalStorage();
 const isInHandler = () => Boolean(store.getStore());
 let server;
 const createApp = async (pwd, config, plugins, routes) => {
   if (!server) {
     config.output.path = "./";
+    const pluginInstances = loadServerPlugins(plugins, pwd);
     server = await createProdServer({
       pwd,
       config,
-      internalPlugins: plugins,
+      plugins: pluginInstances,
       routes,
       appContext: {
         apiDirectory: path.join(pwd, "api"),

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

@@ -104,8 +104,7 @@ const testingBffPlugin = () => ({
           pwd,
           userConfig,
           routes: appContext.serverRoutes,
-          // Todo need use collect server internalPlugins
-          plugins: appContext.serverInternalPlugins,
+          plugins: appContext.serverPlugins,
           utils,
           appContext
         });

package/dist/esm-node/cli/test.js

@@ -2,9 +2,17 @@ import path from "path";
 import { compiler } from "@modern-js/babel-compiler";
 import { runTest } from "../base";
 const test = async (api) => {
-  var _userConfig_tools, _userConfig_tools1;
+  var _runner__internalServerPlugins, _userConfig_tools, _userConfig_tools1;
   const userConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
+  const runner = api.useHookRunners();
+  const { plugins = [] } = await ((_runner__internalServerPlugins = runner._internalServerPlugins) === null || _runner__internalServerPlugins === void 0 ? void 0 : _runner__internalServerPlugins.call(runner, {
+    plugins: []
+  })) || {};
+  api.setAppContext({
+    ...api.useAppContext(),
+    serverPlugins: plugins
+  });
   userConfig.testing = userConfig.testing || {};
   const jest = userConfig.testing.jest || (userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_tools = userConfig.tools) === null || _userConfig_tools === void 0 ? void 0 : _userConfig_tools.jest);
   if (Array.isArray(jest)) {

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import { InternalPlugins } from '@modern-js/types';
+import { ServerPlugin } 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) => Promise<void>>;
+declare const createApp: (pwd: string, config: any, plugins: ServerPlugin[], 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,12 +1,12 @@
 import type { CliPlugin, IAppContext } from '@modern-js/core';
-import { InternalPlugins } from '@modern-js/types';
+import { ServerPlugin } from '@modern-js/prod-server';
 import { UserConfig } from '../../base/config';
 import { TestConfigOperator } from '../../base';
 import type { Hooks } from '../../base/hook';
 export declare const setJestConfigForBFF: ({ pwd, userConfig, plugins, routes, utils, appContext, }: {
     pwd: string;
     userConfig: any;
-    plugins: InternalPlugins;
+    plugins: ServerPlugin[];
     routes: any[];
     utils: TestConfigOperator;
     appContext: IAppContext;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.52.0",
+  "version": "2.54.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.7.3",
+    "@rsbuild/babel-preset": "0.7.9",
     "@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.52.0",
-    "@modern-js/utils": "2.52.0",
-    "@modern-js/prod-server": "2.52.0",
-    "@modern-js/plugin": "2.52.0",
-    "@modern-js/types": "2.52.0",
-    "@modern-js/bff-core": "2.52.0"
+    "@modern-js/babel-compiler": "2.54.0",
+    "@modern-js/utils": "2.54.0",
+    "@modern-js/prod-server": "2.54.0",
+    "@modern-js/plugin": "2.54.0",
+    "@modern-js/bff-core": "2.54.0",
+    "@modern-js/types": "2.54.0"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17",
-    "@modern-js/runtime": "^2.52.0"
+    "@modern-js/runtime": "^2.54.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -156,10 +156,10 @@
     "@types/node": "^14",
     "@types/yargs": "^17.0.2",
     "typescript": "^5",
-    "@scripts/build": "2.52.0",
-    "@modern-js/runtime": "2.52.0",
-    "@modern-js/core": "2.52.0",
-    "@scripts/jest-config": "2.52.0"
+    "@modern-js/core": "2.54.0",
+    "@modern-js/runtime": "2.54.0",
+    "@scripts/build": "2.54.0",
+    "@scripts/jest-config": "2.54.0"
   },
   "sideEffects": false,
   "publishConfig": {