Fix up some inconsistencies between RSC projects

octogonz · octogonz · commit bf742d976a41 · 2020-01-07T13:09:55.000-08:00
diff --git a/stack/rush-stack-compiler-3.2/tsconfig.json b/stack/rush-stack-compiler-3.2/tsconfig.json
@@ -2,9 +2,6 @@
   "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json",
 
   "compilerOptions": {
-    "rootDir": "src",
-    "types": [
-      "node"
-    ]
+    "rootDir": "src"
   }
 }
diff --git a/stack/rush-stack-compiler-3.6/.eslintrc.js b/stack/rush-stack-compiler-3.6/.eslintrc.js
@@ -0,0 +1,7 @@
+// This is a workaround for https://github.com/eslint/eslint/issues/3458
+require("@rushstack/eslint-config/patch-eslint6");
+
+module.exports = {
+  extends: [ "@rushstack/eslint-config" ],
+  parserOptions: { tsconfigRootDir: __dirname },
+};
diff --git a/stack/rush-stack-compiler-3.6/bin/rush-eslint b/stack/rush-stack-compiler-3.6/bin/rush-eslint
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require("eslint/bin/eslint");
diff --git a/stack/rush-stack-compiler-3.6/package.json b/stack/rush-stack-compiler-3.6/package.json
@@ -9,6 +9,7 @@
   },
   "bin": {
     "rush-api-extractor": "./bin/rush-api-extractor",
+    "rush-eslint": "./bin/rush-eslint",
     "rush-tsc": "./bin/rush-tsc",
     "rush-tslint": "./bin/rush-tslint"
   },
@@ -20,15 +21,18 @@
   "dependencies": {
     "@microsoft/api-extractor": "7.7.0",
     "@microsoft/node-core-library": "3.18.0",
+    "@rushstack/eslint-config": "0.4.2",
     "@types/node": "8.10.54",
-    "tslint-microsoft-contrib": "~5.2.1",
+    "eslint": "~6.5.1",
     "tslint": "~5.12.1",
+    "tslint-microsoft-contrib": "~5.2.1",
     "typescript": "~3.6.4"
   },
   "devDependencies": {
     "@microsoft/node-library-build": "6.3.11",
     "@microsoft/rush-stack-compiler-3.5": "0.3.11",
     "@microsoft/rush-stack-compiler-shared": "0.0.0",
+    "@rushstack/eslint-config": "0.4.2",
     "gulp": "~4.0.2"
   }
 }
diff --git a/stack/rush-stack-compiler-3.6/tslint.json b/stack/rush-stack-compiler-3.6/tslint.json
diff --git a/stack/rush-stack-compiler-3.7/.eslintrc.js b/stack/rush-stack-compiler-3.7/.eslintrc.js
@@ -0,0 +1,7 @@
+// This is a workaround for https://github.com/eslint/eslint/issues/3458
+require("@rushstack/eslint-config/patch-eslint6");
+
+module.exports = {
+  extends: [ "@rushstack/eslint-config" ],
+  parserOptions: { tsconfigRootDir: __dirname },
+};
diff --git a/stack/rush-stack-compiler-3.7/bin/rush-eslint b/stack/rush-stack-compiler-3.7/bin/rush-eslint
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require("eslint/bin/eslint");
diff --git a/stack/rush-stack-compiler-3.7/package.json b/stack/rush-stack-compiler-3.7/package.json
@@ -9,6 +9,7 @@
   },
   "bin": {
     "rush-api-extractor": "./bin/rush-api-extractor",
+    "rush-eslint": "./bin/rush-eslint",
     "rush-tsc": "./bin/rush-tsc",
     "rush-tslint": "./bin/rush-tslint"
   },
@@ -20,15 +21,18 @@
   "dependencies": {
     "@microsoft/api-extractor": "7.7.0",
     "@microsoft/node-core-library": "3.18.0",
+    "@rushstack/eslint-config": "0.4.2",
     "@types/node": "8.10.54",
-    "tslint-microsoft-contrib": "~5.2.1",
+    "eslint": "~6.5.1",
     "tslint": "~5.12.1",
+    "tslint-microsoft-contrib": "~5.2.1",
     "typescript": "~3.7.2"
   },
   "devDependencies": {
     "@microsoft/node-library-build": "6.3.11",
     "@microsoft/rush-stack-compiler-3.5": "0.3.11",
     "@microsoft/rush-stack-compiler-shared": "0.0.0",
+    "@rushstack/eslint-config": "0.4.2",
     "gulp": "~4.0.2"
   }
 }
diff --git a/stack/rush-stack-compiler-3.7/tslint.json b/stack/rush-stack-compiler-3.7/tslint.json

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,6 @@`
`2`	`2`	`"extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json",`
`3`	`3`
`4`	`4`	`"compilerOptions": {`
`5`		`- "rootDir": "src",`
`6`		`- "types": [`
`7`		`- "node"`
`8`		`- ]`
	`5`	`+ "rootDir": "src"`
`9`	`6`	`}`
`10`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#!/usr/bin/env node`
	`2`	`+require("eslint/bin/eslint");`