Skip to content

Commit d358785

Browse files
authored
chore: migrate to nx 12.6.0 and distributed workspace config (typescript-eslint#3652)
1 parent 84fff35 commit d358785

File tree

16 files changed

+717
-170
lines changed

16 files changed

+717
-170
lines changed

nx.json

Lines changed: 11 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
22
"npmScope": "typescript-eslint",
33
"implicitDependencies": {
4-
"workspace.json": "*",
54
"package.json": {
65
"dependencies": "*",
76
"devDependencies": "*"
87
},
9-
"nx.json": "*",
108
".github/workflows/ci.yml": "*"
119
},
10+
"affected": {
11+
"defaultBase": "master"
12+
},
1213
"workspaceLayout": {
1314
"libsDir": "packages"
1415
},
@@ -17,50 +18,20 @@
1718
"runner": "@nrwl/nx-cloud",
1819
"options": {
1920
"cacheableOperations": ["build", "test", "package", "prepare"],
20-
"strictlyOrderedTargets": ["build", "package", "prepare"],
2121
"accessToken": "YjFjNTBhOWUtY2JmNy00ZDhiLWE5N2UtZjliNDAwNmIzOTdjfHJlYWQtd3JpdGU=",
2222
"canTrackAnalytics": false,
2323
"showUsageWarnings": true,
2424
"runtimeCacheInputs": ["node -v"]
2525
}
2626
}
2727
},
28-
"projects": {
29-
"@typescript-eslint/ast-spec": {
30-
"implicitDependencies": []
31-
},
32-
"@typescript-eslint/eslint-plugin": {
33-
"implicitDependencies": []
34-
},
35-
"@typescript-eslint/eslint-plugin-internal": {
36-
"implicitDependencies": []
37-
},
38-
"@typescript-eslint/eslint-plugin-tslint": {
39-
"implicitDependencies": []
40-
},
41-
"@typescript-eslint/experimental-utils": {
42-
"implicitDependencies": []
43-
},
44-
"@typescript-eslint/parser": {
45-
"implicitDependencies": []
46-
},
47-
"@typescript-eslint/scope-manager": {
48-
"implicitDependencies": []
49-
},
50-
"@typescript-eslint/shared-fixtures": {
51-
"implicitDependencies": []
52-
},
53-
"@typescript-eslint/types": {
54-
"implicitDependencies": ["@typescript-eslint/ast-spec"]
55-
},
56-
"@typescript-eslint/typescript-estree": {
57-
"implicitDependencies": []
58-
},
59-
"@typescript-eslint/visitor-keys": {
60-
"implicitDependencies": []
61-
}
28+
"targetDependencies": {
29+
"build": [
30+
{
31+
"target": "build",
32+
"projects": "dependencies"
33+
}
34+
]
6235
},
63-
"affected": {
64-
"defaultBase": "master"
65-
}
36+
"projects": {}
6637
}

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@
7777
"@commitlint/cli": "^12.1.4",
7878
"@commitlint/config-conventional": "^12.1.4",
7979
"@commitlint/config-lerna-scopes": "^12.1.4",
80-
"@nrwl/cli": "^12.3.5",
81-
"@nrwl/nx-cloud": "^12.1.3",
82-
"@nrwl/tao": "^12.3.5",
83-
"@nrwl/workspace": "^12.3.5",
80+
"@nrwl/cli": "12.6.0",
81+
"@nrwl/nx-cloud": "12.3.0",
82+
"@nrwl/tao": "12.6.0",
83+
"@nrwl/workspace": "12.6.0",
8484
"@types/babel__code-frame": "^7.0.2",
8585
"@types/debug": "^4.1.5",
8686
"@types/eslint-visitor-keys": "^1.0.0",
@@ -115,7 +115,7 @@
115115
"make-dir": "^3.1.0",
116116
"markdownlint-cli": "^0.27.1",
117117
"node-fetch": "^2.6.1",
118-
"prettier": "^2.3.0",
118+
"prettier": "2.3.2",
119119
"pretty-format": "^27.0.2",
120120
"rimraf": "^3.0.2",
121121
"ts-jest": "^27.0.1",
@@ -127,6 +127,6 @@
127127
"@types/node": "^15.6.1",
128128
"jest-diff": "^27.0.0",
129129
"pretty-format": "^27.0.0",
130-
"typescript": "4.3.2"
130+
"typescript": "4.3.5"
131131
}
132132
}

packages/ast-spec/project.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"root": "packages/ast-spec",
3+
"type": "library",
4+
"implicitDependencies": []
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"root": "packages/eslint-plugin-internal",
3+
"type": "library",
4+
"implicitDependencies": []
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"root": "packages/eslint-plugin-tslint",
3+
"type": "library",
4+
"implicitDependencies": []
5+
}

packages/eslint-plugin/project.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"root": "packages/eslint-plugin",
3+
"type": "library",
4+
"implicitDependencies": []
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"root": "packages/experimental-utils",
3+
"type": "library",
4+
"implicitDependencies": []
5+
}

packages/parser/project.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"root": "packages/parser",
3+
"type": "library",
4+
"implicitDependencies": []
5+
}

packages/scope-manager/project.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"root": "packages/scope-manager",
3+
"type": "library",
4+
"implicitDependencies": []
5+
}

packages/shared-fixtures/project.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"root": "packages/shared-fixtures",
3+
"type": "library",
4+
"implicitDependencies": []
5+
}

packages/types/project.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"root": "packages/types",
3+
"type": "library",
4+
"implicitDependencies": ["@typescript-eslint/ast-spec"]
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"root": "packages/typescript-estree",
3+
"type": "library",
4+
"implicitDependencies": []
5+
}

packages/visitor-keys/project.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"root": "packages/visitor-keys",
3+
"type": "library",
4+
"implicitDependencies": []
5+
}

tsconfig.base.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"sourceMap": true,
1616
"strict": true,
1717
"target": "es2017",
18-
"lib": ["es2017"]
18+
"lib": ["es2017"],
19+
"paths": {}
1920
}
2021
}

workspace.json

Lines changed: 11 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,16 @@
11
{
22
"version": 2,
33
"projects": {
4-
"@typescript-eslint/ast-spec": {
5-
"root": "packages/ast-spec",
6-
"type": "library"
7-
},
8-
"@typescript-eslint/eslint-plugin": {
9-
"root": "packages/eslint-plugin",
10-
"type": "library"
11-
},
12-
"@typescript-eslint/eslint-plugin-internal": {
13-
"root": "packages/eslint-plugin-internal",
14-
"type": "library"
15-
},
16-
"@typescript-eslint/eslint-plugin-tslint": {
17-
"root": "packages/eslint-plugin-tslint",
18-
"type": "library"
19-
},
20-
"@typescript-eslint/experimental-utils": {
21-
"root": "packages/experimental-utils",
22-
"type": "library"
23-
},
24-
"@typescript-eslint/parser": {
25-
"root": "packages/parser",
26-
"type": "library"
27-
},
28-
"@typescript-eslint/scope-manager": {
29-
"root": "packages/scope-manager",
30-
"type": "library"
31-
},
32-
"@typescript-eslint/shared-fixtures": {
33-
"root": "packages/shared-fixtures",
34-
"type": "library"
35-
},
36-
"@typescript-eslint/types": {
37-
"root": "packages/types",
38-
"type": "library"
39-
},
40-
"@typescript-eslint/typescript-estree": {
41-
"root": "packages/typescript-estree",
42-
"type": "library"
43-
},
44-
"@typescript-eslint/visitor-keys": {
45-
"root": "packages/visitor-keys",
46-
"type": "library"
47-
}
4+
"@typescript-eslint/ast-spec": "packages/ast-spec",
5+
"@typescript-eslint/eslint-plugin": "packages/eslint-plugin",
6+
"@typescript-eslint/eslint-plugin-internal": "packages/eslint-plugin-internal",
7+
"@typescript-eslint/eslint-plugin-tslint": "packages/eslint-plugin-tslint",
8+
"@typescript-eslint/experimental-utils": "packages/experimental-utils",
9+
"@typescript-eslint/parser": "packages/parser",
10+
"@typescript-eslint/scope-manager": "packages/scope-manager",
11+
"@typescript-eslint/shared-fixtures": "packages/shared-fixtures",
12+
"@typescript-eslint/types": "packages/types",
13+
"@typescript-eslint/typescript-estree": "packages/typescript-estree",
14+
"@typescript-eslint/visitor-keys": "packages/visitor-keys"
4815
}
4916
}

0 commit comments

Comments
 (0)