Skip to content

Commit 3903b6c

Browse files
brandonrobertsbrandonroberts
authored
build: update to Nx 12.9.0 (#3147)
1 parent 6dc209c commit 3903b6c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+3617
-2793
lines changed

‎angular.json

+378-364
Large diffs are not rendered by default.

‎jest.config.js

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
module.exports = {
2-
projects: [
3-
'<rootDir>/projects/example-app',
4-
'<rootDir>/modules/store',
5-
'<rootDir>/modules/effects',
6-
'<rootDir>/modules/data',
7-
'<rootDir>/modules/entity',
8-
'<rootDir>/modules/store-devtools',
9-
'<rootDir>/modules/router-store',
10-
'<rootDir>/modules/schematics',
11-
'<rootDir>/modules/component',
12-
'<rootDir>/modules/component-store',
13-
'<rootDir>/modules/schematics-core',
14-
],
15-
};
1+
const { getJestProjects } = require('@nrwl/jest');
2+
3+
module.exports = { projects: getJestProjects() };

‎jest.preset.js

+6
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,10 @@ module.exports = {
88
resolver: '@nrwl/jest/plugins/resolver',
99
moduleFileExtensions: ['ts', 'js', 'html'],
1010
coverageReporters: ['html'],
11+
snapshotSerializers: [
12+
'jest-preset-angular/build/serializers/no-ng-attributes',
13+
'jest-preset-angular/build/serializers/ng-snapshot',
14+
'jest-preset-angular/build/serializers/html-comment',
15+
],
16+
testRunner: 'jest-jasmine2',
1117
};

‎migrations.json

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
{
2+
"migrations": [
3+
{
4+
"version": "12.5.0-beta.1",
5+
"description": "Rename the workspace-schematic script into workspace-generator script",
6+
"factory": "./src/migrations/update-12-5-0/add-target-dependencies",
7+
"cli": "nx",
8+
"package": "@nrwl/workspace",
9+
"name": "add-target-dependencies"
10+
},
11+
{
12+
"cli": "nx",
13+
"version": "12.9.0",
14+
"description": "Fixes invalid importPaths for buildable and publishable libs.",
15+
"factory": "./src/migrations/update-12-9-0/update-invalid-import-paths",
16+
"package": "@nrwl/angular",
17+
"name": "update-invalid-import-paths"
18+
},
19+
{
20+
"version": "12.1.0",
21+
"factory": "./update-12/replace-prod-flag",
22+
"description": "Replace the deprecated '--prod' in package.json scripts.",
23+
"package": "@angular/cli",
24+
"name": "replace-deprecated-prod-flag"
25+
},
26+
{
27+
"cli": "nx",
28+
"version": "12.8.0-beta.0",
29+
"description": "Remove Typescript Preprocessor Plugin",
30+
"factory": "./src/migrations/update-12-8-0/remove-typescript-plugin",
31+
"package": "@nrwl/cypress",
32+
"name": "remove-typescript-plugin"
33+
},
34+
{
35+
"version": "12.4.0-beta.1",
36+
"cli": "nx",
37+
"description": "Add testEnvironment: 'jsdom' in web apps + libraries",
38+
"factory": "./src/migrations/update-12-4-0/add-test-environment-for-node",
39+
"package": "@nrwl/jest",
40+
"name": "support-jest-27"
41+
},
42+
{
43+
"version": "12.4.0-beta.1",
44+
"cli": "nx",
45+
"description": "Support for Jest 27 via updating ts-jest + jest-preset-angular",
46+
"factory": "./src/migrations/update-12-4-0/update-jest-preset-angular",
47+
"package": "@nrwl/jest",
48+
"name": "update-ts-jest-and-jest-preset-angular"
49+
},
50+
{
51+
"version": "12.6.0-beta.0",
52+
"cli": "nx",
53+
"description": "Uses `getJestProjects()` to populate projects array in root level `jest.config.js` file.",
54+
"factory": "./src/migrations/update-12-6-0/update-base-jest-config",
55+
"package": "@nrwl/jest",
56+
"name": "update-jest-config-to-use-util"
57+
},
58+
{
59+
"cli": "nx",
60+
"version": "12.4.0-beta.0",
61+
"description": "Remove ESLint parserOptions.project config if no rules requiring type-checking are in use",
62+
"factory": "./src/migrations/update-12-4-0/remove-eslint-project-config-if-no-type-checking-rules",
63+
"package": "@nrwl/linter",
64+
"name": "remove-eslint-project-config-if-no-type-checking-rules"
65+
},
66+
{
67+
"cli": "nx",
68+
"version": "12.9.0-beta.0",
69+
"description": "Add outputs for caching",
70+
"factory": "./src/migrations/update-12-9-0/add-outputs",
71+
"package": "@nrwl/linter",
72+
"name": "add-outputs"
73+
},
74+
{
75+
"cli": "nx",
76+
"version": "12.9.0-beta.0",
77+
"description": "Remove ESLint parserOptions.project config if no rules requiring type-checking are in use",
78+
"factory": "./src/migrations/update-12-4-0/remove-eslint-project-config-if-no-type-checking-rules",
79+
"package": "@nrwl/linter",
80+
"name": "remove-eslint-project-config-if-no-type-checking-rules-again"
81+
}
82+
]
83+
}

‎modules/component-store/jest.config.js

+2-11
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,13 @@ module.exports = {
22
displayName: 'Component Store',
33
preset: '../../jest.preset.js',
44
coverageDirectory: '../../coverage/libs/component-store',
5-
snapshotSerializers: [
6-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
7-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
8-
'jest-preset-angular/build/HTMLCommentSerializer.js',
9-
],
5+
106
setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
117
globals: {
128
'ts-jest': {
139
tsconfig: '<rootDir>/tsconfig.spec.json',
1410
stringifyContentPathRegex: '\\.(html|svg)$',
15-
astTransformers: {
16-
before: [
17-
'jest-preset-angular/build/InlineFilesTransformer',
18-
'jest-preset-angular/build/StripStylesTransformer',
19-
],
20-
},
2111
},
2212
},
13+
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
2314
};

‎modules/component-store/schematics-core/jest.config.js

-5
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,4 @@ module.exports = {
1515
},
1616
},
1717
coverageDirectory: '../../coverage/modules/schematics-core',
18-
snapshotSerializers: [
19-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
20-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
21-
'jest-preset-angular/build/HTMLCommentSerializer.js',
22-
],
2318
};

‎modules/component-store/schematics-core/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular';
1+
import 'jest-preset-angular/setup-jest';

‎modules/component-store/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular';
1+
import 'jest-preset-angular/setup-jest';

‎modules/component/jest.config.js

+2-11
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,9 @@ module.exports = {
66
'ts-jest': {
77
tsconfig: '<rootDir>/tsconfig.spec.json',
88
stringifyContentPathRegex: '\\.(html|svg)$',
9-
astTransformers: {
10-
before: [
11-
'jest-preset-angular/build/InlineFilesTransformer',
12-
'jest-preset-angular/build/StripStylesTransformer',
13-
],
14-
},
159
},
1610
},
1711
setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
18-
snapshotSerializers: [
19-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
20-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
21-
'jest-preset-angular/build/HTMLCommentSerializer.js',
22-
],
12+
13+
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
2314
};

‎modules/component/schematics-core/jest.config.js

-5
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,4 @@ module.exports = {
1515
},
1616
},
1717
coverageDirectory: '../../coverage/modules/schematics-core',
18-
snapshotSerializers: [
19-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
20-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
21-
'jest-preset-angular/build/HTMLCommentSerializer.js',
22-
],
2318
};

‎modules/component/schematics-core/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular';
1+
import 'jest-preset-angular/setup-jest';

‎modules/component/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular';
1+
import 'jest-preset-angular/setup-jest';

‎modules/data/jest.config.js

+2-11
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,13 @@ module.exports = {
22
displayName: 'Data',
33
preset: '../../jest.preset.js',
44
coverageDirectory: '../../coverage/modules/data',
5-
snapshotSerializers: [
6-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
7-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
8-
'jest-preset-angular/build/HTMLCommentSerializer.js',
9-
],
5+
106
setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
117
globals: {
128
'ts-jest': {
139
tsconfig: '<rootDir>/tsconfig.spec.json',
1410
stringifyContentPathRegex: '\\.(html|svg)$',
15-
astTransformers: {
16-
before: [
17-
'jest-preset-angular/build/InlineFilesTransformer',
18-
'jest-preset-angular/build/StripStylesTransformer',
19-
],
20-
},
2111
},
2212
},
13+
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
2314
};

‎modules/data/schematics-core/jest.config.js

-5
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,4 @@ module.exports = {
1515
},
1616
},
1717
coverageDirectory: '../../coverage/modules/schematics-core',
18-
snapshotSerializers: [
19-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
20-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
21-
'jest-preset-angular/build/HTMLCommentSerializer.js',
22-
],
2318
};

‎modules/data/schematics-core/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular';
1+
import 'jest-preset-angular/setup-jest';

‎modules/data/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular';
1+
import 'jest-preset-angular/setup-jest';

‎modules/effects/jest.config.js

+2-11
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,13 @@ module.exports = {
22
displayName: 'Effects',
33
preset: '../../jest.preset.js',
44
coverageDirectory: '../../coverage/modules/effects',
5-
snapshotSerializers: [
6-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
7-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
8-
'jest-preset-angular/build/HTMLCommentSerializer.js',
9-
],
5+
106
setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
117
globals: {
128
'ts-jest': {
139
tsconfig: '<rootDir>/tsconfig.spec.json',
1410
stringifyContentPathRegex: '\\.(html|svg)$',
15-
astTransformers: {
16-
before: [
17-
'jest-preset-angular/build/InlineFilesTransformer',
18-
'jest-preset-angular/build/StripStylesTransformer',
19-
],
20-
},
2111
},
2212
},
13+
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
2314
};

‎modules/effects/schematics-core/jest.config.js

-5
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,4 @@ module.exports = {
1515
},
1616
},
1717
coverageDirectory: '../../coverage/modules/schematics-core',
18-
snapshotSerializers: [
19-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
20-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
21-
'jest-preset-angular/build/HTMLCommentSerializer.js',
22-
],
2318
};

‎modules/effects/schematics-core/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular';
1+
import 'jest-preset-angular/setup-jest';

‎modules/effects/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular';
1+
import 'jest-preset-angular/setup-jest';

‎modules/entity/jest.config.js

+2-11
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,13 @@ module.exports = {
22
displayName: 'Entity',
33
preset: '../../jest.preset.js',
44
coverageDirectory: '../../coverage/modules/entity',
5-
snapshotSerializers: [
6-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
7-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
8-
'jest-preset-angular/build/HTMLCommentSerializer.js',
9-
],
5+
106
setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
117
globals: {
128
'ts-jest': {
139
tsconfig: '<rootDir>/tsconfig.spec.json',
1410
stringifyContentPathRegex: '\\.(html|svg)$',
15-
astTransformers: {
16-
before: [
17-
'jest-preset-angular/build/InlineFilesTransformer',
18-
'jest-preset-angular/build/StripStylesTransformer',
19-
],
20-
},
2111
},
2212
},
13+
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
2314
};

‎modules/entity/schematics-core/jest.config.js

-5
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,4 @@ module.exports = {
1515
},
1616
},
1717
coverageDirectory: '../../coverage/modules/schematics-core',
18-
snapshotSerializers: [
19-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
20-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
21-
'jest-preset-angular/build/HTMLCommentSerializer.js',
22-
],
2318
};

‎modules/entity/schematics-core/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular';
1+
import 'jest-preset-angular/setup-jest';

‎modules/entity/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular';
1+
import 'jest-preset-angular/setup-jest';

‎modules/router-store/jest.config.js

+2-11
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,13 @@ module.exports = {
22
displayName: 'Router Store',
33
preset: '../../jest.preset.js',
44
coverageDirectory: '../../coverage/modules/router-store',
5-
snapshotSerializers: [
6-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
7-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
8-
'jest-preset-angular/build/HTMLCommentSerializer.js',
9-
],
5+
106
setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
117
globals: {
128
'ts-jest': {
139
tsconfig: '<rootDir>/tsconfig.spec.json',
1410
stringifyContentPathRegex: '\\.(html|svg)$',
15-
astTransformers: {
16-
before: [
17-
'jest-preset-angular/build/InlineFilesTransformer',
18-
'jest-preset-angular/build/StripStylesTransformer',
19-
],
20-
},
2111
},
2212
},
13+
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
2314
};

‎modules/router-store/schematics-core/jest.config.js

-5
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,4 @@ module.exports = {
1515
},
1616
},
1717
coverageDirectory: '../../coverage/modules/schematics-core',
18-
snapshotSerializers: [
19-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
20-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
21-
'jest-preset-angular/build/HTMLCommentSerializer.js',
22-
],
2318
};

‎modules/router-store/schematics-core/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular';
1+
import 'jest-preset-angular/setup-jest';

‎modules/router-store/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular';
1+
import 'jest-preset-angular/setup-jest';

‎modules/schematics-core/jest.config.js

-5
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,4 @@ module.exports = {
1515
},
1616
},
1717
coverageDirectory: '../../coverage/modules/schematics-core',
18-
snapshotSerializers: [
19-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
20-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
21-
'jest-preset-angular/build/HTMLCommentSerializer.js',
22-
],
2318
};

‎modules/schematics-core/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular';
1+
import 'jest-preset-angular/setup-jest';

‎modules/schematics/jest.config.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ module.exports = {
22
displayName: 'Schematics',
33
preset: '../../jest.preset.js',
44
coverageDirectory: '../../coverage/modules/schematics',
5-
snapshotSerializers: [
6-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
7-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
8-
'jest-preset-angular/build/HTMLCommentSerializer.js',
9-
],
5+
106
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
7+
testEnvironment: 'node',
118
};

‎modules/schematics/schematics-core/jest.config.js

-5
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,4 @@ module.exports = {
1515
},
1616
},
1717
coverageDirectory: '../../coverage/modules/schematics-core',
18-
snapshotSerializers: [
19-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
20-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
21-
'jest-preset-angular/build/HTMLCommentSerializer.js',
22-
],
2318
};

‎modules/schematics/schematics-core/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular';
1+
import 'jest-preset-angular/setup-jest';

‎modules/schematics/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular';
1+
import 'jest-preset-angular/setup-jest';

0 commit comments

Comments
 (0)