Skip to content

Commit f9acdba

Browse files
author
Peter Smith
committed
chore(repo): upgrade to nx 11
1 parent 9d1c3a0 commit f9acdba

File tree

12 files changed

+108
-83
lines changed

12 files changed

+108
-83
lines changed

.eslintrc

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

.eslintrc.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"root": true,
3+
"plugins": ["@nrwl/nx"],
4+
"overrides": [
5+
{
6+
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
7+
"parserOptions": {
8+
"project": "./tsconfig.*?.json"
9+
},
10+
"rules": {
11+
"@nrwl/nx/enforce-module-boundaries": [
12+
"error",
13+
{
14+
"enforceBuildableLibDependency": true,
15+
"allow": [],
16+
"depConstraints": [
17+
{
18+
"sourceTag": "*",
19+
"onlyDependOnLibsWithTags": ["*"]
20+
}
21+
]
22+
}
23+
]
24+
}
25+
},
26+
{
27+
"files": ["*.ts", "*.tsx"],
28+
"extends": ["plugin:@nrwl/nx/typescript"],
29+
"parserOptions": {
30+
"project": "./tsconfig.*?.json"
31+
},
32+
"rules": {}
33+
},
34+
{
35+
"files": ["*.js", "*.jsx"],
36+
"extends": ["plugin:@nrwl/nx/javascript"],
37+
"rules": {}
38+
}
39+
]
40+
}

.vscode/extensions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"recommendations": [
33
"ms-vscode.vscode-typescript-tslint-plugin",
4-
"esbenp.prettier-vscode"
4+
"esbenp.prettier-vscode",
5+
"firsttris.vscode-jest-runner"
56
]
67
}

jest.config.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
module.exports = {
2-
testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
3-
transform: {
4-
'^.+\\.(ts|js|html)$': 'ts-jest'
5-
},
6-
resolver: '@nrwl/jest/plugins/resolver',
7-
moduleFileExtensions: ['ts', 'js', 'html'],
8-
coverageReporters: ['html']
2+
projects: ['<rootDir>/libs/ddd'],
93
};

jest.preset.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
const nxPreset = require('@nrwl/jest/preset');
2+
module.exports = {
3+
...nxPreset,
4+
testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
5+
transform: {
6+
'^.+\\.(ts|js|html)$': 'ts-jest',
7+
},
8+
resolver: '@nrwl/jest/plugins/resolver',
9+
moduleFileExtensions: ['ts', 'js', 'html'],
10+
coverageReporters: ['html'],
11+
};
File renamed without changes.

libs/ddd/jest.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module.exports = {
2-
name: 'ddd',
3-
preset: '../../jest.config.js',
2+
preset: '../../jest.preset.js',
43
transform: {
54
'^.+\\.[tj]sx?$': 'ts-jest',
65
},
76
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
87
coverageDirectory: '../../coverage/libs/ddd',
98
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
9+
displayName: 'ddd',
1010
};

migrations.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"migrations": [
3+
{
4+
"version": "11.0.0-beta.4",
5+
"description": "Rename ng-update into nx-migrate",
6+
"factory": "./src/migrations/update-11-0-0/rename-ng-update-into-nx-migrate",
7+
"package": "@nrwl/nx-plugin",
8+
"name": "rename-ng-update-into-nx-migrate"
9+
}
10+
]
11+
}

nx.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
},
99
"tslint.json": "*",
1010
"nx.json": "*",
11-
"tsconfig.base.json": "*"
11+
"tsconfig.base.json": "*",
12+
".eslintrc.json": "*"
1213
},
1314
"projects": {
1415
"ddd": {

package.json

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,35 @@
2323
"format:write": "nx format:write",
2424
"format:check": "nx format:check",
2525
"update": "nx migrate latest",
26-
"workspace-schematic": "nx workspace-schematic",
2726
"dep-graph": "nx dep-graph",
28-
"help": "nx help"
27+
"help": "nx help",
28+
"workspace-generator": "nx workspace-generator"
2929
},
3030
"private": true,
3131
"dependencies": {
32-
"@schematics/angular": "10.0.5",
32+
"@schematics/angular": "10.1.7",
3333
"json-schema-to-typescript": "^8.1.0"
3434
},
3535
"devDependencies": {
36-
"@nrwl/angular": "10.0.7",
37-
"@nrwl/eslint-plugin-nx": "10.0.7",
38-
"@nrwl/jest": "10.0.7",
39-
"@nrwl/nx-plugin": "^10.0.7",
40-
"@nrwl/workspace": "10.0.7",
41-
"@types/jest": "25.1.4",
42-
"@types/node": "~8.9.4",
43-
"@typescript-eslint/eslint-plugin": "2.19.2",
44-
"@typescript-eslint/parser": "2.19.2",
36+
"@nrwl/angular": "11.0.20",
37+
"@nrwl/cli": "11.0.20",
38+
"@nrwl/eslint-plugin-nx": "11.0.20",
39+
"@nrwl/jest": "11.0.20",
40+
"@nrwl/nx-plugin": "11.0.20",
41+
"@nrwl/tao": "11.0.20",
42+
"@nrwl/workspace": "11.0.20",
43+
"@types/jest": "26.0.8",
44+
"@types/node": "12.12.38",
45+
"@typescript-eslint/eslint-plugin": "4.3.0",
46+
"@typescript-eslint/parser": "4.3.0",
4547
"dotenv": "6.2.0",
46-
"eslint": "6.8.0",
48+
"eslint": "7.10.0",
4749
"eslint-config-prettier": "6.0.0",
48-
"jest": "25.2.4",
49-
"prettier": "2.0.4",
50-
"ts-jest": "25.2.1",
51-
"ts-node": "~7.0.0",
52-
"tslint": "6.0.0",
53-
"typescript": "3.9.7"
50+
"jest": "26.2.2",
51+
"prettier": "2.1.2",
52+
"ts-jest": "26.4.0",
53+
"ts-node": "9.1.1",
54+
"tslint": "6.1.3",
55+
"typescript": "4.0.5"
5456
}
5557
}

0 commit comments

Comments
 (0)