@modern-js/plugin-testing 1.3.0 → 1.3.3

package/dist/js/treeshaking/cli/test.js

@@ -22,11 +22,12 @@ import { useAppContext, useResolvedConfigContext } from '@modern-js/core';
 import { runTest } from '@modern-js/testing';
 import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
 import testingBffPlugin from '@modern-js/testing-plugin-bff';
+import { fs } from '@modern-js/utils';
 import modernTestPlugin from "./plugins/modern";
 
 var test = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var userConfig, config, webpackConfigs, jest, runtimeExportsPath;
+    var userConfig, config, srcDirectory, existSrc, jest, webpackConfigs, runtimeExportsPath;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -34,9 +35,13 @@ var test = /*#__PURE__*/function () {
             // eslint-disable-next-line react-hooks/rules-of-hooks
             userConfig = useResolvedConfigContext(); // eslint-disable-next-line react-hooks/rules-of-hooks
 
-            config = useAppContext(); // todo: consider lib-tools ...
+            config = useAppContext();
+            srcDirectory = config.srcDirectory;
+            _context.next = 5;
+            return fs.pathExists(srcDirectory);
 
-            webpackConfigs = getWebpackConfig(WebpackConfigTarget.CLIENT);
+          case 5:
+            existSrc = _context.sent;
             userConfig.testing = userConfig.testing || {};
             jest = userConfig.testing.jest || userConfig.tools.jest;
 
@@ -45,16 +50,31 @@ var test = /*#__PURE__*/function () {
             }
 
             userConfig.testing.jest = userConfig.testing.jest || userConfig.tools.jest;
-            userConfig.testing.plugins = [].concat(_toConsumableArray(userConfig.testing.plugins || []), [modernTestPlugin(webpackConfigs, userConfig, config.appDirectory), testingBffPlugin({
-              pwd: config.appDirectory,
-              userConfig: userConfig,
-              plugins: config.plugins.map(function (p) {
-                return p.server;
-              }).filter(Boolean),
-              routes: config.serverRoutes
-            })]);
+
+            if (existSrc) {
+              // todo: consider lib-tools ...
+              webpackConfigs = getWebpackConfig(WebpackConfigTarget.CLIENT);
+              userConfig.testing.plugins = [].concat(_toConsumableArray(userConfig.testing.plugins || []), [modernTestPlugin(webpackConfigs, userConfig, config.appDirectory), testingBffPlugin({
+                pwd: config.appDirectory,
+                userConfig: userConfig,
+                plugins: config.plugins.map(function (p) {
+                  return p.server;
+                }).filter(Boolean),
+                routes: config.serverRoutes
+              })]);
+            } else {
+              userConfig.testing.plugins = [].concat(_toConsumableArray(userConfig.testing.plugins || []), [testingBffPlugin({
+                pwd: config.appDirectory,
+                userConfig: userConfig,
+                plugins: config.plugins.map(function (p) {
+                  return p.server;
+                }).filter(Boolean),
+                routes: config.serverRoutes
+              })]);
+            }
+
             runtimeExportsPath = path.join(config.internalDirectory, '.runtime-exports');
-            _context.next = 11;
+            _context.next = 14;
             return compiler({
               sourceDir: runtimeExportsPath,
               rootDir: runtimeExportsPath,
@@ -66,11 +86,11 @@ var test = /*#__PURE__*/function () {
               }]]
             });
 
-          case 11:
-            _context.next = 13;
+          case 14:
+            _context.next = 16;
             return runTest(userConfig.testing);
 
-          case 13:
+          case 16:
           case "end":
             return _context.stop();
         }

package/dist/js/treeshaking/runtime-testing/base.js

@@ -0,0 +1,3 @@
+export { default as renderApp } from "./customRender";
+export * from '@testing-library/react';
+export { testBff } from '@modern-js/testing-plugin-bff';

package/dist/js/treeshaking/runtime-testing/index.js

@@ -1,4 +1,2 @@
-export { default as renderApp } from "./customRender";
-export * from '@testing-library/react';
-export * from "./reduck";
-export { testBff } from '@modern-js/testing-plugin-bff';
+export * from "./base";
+export * from "./reduck";

package/dist/types/cli/plugins/modern.d.ts

@@ -1,5 +1,4 @@
 import type { NormalizedConfig } from '@modern-js/core';
-export declare const getModuleNameMapper: (config: any) => any;
 export declare const mergeUserJestConfig: (testUtils: any) => Promise<void>;
 
 declare const _default: (webpackConfig: any, userConfig: NormalizedConfig, pwd: string) => any;

package/{src/runtime-testing/index.ts → dist/types/runtime-testing/base.d.ts}

@@ -1,4 +1,3 @@
 export { default as renderApp } from './customRender';
 export * from '@testing-library/react';
-export * from './reduck';
-export { testBff } from '@modern-js/testing-plugin-bff';
+export { testBff } from '@modern-js/testing-plugin-bff';

package/dist/types/runtime-testing/index.d.ts

@@ -1,4 +1,2 @@
-export { default as renderApp } from './customRender';
-export * from '@testing-library/react';
-export * from './reduck';
-export { testBff } from '@modern-js/testing-plugin-bff';
+export * from './base';
+export * from './reduck';

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.0",
+  "version": "1.3.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -40,6 +40,15 @@
       },
       "default": "./dist/js/treeshaking/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",
+        "types": "./types/base.d.ts"
+      },
+      "default": "./dist/js/treeshaking/runtime-testing/base.js"
+    },
     "./cli": {
       "jsnext:source": "./src/cli/index.ts",
       "default": "./dist/js/node/cli/index.js"
@@ -64,22 +73,22 @@
   "dependencies": {
     "@babel/preset-env": "^7.15.6",
     "@babel/runtime": "^7",
-    "@modern-js/babel-compiler": "^1.2.0",
-    "@modern-js/testing": "^1.3.0",
-    "@modern-js/utils": "^1.2.0",
-    "@modern-js/webpack": "^1.2.0",
+    "@modern-js/babel-compiler": "^1.2.1",
+    "@modern-js/testing": "^1.3.2",
+    "@modern-js/utils": "^1.3.1",
+    "@modern-js/webpack": "^1.3.1",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
     "enhanced-resolve": "^5.8.3",
-    "@modern-js/testing-plugin-bff": "^1.2.0"
+    "@modern-js/testing-plugin-bff": "^1.2.2"
   },
   "peerDependencies": {
     "@modern-js-reduck/plugin-auto-actions": "^1.0.0",
     "@modern-js-reduck/plugin-effects": "^1.0.0",
     "@modern-js-reduck/plugin-immutable": "^1.0.0",
     "@modern-js-reduck/store": "^1.0.0",
-    "@modern-js/core": "^1.3.0",
-    "@modern-js/runtime-core": "^1.2.0"
+    "@modern-js/core": "^1.4.1",
+    "@modern-js/runtime-core": "^1.2.1"
   },
   "devDependencies": {
     "@modern-js-reduck/plugin-auto-actions": "^1.0.0",
@@ -87,8 +96,8 @@
     "@modern-js-reduck/plugin-immutable": "^1.0.0",
     "@modern-js-reduck/store": "^1.0.0",
     "@scripts/build": "0.0.0",
-    "@modern-js/core": "^1.3.0",
-    "@modern-js/runtime-core": "^1.2.0",
+    "@modern-js/core": "^1.4.1",
+    "@modern-js/runtime-core": "^1.2.1",
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/react": "^17",
@@ -103,8 +112,7 @@
   "modernConfig": {},
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "scripts": {
     "new": "modern new",

package/tests/.eslintrc.js

@@ -0,0 +1,6 @@
+module.exports = {
+  extends: ['@modern-js'],
+  parserOptions: {
+    project: require.resolve('./tsconfig.json'),
+  },
+};

package/tests/resolver.test.ts

@@ -0,0 +1,30 @@
+import path from 'path';
+import { fs } from '@modern-js/utils';
+
+const resolver = require('../src/cli/resolver');
+
+describe('plugin-testing', () => {
+  it('resolver', () => {
+    const moduleDir = path.join(
+      __dirname,
+      'node_modules/@modern-js/runtime/module',
+    );
+    fs.ensureDirSync(moduleDir);
+    fs.writeJSONSync(
+      path.join(moduleDir, 'package.json'),
+      {
+        name: '@modern-js/runtime/module',
+        main: './index.js',
+      },
+      'utf-8',
+    );
+    fs.writeFileSync(
+      path.join(moduleDir, 'index.js'),
+      'module.exports = "@modern-js/runtime/module"',
+      'utf-8',
+    );
+    expect(
+      resolver('@modern-js/runtime/module', { basedir: __dirname }),
+    ).toContain('module');
+  });
+});

package/tests/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "@modern-js/tsconfig/base",
+  "compilerOptions": {
+    "declaration": true,
+    "jsx": "preserve",
+    "baseUrl": "./",
+    "outDir": "./out",
+    "emitDeclarationOnly": true,
+    "isolatedModules": true,
+    "paths": {},
+    "types": ["node", "jest"]
+  }
+}

package/type.d.ts

@@ -1,7 +1,11 @@
 import '@modern-js/core';
+import "@testing-library/react"
+import "@testing-library/jest-dom"
+import "./dist/types/runtime-testing"
+
 declare module '@modern-js/runtime/testing' {
   export * from '@testing-library/react';
-  export { renderApp, createStore } from '@modern-js/plugin-testing';
+  export { renderApp, createStore, testBff } from './dist/types/runtime-testing';
 }
 
 declare module '@modern-js/core' {

package/src/.eslintrc.json

@@ -1,3 +0,0 @@
-{
-  "extends": ["@modern-js"]
-}

package/src/cli/index.ts

@@ -1,48 +0,0 @@
-import path from 'path';
-import { createRuntimeExportsUtils, PLUGIN_SCHEMAS } from '@modern-js/utils';
-import { createPlugin, useAppContext } from '@modern-js/core';
-import test from './test';
-
-export default createPlugin(
-  () => {
-    let testingExportsUtils: ReturnType<typeof createRuntimeExportsUtils>;
-
-    return {
-      commands: ({ program }: any) => {
-        program
-          .command('test')
-          .allowUnknownOption()
-          .usage('[options]')
-          .action(async () => {
-            await test();
-          });
-      },
-      validateSchema() {
-        return PLUGIN_SCHEMAS['@modern-js/plugin-testing'];
-      },
-      config() {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        const appContext = useAppContext();
-
-        testingExportsUtils = createRuntimeExportsUtils(
-          appContext.internalDirectory,
-          'testing',
-        );
-
-        return {
-          source: {
-            alias: {
-              '@modern-js/runtime/testing': testingExportsUtils.getPath(),
-            },
-          },
-        };
-      },
-      addRuntimeExports() {
-        const testingPath = path.resolve(__dirname, '../');
-
-        testingExportsUtils.addExport(`export * from '${testingPath}'`);
-      },
-    };
-  },
-  { name: '@modern-js/plugin-testing' },
-) as any;

package/src/cli/plugins/modern.test.ts

@@ -1,68 +0,0 @@
-import { mergeUserJestConfig, getModuleNameMapper } from './modern';
-
-describe('modern plugin', () => {
-  test('mergeUserJestConfig support object', () => {
-    const testUtils = {
-      _jestConfig: {
-        a: 1,
-      },
-      get jestConfig() {
-        return this._jestConfig;
-      },
-      testConfig: {
-        jest: {
-          b: 1,
-        },
-      },
-      mergeJestConfig(config: Record<string, string>) {
-        Object.assign(this._jestConfig, config);
-      },
-    };
-
-    mergeUserJestConfig(testUtils);
-
-    expect(testUtils.jestConfig).toEqual({
-      a: 1,
-      b: 1,
-    });
-  });
-
-  test('mergeUserJestConfig support function', () => {
-    const testUtils = {
-      _jestConfig: {
-        a: 1,
-      },
-      get jestConfig() {
-        return this._jestConfig;
-      },
-      testConfig: {
-        jest: (jestConfig: Record<string, number>) => {
-          jestConfig.b = 1;
-        },
-      },
-      mergeJestConfig(config: Record<string, string>) {
-        Object.assign(this._jestConfig, config);
-      },
-    };
-
-    mergeUserJestConfig(testUtils);
-    expect(testUtils.jestConfig).toEqual({
-      a: 1,
-      b: 1,
-    });
-  });
-
-  // TODO: 临时测试代码，待补充
-  test('getModuleNameMapper', () => {
-    const mockConfig = {
-      resolve: {
-        alias: {
-          '@modern-js/runtime/core': '/xxx',
-        },
-      },
-    };
-
-    const alias = getModuleNameMapper(mockConfig);
-    expect(alias).toBeDefined();
-  });
-});

package/src/cli/plugins/modern.ts

@@ -1,83 +0,0 @@
-import path from 'path';
-import { createPlugin } from '@modern-js/testing';
-import type { NormalizedConfig } from '@modern-js/core';
-import { modernjs_config_key } from '../../constant';
-
-export const getModuleNameMapper = (config: any) => {
-  const {
-    resolve: { alias = {} },
-  } = config;
-
-  return Object.keys(alias).reduce((memo, cur) => {
-    const aliasValue = Array.isArray(alias[cur]) ? alias[cur] : [alias[cur]];
-
-    const isFile = aliasValue.some((s: string) => s.endsWith('.js'));
-
-    // It's special for if using @modern-js/runtime alias other module @modern-js/runtime/model would not work.
-    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;
-  }, {} as any);
-};
-
-export const mergeUserJestConfig = async (testUtils: any) => {
-  const resolveJestConfig = testUtils.testConfig.jest;
-
-  if (resolveJestConfig && typeof resolveJestConfig !== 'function') {
-    testUtils.mergeJestConfig(resolveJestConfig);
-  }
-
-  if (typeof resolveJestConfig === 'function') {
-    await resolveJestConfig(testUtils.jestConfig);
-  }
-};
-
-export default (
-  webpackConfig: any,
-  userConfig: NormalizedConfig,
-  pwd: string,
-) =>
-  createPlugin(
-    () => ({
-      jestConfig: (utils: any, next: any) => {
-        utils.mergeJestConfig({
-          globals: {
-            [modernjs_config_key]: userConfig,
-          },
-          moduleNameMapper: getModuleNameMapper(webpackConfig),
-          testEnvironment: 'jsdom',
-          resolver: require.resolve('../resolver'),
-        });
-
-        utils.setJestConfig({
-          rootDir: pwd || process.cwd(),
-          // todo: diffrent test root for diffrent solutions
-          // testMatch: [`<rootDir>/(src|tests|electron)/**/*.test.[jt]s?(x)`],
-          // testMatch bug on windows, issue: https://github.com/facebook/jest/issues/7914
-          testMatch: [
-            `<rootDir>/src/**/*.test.[jt]s?(x)`,
-            `<rootDir>/tests/**/*.test.[jt]s?(x)`,
-            `<rootDir>/electron/**/*.test.[jt]s?(x)`,
-          ],
-        });
-
-        mergeUserJestConfig(utils);
-
-        return next(utils);
-      },
-    }),
-    {
-      name: '@modern-js/testing-plugin-modern',
-    },
-  ) as any;

package/src/cli/resolver.ts

@@ -1,16 +0,0 @@
-import enhanceResolve from 'enhanced-resolve';
-
-const resolver = enhanceResolve.create.sync({
-  conditionNames: ['jsnext:source', 'require', 'node', 'default'],
-  extensions: ['.js', '.json', '.node', '.ts', '.tsx'],
-});
-
-const shouldResolveByEnhance = (url: string) => /^@[^/]+\/[^/]+\/.*/.test(url);
-
-module.exports = function (request: string, options: any) {
-  if (shouldResolveByEnhance(request)) {
-    return resolver(options.basedir, request);
-  }
-
-  return options.defaultResolver(request, options);
-};

package/src/cli/test.ts

@@ -1,77 +0,0 @@
-import path from 'path';
-import { compiler } from '@modern-js/babel-compiler';
-import { useAppContext, useResolvedConfigContext } from '@modern-js/core';
-import { runTest } from '@modern-js/testing';
-import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
-import testingBffPlugin from '@modern-js/testing-plugin-bff';
-import modernTestPlugin from './plugins/modern';
-
-const test = async () => {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const userConfig = useResolvedConfigContext();
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const config = useAppContext();
-
-  // todo: consider lib-tools ...
-  const webpackConfigs = getWebpackConfig(WebpackConfigTarget.CLIENT);
-
-  userConfig.testing = userConfig.testing || {};
-
-  const jest = userConfig.testing.jest || (userConfig.tools as any).jest;
-
-  if (Array.isArray(jest)) {
-    userConfig.testing.jest = jest[0];
-  }
-
-  userConfig.testing.jest =
-    userConfig.testing.jest || (userConfig.tools as any).jest;
-
-  userConfig.testing.plugins = [
-    ...(userConfig.testing.plugins || []),
-    modernTestPlugin(webpackConfigs, userConfig, config.appDirectory),
-    testingBffPlugin({
-      pwd: config.appDirectory,
-      userConfig,
-      plugins: config.plugins.map(p => p.server).filter(Boolean),
-      routes: (config as any).serverRoutes,
-    }),
-  ];
-
-  const runtimeExportsPath = path.join(
-    config.internalDirectory,
-    '.runtime-exports',
-  );
-
-  await compiler(
-    {
-      sourceDir: runtimeExportsPath,
-      rootDir: runtimeExportsPath,
-      distDir: runtimeExportsPath,
-      quiet: true,
-    },
-    {
-      presets: [
-        [
-          require.resolve('@babel/preset-env'),
-          {
-            modules: 'cjs',
-          },
-        ],
-      ],
-    },
-  );
-
-  await runTest(userConfig.testing);
-};
-
-export default test;
-
-declare module '@modern-js/core' {
-  interface UserConfig {
-    testing?: import('@modern-js/testing').TestConfig;
-  }
-
-  interface ToolsConfig {
-    jest?: import('@modern-js/testing').TestConfig['jest'];
-  }
-}

package/src/constant.ts

@@ -1 +0,0 @@
-export const modernjs_config_key = '__modernjs_config__';

package/src/index.ts

@@ -1,4 +0,0 @@
-import '@testing-library/jest-dom/extend-expect';
-import '@testing-library/jest-dom';
-
-export * from './runtime-testing';

package/src/runtime-testing/app.ts

@@ -1,48 +0,0 @@
-import React from 'react';
-import { createApp } from '@modern-js/runtime-core';
-import { UserConfig } from '@modern-js/core';
-import { modernjs_config_key } from '../constant';
-import resolvePlugins from './resolvePlugins';
-
-interface CreateAppProps {
-  entry?: string;
-  children?: React.ReactElement;
-}
-
-class ModernRuntime {
-  private options: UserConfig;
-
-  constructor(options: UserConfig) {
-    this.options = options;
-  }
-
-  public init(options: UserConfig) {
-    this.options = options;
-  }
-
-  public createApp(props?: CreateAppProps) {
-    const { entry, children } = props || {};
-    let runtimeFeatures = this.options?.runtime;
-
-    if (entry) {
-      runtimeFeatures = {
-        ...(runtimeFeatures || {}),
-        ...this.options.runtimeByEntries?.[entry],
-      };
-    }
-
-    const Component = (): React.ReactElement | null => {
-      if (!children) {
-        return null;
-      }
-
-      return children;
-    };
-
-    return createApp({
-      plugins: resolvePlugins(runtimeFeatures || {}),
-    })(Component);
-  }
-}
-
-export default new ModernRuntime((global as any)[modernjs_config_key] || {});

package/src/runtime-testing/customRender.ts

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

package/src/runtime-testing/reduck.ts

@@ -1,38 +0,0 @@
-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';
-import immerPlugin from '@modern-js-reduck/plugin-immutable';
-import { modernjs_config_key } from '../constant';
-
-export const effects = () => effectsPlugin;
-export const immer = () => immerPlugin;
-export const autoActions = () => autoActionsPlugin;
-
-export const createStore: typeof originCreateStore = props => {
-  const createStatePlugins = () => {
-    const modernConfig = (global as any)[modernjs_config_key];
-    const stateConfig = modernConfig?.runtime?.state;
-    const plugins = [];
-
-    if (stateConfig?.effects !== false) {
-      plugins.push(effects());
-    }
-
-    if (stateConfig?.autoActions !== false) {
-      plugins.push(autoActions());
-    }
-
-    if (stateConfig?.immer !== false) {
-      plugins.push(immer());
-    }
-
-    return (props?.plugins || []).concat(plugins);
-  };
-
-  const config = {
-    ...(props || {}),
-    plugins: createStatePlugins(),
-  };
-
-  return originCreateStore(config);
-};