@modern-js/plugin-testing 1.4.1 → 1.4.2

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @modern-js/plugin-testing
 
+## 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

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 { 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";
@@ -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

@@ -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

@@ -8,7 +8,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 import path from 'path';
 import { fs, PLUGIN_SCHEMAS, createRuntimeExportsUtils } from '@modern-js/utils';
-import { jestConfigHook, getModuleNameMapper } from '@modern-js/testing';
+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";
@@ -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/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.1",
+  "version": "1.4.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -84,20 +84,19 @@
     "@babel/preset-env": "^7.15.6",
     "@babel/runtime": "^7",
     "@modern-js/babel-compiler": "^1.2.1",
-    "@modern-js/testing": "^1.4.1",
-    "@modern-js/utils": "^1.3.7",
-    "@modern-js/webpack": "^1.5.3",
+    "@modern-js/testing": "^1.4.2",
+    "@modern-js/utils": "^1.4.0",
+    "@modern-js/webpack": "^1.5.4",
     "@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.3.1"
   },
   "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/runtime-core": "^1.4.0"
+    "@modern-js/runtime-core": "^1.4.1"
   },
   "devDependencies": {
     "@modern-js-reduck/plugin-auto-actions": "^1.0.0",
@@ -105,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.1",
-    "@modern-js/runtime-core": "1.4.0",
+    "@modern-js/core": "1.7.0",
+    "@modern-js/runtime-core": "1.4.1",
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/react": "^17",

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/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');
-  });
-});