@modern-js/plugin-testing 1.4.0 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,66 @@
 # @modern-js/plugin-testing
 
+## 1.5.0
+
+### Minor Changes
+
+- 3bf4f8b0: feat: support start api server only
+
+### Patch Changes
+
+- 04ae5262: chore: bump @modern-js/utils to v1.4.1 in dependencies
+- 60f7d8bf: feat: add tests dir to npmignore
+- Updated dependencies [b8599d09]
+- Updated dependencies [6cffe99d]
+- Updated dependencies [04ae5262]
+- Updated dependencies [60f7d8bf]
+- Updated dependencies [e4cec1ce]
+- Updated dependencies [3bf4f8b0]
+  - @modern-js/utils@1.5.0
+  - @modern-js/webpack@1.5.5
+  - @modern-js/testing@1.4.3
+  - @modern-js/testing-plugin-bff@1.4.0
+  - @modern-js/runtime-core@1.4.2
+  - @modern-js/babel-compiler@1.2.3
+
+## 1.4.2
+
+### Patch Changes
+
+- 77043407: feat: add default enhanced resolver
+- Updated dependencies [485375ae]
+- Updated dependencies [ec1b7367]
+- Updated dependencies [77ff9754]
+- Updated dependencies [d2d1d6b2]
+- Updated dependencies [07a4887e]
+- Updated dependencies [ea2ae711]
+- Updated dependencies [77043407]
+- Updated dependencies [17d0cc46]
+- Updated dependencies [d2d1d6b2]
+  - @modern-js/runtime-core@1.4.1
+  - @modern-js/webpack@1.5.4
+  - @modern-js/utils@1.4.0
+  - @modern-js/testing@1.4.2
+  - @modern-js/testing-plugin-bff@1.3.1
+
+## 1.4.1
+
+### Patch Changes
+
+- bebb39b6: chore: improve devDependencies and peerDependencies
+- 132f7b53: feat: move config declarations to @modern-js/core
+- 8491b6dd: fix: optimise "types" exports from plugin
+- Updated dependencies [bebb39b6]
+- Updated dependencies [4b4e73b7]
+- Updated dependencies [da60172c]
+- Updated dependencies [6cff93dc]
+- Updated dependencies [132f7b53]
+- Updated dependencies [9d4a005b]
+  - @modern-js/webpack@1.5.3
+  - @modern-js/testing@1.4.1
+  - @modern-js/utils@1.3.7
+  - @modern-js/testing-plugin-bff@1.3.0
+
 ## 1.4.0
 
 ### Minor Changes

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

@@ -1,6 +1,6 @@
 import path from 'path';
-import { fs, PLUGIN_SCHEMAS, createRuntimeExportsUtils } from '@modern-js/utils';
-import { jestConfigHook, getModuleNameMapper } from '@modern-js/testing';
+import { PLUGIN_SCHEMAS, createRuntimeExportsUtils, isApiOnly } from '@modern-js/utils';
+import { jestConfigHook, getModuleNameMapper, DEFAULT_RESOLVER_PATH } from '@modern-js/testing';
 import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
 import TestingBffPlugin from '@modern-js/testing-plugin-bff';
 import { MODERNJS_CONFIG_KEY } from "../constant";
@@ -59,9 +59,9 @@ export default (() => {
         },
 
         jestConfig: async (utils, next) => {
-          const existSrc = await fs.pathExists(appContext.srcDirectory);
+          const apiOnly = await isApiOnly(appContext.srcDirectory);
 
-          if (!existSrc) {
+          if (apiOnly) {
             return next(utils);
           }
 
@@ -77,7 +77,7 @@ export default (() => {
             },
             moduleNameMapper: getModuleNameMapper(alias),
             testEnvironment: 'jsdom',
-            resolver: require.resolve("./resolver")
+            resolver: DEFAULT_RESOLVER_PATH
           });
           utils.setJestConfig({
             rootDir: appContext.appDirectory || process.cwd(),

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

@@ -79,9 +79,9 @@ var _default = () => {
         },
 
         jestConfig: async (utils, next) => {
-          const existSrc = await _utils.fs.pathExists(appContext.srcDirectory);
+          const apiOnly = await (0, _utils.isApiOnly)(appContext.srcDirectory);
 
-          if (!existSrc) {
+          if (apiOnly) {
             return next(utils);
           }
 
@@ -97,7 +97,7 @@ var _default = () => {
             },
             moduleNameMapper: (0, _testing.getModuleNameMapper)(alias),
             testEnvironment: 'jsdom',
-            resolver: require.resolve("./resolver")
+            resolver: _testing.DEFAULT_RESOLVER_PATH
           });
           utils.setJestConfig({
             rootDir: appContext.appDirectory || process.cwd(),

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

@@ -7,8 +7,8 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 import path from 'path';
-import { fs, PLUGIN_SCHEMAS, createRuntimeExportsUtils } from '@modern-js/utils';
-import { jestConfigHook, getModuleNameMapper } from '@modern-js/testing';
+import { PLUGIN_SCHEMAS, createRuntimeExportsUtils, isApiOnly } from '@modern-js/utils';
+import { jestConfigHook, getModuleNameMapper, DEFAULT_RESOLVER_PATH } from '@modern-js/testing';
 import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
 import TestingBffPlugin from '@modern-js/testing-plugin-bff';
 import { MODERNJS_CONFIG_KEY } from "../constant";
@@ -75,19 +75,19 @@ export default (function () {
         },
         jestConfig: function () {
           var _jestConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(utils, next) {
-            var existSrc, webpackConfig, _webpackConfig$resolv, alias;
+            var apiOnly, webpackConfig, _webpackConfig$resolv, alias;
 
             return _regeneratorRuntime.wrap(function _callee2$(_context2) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
                     _context2.next = 2;
-                    return fs.pathExists(appContext.srcDirectory);
+                    return isApiOnly(appContext.srcDirectory);
 
                   case 2:
-                    existSrc = _context2.sent;
+                    apiOnly = _context2.sent;
 
-                    if (existSrc) {
+                    if (!apiOnly) {
                       _context2.next = 5;
                       break;
                     }
@@ -101,7 +101,7 @@ export default (function () {
                       globals: _defineProperty({}, MODERNJS_CONFIG_KEY, userConfig),
                       moduleNameMapper: getModuleNameMapper(alias),
                       testEnvironment: 'jsdom',
-                      resolver: require.resolve("./resolver")
+                      resolver: DEFAULT_RESOLVER_PATH
                     });
                     utils.setJestConfig({
                       rootDir: appContext.appDirectory || process.cwd(),

package/dist/types/cli/test.d.ts

@@ -1,11 +1,3 @@
 import type { PluginAPI } from '@modern-js/core';
 declare const test: (api: PluginAPI) => Promise<void>;
-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'];
-  }
-}
+export default test;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { UserConfig } from '@modern-js/core';
+import type { UserConfig } from '@modern-js/core';
 interface CreateAppProps {
   entry?: string;
   children?: React.ReactElement;

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

@@ -1,2 +1,2 @@
-import { NormalizedConfig } from '@modern-js/core';
+import type { NormalizedConfig } from '@modern-js/core';
 export default function resolvePlugins(features: NormalizedConfig['runtime']): any[];

package/jest.config.js

@@ -2,7 +2,6 @@ const sharedConfig = require('@scripts/jest-config');
 
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  // eslint-disable-next-line node/no-unsupported-features/es-syntax
   ...sharedConfig,
   rootDir: __dirname,
 };

package/package.json

@@ -11,13 +11,17 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.0",
+  "version": "1.5.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
   "module": "./dist/js/treeshaking/index.js",
   "jsnext:modern": "./dist/js/modern/index.js",
   "exports": {
+    "./types": {
+      "jsnext:source": "./type.d.ts",
+      "default": "./type.d.ts"
+    },
     "./type": {
       "jsnext:source": "./type.d.ts",
       "default": "./type.d.ts"
@@ -68,6 +72,9 @@
       "type": [
         "./type.d.ts"
       ],
+      "types": [
+        "./type.d.ts"
+      ],
       "runtime-base": [
         "./dist/types/runtime-testing/base.d.ts"
       ]
@@ -76,22 +83,20 @@
   "dependencies": {
     "@babel/preset-env": "^7.15.6",
     "@babel/runtime": "^7",
-    "@modern-js/babel-compiler": "^1.2.1",
-    "@modern-js/testing": "^1.4.0",
-    "@modern-js/utils": "^1.3.6",
-    "@modern-js/webpack": "^1.5.0",
+    "@modern-js/babel-compiler": "^1.2.3",
+    "@modern-js/testing": "^1.4.3",
+    "@modern-js/utils": "^1.5.0",
+    "@modern-js/webpack": "^1.5.6",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
-    "enhanced-resolve": "^5.8.3",
-    "@modern-js/testing-plugin-bff": "^1.3.0"
+    "@modern-js/testing-plugin-bff": "^1.4.0"
   },
   "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.6.0",
-    "@modern-js/runtime-core": "^1.4.0"
+    "@modern-js/runtime-core": "^1.4.2"
   },
   "devDependencies": {
     "@modern-js-reduck/plugin-auto-actions": "^1.0.0",
@@ -99,8 +104,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.6.0",
-    "@modern-js/runtime-core": "^1.4.0",
+    "@modern-js/core": "1.8.0",
+    "@modern-js/runtime-core": "1.4.2",
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/react": "^17",

package/type.d.ts

@@ -1,4 +1,3 @@
-import '@modern-js/core';
 import "@testing-library/react"
 import "@testing-library/jest-dom"
 import "./dist/types/runtime-testing"
@@ -7,13 +6,3 @@ declare module '@modern-js/runtime/testing' {
   export * from '@testing-library/react';
   export { renderApp, createStore, testBff } from './dist/types/runtime-testing';
 }
-
-declare module '@modern-js/core' {
-  interface UserConfig {
-    testing?: import('@modern-js/testing').TestConfig;
-  }
-
-  interface ToolsConfig {
-    jest?: import('@modern-js/testing').TestConfig['jest'];
-  }
-}

package/dist/js/modern/cli/resolver.js

@@ -1,15 +0,0 @@
-import enhanceResolve from 'enhanced-resolve';
-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);
-};

package/dist/js/node/cli/resolver.js

@@ -1,20 +0,0 @@
-"use strict";
-
-var _enhancedResolve = _interopRequireDefault(require("enhanced-resolve"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const resolver = _enhancedResolve.default.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);
-};

package/dist/js/treeshaking/cli/resolver.js

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

package/dist/types/cli/resolver.d.ts

@@ -1 +0,0 @@
-export {};

package/tests/.eslintrc.js

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

package/tests/index.test.ts

@@ -1,7 +0,0 @@
-import { createStore } from '../src';
-
-describe('plugin-testing', () => {
-  it('default', () => {
-    expect(createStore).toBeDefined();
-  });
-});

package/tests/merge-config.test.ts

@@ -1,54 +0,0 @@
-import { mergeUserJestConfig } from '../src/cli';
-
-describe('mergeUserJestConfig', () => {
-  test('mergeUserJestConfig support object', () => {
-    const testUtils: any = {
-      _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: any = {
-      _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,
-    });
-  });
-});

package/tests/resolver.test.ts

@@ -1,30 +0,0 @@
-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

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