Skip to content

Commit aa0be0b

Browse files
authored
feat: nx latest with Angular 14 support (#55)
1 parent 25513fc commit aa0be0b

File tree

14 files changed

+2847
-1658
lines changed

14 files changed

+2847
-1658
lines changed

e2e/nx-e2e/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": "e2e/nx-e2e",
44
"sourceRoot": "e2e/nx-e2e/src",
55
"targets": {
66
"e2e": {

jest.config.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

jest.config.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
const { getJestProjects } = require('@nrwl/jest');
2+
3+
export default { projects: [...getJestProjects(), '<rootDir>/e2e/nx-e2e'] };

jest.preset.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
const nxPreset = require('@nrwl/jest/preset');
1+
const nxPreset = require('@nrwl/jest/preset').default;
22

33
module.exports = { ...nxPreset };

nx.json

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,14 @@
1616
},
1717
"tasksRunnerOptions": {
1818
"default": {
19-
"runner": "@nrwl/workspace/tasks-runners/default",
19+
"runner": "nx/tasks-runners/default",
2020
"options": {
21-
"cacheableOperations": ["build", "lint", "test", "e2e"],
21+
"cacheableOperations": [
22+
"build",
23+
"lint",
24+
"test",
25+
"e2e"
26+
],
2227
"parallel": 1
2328
}
2429
}
@@ -27,15 +32,12 @@
2732
"appsDir": "e2e",
2833
"libsDir": "packages"
2934
},
30-
"targetDependencies": {
31-
"build": [
32-
{
33-
"target": "build",
34-
"projects": "dependencies"
35-
}
36-
]
37-
},
38-
"cli": {
39-
"defaultCollection": "@nrwl/workspace"
35+
"$schema": "./node_modules/nx/schemas/nx-schema.json",
36+
"targetDefaults": {
37+
"build": {
38+
"dependsOn": [
39+
"^build"
40+
]
41+
}
4042
}
4143
}

package.json

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,17 @@
3131
},
3232
"private": true,
3333
"devDependencies": {
34-
"@nrwl/angular": "13.4.6",
35-
"@nrwl/cli": "13.4.6",
36-
"@nrwl/eslint-plugin-nx": "13.4.6",
37-
"@nrwl/jest": "13.4.6",
38-
"@nrwl/nx-plugin": "13.4.6",
39-
"@nrwl/tao": "13.4.6",
40-
"@nrwl/workspace": "13.4.6",
34+
"@nrwl/angular": "14.3.4",
35+
"@nrwl/cli": "14.3.4",
36+
"@nrwl/eslint-plugin-nx": "14.3.4",
37+
"@nrwl/jest": "14.3.4",
38+
"@nrwl/nx-plugin": "14.3.4",
39+
"@nrwl/workspace": "14.3.4",
40+
"@swc-node/register": "^1.4.2",
41+
"@swc/core": "^1.2.173",
4142
"@types/fs-extra": "^9.0.11",
42-
"@types/jest": "27.0.2",
43-
"@types/node": "^16.0.0",
43+
"@types/jest": "27.4.1",
44+
"@types/node": "^17.0.0",
4445
"@types/plist": "^3.0.2",
4546
"@types/xml2js": "^0.4.9",
4647
"@typescript-eslint/eslint-plugin": "^4.3.0",
@@ -52,14 +53,19 @@
5253
"eslint": "7.22.0",
5354
"eslint-config-prettier": "8.1.0",
5455
"fs-extra": "^9.1.0",
55-
"jest": "27.2.3",
56+
"jest": "27.5.1",
5657
"jsonc-parser": "3.0.0",
58+
"nx": "14.3.4",
5759
"plist": "^3.0.4",
58-
"prettier": "2.4.1",
59-
"ts-jest": "27.0.5",
60-
"ts-node": "9.1.1",
60+
"prettier": "2.7.0",
61+
"ts-jest": "27.1.4",
62+
"ts-node": "10.8.1",
63+
"tslib": "^2.4.0",
6164
"tslint": "6.1.3",
62-
"typescript": "4.5.5",
65+
"typescript": "4.7.3",
6366
"xml2js": "^0.4.23"
67+
},
68+
"dependencies": {
69+
"@angular/core": "~14.0.0"
6470
}
6571
}

packages/nx/jest.config.js renamed to packages/nx/jest.config.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
module.exports = {
1+
/* eslint-disable */
2+
export default {
23
displayName: 'nx',
34
preset: '../../jest.preset.js',
45
globals: {

packages/nx/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
"migrations": "./migrations.json"
2929
},
3030
"dependencies": {
31-
"@angular-devkit/architect": "^0.1300.0",
32-
"@angular-devkit/core": "^13.0.0",
33-
"@angular-devkit/schematics": "^13.0.0",
31+
"@angular-devkit/architect": "^0.1400.0",
32+
"@angular-devkit/core": "^14.0.0",
33+
"@angular-devkit/schematics": "^14.0.0",
3434
"fs-extra": "^9.1.0",
3535
"ignore": "^5.0.4",
3636
"jsonc-parser": "3.0.0",

packages/nx/project.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"root": "packages/nx",
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
33
"sourceRoot": "packages/nx/src",
44
"projectType": "library",
55
"generators": {},
@@ -15,12 +15,12 @@
1515
"executor": "@nrwl/jest:jest",
1616
"outputs": ["coverage/packages/nx"],
1717
"options": {
18-
"jestConfig": "packages/nx/jest.config.js",
18+
"jestConfig": "packages/nx/jest.config.ts",
1919
"passWithNoTests": true
2020
}
2121
},
2222
"build": {
23-
"executor": "@nrwl/node:package",
23+
"executor": "@nrwl/js:tsc",
2424
"outputs": ["{options.outputPath}"],
2525
"options": {
2626
"outputPath": "dist/packages/nx",

packages/nx/src/utils/versions.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
export const nxVersion = '^13.0.0';
1+
export const nxVersion = '^14.0.0';
22

3-
export const nsNxPluginVersion = '~3.0.0';
4-
export const nsCoreVersion = '~8.1.0';
5-
export const nsTypesVersion = '~8.1.0';
3+
export const nsNxPluginVersion = '~4.0.0';
4+
export const nsCoreVersion = '~8.2.0';
5+
export const nsTypesVersion = '~8.2.0';
66
export const nsThemeVersion = '~1.0.4';
77
export const nsWebpackVersion = '~5.0.0';
88
export const sassVersion = '^1.32.0';
9-
export const nsIOSRuntimeVersion = '~8.1.0';
10-
export const nsAndroidRuntimeVersion = '~8.1.1';
9+
export const nsIOSRuntimeVersion = '~8.2.0';
10+
export const nsAndroidRuntimeVersion = '~8.2.1';
1111

1212

1313
// Frontend frameworks
14-
export const angularVersion = '^13.0.0';
15-
export const nsAngularVersion = '^13.0.0';
16-
export const nsNgToolsVersion = '^13.0.0';
14+
export const angularVersion = '^14.0.0';
15+
export const nsAngularVersion = '^14.0.0';
16+
export const nsNgToolsVersion = '^14.0.0';
1717
export const rxjsVersion = '~7.5.0';
1818
export const zonejsVersion = '^0.11.4';
19-
export const typescriptVersion = '~4.5.0';
19+
export const typescriptVersion = '~4.7.0';

0 commit comments

Comments
 (0)