Skip to content

Commit 752b60f

Browse files
yharaskrikyharaskrik
committed
build: update nx to 10.4.12
1 parent 7ffd670 commit 752b60f

22 files changed

+748
-539
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: 117 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,123 @@
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",
4+
"version": "10.3.0-beta.0",
5+
"description": "Add @nrwl/cli as dependency",
6+
"factory": "./src/migrations/update-10-3-0/add-cli-dependency",
7+
"package": "@nrwl/workspace",
8+
"name": "add-cli-dependency"
9+
},
10+
{
11+
"version": "10.3.0-beta.0",
12+
"description": "Update typescript to v4",
13+
"factory": "./src/migrations/update-10-3-0/update-typescript",
14+
"package": "@nrwl/workspace",
15+
"name": "update-10-3-0"
16+
},
17+
{
18+
"version": "10.3.0-beta.1",
19+
"description": "Adds .vscode/extensions.json to a workspace",
20+
"factory": "./src/migrations/update-10-3-0/add-vscode-extensions",
21+
"package": "@nrwl/workspace",
22+
"name": "add-vscode-extensions"
23+
},
24+
{
25+
"version": "10.3.0-beta.0",
26+
"description": "Adds `buildableProjectDepsInPackageJsonType` for web and angular package builders",
27+
"factory": "./src/migrations/update-10-3-0/add-buildable-project-deps-in-package-json-type",
28+
"package": "@nrwl/workspace",
29+
"name": "add-buildable-project-deps-in-package-json-type"
30+
},
31+
{
32+
"version": "10.4.0-beta.5",
33+
"description": "Add an explicit dependency on @nrwl/tao",
34+
"factory": "./src/migrations/update-10-4-0/add-explicit-dep-on-tao",
35+
"package": "@nrwl/workspace",
36+
"name": "add-explicit-dep-on-tao"
37+
},
38+
{
39+
"version": "10.4.5",
40+
"description": "Update the 'update' npm script to invoke nx migrate",
41+
"factory": "./src/migrations/update-10-4-0/update-script-to-invoke-nx-migrate",
42+
"package": "@nrwl/workspace",
43+
"name": "update-script-to-invoke-nx-migrate"
44+
},
45+
{
46+
"version": "10.4.6",
47+
"description": "Update the decoration script when using Angular CLI",
48+
"factory": "./src/migrations/update-10-4-0/update-decorate-angular-cli",
49+
"package": "@nrwl/workspace",
50+
"name": "update-decorate-angular-cli"
51+
},
52+
{
53+
"version": "10.3.0-beta.1",
54+
"description": "Adds all jest projects into the root jest config",
55+
"factory": "./src/migrations/update-10-3-0/update-projects-property",
56+
"package": "@nrwl/jest",
57+
"name": "update-projects-property"
58+
},
59+
{
60+
"version": "10.3.1-beta.1",
61+
"description": "Fix ts-jest migration",
62+
"factory": "./src/migrations/update-10-3-0/update-ts-jest",
763
"package": "@nrwl/jest",
8-
"name": "update-10.2.0"
64+
"name": "update-ts-jest"
65+
},
66+
{
67+
"version": "10.3.0-beta.1",
68+
"description": "Adds a jest extension to the recommended extensions for vscode",
69+
"factory": "./src/migrations/update-10-3-0/add-jest-extension",
70+
"package": "@nrwl/jest",
71+
"name": "add-jest-extension"
72+
},
73+
{
74+
"version": "10.3.0-beta.1",
75+
"description": "Update @typescript-eslint to v4.3",
76+
"factory": "./src/migrations/update-10-3-0/update-10-3-0",
77+
"package": "@nrwl/linter",
78+
"name": "update-10.3.0"
79+
},
80+
{
81+
"version": "10.3.0-beta.0",
82+
"description": "Migrate to the new ESLint builder and ESLint config style",
83+
"factory": "./src/migrations/update-10-3-0/update-eslint-builder-and-config",
84+
"package": "@nrwl/linter",
85+
"name": "update-eslint-builder-and-config"
86+
},
87+
{
88+
"version": "10.3.0-beta.2",
89+
"description": "Add explicit .json file extension to .eslintrc files, not using an extension is deprecated",
90+
"factory": "./src/migrations/update-10-3-0/add-json-ext-to-eslintrc",
91+
"package": "@nrwl/linter",
92+
"name": "add-json-ext-to-eslintrc"
93+
},
94+
{
95+
"version": "10.3.0-beta.3",
96+
"description": "Update implicitDependencies within nx.json to include root .eslintrc.json",
97+
"factory": "./src/migrations/update-10-3-0/add-root-eslintrc-json-to-workspace-implicit-deps",
98+
"package": "@nrwl/linter",
99+
"name": "add-root-eslintrc-json-to-workspace-implicit-deps"
100+
},
101+
{
102+
"version": "10.3.1-beta.1",
103+
"description": "Revert any node_modules lintFilesPatterns that were accidentally included by update-eslint-builder-and-config",
104+
"factory": "./src/migrations/update-10-3-1/revert-node-modules-files-in-eslint-builder-options",
105+
"package": "@nrwl/linter",
106+
"name": "revert-node-modules-files-in-eslint-builder-options"
107+
},
108+
{
109+
"version": "10.4.0-beta.0",
110+
"description": "Update ESLint config files to use preset configs which eslint-plugin-nx exports",
111+
"factory": "./src/migrations/update-10-4-0/update-eslint-configs-to-use-nx-presets",
112+
"package": "@nrwl/linter",
113+
"name": "update-eslint-configs-to-use-nx-presets"
114+
},
115+
{
116+
"version": "10.4.0-beta.1",
117+
"description": "Update root ESLint config to use overrides",
118+
"factory": "./src/migrations/update-10-4-0/update-root-eslint-config-to-use-overrides",
119+
"package": "@nrwl/linter",
120+
"name": "update-root-eslint-config-to-use-overrides"
9121
}
10122
]
11-
}
123+
}

‎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: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,29 @@
3737
"devDependencies": {
3838
"@nestjs/schematics": "^7.1.2",
3939
"@nestjs/testing": "^7.4.4",
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": "10.4.12",
41+
"@nrwl/eslint-plugin-nx": "10.4.12",
42+
"@nrwl/jest": "10.4.12",
43+
"@nrwl/nest": "10.4.12",
44+
"@nrwl/node": "10.4.12",
45+
"@nrwl/tao": "10.4.12",
46+
"@nrwl/workspace": "10.4.12",
4547
"@types/jest": "26.0.15",
4648
"@types/node": "~8.9.4",
47-
"@typescript-eslint/eslint-plugin": "2.34.0",
48-
"@typescript-eslint/parser": "2.34.0",
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",
54-
"prettier": "2.2.1",
56+
"prettier": "2.1.2",
5557
"rxjs-marbles": "^6.0.1",
5658
"supertest": "^4.0.2",
57-
"ts-jest": "26.4.4",
59+
"ts-jest": "26.4.0",
5860
"ts-node": "~7.0.0",
5961
"tslint": "~6.1.3",
60-
"typescript": "~3.9.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+
}

‎packages/in-memory-db/jest.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module.exports = {
2-
name: 'in-memory-db',
3-
preset: '../../jest.config.js',
2+
preset: '../../jest.preset.js',
43
globals: {
54
'ts-jest': {
65
tsConfig: '<rootDir>/tsconfig.spec.json',
@@ -12,4 +11,5 @@ module.exports = {
1211
},
1312
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
1413
coverageDirectory: '../../coverage/packages/in-memory-db',
14+
displayName: 'in-memory-db',
1515
};

‎packages/playground-e2e/.eslintrc

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

‎packages/playground-e2e/.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+
}

‎packages/playground-e2e/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: 'playground-e2e',
3-
preset: '../../jest.config.js',
2+
preset: '../../jest.preset.js',
43
globals: {
54
'ts-jest': {
65
tsConfig: '<rootDir>/tsconfig.spec.json',
76
},
87
},
98
coverageDirectory: '../../coverage/packages/playground-e2e',
9+
displayName: 'playground-e2e',
1010
};

‎packages/playground/.eslintrc

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

‎packages/playground/.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+
}

‎packages/playground/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: 'playground',
3-
preset: '../../jest.config.js',
2+
preset: '../../jest.preset.js',
43
globals: {
54
'ts-jest': {
65
tsConfig: '<rootDir>/tsconfig.spec.json',
76
},
87
},
98
coverageDirectory: '../../coverage/packages/playground',
9+
displayName: 'playground',
1010
};

‎packages/spectator/.eslintrc

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

‎packages/spectator/.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+
}

‎packages/spectator/jest.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module.exports = {
2-
name: 'spectator',
3-
preset: '../../jest.config.js',
2+
preset: '../../jest.preset.js',
43
globals: {
54
'ts-jest': {
65
tsConfig: '<rootDir>/tsconfig.spec.json',
@@ -11,4 +10,5 @@ module.exports = {
1110
},
1211
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
1312
coverageDirectory: '../../coverage/packages/spectator',
13+
displayName: 'spectator',
1414
};

0 commit comments

Comments
 (0)