Merge pull request #4553 from iclanton/4530-followups

Some follow-ups to #4530.

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 }
 };

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
     }
   }

build-tests-subspace/rush-lib-test/src/start.ts

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
+/* eslint-disable no-console */
+
 console.log('rush-lib-test loading Rush configuration...');
 
 // Important: Since we're calling an internal API, we need to use the unbundled .d.ts files

build-tests-subspace/rush-lib-test/tsconfig.json

@@ -3,20 +3,23 @@
 
   "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,
-    "types": ["node"],
-
-    "module": "commonjs",
-    "target": "es6",
-    "lib": ["es5", "es2015.collection", "es2015.iterable", "es2015.promise"]
+    "noUnusedLocals": true,
+    "types": ["node"]
   },
-  "include": ["**/*.ts"],
-  "exclude": ["node_modules", "lib"]
+
+  "include": ["src/**/*.ts", "src/**/*.tsx"]
 }

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 }
 };

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
     }
   }

build-tests-subspace/rush-sdk-test/src/start.ts

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
+/* eslint-disable no-console */
+
 console.log('rush-sdk-test loading Rush configuration...');
 
 // Important: Since we're calling an internal API, we need to use the unbundled .d.ts files

build-tests-subspace/rush-sdk-test/tsconfig.json

@@ -3,21 +3,24 @@
 
   "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": ["node"],
-
-    "module": "commonjs",
-    "target": "es6",
-    "lib": ["es5", "es2015.collection", "es2015.iterable", "es2015.promise"],
-    "rootDir": "src",
-    "skipLibCheck": true
+    "skipLibCheck": true // There are issues with importing rush-sdk as an injected dependency
   },
-  "include": ["src/**/*.ts"]
+
+  "include": ["src/**/*.ts", "src/**/*.tsx"]
 }

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 }
 };

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
     }
   }

build-tests-subspace/typescript-newest-test/tsconfig.json

@@ -1,4 +1,6 @@
 {
+  "$schema": "http://json.schemastore.org/tsconfig",
+
   "compilerOptions": {
     "outDir": "lib",
     "rootDir": "src",
@@ -19,6 +21,5 @@
     "types": []
   },
 
-  "include": ["src/**/*.ts", "src/**/*.tsx"],
-  "exclude": ["node_modules", "lib"]
+  "include": ["src/**/*.ts", "src/**/*.tsx"]
 }