Skip to content

Commit 8731033

Browse files
yharaskrikwesleygrimes
yharaskrik
and
wesleygrimes
authored
refactor: update nx versions (#28)
* build: update nx to 10.4.12 * chore: add missing changes * refactor: update nx to version 11 * style: lint issue Co-authored-by: Wes Grimes <[email protected]>
1 parent 00aa87f commit 8731033

28 files changed

+761
-596
lines changed

‎.eslintrc

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

‎.eslintrc.json

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

‎.vscode/extensions.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"recommendations": [
3+
"nrwl.angular-console",
4+
"ms-vscode.vscode-typescript-tslint-plugin",
5+
"esbenp.prettier-vscode",
6+
"firsttris.vscode-jest-runner"
7+
]
8+
}

‎jest.config.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
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: [
3+
'<rootDir>/packages/playground',
4+
'<rootDir>/packages/in-memory-db',
5+
'<rootDir>/packages/playground-e2e',
6+
'<rootDir>/packages/spectator',
7+
],
98
};

‎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+
};

‎migrations.json

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,46 @@
11
{
22
"migrations": [
33
{
4-
"version": "10.2.0",
5-
"description": "Remove deprecated jest builder options",
6-
"factory": "./src/migrations/update-10-2-0/update-10-2-0",
7-
"package": "@nrwl/jest",
8-
"name": "update-10.2.0"
4+
"version": "11.0.0-beta.3",
5+
"description": "Update the decoration script when using Angular CLI",
6+
"factory": "./src/migrations/update-11-0-0/update-decorate-angular-cli",
7+
"package": "@nrwl/workspace",
8+
"name": "update-decorate-angular-cli"
9+
},
10+
{
11+
"version": "11.0.0-beta.3",
12+
"description": "Update the @types/node package",
13+
"factory": "./src/migrations/update-11-0-0/update-node-types",
14+
"package": "@nrwl/workspace",
15+
"name": "update-node-types"
16+
},
17+
{
18+
"version": "11.0.0-beta.3",
19+
"description": "Rename tools/schematics into tools/generators",
20+
"factory": "./src/migrations/update-11-0-0/rename-workspace-schematics",
21+
"package": "@nrwl/workspace",
22+
"name": "rename-workspace-schematics"
23+
},
24+
{
25+
"version": "11.0.0-beta.15",
26+
"description": "Adds `outputs` based on builders",
27+
"factory": "./src/migrations/update-11-0-0/add-outputs-in-workspace",
28+
"package": "@nrwl/workspace",
29+
"name": "add-outputs-in-workspace"
30+
},
31+
{
32+
"version": "11.0.0",
33+
"description": "Check that the right update command is used",
34+
"factory": "./src/migrations/update-11-0-0/update-command-check",
35+
"package": "@nrwl/workspace",
36+
"name": "update-command-check"
37+
},
38+
{
39+
"version": "11.0.2",
40+
"description": "Rename the workspace-schematic script into workspace-generator script",
41+
"factory": "./src/migrations/update-11-0-0/rename-workspace-schematic-script",
42+
"package": "@nrwl/workspace",
43+
"name": "rename-workspace-schematic-script"
944
}
1045
]
1146
}

‎nx.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
},
1212
"tsconfig.base.json": "*",
1313
"tslint.json": "*",
14-
"nx.json": "*"
14+
"nx.json": "*",
15+
".eslintrc.json": "*"
1516
},
1617
"tasksRunnerOptions": {
1718
"default": {

‎package.json

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
"format:write": "nx format:write",
2222
"format:check": "nx format:check",
2323
"update": "nx migrate latest",
24-
"workspace-schematic": "nx workspace-schematic",
2524
"dep-graph": "nx dep-graph",
2625
"help": "nx help",
27-
"commit": "git-cz"
26+
"commit": "git-cz",
27+
"workspace-generator": "nx workspace-generator"
2828
},
2929
"private": true,
3030
"dependencies": {
@@ -37,27 +37,29 @@
3737
"devDependencies": {
3838
"@nestjs/schematics": "^7.2.7",
3939
"@nestjs/testing": "^7.6.11",
40-
"@nrwl/eslint-plugin-nx": "10.2.0",
41-
"@nrwl/jest": "10.2.0",
42-
"@nrwl/nest": "10.2.0",
43-
"@nrwl/node": "10.2.0",
44-
"@nrwl/workspace": "10.2.0",
40+
"@nrwl/cli": "11.2.10",
41+
"@nrwl/eslint-plugin-nx": "11.2.10",
42+
"@nrwl/jest": "11.2.10",
43+
"@nrwl/nest": "11.2.10",
44+
"@nrwl/node": "11.2.10",
45+
"@nrwl/tao": "11.2.10",
46+
"@nrwl/workspace": "11.2.10",
4547
"@types/jest": "26.0.15",
46-
"@types/node": "~8.9.4",
47-
"@typescript-eslint/eslint-plugin": "2.34.0",
48-
"@typescript-eslint/parser": "2.34.0",
48+
"@types/node": "12.12.38",
49+
"@typescript-eslint/eslint-plugin": "4.3.0",
50+
"@typescript-eslint/parser": "4.3.0",
4951
"cz-conventional-changelog": "^3.3.0",
5052
"dotenv": "6.2.0",
51-
"eslint": "6.8.0",
53+
"eslint": "7.10.0",
5254
"eslint-config-prettier": "6.15.0",
5355
"jest": "26.6.3",
5456
"prettier": "2.2.1",
5557
"rxjs-marbles": "^6.0.1",
5658
"supertest": "^4.0.2",
57-
"ts-jest": "26.4.4",
58-
"ts-node": "~7.0.0",
59-
"tslint": "~6.1.3",
60-
"typescript": "~3.9.3"
59+
"ts-jest": "26.4.0",
60+
"ts-node": "9.1.1",
61+
"tslint": "6.1.3",
62+
"typescript": "4.0.5"
6163
},
6264
"config": {
6365
"commitizen": {

‎packages/in-memory-db/.eslintrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎packages/in-memory-db/.eslintrc.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"extends": "../../.eslintrc",
3+
"rules": {},
4+
"ignorePatterns": ["!**/*"]
5+
}

0 commit comments

Comments
 (0)