Skip to content

Commit 09dad6a

Browse files
chore: run nx migrate (#314)
1 parent 4eba508 commit 09dad6a

17 files changed

+90
-82
lines changed

apps/example-app-karma/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
23
"projectType": "application",
3-
"root": "apps/example-app-karma",
44
"sourceRoot": "apps/example-app-karma/src",
55
"prefix": "app",
66
"generators": {},

apps/example-app-karma/tsconfig.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"extends": "../../tsconfig.base.json",
33
"files": [],
44
"include": [],
5-
"compilerOptions": {},
5+
"compilerOptions": {
6+
"target": "es2020"
7+
},
68
"angularCompilerOptions": {
79
"strictInjectionParameters": true,
810
"strictInputAccessModifiers": true,

apps/example-app/jest.config.js renamed to apps/example-app/jest.config.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
module.exports = {
2-
name: 'Example App',
1+
/* eslint-disable */
2+
export default {
33
displayName: {
4-
name: 'Example',
4+
name: 'Example App',
55
color: 'blue',
66
},
77
preset: '../../jest.preset.js',

apps/example-app/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
23
"projectType": "application",
3-
"root": "apps/example-app",
44
"sourceRoot": "apps/example-app/src",
55
"prefix": "app",
66
"generators": {},
@@ -73,7 +73,7 @@
7373
"test": {
7474
"executor": "@nrwl/jest:jest",
7575
"options": {
76-
"jestConfig": "apps/example-app/jest.config.js"
76+
"jestConfig": "apps/example-app/jest.config.ts"
7777
},
7878
"outputs": ["coverage/"]
7979
}

apps/example-app/tsconfig.app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
},
99
"files": ["src/main.ts", "src/polyfills.ts"],
1010
"include": ["src/**/*.d.ts"],
11-
"exclude": ["**/*.test.ts", "**/*.spec.ts"]
11+
"exclude": ["**/*.test.ts", "**/*.spec.ts", "jest.config.ts"]
1212
}

apps/example-app/tsconfig.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"extends": "../../tsconfig.base.json",
33
"files": [],
44
"include": [],
5-
"compilerOptions": {},
5+
"compilerOptions": {
6+
"target": "es2020"
7+
},
68
"angularCompilerOptions": {
79
"strictInjectionParameters": true,
810
"strictInputAccessModifiers": true,

apps/example-app/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"types": ["jest", "node", "@testing-library/jest-dom"]
77
},
88
"files": ["src/test-setup.ts"],
9-
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
9+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
1010
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { getJestProjects } = require('@nrwl/jest');
22

3-
module.exports = {
3+
export default {
44
projects: getJestProjects(),
55
};

jest.preset.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const nxPreset = require('@nrwl/jest/preset');
1+
const nxPreset = require('@nrwl/jest/preset').default;
2+
23
module.exports = {
34
...nxPreset,
45
testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],

nx.json

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@
3434
}
3535
}
3636
},
37-
"targetDependencies": {
38-
"build": [
39-
{
40-
"target": "build",
41-
"projects": "dependencies"
42-
}
43-
]
44-
},
4537
"generators": {
4638
"@nrlw/workspace:library": {
4739
"linter": "eslint",
@@ -60,7 +52,6 @@
6052
"tags": ["type:app"]
6153
},
6254
"@nrwl/angular:library": {
63-
"style": "scss",
6455
"linter": "eslint",
6556
"unitTestRunner": "jest",
6657
"strict": true,
@@ -80,5 +71,11 @@
8071
}
8172
}
8273
},
83-
"defaultProject": "example-app"
74+
"defaultProject": "example-app",
75+
"$schema": "./node_modules/nx/schemas/nx-schema.json",
76+
"targetDefaults": {
77+
"build": {
78+
"dependsOn": ["^build"]
79+
}
80+
}
8481
}

package.json

Lines changed: 55 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"scripts": {
55
"ng": "nx",
66
"nx": "nx",
7-
"postinstall": "node ./decorate-angular-cli.js && ngcc --properties es2015 browser module main",
7+
"postinstall": "node ./decorate-angular-cli.js && ngcc --properties es2020 browser module main",
88
"start": "nx serve",
99
"prebuild": "rimraf dist",
1010
"build": "nx run-many --target=build --projects=testing-library",
1111
"build:schematics": "tsc -p ./projects/testing-library/tsconfig.schematics.json",
12-
"test": "nx run-many --target=test --all",
12+
"test": "nx run-many --target=test --all --parallel=1",
1313
"lint": "nx workspace-lint && nx lint",
1414
"e2e": "nx e2e",
1515
"affected:apps": "nx affected:apps",
@@ -28,77 +28,80 @@
2828
"prepare": "git config core.hookspath .githooks"
2929
},
3030
"dependencies": {
31-
"@angular/animations": "14.0.0",
32-
"@angular/cdk": "14.0.0",
33-
"@angular/common": "14.0.0",
34-
"@angular/compiler": "14.0.0",
35-
"@angular/core": "14.0.0",
36-
"@angular/material": "14.0.0",
37-
"@angular/platform-browser": "14.0.0",
38-
"@angular/platform-browser-dynamic": "14.0.0",
39-
"@angular/router": "14.0.0",
40-
"@ngrx/store": "14.0.0-beta.0",
41-
"@nrwl/angular": "13.4.3",
42-
"@nrwl/nx-cloud": "13.0.2",
31+
"@angular/animations": "14.1.3",
32+
"@angular/cdk": "14.1.3",
33+
"@angular/common": "14.1.3",
34+
"@angular/compiler": "14.1.3",
35+
"@angular/core": "14.1.3",
36+
"@angular/material": "14.1.3",
37+
"@angular/platform-browser": "14.1.3",
38+
"@angular/platform-browser-dynamic": "14.1.3",
39+
"@angular/router": "14.1.3",
40+
"@ngrx/store": "14.0.2",
41+
"@nrwl/angular": "14.5.8",
42+
"@nrwl/nx-cloud": "14.4.1",
4343
"@testing-library/dom": "^8.11.1",
44-
"rxjs": "^7.5.1",
44+
"rxjs": "7.5.6",
4545
"tslib": "~2.3.1",
4646
"zone.js": "~0.11.4"
4747
},
4848
"devDependencies": {
49-
"@angular-devkit/build-angular": "14.0.0",
50-
"@angular-eslint/builder": "14.0.0",
51-
"@angular-eslint/eslint-plugin": "14.0.0",
52-
"@angular-eslint/eslint-plugin-template": "14.0.0",
53-
"@angular-eslint/schematics": "14.0.0",
54-
"@angular-eslint/template-parser": "14.0.0",
55-
"@angular/cli": "14.0.0",
56-
"@angular/compiler-cli": "14.0.0",
57-
"@angular/forms": "14.0.0",
58-
"@angular/language-service": "14.0.0",
59-
"@nrwl/cli": "13.4.3",
60-
"@nrwl/eslint-plugin-nx": "13.4.3",
61-
"@nrwl/jest": "13.4.3",
62-
"@nrwl/linter": "13.4.3",
63-
"@nrwl/node": "13.4.3",
64-
"@nrwl/nx-plugin": "13.4.3",
65-
"@nrwl/workspace": "13.4.3",
49+
"@angular-devkit/build-angular": "14.1.3",
50+
"@angular-eslint/builder": "14.0.2",
51+
"@angular-eslint/eslint-plugin": "14.0.2",
52+
"@angular-eslint/eslint-plugin-template": "14.0.2",
53+
"@angular-eslint/schematics": "14.0.2",
54+
"@angular-eslint/template-parser": "14.0.2",
55+
"@angular/cli": "~14.1.0",
56+
"@angular/compiler-cli": "14.1.3",
57+
"@angular/forms": "14.1.3",
58+
"@angular/language-service": "14.1.3",
59+
"@nrwl/cli": "14.5.8",
60+
"@nrwl/eslint-plugin-nx": "14.5.8",
61+
"@nrwl/jest": "14.5.8",
62+
"@nrwl/linter": "14.5.8",
63+
"@nrwl/node": "14.5.8",
64+
"@nrwl/nx-plugin": "14.5.8",
65+
"@nrwl/workspace": "14.5.8",
66+
"@swc-node/register": "^1.4.2",
67+
"@swc/core": "^1.2.173",
6668
"@testing-library/jasmine-dom": "^1.2.0",
6769
"@testing-library/jest-dom": "^5.15.1",
6870
"@testing-library/user-event": "^13.5.0",
69-
"@types/jasmine": "^3.10.2",
70-
"@types/jest": "27.4.0",
71-
"@types/node": "14.14.37",
72-
"@typescript-eslint/eslint-plugin": "~5.3.0",
73-
"@typescript-eslint/parser": "~5.3.0",
71+
"@types/jasmine": "4.0.3",
72+
"@types/jest": "28.1.7",
73+
"@types/node": "18.7.1",
74+
"@typescript-eslint/eslint-plugin": "5.29.0",
75+
"@typescript-eslint/parser": "5.29.0",
7476
"cpy-cli": "^3.1.1",
75-
"eslint": "~8.6.0",
77+
"eslint": "8.15.0",
7678
"eslint-config-prettier": "8.3.0",
7779
"eslint-plugin-import": "~2.25.4",
7880
"eslint-plugin-jasmine": "~4.1.3",
7981
"eslint-plugin-jest": "~25.3.4",
8082
"eslint-plugin-jest-dom": "~4.0.1",
8183
"eslint-plugin-testing-library": "~5.0.1",
82-
"jasmine-core": "^3.10.1",
83-
"jasmine-spec-reporter": "^7.0.0",
84-
"jest": "28.1.1",
84+
"jasmine-core": "4.2.0",
85+
"jasmine-spec-reporter": "7.0.0",
86+
"jest": "28.1.3",
8587
"jest-environment-jsdom": "^28.1.1",
8688
"jest-preset-angular": "12.1.0",
87-
"karma": "^6.3.9",
89+
"karma": "6.4.0",
8890
"karma-chrome-launcher": "^3.1.0",
89-
"karma-jasmine": "^4.0.1",
90-
"karma-jasmine-html-reporter": "^1.7.0",
91+
"karma-jasmine": "5.1.0",
92+
"karma-jasmine-html-reporter": "2.0.0",
9193
"lint-staged": "^12.1.6",
92-
"ng-packagr": "14.0.0",
94+
"ng-packagr": "14.1.0",
95+
"nx": "14.5.8",
9396
"postcss": "^8.4.5",
94-
"postcss-import": "^14.0.2",
95-
"postcss-preset-env": "^7.2.0",
96-
"postcss-url": "^10.1.3",
97-
"prettier": "^2.4.1",
97+
"postcss-import": "14.1.0",
98+
"postcss-preset-env": "7.5.0",
99+
"postcss-url": "10.1.3",
100+
"prettier": "2.6.2",
98101
"rimraf": "^3.0.2",
99102
"semantic-release": "^18.0.0",
100-
"ts-jest": "28.0.4",
101-
"ts-node": "~10.4.0",
102-
"typescript": "4.7.2"
103+
"ts-jest": "28.0.8",
104+
"ts-node": "10.9.1",
105+
"typescript": "4.7.4"
103106
}
104107
}

projects/testing-library/jest.config.js renamed to projects/testing-library/jest.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
module.exports = {
2-
name: 'Angular Testing Library',
1+
/* eslint-disable */
2+
export default {
33
displayName: {
44
name: 'ATL',
55
color: 'magenta',

projects/testing-library/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
23
"projectType": "library",
3-
"root": "projects/testing-library",
44
"sourceRoot": "projects/testing-library/src",
55
"prefix": "lib",
66
"targets": {
@@ -47,7 +47,7 @@
4747
"test": {
4848
"executor": "@nrwl/jest:jest",
4949
"options": {
50-
"jestConfig": "projects/testing-library/jest.config.js"
50+
"jestConfig": "projects/testing-library/jest.config.ts"
5151
},
5252
"outputs": ["coverage/projects/testing-library"]
5353
}

projects/testing-library/tsconfig.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
"path": "./tsconfig.spec.json"
1414
}
1515
],
16-
"compilerOptions": {},
16+
"compilerOptions": {
17+
"target": "es2020"
18+
},
1719
"angularCompilerOptions": {
1820
"strictInjectionParameters": true,
1921
"strictInputAccessModifiers": true,

projects/testing-library/tsconfig.lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"inlineSources": true,
88
"types": ["node", "jest"]
99
},
10-
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"],
10+
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
1111
"include": ["**/*.ts"]
1212
}

projects/testing-library/tsconfig.lib.prod.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
},
66
"angularCompilerOptions": {
77
"compilationMode": "partial"
8-
}
8+
},
9+
"exclude": ["jest.config.ts"]
910
}

projects/testing-library/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
"types": ["node", "jest", "@testing-library/jest-dom"]
66
},
77
"files": ["test-setup.ts"],
8-
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
8+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
99
}

0 commit comments

Comments
 (0)