@modern-js/plugin-testing 2.20.1-alpha.0 → 2.21.0

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @modern-js/plugin-testing
 
+## 2.21.0
+
+### Patch Changes
+
+- 5424051: fix: the proxy should not recreated when exists
+  fix: proxy server 不应该被重新创建当存在时
+- 26dcf3a: chore: bump typescript to v5 in devDependencies
+
+  chore: 升级 devDependencies 中的 typescript 版本到 v5
+
+- 8b7c6d4: chore: update reduck
+  chore: 更新 reduck
+- ad78387: chore(deps): bump babel-related dependencies to latest version
+
+  chore(deps): 升级 babel 相关依赖到最新版本
+
+- Updated dependencies [cfc5bda]
+- Updated dependencies [e81eeaf]
+- Updated dependencies [26dcf3a]
+- Updated dependencies [0a1aa3b]
+- Updated dependencies [056627f]
+- Updated dependencies [8b7c6d4]
+- Updated dependencies [807f04a]
+- Updated dependencies [0fc15ca]
+- Updated dependencies [43b4e83]
+- Updated dependencies [ad78387]
+  - @modern-js/prod-server@2.21.0
+  - @modern-js/runtime@2.21.0
+  - @modern-js/utils@2.21.0
+  - @modern-js/babel-compiler@2.21.0
+  - @modern-js/babel-preset-app@2.21.0
+  - @modern-js/plugin@2.21.0
+
 ## 2.20.0
 
 ### Patch Changes

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.20.1-alpha.0",
+  "version": "2.21.0",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -99,10 +99,10 @@
   "dependencies": {
     "@babel/core": "^7.21.8",
     "@babel/preset-env": "^7.21.5",
-    "@modern-js-reduck/plugin-auto-actions": "^1.0.2",
-    "@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-reduck/plugin-auto-actions": "^1.1.10",
+    "@modern-js-reduck/plugin-effects": "^1.1.10",
+    "@modern-js-reduck/plugin-immutable": "^1.1.10",
+    "@modern-js-reduck/store": "^1.1.10",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^13.4.0",
     "@types/testing-library__jest-dom": "^5.14.3",
@@ -117,16 +117,16 @@
     "ts-jest": "^29.1.0",
     "yargs": "^17.0.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/babel-compiler": "2.20.0",
-    "@modern-js/utils": "2.20.0",
-    "@modern-js/plugin": "2.20.0",
-    "@modern-js/babel-preset-app": "2.20.0",
-    "@modern-js/prod-server": "2.20.0"
+    "@modern-js/babel-compiler": "2.21.0",
+    "@modern-js/utils": "2.21.0",
+    "@modern-js/babel-preset-app": "2.21.0",
+    "@modern-js/plugin": "2.21.0",
+    "@modern-js/prod-server": "2.21.0"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17",
-    "@modern-js/runtime": "^2.20.0"
+    "@modern-js/runtime": "^2.21.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -141,12 +141,12 @@
     "@types/node": "^14",
     "@types/yargs": "^17.0.2",
     "typescript": "^5",
-    "@modern-js/core": "2.20.0",
-    "@modern-js/types": "2.20.0",
-    "@modern-js/runtime": "2.20.0",
-    "@scripts/build": "2.20.0",
-    "@scripts/jest-config": "2.20.0",
-    "@modern-js/bff-core": "2.20.0"
+    "@modern-js/core": "2.21.0",
+    "@modern-js/types": "2.21.0",
+    "@modern-js/runtime": "2.21.0",
+    "@modern-js/bff-core": "2.21.0",
+    "@scripts/build": "2.21.0",
+    "@scripts/jest-config": "2.21.0"
   },
   "sideEffects": false,
   "modernConfig": {},

package/dist/js/modern/base/config/index.js

@@ -1,36 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import { applyPatches } from "./patches";
-import { TestConfigOperator } from "./testConfigOperator";
-const getJestUtils = (testConfig) => {
-  const testOperator = new TestConfigOperator(testConfig);
-  return testOperator;
-};
-const patchConfig = (testOperator) => __async(void 0, null, function* () {
-  yield applyPatches(testOperator);
-  return testOperator.jestConfig;
-});
-const DEFAULT_RESOLVER_PATH = require.resolve("./resolver");
-export {
-  DEFAULT_RESOLVER_PATH,
-  getJestUtils,
-  patchConfig
-};

package/dist/js/modern/base/config/patches/assetsModule.js

@@ -1,11 +0,0 @@
-const patchAssetsModule = (testOperator) => {
-  testOperator.mergeJestConfig({
-    moduleNameMapper: {
-      "\\.(css|less|scss|sass)$": require.resolve("identity-obj-proxy"),
-      "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": require.resolve("./filemock.js")
-    }
-  });
-};
-export {
-  patchAssetsModule
-};

package/dist/js/modern/base/config/patches/filemock.js

@@ -1,4 +0,0 @@
-var filemock_default = "test-file-stub";
-export {
-  filemock_default as default
-};

package/dist/js/modern/base/config/patches/index.js

@@ -1,34 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import { patchTransformer } from "./transformer";
-import { patchAssetsModule } from "./assetsModule";
-const _applyPatches = (patches2, testOperator) => __async(void 0, null, function* () {
-  for (const patch of patches2) {
-    yield patch(testOperator);
-  }
-});
-const patches = [patchTransformer, patchAssetsModule];
-const applyPatches = (testConfig) => __async(void 0, null, function* () {
-  yield _applyPatches(patches, testConfig);
-});
-export {
-  applyPatches
-};

package/dist/js/modern/base/config/patches/transformer.js

@@ -1,38 +0,0 @@
-import { readCompilerOptions } from "../../utils";
-const resolveTsCompilerOptions = () => {
-  const tsCompilerOptions = readCompilerOptions() || {};
-  const { jsx } = tsCompilerOptions;
-  if (!jsx) {
-    return null;
-  }
-  tsCompilerOptions.jsx = "react-jsx";
-  return tsCompilerOptions;
-};
-const patchTransformer = (testOperator) => {
-  const { transformer } = testOperator.testConfig;
-  if (transformer === "babel-jest") {
-    testOperator.mergeJestConfig({
-      transform: {
-        "\\.[jt]sx?$": require.resolve("../transformer/babelTransformer")
-      }
-    });
-  }
-  if (transformer === "ts-jest") {
-    testOperator.mergeJestConfig({
-      transform: {
-        "\\.[jt]sx?$": require.resolve("ts-jest")
-      }
-    });
-    const compilerOptions = resolveTsCompilerOptions();
-    compilerOptions && testOperator.mergeJestConfig({
-      globals: {
-        "ts-jest": {
-          tsconfig: compilerOptions
-        }
-      }
-    });
-  }
-};
-export {
-  patchTransformer
-};

package/dist/js/modern/base/config/resolver.js

@@ -1,21 +0,0 @@
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-import enhanceResolve from "enhanced-resolve";
-var require_resolver = __commonJS({
-  "src/base/config/resolver.ts"(exports, module) {
-    const resolver = enhanceResolve.create.sync({
-      conditionNames: ["require", "node", "default"],
-      extensions: [".js", ".json", ".node", ".ts", ".tsx"]
-    });
-    const shouldResolveByEnhance = (url) => /^@[^/]+\/[^/]+\/.*/.test(url);
-    module.exports = function(request, options) {
-      if (shouldResolveByEnhance(request)) {
-        return resolver(options.basedir, request);
-      }
-      return options.defaultResolver(request, options);
-    };
-  }
-});
-export default require_resolver();

package/dist/js/modern/base/config/testConfigOperator.js

@@ -1,69 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-import { merge } from "@modern-js/utils/lodash";
-class TestConfigOperator {
-  constructor(testConfig) {
-    this.defaultTestConfig = {
-      transformer: "babel-jest"
-    };
-    this._testConfig = testConfig;
-    this._jestConfig = {};
-    this.userJestConfig = testConfig.jest;
-    this.initial();
-  }
-  initial() {
-    this._testConfig = merge({}, this.defaultTestConfig, this.testConfig);
-  }
-  get jestConfig() {
-    return this._jestConfig;
-  }
-  get testConfig() {
-    return this._testConfig;
-  }
-  mergeJestConfig(sourceConfig) {
-    this._jestConfig = merge({}, this._jestConfig, sourceConfig);
-  }
-  setJestUserConfig() {
-    const { userJestConfig } = this;
-    if (typeof userJestConfig === "object") {
-      this.setJestConfig(userJestConfig);
-    }
-  }
-  setJestConfig(sourceConfig, options) {
-    if (options) {
-      const { force } = options;
-      if (force) {
-        this._jestConfig = sourceConfig;
-        return;
-      }
-    }
-    this._jestConfig = __spreadValues(__spreadValues({}, this._jestConfig), sourceConfig);
-  }
-  getFinalConfig() {
-    const { userJestConfig } = this;
-    if (!userJestConfig) {
-      return this._jestConfig;
-    }
-    if (typeof userJestConfig === "function") {
-      return userJestConfig(this._jestConfig);
-    }
-    return this.jestConfig;
-  }
-}
-export {
-  TestConfigOperator
-};

package/dist/js/modern/base/config/transformer/babelTransformer.js

@@ -1,19 +0,0 @@
-var _a, _b;
-import babelJest from "babel-jest";
-const babelTransformer = (_b = (_a = babelJest).createTransformer) == null ? void 0 : _b.call(_a, {
-  presets: [
-    [
-      require.resolve("@modern-js/babel-preset-app"),
-      {
-        appDirectory: process.cwd(),
-        modules: "cjs"
-      }
-    ]
-  ],
-  configFile: false,
-  babelrc: false
-});
-var babelTransformer_default = babelTransformer;
-export {
-  babelTransformer_default as default
-};

package/dist/js/modern/base/hook.js

@@ -1,12 +0,0 @@
-import { createAsyncPipeline, createParallelWorkflow } from "@modern-js/plugin";
-const jestConfigHook = createAsyncPipeline();
-const afterTestHook = createParallelWorkflow();
-const testingHooks = {
-  jestConfig: createAsyncPipeline(),
-  afterTest: createParallelWorkflow()
-};
-export {
-  afterTestHook,
-  jestConfigHook,
-  testingHooks
-};

package/dist/js/modern/base/index.js

@@ -1,14 +0,0 @@
-import { runTest, runJest } from "./runJest";
-import { getModuleNameMapper } from "./utils";
-import { DEFAULT_RESOLVER_PATH } from "./config";
-import { TestConfigOperator } from "./config/testConfigOperator";
-import { testingHooks } from "./hook";
-export * from "./types";
-export {
-  DEFAULT_RESOLVER_PATH,
-  TestConfigOperator,
-  getModuleNameMapper,
-  runJest,
-  runTest,
-  testingHooks
-};

package/dist/js/modern/base/runJest.js

@@ -1,102 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import yargs from "yargs/yargs";
-import { runCLI } from "jest";
-import { chalk } from "@modern-js/utils";
-import { getJestUtils, patchConfig } from "./config";
-import { debug } from "./utils";
-const buildArgv = (rawArgv, config) => __async(void 0, null, function* () {
-  const argv = yield yargs(rawArgv).argv;
-  const result = {
-    $0: argv.$0,
-    _: argv._.slice(1)
-  };
-  Object.keys(argv).forEach((key) => {
-    if (key.includes("-") || key === "_") {
-      return;
-    }
-    result[key] = argv[key];
-  });
-  if (config) {
-    result.config = JSON.stringify(config);
-  }
-  return result;
-});
-const readResultsAndExit = (result, globalConfig) => {
-  const code = !result || result.success ? 0 : globalConfig.testFailureExitCode;
-  process.on("exit", () => {
-    if (typeof code === "number" && code !== 0) {
-      process.exitCode = code;
-    }
-  });
-  if (globalConfig.forceExit) {
-    if (!globalConfig.detectOpenHandles) {
-      console.warn(
-        `${chalk.bold(
-          "Force exiting Jest: "
-        )}Have you considered using \`--detectOpenHandles\` to detect async operations that kept running after all tests finished?`
-      );
-    }
-    process.exit(code);
-  } else if (!globalConfig.detectOpenHandles) {
-    setTimeout(() => {
-      console.warn(
-        chalk.yellow.bold(
-          "Jest did not exit one second after the test run has completed.\n\n"
-        ) + chalk.yellow(
-          "This usually means that there are asynchronous operations that weren't stopped in your tests. Consider running Jest with `--detectOpenHandles` to troubleshoot this issue."
-        )
-      );
-    }, 1e3).unref();
-  }
-};
-function runJest(_0) {
-  return __async(this, arguments, function* (config, pwd = process.cwd()) {
-    try {
-      const argvConfig = yield buildArgv(process.argv.slice(2), config);
-      const { results, globalConfig } = yield runCLI(argvConfig, [pwd]);
-      readResultsAndExit(results, globalConfig);
-    } catch (e) {
-      console.error(chalk.red((e == null ? void 0 : e.stack) || e));
-      process.exit(1);
-    }
-  });
-}
-function runTest(_0, _1) {
-  return __async(this, arguments, function* (api, config, pwd = process.cwd()) {
-    process.env.NODE_ENV = "test";
-    const jestUtils = getJestUtils(config);
-    yield patchConfig(jestUtils);
-    jestUtils.setJestUserConfig();
-    const hookRunners = api.useHookRunners();
-    const testConfigOperator = yield hookRunners.jestConfig(jestUtils, {
-      onLast: (input) => input
-    });
-    const finalConfig = testConfigOperator.getFinalConfig();
-    debug("Jest config:", finalConfig);
-    yield runJest(finalConfig, pwd);
-    yield hookRunners.afterTest();
-  });
-}
-export {
-  runJest,
-  runTest
-};

package/dist/js/modern/base/utils.js

@@ -1,66 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-import fs from "fs";
-import path from "path";
-import { createDebugger } from "@modern-js/utils";
-const debug = createDebugger("test");
-const readCompilerOptions = (pwd = process.cwd(), filename = "tsconfig.json") => {
-  let tsConfig = {};
-  let extendedCompilerOptions = {};
-  let tsconfigFile = "";
-  try {
-    const maybeTsconfigFile = path.join(pwd, filename);
-    if (fs.existsSync(maybeTsconfigFile)) {
-      tsconfigFile = maybeTsconfigFile;
-    } else {
-      tsconfigFile = require.resolve(filename);
-    }
-    ({ config: tsConfig } = require("typescript").parseConfigFileTextToJson(
-      tsconfigFile,
-      fs.readFileSync(tsconfigFile, "utf8")
-    ));
-  } catch (e) {
-    return {};
-  }
-  if (tsConfig.extends) {
-    extendedCompilerOptions = readCompilerOptions(
-      path.dirname(tsconfigFile),
-      tsConfig.extends
-    );
-  }
-  return __spreadValues(__spreadValues({}, extendedCompilerOptions), tsConfig.compilerOptions);
-};
-const getModuleNameMapper = (alias) => Object.keys(alias).reduce((memo, cur) => {
-  const aliasValue = Array.isArray(alias[cur]) ? alias[cur] : [alias[cur]];
-  const isFile = aliasValue.some((s) => s.endsWith(".js"));
-  if (cur === "@modern-js/runtime$") {
-    memo[`.+${cur}`] = aliasValue[0];
-    return memo;
-  }
-  if (isFile) {
-    memo[cur] = aliasValue[0];
-  }
-  const key = `^${cur}/(.*)$`;
-  const value = path.normalize(`${aliasValue}/$1`);
-  memo[key] = value;
-  return memo;
-}, {});
-export {
-  debug,
-  getModuleNameMapper,
-  readCompilerOptions
-};

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

@@ -1,58 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import { AsyncLocalStorage } from "async_hooks";
-import { Server } from "@modern-js/prod-server";
-const store = new AsyncLocalStorage();
-const isInHandler = () => Boolean(store.getStore());
-let server = null;
-const createApp = (pwd, config, plugins, routes) => __async(void 0, null, function* () {
-  if (!server) {
-    config.output.path = "./";
-    server = new Server({
-      apiOnly: true,
-      pwd,
-      config,
-      internalPlugins: plugins,
-      routes
-    });
-    yield server.init();
-  }
-  const app = server.getRequestHandler();
-  return app;
-});
-const getApp = () => {
-  if (!server) {
-    throw new Error("please createApp first");
-  }
-  return server.getRequestHandler();
-};
-const closeServer = () => __async(void 0, null, function* () {
-  if (!server) {
-    throw new Error("please createApp first");
-  }
-  yield server.close();
-});
-export {
-  closeServer,
-  createApp,
-  getApp,
-  isInHandler
-};

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

@@ -1,4 +0,0 @@
-const bff_info_key = "modern_bff_info";
-export {
-  bff_info_key
-};