Skip to content

Commit bf742d9

Browse files
committed
Fix up some inconsistencies between RSC projects
1 parent 5100559 commit bf742d9

File tree

9 files changed

+29
-12
lines changed

9 files changed

+29
-12
lines changed

stack/rush-stack-compiler-3.2/tsconfig.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
"extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json",
33

44
"compilerOptions": {
5-
"rootDir": "src",
6-
"types": [
7-
"node"
8-
]
5+
"rootDir": "src"
96
}
107
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// This is a workaround for https://github.com/eslint/eslint/issues/3458
2+
require("@rushstack/eslint-config/patch-eslint6");
3+
4+
module.exports = {
5+
extends: [ "@rushstack/eslint-config" ],
6+
parserOptions: { tsconfigRootDir: __dirname },
7+
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env node
2+
require("eslint/bin/eslint");

stack/rush-stack-compiler-3.6/package.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
},
1010
"bin": {
1111
"rush-api-extractor": "./bin/rush-api-extractor",
12+
"rush-eslint": "./bin/rush-eslint",
1213
"rush-tsc": "./bin/rush-tsc",
1314
"rush-tslint": "./bin/rush-tslint"
1415
},
@@ -20,15 +21,18 @@
2021
"dependencies": {
2122
"@microsoft/api-extractor": "7.7.0",
2223
"@microsoft/node-core-library": "3.18.0",
24+
"@rushstack/eslint-config": "0.4.2",
2325
"@types/node": "8.10.54",
24-
"tslint-microsoft-contrib": "~5.2.1",
26+
"eslint": "~6.5.1",
2527
"tslint": "~5.12.1",
28+
"tslint-microsoft-contrib": "~5.2.1",
2629
"typescript": "~3.6.4"
2730
},
2831
"devDependencies": {
2932
"@microsoft/node-library-build": "6.3.11",
3033
"@microsoft/rush-stack-compiler-3.5": "0.3.11",
3134
"@microsoft/rush-stack-compiler-shared": "0.0.0",
35+
"@rushstack/eslint-config": "0.4.2",
3236
"gulp": "~4.0.2"
3337
}
3438
}

stack/rush-stack-compiler-3.6/tslint.json

-3
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// This is a workaround for https://github.com/eslint/eslint/issues/3458
2+
require("@rushstack/eslint-config/patch-eslint6");
3+
4+
module.exports = {
5+
extends: [ "@rushstack/eslint-config" ],
6+
parserOptions: { tsconfigRootDir: __dirname },
7+
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env node
2+
require("eslint/bin/eslint");

stack/rush-stack-compiler-3.7/package.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
},
1010
"bin": {
1111
"rush-api-extractor": "./bin/rush-api-extractor",
12+
"rush-eslint": "./bin/rush-eslint",
1213
"rush-tsc": "./bin/rush-tsc",
1314
"rush-tslint": "./bin/rush-tslint"
1415
},
@@ -20,15 +21,18 @@
2021
"dependencies": {
2122
"@microsoft/api-extractor": "7.7.0",
2223
"@microsoft/node-core-library": "3.18.0",
24+
"@rushstack/eslint-config": "0.4.2",
2325
"@types/node": "8.10.54",
24-
"tslint-microsoft-contrib": "~5.2.1",
26+
"eslint": "~6.5.1",
2527
"tslint": "~5.12.1",
28+
"tslint-microsoft-contrib": "~5.2.1",
2629
"typescript": "~3.7.2"
2730
},
2831
"devDependencies": {
2932
"@microsoft/node-library-build": "6.3.11",
3033
"@microsoft/rush-stack-compiler-3.5": "0.3.11",
3134
"@microsoft/rush-stack-compiler-shared": "0.0.0",
35+
"@rushstack/eslint-config": "0.4.2",
3236
"gulp": "~4.0.2"
3337
}
3438
}

stack/rush-stack-compiler-3.7/tslint.json

-3
This file was deleted.

0 commit comments

Comments
 (0)