Skip to content

Commit 90d3286

Browse files
committed
feat: upgrade to Nx 13.1.4
1 parent fd5312b commit 90d3286

12 files changed

+2487
-5969
lines changed

.eslintrc.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
"overrides": [
55
{
66
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
7-
"parserOptions": {
8-
"project": "./tsconfig.*?.json"
9-
},
107
"rules": {
118
"@nrwl/nx/enforce-module-boundaries": [
129
"error",
@@ -26,9 +23,6 @@
2623
{
2724
"files": ["*.ts", "*.tsx"],
2825
"extends": ["plugin:@nrwl/nx/typescript"],
29-
"parserOptions": {
30-
"project": "./tsconfig.*?.json"
31-
},
3226
"rules": {}
3327
},
3428
{

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ nodeLinker: node-modules
22

33
plugins:
44
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
5-
spec: "@yarnpkg/plugin-interactive-tools"
5+
spec: '@yarnpkg/plugin-interactive-tools'
66

77
yarnPath: .yarn/releases/yarn-3.2.0-rc.6.cjs

jest.config.js

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

libs/ddd/.eslintrc.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
{
22
"extends": "../../.eslintrc",
33
"rules": {},
4-
"ignorePatterns": ["!**/*"]
4+
"ignorePatterns": ["!**/*"],
5+
"overrides": [
6+
{
7+
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
8+
"rules": {}
9+
},
10+
{
11+
"files": ["*.ts", "*.tsx"],
12+
"rules": {}
13+
},
14+
{
15+
"files": ["*.js", "*.jsx"],
16+
"rules": {}
17+
}
18+
]
519
}

libs/ddd/jest.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module.exports = {
55
},
66
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
77
coverageDirectory: '../../coverage/libs/ddd',
8-
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
8+
globals: { 'ts-jest': { tsconfig: '<rootDir>/tsconfig.spec.json' } },
99
displayName: 'ddd',
10+
testEnvironment: 'node',
1011
};

libs/ddd/tsconfig.lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"declaration": true,
77
"types": ["node"]
88
},
9-
"exclude": ["**/*.spec.ts", "**/files/**"],
9+
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/files/**"],
1010
"include": ["**/*.ts"]
1111
}

libs/ddd/tsconfig.spec.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@
77
},
88
"include": [
99
"**/*.spec.ts",
10+
"**/*.test.ts",
1011
"**/*.spec.tsx",
12+
"**/*.test.tsx",
1113
"**/*.spec.js",
14+
"**/*.test.js",
1215
"**/*.spec.jsx",
16+
"**/*.test.jsx",
1317
"**/*.d.ts"
1418
]
1519
}

migrations.json

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

nx.json

Lines changed: 64 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@
1111
"tsconfig.base.json": "*",
1212
".eslintrc.json": "*"
1313
},
14-
"projects": {
15-
"ddd": {
16-
"tags": []
17-
},
18-
"ddd-e2e": {
19-
"tags": [],
20-
"implicitDependencies": ["ddd"]
21-
}
22-
},
2314
"tasksRunnerOptions": {
2415
"default": {
2516
"runner": "@nrwl/workspace/tasks-runners/default",
@@ -30,5 +21,69 @@
3021
},
3122
"affected": {
3223
"defaultBase": "master"
24+
},
25+
"targetDependencies": {
26+
"build": [
27+
{
28+
"target": "build",
29+
"projects": "dependencies"
30+
}
31+
]
32+
},
33+
"cli": {
34+
"defaultCollection": "@nrwl/workspace"
35+
},
36+
"generators": {
37+
"@nrwl/workspace": {
38+
"library": {
39+
"linter": "eslint"
40+
}
41+
},
42+
"@nrwl/cypress": {
43+
"cypress-project": {
44+
"linter": "eslint"
45+
}
46+
},
47+
"@nrwl/react": {
48+
"application": {
49+
"linter": "eslint"
50+
},
51+
"library": {
52+
"linter": "eslint"
53+
}
54+
},
55+
"@nrwl/next": {
56+
"application": {
57+
"linter": "eslint"
58+
}
59+
},
60+
"@nrwl/web": {
61+
"application": {
62+
"linter": "eslint"
63+
}
64+
},
65+
"@nrwl/node": {
66+
"application": {
67+
"linter": "eslint"
68+
},
69+
"library": {
70+
"linter": "eslint"
71+
}
72+
},
73+
"@nrwl/nx-plugin": {
74+
"plugin": {
75+
"linter": "eslint"
76+
}
77+
},
78+
"@nrwl/nest": {
79+
"application": {
80+
"linter": "eslint"
81+
}
82+
},
83+
"@nrwl/express": {
84+
"application": {
85+
"linter": "eslint"
86+
}
87+
}
3388
}
3489
}

package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,30 +38,30 @@
3838
"@schematics/angular": "^12.0.0"
3939
},
4040
"devDependencies": {
41-
"@nrwl/angular": "11.0.20",
42-
"@nrwl/cli": "11.0.20",
43-
"@nrwl/eslint-plugin-nx": "11.0.20",
44-
"@nrwl/jest": "11.0.20",
45-
"@nrwl/nx-plugin": "11.0.20",
46-
"@nrwl/tao": "11.0.20",
47-
"@nrwl/workspace": "11.0.20",
48-
"@types/jest": "26.0.8",
49-
"@types/node": "12.12.38",
50-
"@typescript-eslint/eslint-plugin": "4.3.0",
51-
"@typescript-eslint/parser": "4.3.0",
41+
"@nrwl/angular": "13.1.4",
42+
"@nrwl/cli": "13.1.4",
43+
"@nrwl/eslint-plugin-nx": "13.1.4",
44+
"@nrwl/jest": "13.1.4",
45+
"@nrwl/nx-plugin": "13.1.4",
46+
"@nrwl/tao": "13.1.4",
47+
"@nrwl/workspace": "13.1.4",
48+
"@types/jest": "27.0.2",
49+
"@types/node": "14.14.33",
50+
"@typescript-eslint/eslint-plugin": "4.33.0",
51+
"@typescript-eslint/parser": "4.33.0",
5252
"@yarnpkg/plugin-dlx": "^3.1.1",
5353
"commitizen": "^4.2.2",
5454
"cz-customizable": "^6.3.0",
55-
"dotenv": "6.2.0",
56-
"eslint": "7.10.0",
57-
"eslint-config-prettier": "6.0.0",
58-
"jest": "26.2.2",
55+
"dotenv": "10.0.0",
56+
"eslint": "7.32.0",
57+
"eslint-config-prettier": "8.1.0",
58+
"jest": "27.2.3",
5959
"json-schema-to-typescript": "^8.1.0",
60-
"prettier": "2.1.2",
61-
"ts-jest": "26.4.0",
60+
"prettier": "2.5.0",
61+
"ts-jest": "27.0.5",
6262
"ts-node": "9.1.1",
6363
"tslint": "6.1.3",
64-
"typescript": "4.0.5"
64+
"typescript": "4.3.5"
6565
},
6666
"packageManager": "[email protected]"
6767
}

0 commit comments

Comments
 (0)