@nx/jest 16.0.0-beta.2 → 16.0.0-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/migrations.json +9 -0
- package/package.json +5 -5
- package/preset/jest-preset.js +1 -1
- package/preset/jest-preset.js.map +1 -1
- package/src/generators/init/init.js +8 -8
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/jest-project/lib/update-workspace.js +1 -1
- package/src/generators/jest-project/lib/update-workspace.js.map +1 -1
- package/src/utils/config/get-jest-projects.js +2 -2
- package/src/utils/config/get-jest-projects.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +1 -1
package/migrations.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/jest",
|
|
3
|
-
"version": "16.0.0-beta.
|
|
3
|
+
"version": "16.0.0-beta.4",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for Jest contains executors and generators allowing your workspace to use the powerful Jest testing capabilities.",
|
|
6
6
|
"repository": {
|
|
@@ -36,9 +36,9 @@
|
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@jest/reporters": "^29.4.1",
|
|
38
38
|
"@jest/test-result": "^29.4.1",
|
|
39
|
-
"@nrwl/jest": "16.0.0-beta.
|
|
40
|
-
"@nx/devkit": "16.0.0-beta.
|
|
41
|
-
"@nx/js": "16.0.0-beta.
|
|
39
|
+
"@nrwl/jest": "16.0.0-beta.4",
|
|
40
|
+
"@nx/devkit": "16.0.0-beta.4",
|
|
41
|
+
"@nx/js": "16.0.0-beta.4",
|
|
42
42
|
"@phenomnomnominal/tsquery": "~5.0.1",
|
|
43
43
|
"chalk": "^4.1.0",
|
|
44
44
|
"dotenv": "~10.0.0",
|
|
@@ -53,5 +53,5 @@
|
|
|
53
53
|
"access": "public"
|
|
54
54
|
},
|
|
55
55
|
"types": "./index.d.ts",
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "0fc3d4441eb6900f8bdf0091c39f65e3cd1977ba"
|
|
57
57
|
}
|
package/preset/jest-preset.js
CHANGED
|
@@ -4,7 +4,7 @@ exports.nxPreset = void 0;
|
|
|
4
4
|
exports.nxPreset = {
|
|
5
5
|
// This is one of the patterns that jest finds by default https://jestjs.io/docs/configuration#testmatch-arraystring
|
|
6
6
|
testMatch: ['**/?(*.)+(spec|test).[jt]s?(x)'],
|
|
7
|
-
resolver: '@
|
|
7
|
+
resolver: '@nx/jest/plugins/resolver',
|
|
8
8
|
moduleFileExtensions: ['ts', 'js', 'mjs', 'html'],
|
|
9
9
|
coverageReporters: ['html'],
|
|
10
10
|
transform: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jest-preset.js","sourceRoot":"","sources":["../../../../packages/jest/preset/jest-preset.ts"],"names":[],"mappings":";;;AACa,QAAA,QAAQ,GAAW;IAC9B,oHAAoH;IACpH,SAAS,EAAE,CAAC,gCAAgC,CAAC;IAC7C,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"jest-preset.js","sourceRoot":"","sources":["../../../../packages/jest/preset/jest-preset.ts"],"names":[],"mappings":";;;AACa,QAAA,QAAQ,GAAW;IAC9B,oHAAoH;IACpH,SAAS,EAAE,CAAC,gCAAgC,CAAC;IAC7C,QAAQ,EAAE,2BAA2B;IACrC,oBAAoB,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC;IACjD,iBAAiB,EAAE,CAAC,MAAM,CAAC;IAC3B,SAAS,EAAE;QACT,qBAAqB,EAAE;YACrB,SAAS;YACT,EAAE,QAAQ,EAAE,8BAA8B,EAAE;SAC7C;KACF;IACD,eAAe,EAAE,OAAO;IACxB;;;;;;;;;;;;OAYG;IACH,sBAAsB,EAAE;QACtB,sBAAsB,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC;KACvD;CACF,CAAC"}
|
|
@@ -15,13 +15,13 @@ const schemaDefaults = {
|
|
|
15
15
|
function generateGlobalConfig(tree, isJS) {
|
|
16
16
|
const contents = isJS
|
|
17
17
|
? (0, devkit_1.stripIndents) `
|
|
18
|
-
const { getJestProjects } = require('@
|
|
18
|
+
const { getJestProjects } = require('@nx/jest');
|
|
19
19
|
|
|
20
20
|
module.exports = {
|
|
21
21
|
projects: getJestProjects()
|
|
22
22
|
};`
|
|
23
23
|
: (0, devkit_1.stripIndents) `
|
|
24
|
-
import { getJestProjects } from '@
|
|
24
|
+
import { getJestProjects } from '@nx/jest';
|
|
25
25
|
|
|
26
26
|
export default {
|
|
27
27
|
projects: getJestProjects()
|
|
@@ -33,7 +33,7 @@ function createJestConfig(tree, options) {
|
|
|
33
33
|
if (!tree.exists('jest.preset.js')) {
|
|
34
34
|
// preset is always js file.
|
|
35
35
|
tree.write(`jest.preset.js`, `
|
|
36
|
-
const nxPreset = require('@
|
|
36
|
+
const nxPreset = require('@nx/jest/preset').default;
|
|
37
37
|
|
|
38
38
|
module.exports = { ...nxPreset }`);
|
|
39
39
|
addTestInputs(tree);
|
|
@@ -61,7 +61,7 @@ function createJestConfig(tree, options) {
|
|
|
61
61
|
// if it's missing there's nothing to migrate
|
|
62
62
|
if (rootProject) {
|
|
63
63
|
const rootProjectConfig = projects.get(rootProject);
|
|
64
|
-
const jestTarget = Object.values(rootProjectConfig.targets || {}).find((t) => (t === null || t === void 0 ? void 0 : t.executor) === '@nrwl/jest:jest');
|
|
64
|
+
const jestTarget = Object.values(rootProjectConfig.targets || {}).find((t) => (t === null || t === void 0 ? void 0 : t.executor) === '@nx/jest:jest' || (t === null || t === void 0 ? void 0 : t.executor) === '@nrwl/jest:jest');
|
|
65
65
|
const isProjectConfig = ((_a = jestTarget === null || jestTarget === void 0 ? void 0 : jestTarget.options) === null || _a === void 0 ? void 0 : _a.jestConfig) === rootJestPath;
|
|
66
66
|
// if root project doesn't have jest target, there's nothing to migrate
|
|
67
67
|
if (isProjectConfig) {
|
|
@@ -107,7 +107,7 @@ function updateDependencies(tree, options) {
|
|
|
107
107
|
tslib: versions_1.tslibVersion,
|
|
108
108
|
};
|
|
109
109
|
const devDeps = {
|
|
110
|
-
'@
|
|
110
|
+
'@nx/jest': versions_1.nxVersion,
|
|
111
111
|
jest: versions_1.jestVersion,
|
|
112
112
|
// because the default jest-preset uses ts-jest,
|
|
113
113
|
// jest will throw an error if it's not installed
|
|
@@ -124,8 +124,8 @@ function updateDependencies(tree, options) {
|
|
|
124
124
|
}
|
|
125
125
|
if (options.compiler === 'babel' || options.babelJest) {
|
|
126
126
|
devDeps['babel-jest'] = versions_1.babelJestVersion;
|
|
127
|
-
// in some cases @
|
|
128
|
-
devDeps['@
|
|
127
|
+
// in some cases @nx/js will not already be present i.e. node only projects
|
|
128
|
+
devDeps['@nx/js'] = versions_1.nxVersion;
|
|
129
129
|
}
|
|
130
130
|
else if (options.compiler === 'swc') {
|
|
131
131
|
devDeps['@swc/jest'] = versions_1.swcJestVersion;
|
|
@@ -152,7 +152,7 @@ function jestInitGenerator(tree, schema) {
|
|
|
152
152
|
tasks.push(yield (0, js_1.initGenerator)(tree, Object.assign(Object.assign({}, schema), { skipFormat: true })));
|
|
153
153
|
createJestConfig(tree, options);
|
|
154
154
|
if (!options.skipPackageJson) {
|
|
155
|
-
(0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@
|
|
155
|
+
(0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/jest'], []);
|
|
156
156
|
const installTask = updateDependencies(tree, options);
|
|
157
157
|
tasks.push(installTask);
|
|
158
158
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/jest/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,uCAaoB;AACpB,+BAA0D;AAE1D,kFAA6E;AAC7E,mDAU8B;AAK9B,MAAM,cAAc,GAAG;IACrB,QAAQ,EAAE,KAAK;IACf,EAAE,EAAE,KAAK;IACT,WAAW,EAAE,KAAK;IAClB,eAAe,EAAE,OAAO;CAChB,CAAC;AAEX,SAAS,oBAAoB,CAAC,IAAU,EAAE,IAAa;IACrD,MAAM,QAAQ,GAAG,IAAI;QACnB,CAAC,CAAC,IAAA,qBAAY,EAAA;;;;;OAKX;QACH,CAAC,CAAC,IAAA,qBAAY,EAAA;;;;;OAKX,CAAC;IACN,IAAI,CAAC,KAAK,CAAC,eAAe,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;AAC5D,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAyB;;IAC7D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE;QAClC,4BAA4B;QAC5B,IAAI,CAAC,KAAK,CACR,gBAAgB,EAChB;;;uCAGiC,CAClC,CAAC;QAEF,aAAa,CAAC,IAAI,CAAC,CAAC;KACrB;IACD,IAAI,OAAO,CAAC,WAAW,EAAE;QACvB,yEAAyE;QACzE,qCAAqC;QACrC,OAAO;KACR;IACD,MAAM,YAAY,GAAG,IAAA,yCAAkB,EAAC,IAAI,CAAC,CAAC;IAC9C,IAAI,CAAC,YAAY,EAAE;QACjB,iEAAiE;QACjE,wBAAwB;QACxB,4EAA4E;QAC5E,yEAAyE;QACzE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QACvC,OAAO;KACR;IAED,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,2DAA2D;QAC3D,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QACjD,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CACnC,CAAC,WAAW,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,0CAAE,IAAI,MAAK,GAAG,CAAA,EAAA,CACzD,CAAC;QACF,wCAAwC;QACxC,6CAA6C;QAC7C,IAAI,WAAW,EAAE;YACf,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACpD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,CACpE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,MAAK,iBAAiB,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/jest/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ function updateWorkspace(tree, options) {
|
|
|
6
6
|
var _a;
|
|
7
7
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
8
8
|
projectConfig.targets.test = {
|
|
9
|
-
executor: '@
|
|
9
|
+
executor: '@nx/jest:jest',
|
|
10
10
|
outputs: [
|
|
11
11
|
options.rootProject
|
|
12
12
|
? (0, devkit_1.joinPathFragments)('{workspaceRoot}', 'coverage', '{projectName}')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-workspace.js","sourceRoot":"","sources":["../../../../../../../packages/jest/src/generators/jest-project/lib/update-workspace.ts"],"names":[],"mappings":";;;AACA,uCAMoB;AAEpB,SAAgB,eAAe,CAC7B,IAAU,EACV,OAAoC;;IAEpC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACtE,aAAa,CAAC,OAAO,CAAC,IAAI,GAAG;QAC3B,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"update-workspace.js","sourceRoot":"","sources":["../../../../../../../packages/jest/src/generators/jest-project/lib/update-workspace.ts"],"names":[],"mappings":";;;AACA,uCAMoB;AAEpB,SAAgB,eAAe,CAC7B,IAAU,EACV,OAAoC;;IAEpC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACtE,aAAa,CAAC,OAAO,CAAC,IAAI,GAAG;QAC3B,QAAQ,EAAE,eAAe;QACzB,OAAO,EAAE;YACP,OAAO,CAAC,WAAW;gBACjB,CAAC,CAAC,IAAA,0BAAiB,EAAC,iBAAiB,EAAE,UAAU,EAAE,eAAe,CAAC;gBACnE,CAAC,CAAC,IAAA,0BAAiB,EAAC,iBAAiB,EAAE,UAAU,EAAE,eAAe,CAAC;SACtE;QACD,OAAO,EAAE;YACP,UAAU,EAAE,IAAA,0BAAiB,EAC3B,IAAA,sBAAa,EAAC,aAAa,CAAC,IAAI,CAAC,EACjC,eAAe,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAC1C;YACD,eAAe,EAAE,IAAI;SACtB;QACD,cAAc,EAAE;YACd,EAAE,EAAE;gBACF,EAAE,EAAE,IAAI;gBACR,YAAY,EAAE,IAAI;aACnB;SACF;KACF,CAAC;IAEF,MAAM,aAAa,GACjB,CAAA,MAAA,aAAa,CAAC,OAAO,CAAC,IAAI,0CAAE,QAAQ;QACpC,sCAAsC,CAAC;IAEzC,IAAI,aAAa,EAAE;QACjB,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG;YAC5C,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;YACtD,IAAA,0BAAiB,EACf,IAAA,sBAAa,EAAC,aAAa,CAAC,IAAI,CAAC,EACjC,oBAAoB,CACrB;SACF,CAAC;KACH;IACD,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AACnE,CAAC;AAzCD,0CAyCC"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getNestedJestProjects = exports.getJestProjects = void 0;
|
|
4
4
|
const path_1 = require("path");
|
|
5
5
|
const file_utils_1 = require("nx/src/project-graph/file-utils");
|
|
6
|
-
const JEST_RUNNER_TOKEN = '@nrwl/jest:jest';
|
|
7
6
|
function getJestConfigProjectPath(projectJestConfigPath) {
|
|
8
7
|
return (0, path_1.join)('<rootDir>', projectJestConfigPath);
|
|
9
8
|
}
|
|
@@ -30,7 +29,8 @@ function getJestProjects() {
|
|
|
30
29
|
continue;
|
|
31
30
|
}
|
|
32
31
|
for (const targetConfiguration of Object.values(projectConfig.targets)) {
|
|
33
|
-
if (targetConfiguration.executor !==
|
|
32
|
+
if (targetConfiguration.executor !== '@nx/jest:jest' &&
|
|
33
|
+
targetConfiguration.executor !== '@nrwl/jest:jest') {
|
|
34
34
|
continue;
|
|
35
35
|
}
|
|
36
36
|
if ((_a = targetConfiguration.options) === null || _a === void 0 ? void 0 : _a.jestConfig) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-jest-projects.js","sourceRoot":"","sources":["../../../../../../packages/jest/src/utils/config/get-jest-projects.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAE5B,gEAAsE;AAEtE,
|
|
1
|
+
{"version":3,"file":"get-jest-projects.js","sourceRoot":"","sources":["../../../../../../packages/jest/src/utils/config/get-jest-projects.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAE5B,gEAAsE;AAEtE,SAAS,wBAAwB,CAAC,qBAA6B;IAC7D,OAAO,IAAA,WAAI,EAAC,WAAW,EAAE,qBAAqB,CAAC,CAAC;AAClD,CAAC;AAED;;;;;;;;;;;IAWI;AACJ,SAAgB,eAAe;;IAC7B,MAAM,EAAE,GAAG,IAAA,gCAAmB,EAAC;QAC7B,MAAM,EAAE,IAAI;KACb,CAA2B,CAAC;IAC7B,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/C,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE;QACtD,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE;YAC1B,SAAS;SACV;QACD,KAAK,MAAM,mBAAmB,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE;YACtE,IACE,mBAAmB,CAAC,QAAQ,KAAK,eAAe;gBAChD,mBAAmB,CAAC,QAAQ,KAAK,iBAAiB,EAClD;gBACA,SAAS;aACV;YACD,IAAI,MAAA,mBAAmB,CAAC,OAAO,0CAAE,UAAU,EAAE;gBAC3C,oBAAoB,CAAC,GAAG,CACtB,wBAAwB,CAAC,mBAAmB,CAAC,OAAO,CAAC,UAAU,CAAC,CACjE,CAAC;aACH;YACD,IAAI,mBAAmB,CAAC,cAAc,EAAE;gBACtC,KAAK,MAAM,mBAAmB,IAAI,MAAM,CAAC,MAAM,CAC7C,mBAAmB,CAAC,cAAc,CACnC,EAAE;oBACD,IAAI,mBAAmB,CAAC,UAAU,EAAE;wBAClC,oBAAoB,CAAC,GAAG,CACtB,wBAAwB,CAAC,mBAAmB,CAAC,UAAU,CAAC,CACzD,CAAC;qBACH;iBACF;aACF;SACF;KACF;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAC1C,CAAC;AAnCD,0CAmCC;AAED;;;;KAIK;AACL,SAAgB,qBAAqB;IACnC,mFAAmF;IACnF,6EAA6E;IAC7E,oDAAoD;IAEpD,MAAM,WAAW,GAAG,eAAe,EAAE,CAAC;IACtC,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC5B,CAAC;AAPD,sDAOC"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ export declare const nxVersion: any;
|
|
|
2
2
|
export declare const jestVersion = "^29.4.1";
|
|
3
3
|
export declare const babelJestVersion = "^29.4.1";
|
|
4
4
|
export declare const jestTypesVersion = "^29.4.0";
|
|
5
|
-
export declare const tsJestVersion = "^29.0
|
|
5
|
+
export declare const tsJestVersion = "^29.1.0";
|
|
6
6
|
export declare const tslibVersion = "^2.3.0";
|
|
7
7
|
export declare const swcJestVersion = "0.2.20";
|
|
8
8
|
export declare const typesNodeVersion = "16.11.7";
|
package/src/utils/versions.js
CHANGED
|
@@ -5,7 +5,7 @@ exports.nxVersion = require('../../package.json').version;
|
|
|
5
5
|
exports.jestVersion = '^29.4.1';
|
|
6
6
|
exports.babelJestVersion = '^29.4.1';
|
|
7
7
|
exports.jestTypesVersion = '^29.4.0';
|
|
8
|
-
exports.tsJestVersion = '^29.0
|
|
8
|
+
exports.tsJestVersion = '^29.1.0';
|
|
9
9
|
exports.tslibVersion = '^2.3.0';
|
|
10
10
|
exports.swcJestVersion = '0.2.20';
|
|
11
11
|
exports.typesNodeVersion = '16.11.7';
|