Some follow-ups to microsoft#4530.

iclanton · Feb 28, 2024 · 731fe5c · 731fe5c
1 parent a26f066
commit 731fe5c
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 312 deletions.
diff --git a/build-tests-subspace/rush-lib-test/.eslintrc.js b/build-tests-subspace/rush-lib-test/.eslintrc.js
@@ -1,7 +1,12 @@
 // This is a workaround for https://github.com/eslint/eslint/issues/3458
-require('@rushstack/eslint-config/patch/modern-module-resolution');
+require('local-node-rig/profiles/default/includes/eslint/patch/modern-module-resolution');
+// This is a workaround for https://github.com/microsoft/rushstack/issues/3021
+require('local-node-rig/profiles/default/includes/eslint/patch/custom-config-package-names');
 
 module.exports = {
-  extends: ['@rushstack/eslint-config/profile/node'],
+  extends: [
+    'local-node-rig/profiles/default/includes/eslint/profile/node-trusted-tool',
+    'local-node-rig/profiles/default/includes/eslint/mixins/friendly-locals'
+  ],
   parserOptions: { tsconfigRootDir: __dirname }
 };
diff --git a/build-tests-subspace/rush-lib-test/config/heft.json b/build-tests-subspace/rush-lib-test/config/heft.json
diff --git a/build-tests-subspace/rush-lib-test/package.json b/build-tests-subspace/rush-lib-test/package.json
@@ -14,13 +14,10 @@
     "@rushstack/terminal": "workspace:*"
   },
   "devDependencies": {
-    "local-node-rig": "workspace:*",
     "@rushstack/eslint-config": "workspace:*",
     "@rushstack/heft": "workspace:*",
-    "@rushstack/heft-lint-plugin": "workspace:*",
-    "@rushstack/heft-typescript-plugin": "workspace:*",
     "@types/node": "18.17.15",
-    "typescript": "~5.3.3"
+    "local-node-rig": "workspace:*"
   },
   "dependenciesMeta": {
     "@microsoft/rush-lib": {
@@ -32,10 +29,7 @@
     "@rushstack/heft": {
       "injected": true
     },
-    "@rushstack/heft-lint-plugin": {
-      "injected": true
-    },
-    "@rushstack/heft-typescript-plugin": {
+    "local-node-rig": {
       "injected": true
     }
   }

diff --git a/build-tests-subspace/rush-lib-test/tsconfig.json b/build-tests-subspace/rush-lib-test/tsconfig.json
@@ -1,22 +1,3 @@
 {
-  "$schema": "http://json.schemastore.org/tsconfig",
-
-  "compilerOptions": {
-    "outDir": "lib",
-
-    "forceConsistentCasingInFileNames": true,
-    "jsx": "react",
-    "declaration": true,
-    "sourceMap": true,
-    "inlineSources": true,
-    "experimentalDecorators": true,
-    "strictNullChecks": true,
-    "types": ["node"],
-
-    "module": "commonjs",
-    "target": "es6",
-    "lib": ["es5", "es2015.collection", "es2015.iterable", "es2015.promise"]
-  },
-  "include": ["**/*.ts"],
-  "exclude": ["node_modules", "lib"]
+  "extends": "./node_modules/local-node-rig/profiles/default/tsconfig-base.json"
 }
diff --git a/build-tests-subspace/rush-sdk-test/.eslintrc.js b/build-tests-subspace/rush-sdk-test/.eslintrc.js
@@ -1,7 +1,12 @@
 // This is a workaround for https://github.com/eslint/eslint/issues/3458
-require('@rushstack/eslint-config/patch/modern-module-resolution');
+require('local-node-rig/profiles/default/includes/eslint/patch/modern-module-resolution');
+// This is a workaround for https://github.com/microsoft/rushstack/issues/3021
+require('local-node-rig/profiles/default/includes/eslint/patch/custom-config-package-names');
 
 module.exports = {
-  extends: ['@rushstack/eslint-config/profile/node'],
+  extends: [
+    'local-node-rig/profiles/default/includes/eslint/profile/node-trusted-tool',
+    'local-node-rig/profiles/default/includes/eslint/mixins/friendly-locals'
+  ],
   parserOptions: { tsconfigRootDir: __dirname }
 };
diff --git a/build-tests-subspace/rush-sdk-test/config/heft.json b/build-tests-subspace/rush-sdk-test/config/heft.json
diff --git a/build-tests-subspace/rush-sdk-test/package.json b/build-tests-subspace/rush-sdk-test/package.json
@@ -13,14 +13,11 @@
     "@rushstack/rush-sdk": "workspace:*"
   },
   "devDependencies": {
-    "local-node-rig": "workspace:*",
+    "@microsoft/rush-lib": "workspace:*",
     "@rushstack/eslint-config": "workspace:*",
     "@rushstack/heft": "workspace:*",
-    "@rushstack/heft-lint-plugin": "workspace:*",
-    "@rushstack/heft-typescript-plugin": "workspace:*",
-    "@microsoft/rush-lib": "workspace:*",
     "@types/node": "18.17.15",
-    "typescript": "~5.3.3"
+    "local-node-rig": "workspace:*"
   },
   "dependenciesMeta": {
     "@microsoft/rush-lib": {
@@ -32,10 +29,7 @@
     "@rushstack/heft": {
       "injected": true
     },
-    "@rushstack/heft-lint-plugin": {
-      "injected": true
-    },
-    "@rushstack/heft-typescript-plugin": {
+    "local-node-rig": {
       "injected": true
     }
   }

diff --git a/build-tests-subspace/rush-sdk-test/tsconfig.json b/build-tests-subspace/rush-sdk-test/tsconfig.json
@@ -1,23 +1,3 @@
 {
-  "$schema": "http://json.schemastore.org/tsconfig",
-
-  "compilerOptions": {
-    "outDir": "lib",
-
-    "forceConsistentCasingInFileNames": true,
-    "jsx": "react",
-    "declaration": true,
-    "sourceMap": true,
-    "inlineSources": true,
-    "experimentalDecorators": true,
-    "strictNullChecks": true,
-    "types": ["node"],
-
-    "module": "commonjs",
-    "target": "es6",
-    "lib": ["es5", "es2015.collection", "es2015.iterable", "es2015.promise"],
-    "rootDir": "src",
-    "skipLibCheck": true
-  },
-  "include": ["src/**/*.ts"]
+  "extends": "./node_modules/local-node-rig/profiles/default/tsconfig-base.json"
 }
diff --git a/build-tests-subspace/typescript-newest-test/.eslintrc.js b/build-tests-subspace/typescript-newest-test/.eslintrc.js
@@ -1,7 +1,12 @@
 // This is a workaround for https://github.com/eslint/eslint/issues/3458
-require('@rushstack/eslint-config/patch/modern-module-resolution');
+require('local-node-rig/profiles/default/includes/eslint/patch/modern-module-resolution');
+// This is a workaround for https://github.com/microsoft/rushstack/issues/3021
+require('local-node-rig/profiles/default/includes/eslint/patch/custom-config-package-names');
 
 module.exports = {
-  extends: ['@rushstack/eslint-config/profile/node'],
+  extends: [
+    'local-node-rig/profiles/default/includes/eslint/profile/node-trusted-tool',
+    'local-node-rig/profiles/default/includes/eslint/mixins/friendly-locals'
+  ],
   parserOptions: { tsconfigRootDir: __dirname }
 };
diff --git a/build-tests-subspace/typescript-newest-test/config/heft.json b/build-tests-subspace/typescript-newest-test/config/heft.json
diff --git a/build-tests-subspace/typescript-newest-test/package.json b/build-tests-subspace/typescript-newest-test/package.json
@@ -10,14 +10,11 @@
     "_phase:build": "heft run --only build -- --clean"
   },
   "devDependencies": {
-    "local-node-rig": "workspace:*",
     "@rushstack/eslint-config": "workspace:*",
     "@rushstack/heft": "workspace:*",
-    "@rushstack/heft-lint-plugin": "workspace:*",
-    "@rushstack/heft-typescript-plugin": "workspace:*",
-    "typescript": "~5.3.3",
-    "tslint": "~5.20.1",
-    "eslint": "~8.7.0"
+    "eslint": "~8.7.0",
+    "local-node-rig": "workspace:*",
+    "typescript": "~5.3.3"
   },
   "dependenciesMeta": {
     "@rushstack/eslint-config": {
@@ -26,10 +23,7 @@
     "@rushstack/heft": {
       "injected": true
     },
-    "@rushstack/heft-lint-plugin": {
-      "injected": true
-    },
-    "@rushstack/heft-typescript-plugin": {
+    "local-node-rig": {
       "injected": true
     }
   }

diff --git a/build-tests-subspace/typescript-newest-test/tsconfig.json b/build-tests-subspace/typescript-newest-test/tsconfig.json
@@ -1,24 +1,3 @@
 {
-  "compilerOptions": {
-    "outDir": "lib",
-    "rootDir": "src",
-
-    "module": "commonjs",
-    "target": "es2017",
-    "lib": ["es2017"],
-
-    "forceConsistentCasingInFileNames": true,
-    "jsx": "react",
-    "declaration": true,
-    "sourceMap": true,
-    "declarationMap": true,
-    "inlineSources": true,
-    "experimentalDecorators": true,
-    "strictNullChecks": true,
-    "noUnusedLocals": true,
-    "types": []
-  },
-
-  "include": ["src/**/*.ts", "src/**/*.tsx"],
-  "exclude": ["node_modules", "lib"]
+  "extends": "./node_modules/local-node-rig/profiles/default/tsconfig-base.json"
 }
diff --git a/build-tests-subspace/typescript-newest-test/tslint.json b/build-tests-subspace/typescript-newest-test/tslint.json