@modern-js/plugin-testing 2.4.1-beta.0 → 2.5.0

package/dist/{js/node → cjs}/cli/index.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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());
-  });
-};
 var cli_exports = {};
 __export(cli_exports, {
   default: () => cli_default,
@@ -70,9 +50,9 @@ var cli_default = () => {
       let testingExportsUtils;
       return {
         commands: ({ program }) => {
-          program.command("test").allowUnknownOption().usage("<regexForTestFiles> --[options]").action(() => __async(void 0, null, function* () {
-            yield (0, import_test.default)(api);
-          }));
+          program.command("test").allowUnknownOption().usage("<regexForTestFiles> --[options]").action(async () => {
+            await (0, import_test.default)(api);
+          });
         },
         validateSchema() {
           return import_utils.PLUGIN_SCHEMAS["@modern-js/plugin-testing"];
@@ -96,10 +76,10 @@ var cli_default = () => {
           const testingPath = import_path.default.resolve(__dirname, "../");
           testingExportsUtils.addExport(`export * from '${testingPath}'`);
         },
-        jestConfig: (utils, next) => __async(void 0, null, function* () {
+        jestConfig: async (utils, next) => {
           const appContext = api.useAppContext();
           const userConfig = api.useResolvedConfigContext();
-          const apiOnly = yield (0, import_utils.isApiOnly)(appContext.appDirectory);
+          const apiOnly = await (0, import_utils.isApiOnly)(appContext.appDirectory);
           if (apiOnly) {
             return next(utils);
           }
@@ -124,7 +104,7 @@ var cli_default = () => {
           });
           mergeUserJestConfig(utils);
           return next(utils);
-        })
+        }
       };
     }
   };

package/dist/{js/node → cjs}/cli/test.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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());
-  });
-};
 var test_exports = {};
 __export(test_exports, {
   default: () => test_default
@@ -49,7 +29,7 @@ module.exports = __toCommonJS(test_exports);
 var import_path = __toESM(require("path"));
 var import_babel_compiler = require("@modern-js/babel-compiler");
 var import_base = require("../base");
-const test = (api) => __async(void 0, null, function* () {
+const test = async (api) => {
   var _a, _b;
   const userConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
@@ -63,7 +43,7 @@ const test = (api) => __async(void 0, null, function* () {
     appContext.internalDirectory,
     ".runtime-exports"
   );
-  yield (0, import_babel_compiler.compiler)(
+  await (0, import_babel_compiler.compiler)(
     {
       sourceDir: runtimeExportsPath,
       rootDir: runtimeExportsPath,
@@ -81,8 +61,8 @@ const test = (api) => __async(void 0, null, function* () {
       ]
     }
   );
-  yield (0, import_base.runTest)(api, userConfig.testing);
-});
+  await (0, import_base.runTest)(api, userConfig.testing);
+};
 var test_default = test;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/{js/node → cjs}/runtime-testing/app.js

@@ -2,22 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -55,7 +41,10 @@ class ModernRuntime {
     const { entry, children } = props || {};
     let runtimeFeatures = (_a = this.options) == null ? void 0 : _a.runtime;
     if (entry) {
-      runtimeFeatures = __spreadValues(__spreadValues({}, runtimeFeatures || {}), (_b = this.options.runtimeByEntries) == null ? void 0 : _b[entry]);
+      runtimeFeatures = {
+        ...runtimeFeatures || {},
+        ...(_b = this.options.runtimeByEntries) == null ? void 0 : _b[entry]
+      };
     }
     const Component = () => {
       if (!children) {

package/dist/{js/node → cjs}/runtime-testing/customRender.js

@@ -2,22 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -44,7 +30,7 @@ var import_react = __toESM(require("react"));
 var import_react2 = require("@testing-library/react");
 var import_app = __toESM(require("./app"));
 const WrapModernProviders = (props) => import_react.default.createElement(import_app.default.createApp(props));
-const customRender = (ui, options) => (0, import_react2.render)(ui, __spreadValues({ wrapper: WrapModernProviders }, options));
+const customRender = (ui, options) => (0, import_react2.render)(ui, { wrapper: WrapModernProviders, ...options });
 var customRender_default = customRender;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/{js/node → cjs}/runtime-testing/reduck.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -71,9 +54,10 @@ const createStore = (props) => {
     }
     return ((props == null ? void 0 : props.plugins) || []).concat(plugins);
   };
-  const config = __spreadProps(__spreadValues({}, props || {}), {
+  const config = {
+    ...props || {},
     plugins: createStatePlugins()
-  });
+  };
   return (0, import_store.createStore)(config);
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/{js/node → cjs}/runtime-testing/resolvePlugins.js

@@ -1,21 +1,7 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-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;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -42,7 +28,9 @@ function resolvePlugins(features) {
   }
   Object.keys(features).forEach((feature) => {
     if (allowedFeatures.includes(feature)) {
-      const curPluginRes = require(`@modern-js/runtime/plugins`)[feature](__spreadValues({}, features[feature]));
+      const curPluginRes = require(`@modern-js/runtime/plugins`)[feature]({
+        ...features[feature]
+      });
       plugins.push(curPluginRes);
     }
   });

package/dist/esm-node/base/config/index.js

@@ -0,0 +1,16 @@
+import { applyPatches } from "./patches";
+import { TestConfigOperator } from "./testConfigOperator";
+const getJestUtils = (testConfig) => {
+  const testOperator = new TestConfigOperator(testConfig);
+  return testOperator;
+};
+const patchConfig = async (testOperator) => {
+  await applyPatches(testOperator);
+  return testOperator.jestConfig;
+};
+const DEFAULT_RESOLVER_PATH = require.resolve("./resolver");
+export {
+  DEFAULT_RESOLVER_PATH,
+  getJestUtils,
+  patchConfig
+};

package/dist/esm-node/base/config/patches/index.js

@@ -0,0 +1,14 @@
+import { patchTransformer } from "./transformer";
+import { patchAssetsModule } from "./assetsModule";
+const _applyPatches = async (patches2, testOperator) => {
+  for (const patch of patches2) {
+    await patch(testOperator);
+  }
+};
+const patches = [patchTransformer, patchAssetsModule];
+const applyPatches = async (testConfig) => {
+  await _applyPatches(patches, testConfig);
+};
+export {
+  applyPatches
+};

package/dist/{js/modern → esm-node}/base/config/testConfigOperator.js

@@ -1,19 +1,3 @@
-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) {
@@ -51,7 +35,7 @@ class TestConfigOperator {
         return;
       }
     }
-    this._jestConfig = __spreadValues(__spreadValues({}, this._jestConfig), sourceConfig);
+    this._jestConfig = { ...this._jestConfig, ...sourceConfig };
   }
   getFinalConfig() {
     const { userJestConfig } = this;

package/dist/esm-node/base/runJest.js

@@ -0,0 +1,78 @@
+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 = async (rawArgv, config) => {
+  const argv = await 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();
+  }
+};
+async function runJest(config, pwd = process.cwd()) {
+  try {
+    const argvConfig = await buildArgv(process.argv.slice(2), config);
+    const { results, globalConfig } = await runCLI(argvConfig, [pwd]);
+    readResultsAndExit(results, globalConfig);
+  } catch (e) {
+    console.error(chalk.red((e == null ? void 0 : e.stack) || e));
+    process.exit(1);
+  }
+}
+async function runTest(api, config, pwd = process.cwd()) {
+  process.env.NODE_ENV = "test";
+  const jestUtils = getJestUtils(config);
+  await patchConfig(jestUtils);
+  jestUtils.setJestUserConfig();
+  const hookRunners = api.useHookRunners();
+  const testConfigOperator = await hookRunners.jestConfig(jestUtils, {
+    onLast: (input) => input
+  });
+  const finalConfig = testConfigOperator.getFinalConfig();
+  debug("Jest config:", finalConfig);
+  await runJest(finalConfig, pwd);
+  await hookRunners.afterTest();
+}
+export {
+  runJest,
+  runTest
+};

package/dist/{js/modern → esm-node}/base/utils.js

@@ -1,19 +1,3 @@
-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";
@@ -42,7 +26,10 @@ const readCompilerOptions = (pwd = process.cwd(), filename = "tsconfig.json") =>
       tsConfig.extends
     );
   }
-  return __spreadValues(__spreadValues({}, extendedCompilerOptions), tsConfig.compilerOptions);
+  return {
+    ...extendedCompilerOptions,
+    ...tsConfig.compilerOptions
+  };
 };
 const getModuleNameMapper = (alias) => Object.keys(alias).reduce((memo, cur) => {
   const aliasValue = Array.isArray(alias[cur]) ? alias[cur] : [alias[cur]];

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

@@ -0,0 +1,38 @@
+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 = async (pwd, config, plugins, routes) => {
+  if (!server) {
+    config.output.path = "./";
+    server = new Server({
+      apiOnly: true,
+      pwd,
+      config,
+      internalPlugins: plugins,
+      routes
+    });
+    await server.init();
+  }
+  const app = server.getRequestHandler();
+  return app;
+};
+const getApp = () => {
+  if (!server) {
+    throw new Error("please createApp first");
+  }
+  return server.getRequestHandler();
+};
+const closeServer = async () => {
+  if (!server) {
+    throw new Error("please createApp first");
+  }
+  await server.close();
+};
+export {
+  closeServer,
+  createApp,
+  getApp,
+  isInHandler
+};