Merge pull request #4339 from iclanton/internal-node-rig

Follow-ups to #3944

README.md

@@ -179,8 +179,9 @@ These GitHub repositories provide supplementary resources for Rush Stack:
 | [/repo-scripts/doc-plugin-rush-stack](./repo-scripts/doc-plugin-rush-stack/) | API Documenter plugin used with the rushstack.io website |
 | [/repo-scripts/generate-api-docs](./repo-scripts/generate-api-docs/) | Used to generate API docs for the rushstack.io website |
 | [/repo-scripts/repo-toolbox](./repo-scripts/repo-toolbox/) | Used to execute various operations specific to this repo |
+| [/rigs/local-node-rig](./rigs/local-node-rig/) | A rig package for Node.js projects that build using Heft inside the RushStack repository. |
+| [/rigs/local-web-rig](./rigs/local-web-rig/) | A rig package for Web projects that build using Heft inside the RushStack repository. |
 | [/rush-plugins/rush-litewatch-plugin](./rush-plugins/rush-litewatch-plugin/) | An experimental alternative approach for multi-project watch mode |
-| [/rushstack-internal-rigs/heft-rushstack-internal-node-rig](./rushstack-internal-rigs/heft-rushstack-internal-node-rig/) | A rig package for Node.js projects that build using Heft inside the RushStack repository. |
 | [/vscode-extensions/rush-vscode-command-webview](./vscode-extensions/rush-vscode-command-webview/) | Part of the Rush Stack VSCode extension, provides a UI for invoking Rush commands |
 | [/vscode-extensions/rush-vscode-extension](./vscode-extensions/rush-vscode-extension/) | Enhanced experience for monorepos that use the Rush Stack toolchain |
 | [/webpack/webpack-deep-imports-plugin](./webpack/webpack-deep-imports-plugin/) | This plugin creates a bundle and commonJS files in a 'lib' folder mirroring modules in another 'lib' folder. |

apps/api-documenter/config/jest.config.json

@@ -1,3 +1,3 @@
 {
-  "extends": "heft-rushstack-internal-node-rig/profiles/default/config/jest.config.json"
+  "extends": "local-node-rig/profiles/default/config/jest.config.json"
 }

apps/api-documenter/config/rig.json

@@ -3,5 +3,5 @@
   // Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
   "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
 
-  "rigPackageName": "heft-rushstack-internal-node-rig"
+  "rigPackageName": "local-node-rig"
 }

apps/api-documenter/package.json

@@ -31,7 +31,7 @@
   "devDependencies": {
     "@rushstack/eslint-config": "workspace:*",
     "@rushstack/heft": "workspace:*",
-    "heft-rushstack-internal-node-rig": "workspace:*",
+    "local-node-rig": "workspace:*",
     "@types/js-yaml": "3.12.1",
     "@types/resolve": "1.20.2"
   }

apps/api-documenter/tsconfig.json

@@ -1,3 +1,3 @@
 {
-  "extends": "./node_modules/heft-rushstack-internal-node-rig/profiles/default/tsconfig-base.json"
+  "extends": "./node_modules/local-node-rig/profiles/default/tsconfig-base.json"
 }

apps/api-extractor/config/rush-project.json

@@ -4,7 +4,7 @@
   "operationSettings": [
     {
       "operationName": "_phase:build",
-      "outputFolderNames": [".heft", "release"]
+      "outputFolderNames": [".heft"]
     },
     {
       "operationName": "_phase:test",

apps/heft/config/rush-project.json

@@ -4,7 +4,7 @@
   "operationSettings": [
     {
       "operationName": "_phase:build",
-      "outputFolderNames": [".heft", "release"]
+      "outputFolderNames": [".heft"]
     },
     {
       "operationName": "_phase:test",

apps/lockfile-explorer-web/config/heft.json

@@ -8,7 +8,7 @@
    * Optionally specifies another JSON config file that this file extends from. This provides a way for standard
    * settings to be shared across multiple projects.
    */
-  "extends": "@rushstack/heft-web-rig/profiles/app/config/heft.json",
+  "extends": "local-web-rig/profiles/app/config/heft.json",
 
   "phasesByName": {
     "build": {

apps/lockfile-explorer-web/config/jest.config.json

@@ -1,13 +1,5 @@
 {
-  "extends": "@rushstack/heft-web-rig/profiles/app/config/jest.config.json",
-
-  // Enable code coverage for Jest
-  "collectCoverage": true,
-  "coverageDirectory": "<rootDir>/coverage",
-  "coverageReporters": ["cobertura", "html"],
-
-  // Use v8 coverage provider to avoid Babel
-  "coverageProvider": "v8",
+  "extends": "local-web-rig/profiles/app/config/jest.config.json",
 
   // Load the initappcontext.js stub when running tests
   "setupFiles": ["../lib-commonjs/stub/initappcontext.js"]

apps/lockfile-explorer-web/config/rig.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
 
-  "rigPackageName": "@rushstack/heft-web-rig",
+  "rigPackageName": "local-web-rig",
   "rigProfile": "app"
 }

apps/lockfile-explorer-web/package.json

@@ -23,11 +23,9 @@
   },
   "devDependencies": {
     "@rushstack/eslint-config": "workspace:*",
-    "@rushstack/heft-web-rig": "workspace:*",
     "@rushstack/heft": "workspace:*",
-    "@types/heft-jest": "1.0.1",
     "@types/react-dom": "16.9.14",
     "@types/react": "16.14.23",
-    "@types/webpack-env": "1.18.0"
+    "local-web-rig": "workspace:*"
   }
 }

apps/lockfile-explorer-web/tsconfig.json

@@ -1,8 +1,3 @@
 {
-  "extends": "./node_modules/@rushstack/heft-web-rig/profiles/app/tsconfig-base.json",
-  "compilerOptions": {
-    "types": ["heft-jest", "webpack-env"],
-    "target": "es2017",
-    "lib": ["es2017", "scripthost", "es2015.collection", "es2015.promise", "es2015.iterable", "dom"]
-  }
+  "extends": "./node_modules/local-web-rig/profiles/app/tsconfig-base.json"
 }

apps/lockfile-explorer-web/webpack.config.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const createWebpackConfig = require('@rushstack/heft-web-rig/profiles/app/webpack-base.config');
+const createWebpackConfig = require('local-web-rig/profiles/app/webpack-base.config');
 
 module.exports = function createConfig(env, argv) {
   return createWebpackConfig({

apps/lockfile-explorer/config/heft.json

@@ -8,7 +8,7 @@
    * Optionally specifies another JSON config file that this file extends from. This provides a way for standard
    * settings to be shared across multiple projects.
    */
-  "extends": "heft-rushstack-internal-node-rig/profiles/default/config/heft.json",
+  "extends": "local-node-rig/profiles/default/config/heft.json",
 
   "phasesByName": {
     "build": {

apps/lockfile-explorer/config/jest.config.json

@@ -1,3 +1,3 @@
 {
-  "extends": "heft-rushstack-internal-node-rig/profiles/default/config/jest.config.json"
+  "extends": "local-node-rig/profiles/default/config/jest.config.json"
 }

apps/lockfile-explorer/config/rig.json

@@ -7,7 +7,7 @@
    * (Required) The name of the rig package to inherit from.
    * It should be an NPM package name with the "-rig" suffix.
    */
-  "rigPackageName": "heft-rushstack-internal-node-rig"
+  "rigPackageName": "local-node-rig"
 
   /**
    * (Optional) Selects a config profile from the rig package.  The name must consist of

apps/lockfile-explorer/package.json

@@ -39,7 +39,7 @@
   "devDependencies": {
     "@microsoft/rush-lib": "workspace:*",
     "@rushstack/eslint-config": "workspace:*",
-    "heft-rushstack-internal-node-rig": "workspace:*",
+    "local-node-rig": "workspace:*",
     "@rushstack/heft": "workspace:*",
     "@rushstack/lockfile-explorer-web": "workspace:*",
     "@types/cors": "~2.8.12",

apps/lockfile-explorer/tsconfig.json

@@ -1,3 +1,3 @@
 {
-  "extends": "./node_modules/heft-rushstack-internal-node-rig/profiles/default/tsconfig-base.json"
+  "extends": "./node_modules/local-node-rig/profiles/default/tsconfig-base.json"
 }

apps/rundown/config/rig.json

@@ -3,5 +3,5 @@
   // Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
   "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
 
-  "rigPackageName": "heft-rushstack-internal-node-rig"
+  "rigPackageName": "local-node-rig"
 }

apps/rundown/package.json

@@ -28,6 +28,6 @@
   "devDependencies": {
     "@rushstack/eslint-config": "workspace:*",
     "@rushstack/heft": "workspace:*",
-    "heft-rushstack-internal-node-rig": "workspace:*"
+    "local-node-rig": "workspace:*"
   }
 }

apps/rundown/tsconfig.json

@@ -1,3 +1,3 @@
 {
-  "extends": "./node_modules/heft-rushstack-internal-node-rig/profiles/default/tsconfig-base.json"
+  "extends": "./node_modules/local-node-rig/profiles/default/tsconfig-base.json"
 }

apps/rush/config/jest.config.json

@@ -1,3 +1,3 @@
 {
-  "extends": "heft-rushstack-internal-node-rig/profiles/default/config/jest.config.json"
+  "extends": "local-node-rig/profiles/default/config/jest.config.json"
 }

apps/rush/config/rig.json

@@ -3,5 +3,5 @@
   // Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
   "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
 
-  "rigPackageName": "heft-rushstack-internal-node-rig"
+  "rigPackageName": "local-node-rig"
 }

apps/rush/package.json

@@ -44,7 +44,7 @@
   "devDependencies": {
     "@rushstack/eslint-config": "workspace:*",
     "@rushstack/heft": "workspace:*",
-    "heft-rushstack-internal-node-rig": "workspace:*",
+    "local-node-rig": "workspace:*",
     "@rushstack/rush-amazon-s3-build-cache-plugin": "workspace:*",
     "@rushstack/rush-azure-storage-build-cache-plugin": "workspace:*",
     "@rushstack/rush-http-build-cache-plugin": "workspace:*",

apps/rush/tsconfig.json

@@ -1,3 +1,3 @@
 {
-  "extends": "./node_modules/heft-rushstack-internal-node-rig/profiles/default/tsconfig-base.json"
+  "extends": "./node_modules/local-node-rig/profiles/default/tsconfig-base.json"
 }

apps/trace-import/config/jest.config.json

@@ -1,3 +1,3 @@
 {
-  "extends": "heft-rushstack-internal-node-rig/profiles/default/config/jest.config.json"
+  "extends": "local-node-rig/profiles/default/config/jest.config.json"
 }

apps/trace-import/config/rig.json

@@ -3,5 +3,5 @@
   // Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
   "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
 
-  "rigPackageName": "heft-rushstack-internal-node-rig"
+  "rigPackageName": "local-node-rig"
 }

apps/trace-import/package.json

@@ -28,7 +28,7 @@
   "devDependencies": {
     "@rushstack/eslint-config": "workspace:*",
     "@rushstack/heft": "workspace:*",
-    "heft-rushstack-internal-node-rig": "workspace:*",
+    "local-node-rig": "workspace:*",
     "@types/resolve": "1.20.2",
     "@types/semver": "7.5.0"
   }

apps/trace-import/tsconfig.json

@@ -1,3 +1,3 @@
 {
-  "extends": "./node_modules/heft-rushstack-internal-node-rig/profiles/default/tsconfig-base.json"
+  "extends": "./node_modules/local-node-rig/profiles/default/tsconfig-base.json"
 }

build-tests/eslint-7-test/config/rig.json

@@ -3,5 +3,5 @@
   // Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
   "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
 
-  "rigPackageName": "heft-rushstack-internal-node-rig"
+  "rigPackageName": "local-node-rig"
 }

build-tests/eslint-7-test/package.json

@@ -12,7 +12,7 @@
   "devDependencies": {
     "@rushstack/eslint-config": "workspace:*",
     "@rushstack/heft": "workspace:*",
-    "heft-rushstack-internal-node-rig": "workspace:*",
+    "local-node-rig": "workspace:*",
     "@types/node": "18.17.15",
     "@typescript-eslint/parser": "~5.59.2",
     "eslint": "~7.30.0",

build-tests/rush-amazon-s3-build-cache-plugin-integration-test/config/rig.json

@@ -3,5 +3,5 @@
   // Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
   "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
 
-  "rigPackageName": "heft-rushstack-internal-node-rig"
+  "rigPackageName": "local-node-rig"
 }

build-tests/rush-amazon-s3-build-cache-plugin-integration-test/package.json

@@ -13,7 +13,7 @@
   "devDependencies": {
     "@rushstack/eslint-config": "workspace:*",
     "@rushstack/heft": "workspace:*",
-    "heft-rushstack-internal-node-rig": "workspace:*",
+    "local-node-rig": "workspace:*",
     "@rushstack/rush-amazon-s3-build-cache-plugin": "workspace:*",
     "@rushstack/node-core-library": "workspace:*",
     "@types/node": "18.17.15",

build-tests/rush-lib-declaration-paths-test/config/heft.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/heft/v0/heft.schema.json",
 
-  "extends": "heft-rushstack-internal-node-rig/profiles/default/config/heft.json",
+  "extends": "local-node-rig/profiles/default/config/heft.json",
 
   "phasesByName": {
     "build": {

build-tests/rush-lib-declaration-paths-test/config/rig.json

@@ -3,5 +3,5 @@
   // Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
   "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
 
-  "rigPackageName": "heft-rushstack-internal-node-rig"
+  "rigPackageName": "local-node-rig"
 }

build-tests/rush-lib-declaration-paths-test/package.json

@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "@rushstack/eslint-config": "workspace:*",
-    "heft-rushstack-internal-node-rig": "workspace:*",
+    "local-node-rig": "workspace:*",
     "@rushstack/heft": "workspace:*",
     "@rushstack/node-core-library": "workspace:*",
     "@types/node": "18.17.15"

build-tests/rush-lib-declaration-paths-test/tsconfig.json

@@ -1,3 +1,3 @@
 {
-  "extends": "./node_modules/heft-rushstack-internal-node-rig/profiles/default/tsconfig-base.json"
+  "extends": "./node_modules/local-node-rig/profiles/default/tsconfig-base.json"
 }

build-tests/rush-project-change-analyzer-test/config/rig.json

@@ -3,5 +3,5 @@
   // Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
   "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
 
-  "rigPackageName": "heft-rushstack-internal-node-rig"
+  "rigPackageName": "local-node-rig"
 }

build-tests/rush-project-change-analyzer-test/package.json

@@ -17,6 +17,6 @@
     "@rushstack/eslint-config": "workspace:*",
     "@rushstack/heft": "workspace:*",
     "@types/node": "18.17.15",
-    "heft-rushstack-internal-node-rig": "workspace:*"
+    "local-node-rig": "workspace:*"
   }
 }

build-tests/rush-project-change-analyzer-test/tsconfig.json

@@ -1,3 +1,3 @@
 {
-  "extends": "./node_modules/heft-rushstack-internal-node-rig/profiles/default/tsconfig-base.json"
+  "extends": "./node_modules/local-node-rig/profiles/default/tsconfig-base.json"
 }

build-tests/rush-redis-cobuild-plugin-integration-test/config/rig.json

@@ -3,5 +3,5 @@
   // Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
   "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
 
-  "rigPackageName": "heft-rushstack-internal-node-rig"
+  "rigPackageName": "local-node-rig"
 }

build-tests/rush-redis-cobuild-plugin-integration-test/package.json

@@ -13,7 +13,7 @@
     "@microsoft/rush-lib": "workspace:*",
     "@rushstack/eslint-config": "workspace:*",
     "@rushstack/heft": "workspace:*",
-    "heft-rushstack-internal-node-rig": "workspace:*",
+    "local-node-rig": "workspace:*",
     "@rushstack/node-core-library": "workspace:*",
     "@rushstack/rush-redis-cobuild-plugin": "workspace:*",
     "@types/http-proxy": "~1.17.8",

common/changes/@rushstack/heft-lint-plugin/internal-node-rig_2023-09-19-08-28.json → common/changes/@microsoft/load-themed-styles/internal-node-rig_2023-09-19-19-11.json

@@ -3,9 +3,9 @@
     {
       "comment": "",
       "type": "none",
-      "packageName": "@rushstack/heft-lint-plugin"
+      "packageName": "@microsoft/load-themed-styles"
     }
   ],
-  "packageName": "@rushstack/heft-lint-plugin",
+  "packageName": "@microsoft/load-themed-styles",
   "email": "[email protected]"
 }

common/config/rush/browser-approved-packages.json

@@ -58,6 +58,10 @@
       "name": "dependency-path",
       "allowedCategories": [ "libraries" ]
     },
+    {
+      "name": "local-web-rig",
+      "allowedCategories": [ "libraries", "vscode-extensions" ]
+    },
     {
       "name": "office-ui-fabric-core",
       "allowedCategories": [ "libraries" ]

common/config/rush/nonbrowser-approved-packages.json

@@ -510,10 +510,6 @@
       "name": "heft-parameter-plugin",
       "allowedCategories": [ "tests" ]
     },
-    {
-      "name": "heft-rushstack-internal-node-rig",
-      "allowedCategories": [ "libraries", "tests", "vscode-extensions" ]
-    },
     {
       "name": "heft-storybook-react-tutorial",
       "allowedCategories": [ "tests" ]
@@ -614,6 +610,10 @@
       "name": "loader-utils",
       "allowedCategories": [ "libraries" ]
     },
+    {
+      "name": "local-node-rig",
+      "allowedCategories": [ "libraries", "tests", "vscode-extensions" ]
+    },
     {
       "name": "lodash",
       "allowedCategories": [ "libraries", "tests" ]