@modern-js/plugin-testing 2.4.0 → 2.5.0

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
+};

package/dist/{js/modern → esm-node}/cli/bff/index.js

@@ -1,39 +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;
-};
-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 path from "path";
 import { isApiOnly } from "@modern-js/utils";
 import {
@@ -42,13 +6,13 @@ import {
 } from "../../base";
 import { bff_info_key } from "./constant";
 import { isBFFProject } from "./utils";
-const setJestConfigForBFF = (_0) => __async(void 0, [_0], function* ({
+const setJestConfigForBFF = async ({
   pwd,
   userConfig,
   plugins,
   routes,
   utils
-}) {
+}) => {
   var _a;
   const bffConfig = {
     rootDir: path.join(pwd, "./api"),
@@ -76,8 +40,11 @@ const setJestConfigForBFF = (_0) => __async(void 0, [_0], function* ({
   const transform = {
     "\\.[jt]sx?$": require.resolve("ts-jest")
   };
-  const apiOnly = yield isApiOnly(pwd);
-  const mergedModuleNameMapper = __spreadValues(__spreadValues({}, moduleNameMapper), aliasMapper);
+  const apiOnly = await isApiOnly(pwd);
+  const mergedModuleNameMapper = {
+    ...moduleNameMapper,
+    ...aliasMapper
+  };
   const resolver = jestConfig.resolver || DEFAULT_RESOLVER_PATH;
   const configFields = ["coverage", "collectCoverage", "testTimeout"];
   const commonConfig = configFields.reduce((obj, field) => {
@@ -90,12 +57,15 @@ const setJestConfigForBFF = (_0) => __async(void 0, [_0], function* ({
     utils.setJestConfig(
       {
         projects: [
-          __spreadValues({}, jestConfig),
-          __spreadValues({
+          {
+            ...jestConfig
+          },
+          {
             transform,
             moduleNameMapper: mergedModuleNameMapper,
-            resolver
-          }, bffConfig)
+            resolver,
+            ...bffConfig
+          }
         ]
       },
       {
@@ -106,11 +76,12 @@ const setJestConfigForBFF = (_0) => __async(void 0, [_0], function* ({
     utils.setJestConfig(
       {
         projects: [
-          __spreadValues({
+          {
             transform,
             moduleNameMapper: mergedModuleNameMapper,
-            resolver
-          }, bffConfig)
+            resolver,
+            ...bffConfig
+          }
         ]
       },
       {
@@ -119,19 +90,19 @@ const setJestConfigForBFF = (_0) => __async(void 0, [_0], function* ({
     );
   }
   utils.setJestConfig(commonConfig);
-});
+};
 var bff_default = () => ({
   name: "@modern-js/testing-plugin-bff",
   setup(api) {
     return {
-      jestConfig: (utils, next) => __async(this, null, function* () {
+      jestConfig: async (utils, next) => {
         const appContext = api.useAppContext();
         const pwd = appContext.appDirectory;
         if (!isBFFProject(pwd)) {
           return next(utils);
         }
         const userConfig = api.useResolvedConfigContext();
-        yield setJestConfigForBFF({
+        await setJestConfigForBFF({
           pwd,
           userConfig,
           routes: appContext.serverRoutes,
@@ -139,7 +110,7 @@ var bff_default = () => ({
           utils
         });
         return next(utils);
-      })
+      }
     };
   }
 });

package/dist/{js/modern → esm-node}/cli/bff/mockAPI.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 * as ptr from "path-to-regexp";
 import * as mockAppModule from "./app";
 const mock_replaceUrlWithParams = (url, paramValues, payload) => {
@@ -26,7 +10,10 @@ const mock_replaceUrlWithParams = (url, paramValues, payload) => {
     return cur;
   }, {});
   const getFinalPath = ptr.compile(url, { encode: encodeURIComponent });
-  return getFinalPath(__spreadValues(__spreadValues({}, params), payload));
+  return getFinalPath({
+    ...params,
+    ...payload
+  });
 };
 const mock_getParamsAndPayload = (args) => {
   if (args.length === 0) {
@@ -88,7 +75,7 @@ var mockAPI_default = (mockApiInfosByFile) => {
               return test.then((value) => {
                 try {
                   return JSON.parse(value.text);
-                } catch (e) {
+                } catch {
                   return value.text;
                 }
               });

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

@@ -0,0 +1,46 @@
+import path from "path";
+import { ApiRouter } from "@modern-js/bff-core";
+import { bff_info_key } from "./constant";
+import mockAPI from "./mockAPI";
+import { createApp, closeServer } from "./app";
+let uped = false;
+const setup = () => {
+  var _a, _b;
+  if (uped) {
+    return;
+  }
+  uped = true;
+  const bff_info = global[bff_info_key];
+  const prefix = (_b = (_a = bff_info == null ? void 0 : bff_info.modernUserConfig) == null ? void 0 : _a.bff) == null ? void 0 : _b.prefix;
+  const apiRouter = new ApiRouter({
+    apiDir: path.join(bff_info.appDir, "./api"),
+    prefix
+  });
+  const apiInfos = apiRouter.getApiHandlers();
+  const apiInfosByFile = apiInfos.reduce(
+    (res, apiInfo) => {
+      if (!res[apiInfo.filename]) {
+        res[apiInfo.filename] = [];
+      }
+      res[apiInfo.filename].push(apiInfo);
+      return res;
+    },
+    {}
+  );
+  let app = null;
+  beforeAll(async () => {
+    if (!app) {
+      app = await createApp(
+        bff_info.appDir,
+        bff_info.modernUserConfig,
+        bff_info.plugins,
+        bff_info.routes
+      );
+    }
+  });
+  afterAll(async () => {
+    await closeServer();
+  });
+  mockAPI(apiInfosByFile);
+};
+setup();

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

@@ -0,0 +1,21 @@
+import path from "path";
+import { chalk } from "@modern-js/utils";
+const isBFFProject = (pwd) => {
+  try {
+    const packageJson = require(path.join(pwd, "./package.json"));
+    const { dependencies, devDependencies } = packageJson;
+    const isBFF = Object.keys({ ...dependencies, ...devDependencies }).some(
+      (dependency) => dependency.includes("plugin-bff")
+    );
+    const isMWA = Object.keys(devDependencies).some(
+      (devDependency) => devDependency.includes("app-tools")
+    );
+    return isMWA && isBFF;
+  } catch (error) {
+    console.log(chalk.red(error));
+    return false;
+  }
+};
+export {
+  isBFFProject
+};

package/dist/{js/modern → esm-node}/cli/index.js

@@ -1,23 +1,3 @@
-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 path from "path";
 import {
   isApiOnly,
@@ -50,9 +30,9 @@ var cli_default = () => {
       let testingExportsUtils;
       return {
         commands: ({ program }) => {
-          program.command("test").allowUnknownOption().usage("<regexForTestFiles> --[options]").action(() => __async(void 0, null, function* () {
-            yield test(api);
-          }));
+          program.command("test").allowUnknownOption().usage("<regexForTestFiles> --[options]").action(async () => {
+            await test(api);
+          });
         },
         validateSchema() {
           return PLUGIN_SCHEMAS["@modern-js/plugin-testing"];
@@ -76,10 +56,10 @@ var cli_default = () => {
           const testingPath = path.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 isApiOnly(appContext.appDirectory);
+          const apiOnly = await isApiOnly(appContext.appDirectory);
           if (apiOnly) {
             return next(utils);
           }
@@ -104,7 +84,7 @@ var cli_default = () => {
           });
           mergeUserJestConfig(utils);
           return next(utils);
-        })
+        }
       };
     }
   };

package/dist/{js/modern → esm-node}/cli/test.js

@@ -1,27 +1,7 @@
-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 path from "path";
 import { compiler } from "@modern-js/babel-compiler";
 import { runTest } from "../base";
-const test = (api) => __async(void 0, null, function* () {
+const test = async (api) => {
   var _a, _b;
   const userConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
@@ -35,7 +15,7 @@ const test = (api) => __async(void 0, null, function* () {
     appContext.internalDirectory,
     ".runtime-exports"
   );
-  yield compiler(
+  await compiler(
     {
       sourceDir: runtimeExportsPath,
       rootDir: runtimeExportsPath,
@@ -53,8 +33,8 @@ const test = (api) => __async(void 0, null, function* () {
       ]
     }
   );
-  yield runTest(api, userConfig.testing);
-});
+  await runTest(api, userConfig.testing);
+};
 var test_default = test;
 export {
   test_default as default

package/dist/esm-node/runtime-testing/app.js

@@ -0,0 +1,35 @@
+import { createApp } from "@modern-js/runtime";
+import { MODERNJS_CONFIG_KEY } from "../constant";
+import resolvePlugins from "./resolvePlugins";
+class ModernRuntime {
+  constructor(options) {
+    this.options = options;
+  }
+  init(options) {
+    this.options = options;
+  }
+  createApp(props) {
+    var _a, _b;
+    const { entry, children } = props || {};
+    let runtimeFeatures = (_a = this.options) == null ? void 0 : _a.runtime;
+    if (entry) {
+      runtimeFeatures = {
+        ...runtimeFeatures || {},
+        ...(_b = this.options.runtimeByEntries) == null ? void 0 : _b[entry]
+      };
+    }
+    const Component = () => {
+      if (!children) {
+        return null;
+      }
+      return children;
+    };
+    return createApp({
+      plugins: resolvePlugins(runtimeFeatures || {})
+    })(Component);
+  }
+}
+var app_default = new ModernRuntime(global[MODERNJS_CONFIG_KEY] || {});
+export {
+  app_default as default
+};

package/dist/esm-node/runtime-testing/customRender.js

@@ -0,0 +1,9 @@
+import React from "react";
+import { render } from "@testing-library/react";
+import app from "./app";
+const WrapModernProviders = (props) => React.createElement(app.createApp(props));
+const customRender = (ui, options) => render(ui, { wrapper: WrapModernProviders, ...options });
+var customRender_default = customRender;
+export {
+  customRender_default as default
+};

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

@@ -1,22 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-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 __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { createStore as originCreateStore } from "@modern-js-reduck/store";
 import effectsPlugin from "@modern-js-reduck/plugin-effects";
 import autoActionsPlugin from "@modern-js-reduck/plugin-auto-actions";
@@ -42,9 +23,10 @@ const createStore = (props) => {
     }
     return ((props == null ? void 0 : props.plugins) || []).concat(plugins);
   };
-  const config = __spreadProps(__spreadValues({}, props || {}), {
+  const config = {
+    ...props || {},
     plugins: createStatePlugins()
-  });
+  };
   return originCreateStore(config);
 };
 export {

package/dist/esm-node/runtime-testing/resolvePlugins.js

@@ -0,0 +1,19 @@
+const allowedFeatures = ["router", "state"];
+function resolvePlugins(features) {
+  const plugins = [];
+  if (!features) {
+    return plugins;
+  }
+  Object.keys(features).forEach((feature) => {
+    if (allowedFeatures.includes(feature)) {
+      const curPluginRes = require(`@modern-js/runtime/plugins`)[feature]({
+        ...features[feature]
+      });
+      plugins.push(curPluginRes);
+    }
+  });
+  return plugins;
+}
+export {
+  resolvePlugins as default
+};

package/package.json

@@ -11,12 +11,11 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.0",
+  "version": "2.5.0",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
-  "main": "./dist/js/node/cli/index.js",
-  "module": "./dist/js/treeshaking/cli/index.js",
-  "jsnext:modern": "./dist/js/modern/cli/index.js",
+  "main": "./dist/cjs/cli/index.js",
+  "module": "./dist/esm/cli/index.js",
   "exports": {
     "./types": {
       "jsnext:source": "./types/index.d.ts",
@@ -28,35 +27,35 @@
     },
     ".": {
       "jsnext:source": "./src/cli/index.ts",
-      "default": "./dist/js/node/cli/index.js"
+      "default": "./dist/cjs/cli/index.js"
     },
     "./runtime": {
       "jsnext:source": "./src/runtime-testing/index.ts",
       "node": {
-        "import": "./dist/js/modern/runtime-testing/index.js",
-        "require": "./dist/js/node/runtime-testing/index.js"
+        "import": "./dist/esm-node/runtime-testing/index.js",
+        "require": "./dist/cjs/runtime-testing/index.js"
       },
-      "default": "./dist/js/treeshaking/runtime-testing/index.js"
+      "default": "./dist/esm/runtime-testing/index.js"
     },
     "./runtime-base": {
       "jsnext:source": "./src/runtime-testing/base.ts",
       "node": {
-        "import": "./dist/js/modern/runtime-testing/base.js",
-        "require": "./dist/js/node/runtime-testing/base.js"
+        "import": "./dist/esm-node/runtime-testing/base.js",
+        "require": "./dist/cjs/runtime-testing/base.js"
       },
-      "default": "./dist/js/treeshaking/runtime-testing/base.js"
+      "default": "./dist/esm/runtime-testing/base.js"
     },
     "./cli": {
       "jsnext:source": "./src/cli/index.ts",
-      "default": "./dist/js/node/cli/index.js"
+      "default": "./dist/cjs/cli/index.js"
     },
     "./bff-cli": {
       "jsnext:source": "./src/cli/bff/index.ts",
-      "default": "./dist/js/node/cli/bff/index.js"
+      "default": "./dist/cjs/cli/bff/index.js"
     },
     "./base": {
       "jsnext:source": "./src/base/index.ts",
-      "default": "./dist/js/node/base/index.js"
+      "default": "./dist/cjs/base/index.js"
     }
   },
   "typesVersions": {
@@ -107,16 +106,16 @@
     "jest": "^27.0.6",
     "ts-jest": "^27.0.4",
     "yargs": "^17.0.1",
-    "@modern-js/babel-compiler": "2.4.0",
-    "@modern-js/utils": "2.4.0",
-    "@modern-js/babel-preset-app": "2.4.0",
-    "@modern-js/plugin": "2.4.0",
-    "@modern-js/prod-server": "2.4.0"
+    "@modern-js/babel-compiler": "2.5.0",
+    "@modern-js/utils": "2.5.0",
+    "@modern-js/babel-preset-app": "2.5.0",
+    "@modern-js/plugin": "2.5.0",
+    "@modern-js/prod-server": "2.5.0"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17",
-    "@modern-js/runtime": "^2.4.0"
+    "@modern-js/runtime": "^2.5.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -133,12 +132,12 @@
     "@jest/types": "^27.0.6",
     "jest": "^27",
     "typescript": "^4",
-    "@modern-js/core": "2.4.0",
-    "@modern-js/runtime": "2.4.0",
-    "@modern-js/bff-core": "2.4.0",
-    "@modern-js/types": "2.4.0",
-    "@scripts/jest-config": "2.4.0",
-    "@scripts/build": "2.4.0"
+    "@modern-js/core": "2.5.0",
+    "@modern-js/types": "2.5.0",
+    "@modern-js/runtime": "2.5.0",
+    "@modern-js/bff-core": "2.5.0",
+    "@scripts/build": "2.5.0",
+    "@scripts/jest-config": "2.5.0"
   },
   "sideEffects": false,
   "modernConfig": {},