@modern-js/plugin-testing 1.21.3 → 2.0.0-beta.0

package/CHANGELOG.md

@@ -1,16 +1,47 @@
 # @modern-js/plugin-testing
 
-## 1.21.3
+## 2.0.0-beta.0
+
+### Major Changes
+
+- dda38c9: chore: v2
 
 ### Patch Changes
 
-- @modern-js/babel-preset-app@1.21.3
-- @modern-js/webpack@1.21.3
-- @modern-js/runtime@1.21.3
-- @modern-js/prod-server@1.21.3
-- @modern-js/babel-compiler@1.21.3
-- @modern-js/plugin@1.21.3
-- @modern-js/utils@1.21.3
+- cc971eabf: refactor: move server plugin load logic in `@modern-js/core`
+  refactor：移除在 `@modern-js/core` 中的 server 插件加载逻辑
+- 14b712d: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [b18fa8f]
+- Updated dependencies [c9e800d39]
+- Updated dependencies [15bf09d9c]
+- Updated dependencies [a2509bf]
+- Updated dependencies [decfcd989]
+- Updated dependencies [4369648ae]
+- Updated dependencies [edd1cfb1a]
+- Updated dependencies [cc971eabf]
+- Updated dependencies [5b9049f]
+- Updated dependencies [6bda14ed7]
+- Updated dependencies [b8bbe036c]
+- Updated dependencies [60d5378]
+- Updated dependencies [d5a31df78]
+- Updated dependencies [dda38c9]
+- Updated dependencies [102d32e4b]
+- Updated dependencies [8b8e1bb57]
+- Updated dependencies [3bbea92b2]
+- Updated dependencies [73cd29dd9]
+- Updated dependencies [fcace5b5b]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be95]
+- Updated dependencies [14b712d]
+  - @modern-js/runtime@2.0.0-beta.0
+  - @modern-js/prod-server@2.0.0-beta.0
+  - @modern-js/babel-preset-app@2.0.0-beta.0
+  - @modern-js/utils@2.0.0-beta.0
+  - @modern-js/plugin@2.0.0-beta.0
+  - @modern-js/babel-compiler@2.0.0-beta.0
 
 ## 1.21.2
 

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

@@ -11,7 +11,7 @@ const createApp = async (pwd, config, plugins, routes) => {
       apiOnly: true,
       pwd,
       config,
-      plugins,
+      internalPlugins: plugins,
       routes
     });
     await server.init();

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

@@ -102,12 +102,11 @@ export default (() => ({
         }
 
         const userConfig = api.useResolvedConfigContext();
-        const plugins = appContext.plugins.map(p => p.server).filter(Boolean);
         await setJestConfigForBFF({
           pwd,
           userConfig,
-          plugins,
           routes: appContext.serverRoutes,
+          plugins: appContext.serverInternalPlugins,
           utils
         });
         return next(utils);

package/dist/js/modern/cli/index.js

@@ -1,6 +1,5 @@
 import path from 'path';
-import { PLUGIN_SCHEMAS, createRuntimeExportsUtils, isApiOnly } from '@modern-js/utils';
-import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
+import { isApiOnly, mergeAlias, PLUGIN_SCHEMAS, createRuntimeExportsUtils } from '@modern-js/utils';
 import { testingHooks, getModuleNameMapper, DEFAULT_RESOLVER_PATH } from "../base";
 import { MODERNJS_CONFIG_KEY } from "../constant";
 import TestingBffPlugin from "./bff";
@@ -60,12 +59,12 @@ export default (() => {
             return next(utils);
           }
 
-          const webpackConfig = getWebpackConfig(WebpackConfigTarget.CLIENT, appContext, userConfig);
-          const {
-            resolve: {
-              alias = {}
-            }
-          } = webpackConfig;
+          const alias = mergeAlias(userConfig.source.alias);
+
+          if (testingExportsUtils) {
+            alias['@modern-js/runtime/testing'] = [testingExportsUtils.getPath()];
+          }
+
           utils.mergeJestConfig({
             globals: {
               [MODERNJS_CONFIG_KEY]: userConfig

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

@@ -23,7 +23,7 @@ const createApp = async (pwd, config, plugins, routes) => {
       apiOnly: true,
       pwd,
       config,
-      plugins,
+      internalPlugins: plugins,
       routes
     });
     await server.init();

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

@@ -119,12 +119,11 @@ var _default = () => ({
         }
 
         const userConfig = api.useResolvedConfigContext();
-        const plugins = appContext.plugins.map(p => p.server).filter(Boolean);
         await setJestConfigForBFF({
           pwd,
           userConfig,
-          plugins,
           routes: appContext.serverRoutes,
+          plugins: appContext.serverInternalPlugins,
           utils
         });
         return next(utils);

package/dist/js/node/cli/index.js

@@ -9,8 +9,6 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _webpack = require("@modern-js/webpack");
-
 var _base = require("../base");
 
 var _constant = require("../constant");
@@ -80,12 +78,12 @@ var _default = () => {
             return next(utils);
           }
 
-          const webpackConfig = (0, _webpack.getWebpackConfig)(_webpack.WebpackConfigTarget.CLIENT, appContext, userConfig);
-          const {
-            resolve: {
-              alias = {}
-            }
-          } = webpackConfig;
+          const alias = (0, _utils.mergeAlias)(userConfig.source.alias);
+
+          if (testingExportsUtils) {
+            alias['@modern-js/runtime/testing'] = [testingExportsUtils.getPath()];
+          }
+
           utils.mergeJestConfig({
             globals: {
               [_constant.MODERNJS_CONFIG_KEY]: userConfig

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

@@ -25,7 +25,7 @@ var createApp = /*#__PURE__*/function () {
               apiOnly: true,
               pwd: pwd,
               config: config,
-              plugins: plugins,
+              internalPlugins: plugins,
               routes: routes
             });
             _context.next = 5;

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

@@ -103,7 +103,7 @@ export default (function () {
       return {
         jestConfig: function () {
           var _jestConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(utils, next) {
-            var appContext, pwd, userConfig, plugins;
+            var appContext, pwd, userConfig;
             return _regeneratorRuntime().wrap(function _callee2$(_context2) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
@@ -120,22 +120,19 @@ export default (function () {
 
                   case 4:
                     userConfig = api.useResolvedConfigContext();
-                    plugins = appContext.plugins.map(function (p) {
-                      return p.server;
-                    }).filter(Boolean);
-                    _context2.next = 8;
+                    _context2.next = 7;
                     return setJestConfigForBFF({
                       pwd: pwd,
                       userConfig: userConfig,
-                      plugins: plugins,
                       routes: appContext.serverRoutes,
+                      plugins: appContext.serverInternalPlugins,
                       utils: utils
                     });
 
-                  case 8:
+                  case 7:
                     return _context2.abrupt("return", next(utils));
 
-                  case 9:
+                  case 8:
                   case "end":
                     return _context2.stop();
                 }

package/dist/js/treeshaking/cli/index.js

@@ -2,8 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import path from 'path';
-import { PLUGIN_SCHEMAS, createRuntimeExportsUtils, isApiOnly } from '@modern-js/utils';
-import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
+import { isApiOnly, mergeAlias, PLUGIN_SCHEMAS, createRuntimeExportsUtils } from '@modern-js/utils';
 import { testingHooks, getModuleNameMapper, DEFAULT_RESOLVER_PATH } from "../base";
 import { MODERNJS_CONFIG_KEY } from "../constant";
 import TestingBffPlugin from "./bff";
@@ -63,8 +62,7 @@ export default (function () {
         },
         jestConfig: function () {
           var _jestConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(utils, next) {
-            var appContext, userConfig, apiOnly, webpackConfig, _webpackConfig$resolv, alias;
-
+            var appContext, userConfig, apiOnly, alias;
             return _regeneratorRuntime().wrap(function _callee2$(_context2) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
@@ -85,8 +83,12 @@ export default (function () {
                     return _context2.abrupt("return", next(utils));
 
                   case 7:
-                    webpackConfig = getWebpackConfig(WebpackConfigTarget.CLIENT, appContext, userConfig);
-                    _webpackConfig$resolv = webpackConfig.resolve.alias, alias = _webpackConfig$resolv === void 0 ? {} : _webpackConfig$resolv;
+                    alias = mergeAlias(userConfig.source.alias);
+
+                    if (testingExportsUtils) {
+                      alias['@modern-js/runtime/testing'] = [testingExportsUtils.getPath()];
+                    }
+
                     utils.mergeJestConfig({
                       globals: _defineProperty({}, MODERNJS_CONFIG_KEY, userConfig),
                       moduleNameMapper: getModuleNameMapper(alias),

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

@@ -1,8 +1,9 @@
 /// <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: any[], routes: any[]) => Promise<(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, next?: (() => void) | undefined) => void>;
 declare const getApp: () => (req: import("http").IncomingMessage, res: import("http").ServerResponse, next?: (() => void) | undefined) => void;
 declare const closeServer: () => Promise<void>;
 export { createApp, getApp, closeServer };

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

@@ -1,4 +1,5 @@
 import type { CliPlugin } from '@modern-js/core';
+import { InternalPlugins } from '@modern-js/types';
 import { TestConfigOperator } from '../../base';
 export declare const setJestConfigForBFF: ({
   pwd,
@@ -9,7 +10,7 @@ export declare const setJestConfigForBFF: ({
 }: {
   pwd: string;
   userConfig: any;
-  plugins: any[];
+  plugins: InternalPlugins;
   routes: any[];
   utils: TestConfigOperator;
 }) => Promise<void>;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.3",
+  "version": "2.0.0-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -99,14 +99,13 @@
     "@modern-js-reduck/plugin-effects": "^1.0.2",
     "@modern-js-reduck/plugin-immutable": "^1.0.1",
     "@modern-js-reduck/store": "^1.0.3",
-    "@modern-js/babel-compiler": "1.21.3",
-    "@modern-js/utils": "1.21.3",
-    "@modern-js/webpack": "1.21.3",
-    "@modern-js/babel-preset-app": "1.21.3",
-    "@modern-js/plugin": "1.21.3",
-    "@modern-js/prod-server": "1.21.3",
+    "@modern-js/babel-compiler": "2.0.0-beta.0",
+    "@modern-js/utils": "2.0.0-beta.0",
+    "@modern-js/babel-preset-app": "2.0.0-beta.0",
+    "@modern-js/plugin": "2.0.0-beta.0",
+    "@modern-js/prod-server": "2.0.0-beta.0",
     "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^12.0.0",
+    "@testing-library/react": "^13.4.0",
     "@types/testing-library__jest-dom": "^5.14.3",
     "jest-environment-node": "^27.2.2",
     "path-to-regexp": "^6.2.0",
@@ -121,7 +120,7 @@
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17",
-    "@modern-js/runtime": "^1.21.3"
+    "@modern-js/runtime": "^2.0.0-beta.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -129,13 +128,14 @@
     }
   },
   "devDependencies": {
-    "react": "^17",
-    "react-dom": "^17",
-    "@modern-js/core": "1.21.3",
-    "@modern-js/runtime": "1.21.3",
-    "@modern-js/bff-core": "1.21.3",
-    "@scripts/build": "1.21.3",
-    "@scripts/jest-config": "1.21.3",
+    "react": "^18",
+    "react-dom": "^18",
+    "@modern-js/core": "2.0.0-beta.0",
+    "@modern-js/types": "2.0.0-beta.0",
+    "@modern-js/runtime": "2.0.0-beta.0",
+    "@modern-js/bff-core": "2.0.0-beta.0",
+    "@scripts/build": "2.0.0-beta.0",
+    "@scripts/jest-config": "2.0.0-beta.0",
     "@types/jest": "^27",
     "@types/supertest": "^2.0.11",
     "@types/node": "^14",
@@ -150,33 +150,10 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
     "new": "modern new",
     "dev": "modern build --watch",
-    "build": "wireit",
-    "test": "wireit"
+    "build": "modern build",
+    "test": "jest"
   }
 }