From 3cb1eabccee60e36b9ec341189eecbc0b175af04 Mon Sep 17 00:00:00 2001
From: Emmanuel Oluyomi <emmanueloluyomi@users.noreply.github.com>
Date: Fri, 9 Jul 2021 14:16:11 -0400
Subject: [PATCH 001/155] reading any EnvironmentConfiguration property without
 initialization, validating all properties

---
 .../src/api/EnvironmentConfiguration.ts       | 34 +++++++++----------
 apps/rush-lib/src/api/RushConfiguration.ts    |  2 +-
 .../api/test/EnvironmentConfiguration.test.ts | 32 ++++++++---------
 .../workspace/common/pnpm-lock.yaml           | 10 +++---
 4 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/apps/rush-lib/src/api/EnvironmentConfiguration.ts b/apps/rush-lib/src/api/EnvironmentConfiguration.ts
index 8a6ab093990..673dc6e0917 100644
--- a/apps/rush-lib/src/api/EnvironmentConfiguration.ts
+++ b/apps/rush-lib/src/api/EnvironmentConfiguration.ts
@@ -155,7 +155,7 @@ export const enum EnvironmentVariableNames {
  * Initialize will throw if any unknown parameters are present.
  */
 export class EnvironmentConfiguration {
-  private static _hasBeenInitialized: boolean = false;
+  private static _hasBeenValidated: boolean = false;
 
   private static _rushTempFolderOverride: string | undefined;
 
@@ -181,7 +181,7 @@ export class EnvironmentConfiguration {
    * An override for the common/temp folder path.
    */
   public static get rushTempFolderOverride(): string | undefined {
-    EnvironmentConfiguration._ensureInitialized();
+    //EnvironmentConfiguration._ensureInitialized();
     return EnvironmentConfiguration._rushTempFolderOverride;
   }
 
@@ -190,7 +190,7 @@ export class EnvironmentConfiguration {
    * See {@link EnvironmentVariableNames.RUSH_ABSOLUTE_SYMLINKS}
    */
   public static get absoluteSymlinks(): boolean {
-    EnvironmentConfiguration._ensureInitialized();
+    //EnvironmentConfiguration._ensureInitialized();
     return EnvironmentConfiguration._absoluteSymlinks;
   }
 
@@ -202,7 +202,7 @@ export class EnvironmentConfiguration {
    * See {@link EnvironmentVariableNames.RUSH_ALLOW_UNSUPPORTED_NODEJS}.
    */
   public static get allowUnsupportedNodeVersion(): boolean {
-    EnvironmentConfiguration._ensureInitialized();
+    //EnvironmentConfiguration._ensureInitialized();
     return EnvironmentConfiguration._allowUnsupportedNodeVersion;
   }
 
@@ -212,7 +212,7 @@ export class EnvironmentConfiguration {
    * or `0` to disallow them. (See the comments in the command-line.json file for more information).
    */
   public static get allowWarningsInSuccessfulBuild(): boolean {
-    EnvironmentConfiguration._ensureInitialized();
+    //EnvironmentConfiguration._ensureInitialized();
     return EnvironmentConfiguration._allowWarningsInSuccessfulBuild;
   }
 
@@ -221,7 +221,7 @@ export class EnvironmentConfiguration {
    * See {@link EnvironmentVariableNames.RUSH_PNPM_STORE_PATH}
    */
   public static get pnpmStorePathOverride(): string | undefined {
-    EnvironmentConfiguration._ensureInitialized();
+    //EnvironmentConfiguration._ensureInitialized();
     return EnvironmentConfiguration._pnpmStorePathOverride;
   }
 
@@ -230,7 +230,7 @@ export class EnvironmentConfiguration {
    * See {@link EnvironmentVariableNames.RUSH_GLOBAL_FOLDER}
    */
   public static get rushGlobalFolderOverride(): string | undefined {
-    EnvironmentConfiguration._ensureInitialized();
+    //EnvironmentConfiguration._ensureInitialized();
     return EnvironmentConfiguration._rushGlobalFolderOverride;
   }
 
@@ -239,7 +239,7 @@ export class EnvironmentConfiguration {
    * See {@link EnvironmentVariableNames.RUSH_BUILD_CACHE_CREDENTIAL}
    */
   public static get buildCacheCredential(): string | undefined {
-    EnvironmentConfiguration._ensureInitialized();
+    //EnvironmentConfiguration._ensureInitialized();
     return EnvironmentConfiguration._buildCacheCredential;
   }
 
@@ -248,7 +248,7 @@ export class EnvironmentConfiguration {
    * See {@link EnvironmentVariableNames.RUSH_BUILD_CACHE_ENABLED}
    */
   public static get buildCacheEnabled(): boolean | undefined {
-    EnvironmentConfiguration._ensureInitialized();
+    //EnvironmentConfiguration._ensureInitialized();
     return EnvironmentConfiguration._buildCacheEnabled;
   }
 
@@ -257,7 +257,7 @@ export class EnvironmentConfiguration {
    * See {@link EnvironmentVariableNames.RUSH_BUILD_CACHE_WRITE_ALLOWED}
    */
   public static get buildCacheWriteAllowed(): boolean | undefined {
-    EnvironmentConfiguration._ensureInitialized();
+    //EnvironmentConfiguration._ensureInitialized();
     return EnvironmentConfiguration._buildCacheWriteAllowed;
   }
 
@@ -266,7 +266,7 @@ export class EnvironmentConfiguration {
    * See {@link EnvironmentVariableNames.RUSH_GIT_BINARY_PATH}
    */
   public static get gitBinaryPath(): string | undefined {
-    EnvironmentConfiguration._ensureInitialized();
+    //EnvironmentConfiguration._ensureInitialized();
     return EnvironmentConfiguration._gitBinaryPath;
   }
 
@@ -288,7 +288,7 @@ export class EnvironmentConfiguration {
   /**
    * Reads and validates environment variables. If any are invalid, this function will throw.
    */
-  public static initialize(options: IEnvironmentConfigurationInitializeOptions = {}): void {
+  public static validate(options: IEnvironmentConfigurationInitializeOptions = {}): void {
     EnvironmentConfiguration.reset();
 
     const unknownEnvVariables: string[] = [];
@@ -411,7 +411,7 @@ export class EnvironmentConfiguration {
     EnvironmentConfiguration._rushGlobalFolderOverride =
       EnvironmentConfiguration._getRushGlobalFolderOverride(process.env);
 
-    EnvironmentConfiguration._hasBeenInitialized = true;
+    EnvironmentConfiguration._hasBeenValidated = true;
   }
 
   /**
@@ -420,16 +420,16 @@ export class EnvironmentConfiguration {
   public static reset(): void {
     EnvironmentConfiguration._rushTempFolderOverride = undefined;
 
-    EnvironmentConfiguration._hasBeenInitialized = false;
+    EnvironmentConfiguration._hasBeenValidated = false;
   }
 
-  private static _ensureInitialized(): void {
-    if (!EnvironmentConfiguration._hasBeenInitialized) {
+  /**private static _ensureInitialized(): void {
+    if (!EnvironmentConfiguration._hasBeenValidated) {
       throw new InternalError(
         'The EnvironmentConfiguration must be initialized before values can be accessed.'
       );
     }
-  }
+  }**/
 
   public static parseBooleanEnvironmentVariable(
     name: string,
diff --git a/apps/rush-lib/src/api/RushConfiguration.ts b/apps/rush-lib/src/api/RushConfiguration.ts
index 9b3f8dfeab7..7c3d575c5bd 100644
--- a/apps/rush-lib/src/api/RushConfiguration.ts
+++ b/apps/rush-lib/src/api/RushConfiguration.ts
@@ -490,7 +490,7 @@ export class RushConfiguration {
    */
   private constructor(rushConfigurationJson: IRushConfigurationJson, rushJsonFilename: string) {
     this._rushConfigurationJson = rushConfigurationJson;
-    EnvironmentConfiguration.initialize();
+    EnvironmentConfiguration.validate();
 
     if (rushConfigurationJson.nodeSupportedVersionRange) {
       if (!semver.validRange(rushConfigurationJson.nodeSupportedVersionRange)) {
diff --git a/apps/rush-lib/src/api/test/EnvironmentConfiguration.test.ts b/apps/rush-lib/src/api/test/EnvironmentConfiguration.test.ts
index 3b217166de1..677dd1b010b 100644
--- a/apps/rush-lib/src/api/test/EnvironmentConfiguration.test.ts
+++ b/apps/rush-lib/src/api/test/EnvironmentConfiguration.test.ts
@@ -17,41 +17,41 @@ describe('EnvironmentConfiguration', () => {
     process.env = _oldEnv;
   });
 
-  describe('initialize', () => {
+  describe('validate', () => {
     it('correctly allows no environment variables', () => {
-      expect(EnvironmentConfiguration.initialize).not.toThrow();
+      expect(EnvironmentConfiguration.validate).not.toThrow();
     });
 
     it('allows known environment variables', () => {
       process.env['RUSH_TEMP_FOLDER'] = '/var/temp'; // eslint-disable-line dot-notation
-      expect(EnvironmentConfiguration.initialize).not.toThrow();
+      expect(EnvironmentConfiguration.validate).not.toThrow();
     });
 
     it('does not allow unknown environment variables', () => {
       process.env['rush_foobar'] = 'asdf'; // eslint-disable-line dot-notation
-      expect(EnvironmentConfiguration.initialize).toThrow();
+      expect(EnvironmentConfiguration.validate).toThrow();
     });
 
-    it('can be re-initialized', () => {
+    it('can be re-validated', () => {
       process.env['RUSH_TEMP_FOLDER'] = '/var/tempA'; // eslint-disable-line dot-notation
-      EnvironmentConfiguration.initialize({ doNotNormalizePaths: true });
+      EnvironmentConfiguration.validate({ doNotNormalizePaths: true });
 
       expect(EnvironmentConfiguration.rushTempFolderOverride).toEqual('/var/tempA');
 
       process.env['RUSH_TEMP_FOLDER'] = '/var/tempB'; // eslint-disable-line dot-notation
-      EnvironmentConfiguration.initialize({ doNotNormalizePaths: true });
+      EnvironmentConfiguration.validate({ doNotNormalizePaths: true });
 
       expect(EnvironmentConfiguration.rushTempFolderOverride).toEqual('/var/tempB');
     });
   });
 
   describe('rushTempDirOverride', () => {
-    it('throws if EnvironmentConfiguration is not initialized', () => {
+    /**it('throws if EnvironmentConfiguration is not validated', () => {
       expect(() => EnvironmentConfiguration.rushTempFolderOverride).toThrow();
-    });
+    });**/
 
     it('returns undefined for unset environment variables', () => {
-      EnvironmentConfiguration.initialize();
+      EnvironmentConfiguration.validate();
 
       expect(EnvironmentConfiguration.rushTempFolderOverride).not.toBeDefined();
     });
@@ -59,7 +59,7 @@ describe('EnvironmentConfiguration', () => {
     it('returns the value for a set environment variable', () => {
       const expectedValue: string = '/var/temp';
       process.env['RUSH_TEMP_FOLDER'] = expectedValue; // eslint-disable-line dot-notation
-      EnvironmentConfiguration.initialize({ doNotNormalizePaths: true });
+      EnvironmentConfiguration.validate({ doNotNormalizePaths: true });
 
       expect(EnvironmentConfiguration.rushTempFolderOverride).toEqual(expectedValue);
     });
@@ -67,12 +67,12 @@ describe('EnvironmentConfiguration', () => {
 
   describe('pnpmStorePathOverride', () => {
     const ENV_VAR: string = 'RUSH_PNPM_STORE_PATH';
-    it('throws if EnvironmentConfiguration is not initialized', () => {
+    /**it('throws if EnvironmentConfiguration is not validated', () => {
       expect(() => EnvironmentConfiguration.pnpmStorePathOverride).toThrow();
-    });
+    });**/
 
     it('returns undefined for unset environment variable', () => {
-      EnvironmentConfiguration.initialize();
+      EnvironmentConfiguration.validate();
 
       expect(EnvironmentConfiguration.pnpmStorePathOverride).not.toBeDefined();
     });
@@ -80,7 +80,7 @@ describe('EnvironmentConfiguration', () => {
     it('returns the expected path from environment variable without normalization', () => {
       const expectedValue: string = '/var/temp';
       process.env[ENV_VAR] = expectedValue;
-      EnvironmentConfiguration.initialize({ doNotNormalizePaths: true });
+      EnvironmentConfiguration.validate({ doNotNormalizePaths: true });
 
       expect(EnvironmentConfiguration.pnpmStorePathOverride).toEqual(expectedValue);
     });
@@ -90,7 +90,7 @@ describe('EnvironmentConfiguration', () => {
       const envVar: string = './temp';
       process.env[ENV_VAR] = envVar;
 
-      EnvironmentConfiguration.initialize();
+      EnvironmentConfiguration.validate();
 
       expect(EnvironmentConfiguration.pnpmStorePathOverride).toEqual(expectedValue);
     });
diff --git a/build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml b/build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml
index 37659e3b16a..ccdd377ab35 100644
--- a/build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml
+++ b/build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml
@@ -5,13 +5,13 @@ importers:
   typescript-newest-test:
     specifiers:
       '@rushstack/eslint-config': file:rushstack-eslint-config-2.3.4.tgz
-      '@rushstack/heft': file:rushstack-heft-0.33.0.tgz
+      '@rushstack/heft': file:rushstack-heft-0.34.0.tgz
       eslint: ~7.12.1
       tslint: ~5.20.1
       typescript: ~4.3.2
     devDependencies:
       '@rushstack/eslint-config': file:../temp/tarballs/rushstack-eslint-config-2.3.4.tgz_eslint@7.12.1+typescript@4.3.2
-      '@rushstack/heft': file:../temp/tarballs/rushstack-heft-0.33.0.tgz
+      '@rushstack/heft': file:../temp/tarballs/rushstack-heft-0.34.0.tgz
       eslint: 7.12.1
       tslint: 5.20.1_typescript@4.3.2
       typescript: 4.3.2
@@ -2771,10 +2771,10 @@ packages:
       - typescript
     dev: true
 
-  file:../temp/tarballs/rushstack-heft-0.33.0.tgz:
-    resolution: {tarball: file:../temp/tarballs/rushstack-heft-0.33.0.tgz}
+  file:../temp/tarballs/rushstack-heft-0.34.0.tgz:
+    resolution: {tarball: file:../temp/tarballs/rushstack-heft-0.34.0.tgz}
     name: '@rushstack/heft'
-    version: 0.33.0
+    version: 0.34.0
     engines: {node: '>=10.13.0'}
     hasBin: true
     dependencies:

From 4650f86db80bb9c1c3349d16370398836481665d Mon Sep 17 00:00:00 2001
From: Elliot Nelson <elliot.nelson@users.noreply.github.com>
Date: Fri, 9 Jul 2021 16:29:35 -0400
Subject: [PATCH 002/155] Commands that do not support incremental builds do
 not pull from build cache

---
 .../src/cli/scriptActions/BulkScriptAction.ts |  20 +-
 .../CommandLineHelp.test.ts.snap              |  20 +-
 ...zureStorageBuildCacheProvider.test.ts.snap |   2 -
 .../src/logic/taskRunner/ProjectBuilder.ts    | 205 +++++++++---------
 4 files changed, 123 insertions(+), 124 deletions(-)

diff --git a/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts b/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
index 1d5afe99741..68fc6ffed8d 100644
--- a/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
+++ b/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
@@ -282,6 +282,11 @@ export class BulkScriptAction extends BaseScriptAction {
       description: 'Display the logs during the build, rather than just displaying the build status summary'
     });
 
+    this._ignoreHooksParameter = this.defineFlagParameter({
+      parameterLongName: '--ignore-hooks',
+      description: `Skips execution of the "eventHooks" scripts defined in rush.json. Make sure you know what you are skipping.`
+    });
+
     if (this._isIncrementalBuildAllowed) {
       this._changedProjectsOnly = this.defineFlagParameter({
         parameterLongName: '--changed-projects-only',
@@ -293,17 +298,12 @@ export class BulkScriptAction extends BaseScriptAction {
           ' Note that this parameter is "unsafe"; it is up to the developer to ensure that the ignored projects' +
           ' are okay to ignore.'
       });
-    }
-
-    this._ignoreHooksParameter = this.defineFlagParameter({
-      parameterLongName: '--ignore-hooks',
-      description: `Skips execution of the "eventHooks" scripts defined in rush.json. Make sure you know what you are skipping.`
-    });
 
-    this._disableBuildCacheFlag = this.defineFlagParameter({
-      parameterLongName: '--disable-build-cache',
-      description: '(EXPERIMENTAL) Disables the build cache for this command invocation.'
-    });
+      this._disableBuildCacheFlag = this.defineFlagParameter({
+        parameterLongName: '--disable-build-cache',
+        description: '(EXPERIMENTAL) Disables the build cache for this command invocation.'
+      });
+    }
 
     this.defineScriptParameters();
   }
diff --git a/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap b/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap
index 1b10d854254..cc515d34d43 100644
--- a/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap
+++ b/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap
@@ -118,8 +118,8 @@ exports[`CommandLineHelp prints the help for each action: build 1`] = `
 "usage: rush build [-h] [-p COUNT] [-t PROJECT] [-T PROJECT] [-f PROJECT]
                   [-o PROJECT] [-i PROJECT] [-I PROJECT]
                   [--to-version-policy VERSION_POLICY_NAME]
-                  [--from-version-policy VERSION_POLICY_NAME] [-v] [-c]
-                  [--ignore-hooks] [--disable-build-cache] [-s] [-m]
+                  [--from-version-policy VERSION_POLICY_NAME] [-v]
+                  [--ignore-hooks] [-c] [--disable-build-cache] [-s] [-m]
                   
 
 This command is similar to \\"rush rebuild\\", except that \\"rush build\\" performs 
@@ -224,6 +224,9 @@ Optional arguments:
                         subsets of projects\\".
   -v, --verbose         Display the logs during the build, rather than just 
                         displaying the build status summary
+  --ignore-hooks        Skips execution of the \\"eventHooks\\" scripts defined 
+                        in rush.json. Make sure you know what you are 
+                        skipping.
   -c, --changed-projects-only
                         Normally the incremental build logic will rebuild 
                         changed projects as well as any projects that 
@@ -233,9 +236,6 @@ Optional arguments:
                         were changed. Note that this parameter is \\"unsafe\\"; 
                         it is up to the developer to ensure that the ignored 
                         projects are okay to ignore.
-  --ignore-hooks        Skips execution of the \\"eventHooks\\" scripts defined 
-                        in rush.json. Make sure you know what you are 
-                        skipping.
   --disable-build-cache
                         (EXPERIMENTAL) Disables the build cache for this 
                         command invocation.
@@ -363,7 +363,7 @@ exports[`CommandLineHelp prints the help for each action: import-strings 1`] = `
                            [-f PROJECT] [-o PROJECT] [-i PROJECT] [-I PROJECT]
                            [--to-version-policy VERSION_POLICY_NAME]
                            [--from-version-policy VERSION_POLICY_NAME] [-v]
-                           [--ignore-hooks] [--disable-build-cache]
+                           [--ignore-hooks]
                            [--locale {en-us,fr-fr,es-es,zh-cn}]
                            
 
@@ -463,9 +463,6 @@ Optional arguments:
   --ignore-hooks        Skips execution of the \\"eventHooks\\" scripts defined 
                         in rush.json. Make sure you know what you are 
                         skipping.
-  --disable-build-cache
-                        (EXPERIMENTAL) Disables the build cache for this 
-                        command invocation.
   --locale {en-us,fr-fr,es-es,zh-cn}
                         Selects a single instead of the default locale 
                         (en-us) for non-ship builds or all locales for ship 
@@ -817,7 +814,7 @@ exports[`CommandLineHelp prints the help for each action: rebuild 1`] = `
                     [-o PROJECT] [-i PROJECT] [-I PROJECT]
                     [--to-version-policy VERSION_POLICY_NAME]
                     [--from-version-policy VERSION_POLICY_NAME] [-v]
-                    [--ignore-hooks] [--disable-build-cache] [-s] [-m]
+                    [--ignore-hooks] [-s] [-m]
                     
 
 This command assumes that the package.json file for each project contains a 
@@ -922,9 +919,6 @@ Optional arguments:
   --ignore-hooks        Skips execution of the \\"eventHooks\\" scripts defined 
                         in rush.json. Make sure you know what you are 
                         skipping.
-  --disable-build-cache
-                        (EXPERIMENTAL) Disables the build cache for this 
-                        command invocation.
   -s, --ship            Perform a production build, including minification 
                         and localization steps
   -m, --minimal         Perform a fast build, which disables certain tasks 
diff --git a/apps/rush-lib/src/logic/buildCache/test/__snapshots__/AzureStorageBuildCacheProvider.test.ts.snap b/apps/rush-lib/src/logic/buildCache/test/__snapshots__/AzureStorageBuildCacheProvider.test.ts.snap
index 48e68028b88..9ccb16c9aff 100644
--- a/apps/rush-lib/src/logic/buildCache/test/__snapshots__/AzureStorageBuildCacheProvider.test.ts.snap
+++ b/apps/rush-lib/src/logic/buildCache/test/__snapshots__/AzureStorageBuildCacheProvider.test.ts.snap
@@ -14,6 +14,4 @@ Array [
 ]
 `;
 
-exports[`AzureStorageBuildCacheProvider Uses a correct list of Azure authority hosts 1`] = `"The specified Azure Environment (\\"INCORRECT_AZURE_ENVIRONMENT\\") is invalid. If it is specified, it must be one of: AzureChina, AzureGermany, AzureGovernment, AzurePublicCloud"`;
-
 exports[`AzureStorageBuildCacheProvider uses a correct list of Azure authority hosts 1`] = `"The specified Azure Environment (\\"INCORRECT_AZURE_ENVIRONMENT\\") is invalid. If it is specified, it must be one of: AzureChina, AzureGermany, AzureGovernment, AzurePublicCloud"`;
diff --git a/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts b/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts
index 4390012b2ba..6ad2b1ad80f 100644
--- a/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts
+++ b/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts
@@ -227,15 +227,17 @@ export class ProjectBuilder extends BaseBuilder {
             files,
             arguments: this._commandToRun
           };
-        } else {
+        } else if (this.isIncrementalBuildAllowed) {
           terminal.writeLine(
             'Unable to calculate incremental build state. Instead running full rebuild. Ensure Git is present.'
           );
         }
       } catch (error) {
-        terminal.writeLine(
-          'Error calculating incremental build state. Instead running full rebuild. ' + error.toString()
-        );
+        if (this.isIncrementalBuildAllowed) {
+          terminal.writeLine(
+            'Error calculating incremental build state. Instead running full rebuild. ' + error.toString()
+          );
+        }
       }
 
       const isPackageUnchanged: boolean = !!(
@@ -245,120 +247,125 @@ export class ProjectBuilder extends BaseBuilder {
         _areShallowEqual(projectBuildDeps.files, lastProjectBuildDeps.files)
       );
 
-      const projectBuildCache: ProjectBuildCache | undefined = await this._getProjectBuildCacheAsync(
-        terminal,
-        trackedFiles,
-        context.repoCommandLineConfiguration
-      );
-      const restoreFromCacheSuccess: boolean | undefined = await projectBuildCache?.tryRestoreFromCacheAsync(
-        terminal
-      );
-
-      if (restoreFromCacheSuccess) {
-        return TaskStatus.FromCache;
-      } else if (isPackageUnchanged && this.isIncrementalBuildAllowed) {
-        return TaskStatus.Skipped;
-      } else {
-        // If the deps file exists, remove it before starting a build.
-        FileSystem.deleteFile(currentDepsPath);
-
-        // TODO: Remove legacyDepsPath with the next major release of Rush
-        const legacyDepsPath: string = path.join(this._rushProject.projectFolder, 'package-deps.json');
-        // Delete the legacy package-deps.json
-        FileSystem.deleteFile(legacyDepsPath);
-
-        if (!this._commandToRun) {
-          // Write deps on success.
-          if (projectBuildDeps) {
-            JsonFile.save(projectBuildDeps, currentDepsPath, {
-              ensureFolderExists: true
-            });
-          }
+      // If the current command is allowed to do incremental builds, attempt to retrieve
+      // the project from the build cache or skip building, if appropriate.
+      if (this.isIncrementalBuildAllowed) {
+        const projectBuildCache: ProjectBuildCache | undefined = await this._getProjectBuildCacheAsync(
+          terminal,
+          trackedFiles,
+          context.repoCommandLineConfiguration
+        );
+        const restoreFromCacheSuccess: boolean | undefined =
+          await projectBuildCache?.tryRestoreFromCacheAsync(terminal);
 
-          return TaskStatus.Success;
+        if (restoreFromCacheSuccess) {
+          return TaskStatus.FromCache;
+        } else if (isPackageUnchanged) {
+          return TaskStatus.Skipped;
         }
+      }
 
-        // Run the task
-        terminal.writeLine('Invoking: ' + this._commandToRun);
+      // If the deps file exists, remove it before starting a build.
+      FileSystem.deleteFile(currentDepsPath);
 
-        const task: child_process.ChildProcess = Utilities.executeLifecycleCommandAsync(this._commandToRun, {
-          rushConfiguration: this._rushConfiguration,
-          workingDirectory: projectFolder,
-          initCwd: this._rushConfiguration.commonTempFolder,
-          handleOutput: true,
-          environmentPathOptions: {
-            includeProjectBin: true
-          }
-        });
+      // TODO: Remove legacyDepsPath with the next major release of Rush
+      const legacyDepsPath: string = path.join(this._rushProject.projectFolder, 'package-deps.json');
+      // Delete the legacy package-deps.json
+      FileSystem.deleteFile(legacyDepsPath);
 
-        // Hook into events, in order to get live streaming of build log
-        if (task.stdout !== null) {
-          task.stdout.on('data', (data: Buffer) => {
-            const text: string = data.toString();
-            collatedTerminal.writeChunk({ text, kind: TerminalChunkKind.Stdout });
+      if (!this._commandToRun) {
+        // Write deps on success.
+        if (projectBuildDeps) {
+          JsonFile.save(projectBuildDeps, currentDepsPath, {
+            ensureFolderExists: true
           });
         }
-        if (task.stderr !== null) {
-          task.stderr.on('data', (data: Buffer) => {
-            const text: string = data.toString();
-            collatedTerminal.writeChunk({ text, kind: TerminalChunkKind.Stderr });
-            hasWarningOrError = true;
-          });
+
+        return TaskStatus.Success;
+      }
+
+      // Run the task
+      terminal.writeLine('Invoking: ' + this._commandToRun);
+
+      const task: child_process.ChildProcess = Utilities.executeLifecycleCommandAsync(this._commandToRun, {
+        rushConfiguration: this._rushConfiguration,
+        workingDirectory: projectFolder,
+        initCwd: this._rushConfiguration.commonTempFolder,
+        handleOutput: true,
+        environmentPathOptions: {
+          includeProjectBin: true
         }
+      });
 
-        let status: TaskStatus = await new Promise(
-          (resolve: (status: TaskStatus) => void, reject: (error: TaskError) => void) => {
-            task.on('close', (code: number) => {
-              try {
-                if (code !== 0) {
-                  reject(new TaskError('error', `Returned error code: ${code}`));
-                } else if (hasWarningOrError) {
-                  resolve(TaskStatus.SuccessWithWarning);
-                } else {
-                  resolve(TaskStatus.Success);
-                }
-              } catch (error) {
-                reject(error);
+      // Hook into events, in order to get live streaming of build log
+      if (task.stdout !== null) {
+        task.stdout.on('data', (data: Buffer) => {
+          const text: string = data.toString();
+          collatedTerminal.writeChunk({ text, kind: TerminalChunkKind.Stdout });
+        });
+      }
+      if (task.stderr !== null) {
+        task.stderr.on('data', (data: Buffer) => {
+          const text: string = data.toString();
+          collatedTerminal.writeChunk({ text, kind: TerminalChunkKind.Stderr });
+          hasWarningOrError = true;
+        });
+      }
+
+      let status: TaskStatus = await new Promise(
+        (resolve: (status: TaskStatus) => void, reject: (error: TaskError) => void) => {
+          task.on('close', (code: number) => {
+            try {
+              if (code !== 0) {
+                reject(new TaskError('error', `Returned error code: ${code}`));
+              } else if (hasWarningOrError) {
+                resolve(TaskStatus.SuccessWithWarning);
+              } else {
+                resolve(TaskStatus.Success);
               }
-            });
+            } catch (error) {
+              reject(error);
+            }
+          });
+        }
+      );
+
+      if (status === TaskStatus.Success && projectBuildDeps) {
+        // Write deps on success.
+        const writeProjectStatePromise: Promise<boolean> = JsonFile.saveAsync(
+          projectBuildDeps,
+          currentDepsPath,
+          {
+            ensureFolderExists: true
           }
         );
 
-        if (status === TaskStatus.Success && projectBuildDeps) {
-          // Write deps on success.
-          const writeProjectStatePromise: Promise<boolean> = JsonFile.saveAsync(
-            projectBuildDeps,
-            currentDepsPath,
-            {
-              ensureFolderExists: true
-            }
-          );
-
-          const setCacheEntryPromise: Promise<boolean | undefined> = this.tryWriteCacheEntryAsync(
-            terminal,
-            trackedFiles,
-            context.repoCommandLineConfiguration
-          );
+        // If the command is successful and we can calculate project hash, we will write a
+        // new cache entry even if incremental builds are not allowed.
+        const setCacheEntryPromise: Promise<boolean | undefined> = this.tryWriteCacheEntryAsync(
+          terminal,
+          trackedFiles,
+          context.repoCommandLineConfiguration
+        );
 
-          const [, cacheWriteSuccess] = await Promise.all([writeProjectStatePromise, setCacheEntryPromise]);
+        const [, cacheWriteSuccess] = await Promise.all([writeProjectStatePromise, setCacheEntryPromise]);
 
-          if (terminalProvider.hasErrors) {
-            status = TaskStatus.Failure;
-          } else if (cacheWriteSuccess === false) {
-            status = TaskStatus.SuccessWithWarning;
-          }
+        if (terminalProvider.hasErrors) {
+          status = TaskStatus.Failure;
+        } else if (cacheWriteSuccess === false) {
+          status = TaskStatus.SuccessWithWarning;
         }
+      }
 
-        normalizeNewlineTransform.close();
+      normalizeNewlineTransform.close();
 
-        // If the pipeline is wired up correctly, then closing normalizeNewlineTransform should
-        // have closed projectLogWritable.
-        if (projectLogWritable.isOpen) {
-          throw new InternalError('The output file handle was not closed');
-        }
-
-        return status;
+      // If the pipeline is wired up correctly, then closing normalizeNewlineTransform should
+      // have closed projectLogWritable.
+      if (projectLogWritable.isOpen) {
+        throw new InternalError('The output file handle was not closed');
       }
+
+      return status;
     } finally {
       projectLogWritable.close();
     }

From 54b9fd023ba4c5b3d684142ef1caa616fd583fd1 Mon Sep 17 00:00:00 2001
From: Elliot Nelson <elliot.nelson@users.noreply.github.com>
Date: Fri, 9 Jul 2021 16:31:00 -0400
Subject: [PATCH 003/155] disable-build-cache is still a valid flag for
 rebuilds

---
 .../src/cli/scriptActions/BulkScriptAction.ts | 20 +++++++++----------
 .../CommandLineHelp.test.ts.snap              | 20 ++++++++++++-------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts b/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
index 68fc6ffed8d..1d5afe99741 100644
--- a/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
+++ b/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
@@ -282,11 +282,6 @@ export class BulkScriptAction extends BaseScriptAction {
       description: 'Display the logs during the build, rather than just displaying the build status summary'
     });
 
-    this._ignoreHooksParameter = this.defineFlagParameter({
-      parameterLongName: '--ignore-hooks',
-      description: `Skips execution of the "eventHooks" scripts defined in rush.json. Make sure you know what you are skipping.`
-    });
-
     if (this._isIncrementalBuildAllowed) {
       this._changedProjectsOnly = this.defineFlagParameter({
         parameterLongName: '--changed-projects-only',
@@ -298,13 +293,18 @@ export class BulkScriptAction extends BaseScriptAction {
           ' Note that this parameter is "unsafe"; it is up to the developer to ensure that the ignored projects' +
           ' are okay to ignore.'
       });
-
-      this._disableBuildCacheFlag = this.defineFlagParameter({
-        parameterLongName: '--disable-build-cache',
-        description: '(EXPERIMENTAL) Disables the build cache for this command invocation.'
-      });
     }
 
+    this._ignoreHooksParameter = this.defineFlagParameter({
+      parameterLongName: '--ignore-hooks',
+      description: `Skips execution of the "eventHooks" scripts defined in rush.json. Make sure you know what you are skipping.`
+    });
+
+    this._disableBuildCacheFlag = this.defineFlagParameter({
+      parameterLongName: '--disable-build-cache',
+      description: '(EXPERIMENTAL) Disables the build cache for this command invocation.'
+    });
+
     this.defineScriptParameters();
   }
 
diff --git a/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap b/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap
index cc515d34d43..1b10d854254 100644
--- a/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap
+++ b/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap
@@ -118,8 +118,8 @@ exports[`CommandLineHelp prints the help for each action: build 1`] = `
 "usage: rush build [-h] [-p COUNT] [-t PROJECT] [-T PROJECT] [-f PROJECT]
                   [-o PROJECT] [-i PROJECT] [-I PROJECT]
                   [--to-version-policy VERSION_POLICY_NAME]
-                  [--from-version-policy VERSION_POLICY_NAME] [-v]
-                  [--ignore-hooks] [-c] [--disable-build-cache] [-s] [-m]
+                  [--from-version-policy VERSION_POLICY_NAME] [-v] [-c]
+                  [--ignore-hooks] [--disable-build-cache] [-s] [-m]
                   
 
 This command is similar to \\"rush rebuild\\", except that \\"rush build\\" performs 
@@ -224,9 +224,6 @@ Optional arguments:
                         subsets of projects\\".
   -v, --verbose         Display the logs during the build, rather than just 
                         displaying the build status summary
-  --ignore-hooks        Skips execution of the \\"eventHooks\\" scripts defined 
-                        in rush.json. Make sure you know what you are 
-                        skipping.
   -c, --changed-projects-only
                         Normally the incremental build logic will rebuild 
                         changed projects as well as any projects that 
@@ -236,6 +233,9 @@ Optional arguments:
                         were changed. Note that this parameter is \\"unsafe\\"; 
                         it is up to the developer to ensure that the ignored 
                         projects are okay to ignore.
+  --ignore-hooks        Skips execution of the \\"eventHooks\\" scripts defined 
+                        in rush.json. Make sure you know what you are 
+                        skipping.
   --disable-build-cache
                         (EXPERIMENTAL) Disables the build cache for this 
                         command invocation.
@@ -363,7 +363,7 @@ exports[`CommandLineHelp prints the help for each action: import-strings 1`] = `
                            [-f PROJECT] [-o PROJECT] [-i PROJECT] [-I PROJECT]
                            [--to-version-policy VERSION_POLICY_NAME]
                            [--from-version-policy VERSION_POLICY_NAME] [-v]
-                           [--ignore-hooks]
+                           [--ignore-hooks] [--disable-build-cache]
                            [--locale {en-us,fr-fr,es-es,zh-cn}]
                            
 
@@ -463,6 +463,9 @@ Optional arguments:
   --ignore-hooks        Skips execution of the \\"eventHooks\\" scripts defined 
                         in rush.json. Make sure you know what you are 
                         skipping.
+  --disable-build-cache
+                        (EXPERIMENTAL) Disables the build cache for this 
+                        command invocation.
   --locale {en-us,fr-fr,es-es,zh-cn}
                         Selects a single instead of the default locale 
                         (en-us) for non-ship builds or all locales for ship 
@@ -814,7 +817,7 @@ exports[`CommandLineHelp prints the help for each action: rebuild 1`] = `
                     [-o PROJECT] [-i PROJECT] [-I PROJECT]
                     [--to-version-policy VERSION_POLICY_NAME]
                     [--from-version-policy VERSION_POLICY_NAME] [-v]
-                    [--ignore-hooks] [-s] [-m]
+                    [--ignore-hooks] [--disable-build-cache] [-s] [-m]
                     
 
 This command assumes that the package.json file for each project contains a 
@@ -919,6 +922,9 @@ Optional arguments:
   --ignore-hooks        Skips execution of the \\"eventHooks\\" scripts defined 
                         in rush.json. Make sure you know what you are 
                         skipping.
+  --disable-build-cache
+                        (EXPERIMENTAL) Disables the build cache for this 
+                        command invocation.
   -s, --ship            Perform a production build, including minification 
                         and localization steps
   -m, --minimal         Perform a fast build, which disables certain tasks 

From 0934ddeced3056b41b6fb6c22f9535db723fbb7b Mon Sep 17 00:00:00 2001
From: Elliot Nelson <elliot.nelson@users.noreply.github.com>
Date: Fri, 9 Jul 2021 16:31:53 -0400
Subject: [PATCH 004/155] rush change

---
 .../@microsoft/rush/rebuild_2021-07-09-20-31.json     | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json

diff --git a/common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json b/common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json
new file mode 100644
index 00000000000..a58526cb66d
--- /dev/null
+++ b/common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "rush rebuild ignores existing build cache entries",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "elliot.nelson@users.noreply.github.com"
+}
\ No newline at end of file

From 286c3996fc6c21e7659d7b2374954e5cc400de95 Mon Sep 17 00:00:00 2001
From: Elliot Nelson <elliot.nelson@users.noreply.github.com>
Date: Fri, 9 Jul 2021 16:40:07 -0400
Subject: [PATCH 005/155] Remove the disable-build-cache flag for all commands

---
 .../src/cli/scriptActions/BulkScriptAction.ts     |  8 +-------
 .../__snapshots__/CommandLineHelp.test.ts.snap    | 15 +++------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts b/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
index 1d5afe99741..7b50a248021 100644
--- a/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
+++ b/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
@@ -78,7 +78,6 @@ export class BulkScriptAction extends BaseScriptAction {
   private _verboseParameter!: CommandLineFlagParameter;
   private _parallelismParameter: CommandLineStringParameter | undefined;
   private _ignoreHooksParameter!: CommandLineFlagParameter;
-  private _disableBuildCacheFlag: CommandLineFlagParameter | undefined;
 
   public constructor(options: IBulkScriptActionOptions) {
     super(options);
@@ -126,7 +125,7 @@ export class BulkScriptAction extends BaseScriptAction {
 
     const terminal: Terminal = new Terminal(new ConsoleTerminalProvider());
     let buildCacheConfiguration: BuildCacheConfiguration | undefined;
-    if (!this._disableBuildCacheFlag?.value && !this._disableBuildCache) {
+    if (!this._disableBuildCache) {
       buildCacheConfiguration = await BuildCacheConfiguration.tryLoadAsync(terminal, this.rushConfiguration);
     }
 
@@ -300,11 +299,6 @@ export class BulkScriptAction extends BaseScriptAction {
       description: `Skips execution of the "eventHooks" scripts defined in rush.json. Make sure you know what you are skipping.`
     });
 
-    this._disableBuildCacheFlag = this.defineFlagParameter({
-      parameterLongName: '--disable-build-cache',
-      description: '(EXPERIMENTAL) Disables the build cache for this command invocation.'
-    });
-
     this.defineScriptParameters();
   }
 
diff --git a/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap b/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap
index 1b10d854254..51db5a26052 100644
--- a/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap
+++ b/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap
@@ -119,7 +119,7 @@ exports[`CommandLineHelp prints the help for each action: build 1`] = `
                   [-o PROJECT] [-i PROJECT] [-I PROJECT]
                   [--to-version-policy VERSION_POLICY_NAME]
                   [--from-version-policy VERSION_POLICY_NAME] [-v] [-c]
-                  [--ignore-hooks] [--disable-build-cache] [-s] [-m]
+                  [--ignore-hooks] [-s] [-m]
                   
 
 This command is similar to \\"rush rebuild\\", except that \\"rush build\\" performs 
@@ -236,9 +236,6 @@ Optional arguments:
   --ignore-hooks        Skips execution of the \\"eventHooks\\" scripts defined 
                         in rush.json. Make sure you know what you are 
                         skipping.
-  --disable-build-cache
-                        (EXPERIMENTAL) Disables the build cache for this 
-                        command invocation.
   -s, --ship            Perform a production build, including minification 
                         and localization steps
   -m, --minimal         Perform a fast build, which disables certain tasks 
@@ -363,7 +360,7 @@ exports[`CommandLineHelp prints the help for each action: import-strings 1`] = `
                            [-f PROJECT] [-o PROJECT] [-i PROJECT] [-I PROJECT]
                            [--to-version-policy VERSION_POLICY_NAME]
                            [--from-version-policy VERSION_POLICY_NAME] [-v]
-                           [--ignore-hooks] [--disable-build-cache]
+                           [--ignore-hooks]
                            [--locale {en-us,fr-fr,es-es,zh-cn}]
                            
 
@@ -463,9 +460,6 @@ Optional arguments:
   --ignore-hooks        Skips execution of the \\"eventHooks\\" scripts defined 
                         in rush.json. Make sure you know what you are 
                         skipping.
-  --disable-build-cache
-                        (EXPERIMENTAL) Disables the build cache for this 
-                        command invocation.
   --locale {en-us,fr-fr,es-es,zh-cn}
                         Selects a single instead of the default locale 
                         (en-us) for non-ship builds or all locales for ship 
@@ -817,7 +811,7 @@ exports[`CommandLineHelp prints the help for each action: rebuild 1`] = `
                     [-o PROJECT] [-i PROJECT] [-I PROJECT]
                     [--to-version-policy VERSION_POLICY_NAME]
                     [--from-version-policy VERSION_POLICY_NAME] [-v]
-                    [--ignore-hooks] [--disable-build-cache] [-s] [-m]
+                    [--ignore-hooks] [-s] [-m]
                     
 
 This command assumes that the package.json file for each project contains a 
@@ -922,9 +916,6 @@ Optional arguments:
   --ignore-hooks        Skips execution of the \\"eventHooks\\" scripts defined 
                         in rush.json. Make sure you know what you are 
                         skipping.
-  --disable-build-cache
-                        (EXPERIMENTAL) Disables the build cache for this 
-                        command invocation.
   -s, --ship            Perform a production build, including minification 
                         and localization steps
   -m, --minimal         Perform a fast build, which disables certain tasks 

From 80dec6cb7fe2dbb9a9e2efffe6af676537c26b4d Mon Sep 17 00:00:00 2001
From: Elliot Nelson <Elliot.Nelson@hbo.com>
Date: Tue, 13 Jul 2021 17:30:29 -0400
Subject: [PATCH 006/155] Update
 common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json

Co-authored-by: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
---
 common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json b/common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json
index a58526cb66d..322ab41d190 100644
--- a/common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json
+++ b/common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json
@@ -2,10 +2,10 @@
   "changes": [
     {
       "packageName": "@microsoft/rush",
-      "comment": "rush rebuild ignores existing build cache entries",
+      "comment": "When the experimental build cache is enabled, \"rush rebuild\" now forces cached projects to be rebuilt  (GitHub #2802)",
       "type": "none"
     }
   ],
   "packageName": "@microsoft/rush",
   "email": "elliot.nelson@users.noreply.github.com"
-}
\ No newline at end of file
+}

From d3e6f3af2d2feb8200114a1881c13fd9e4961c39 Mon Sep 17 00:00:00 2001
From: Elliot Nelson <elliot-nelson@users.noreply.github.com>
Date: Tue, 13 Jul 2021 17:33:12 -0400
Subject: [PATCH 007/155] rush change - additional details

---
 .../@microsoft/rush/rebuild_2021-07-09-20-31.json     |  2 +-
 .../@microsoft/rush/rebuild_2021-07-13-21-32.json     | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 common/changes/@microsoft/rush/rebuild_2021-07-13-21-32.json

diff --git a/common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json b/common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json
index 322ab41d190..ea03e50f4f1 100644
--- a/common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json
+++ b/common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json
@@ -3,7 +3,7 @@
     {
       "packageName": "@microsoft/rush",
       "comment": "When the experimental build cache is enabled, \"rush rebuild\" now forces cached projects to be rebuilt  (GitHub #2802)",
-      "type": "none"
+      "type": "patch"
     }
   ],
   "packageName": "@microsoft/rush",
diff --git a/common/changes/@microsoft/rush/rebuild_2021-07-13-21-32.json b/common/changes/@microsoft/rush/rebuild_2021-07-13-21-32.json
new file mode 100644
index 00000000000..21880c1c97a
--- /dev/null
+++ b/common/changes/@microsoft/rush/rebuild_2021-07-13-21-32.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "(Breaking change) Remove the experimental \"--disable-build-cche\" command line parameter.",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "elliot-nelson@users.noreply.github.com"
+}

From cb5acc0735922b66e9576e20f2ad3434c0bbf9cc Mon Sep 17 00:00:00 2001
From: Emmanuel Oluyomi <emmanueloluyomi@users.noreply.github.com>
Date: Tue, 13 Jul 2021 17:34:05 -0400
Subject: [PATCH 008/155] Changes made to the initialization of any
 EnvironmentConfiguration property

---
 apps/rush-lib/src/api/EnvironmentConfiguration.ts | 1 -
 apps/rush-lib/src/cli/RushCommandLineParser.ts    | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/rush-lib/src/api/EnvironmentConfiguration.ts b/apps/rush-lib/src/api/EnvironmentConfiguration.ts
index 673dc6e0917..faab1c4d176 100644
--- a/apps/rush-lib/src/api/EnvironmentConfiguration.ts
+++ b/apps/rush-lib/src/api/EnvironmentConfiguration.ts
@@ -1,4 +1,3 @@
-import { InternalError } from '@rushstack/node-core-library';
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
diff --git a/apps/rush-lib/src/cli/RushCommandLineParser.ts b/apps/rush-lib/src/cli/RushCommandLineParser.ts
index 544fcd013f0..d78ddce61cc 100644
--- a/apps/rush-lib/src/cli/RushCommandLineParser.ts
+++ b/apps/rush-lib/src/cli/RushCommandLineParser.ts
@@ -250,8 +250,7 @@ export class RushCommandLineParser extends CommandLineParser {
 
     this._validateCommandLineConfigCommand(command);
 
-    const overrideAllowWarnings: boolean =
-      this.rushConfiguration && EnvironmentConfiguration.allowWarningsInSuccessfulBuild;
+    const overrideAllowWarnings: boolean = EnvironmentConfiguration.allowWarningsInSuccessfulBuild;
 
     switch (command.commandKind) {
       case RushConstants.bulkCommandKind:

From 9545be53beb05cd5ed787b66b0b4473b50f64327 Mon Sep 17 00:00:00 2001
From: Elliot Nelson <Elliot.Nelson@hbo.com>
Date: Tue, 13 Jul 2021 20:35:38 -0400
Subject: [PATCH 009/155] Update
 common/changes/@microsoft/rush/rebuild_2021-07-13-21-32.json

Co-authored-by: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
---
 common/changes/@microsoft/rush/rebuild_2021-07-13-21-32.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/changes/@microsoft/rush/rebuild_2021-07-13-21-32.json b/common/changes/@microsoft/rush/rebuild_2021-07-13-21-32.json
index 21880c1c97a..79fe55c7aeb 100644
--- a/common/changes/@microsoft/rush/rebuild_2021-07-13-21-32.json
+++ b/common/changes/@microsoft/rush/rebuild_2021-07-13-21-32.json
@@ -2,7 +2,7 @@
   "changes": [
     {
       "packageName": "@microsoft/rush",
-      "comment": "(Breaking change) Remove the experimental \"--disable-build-cche\" command line parameter.",
+      "comment": "(Breaking change) Remove the experimental \"--disable-build-cache\" command line parameter.",
       "type": "minor"
     }
   ],

From fe86064fba37fa63e3756d911800f027307105b7 Mon Sep 17 00:00:00 2001
From: Emmanuel Oluyomi <emmanueloluyomi@users.noreply.github.com>
Date: Tue, 13 Jul 2021 21:06:31 -0400
Subject: [PATCH 010/155] Changed the process of reading any
 EnvironmentConfiguration property by calling validate

---
 apps/rush-lib/src/api/EnvironmentConfiguration.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/rush-lib/src/api/EnvironmentConfiguration.ts b/apps/rush-lib/src/api/EnvironmentConfiguration.ts
index faab1c4d176..88e4c88ebcc 100644
--- a/apps/rush-lib/src/api/EnvironmentConfiguration.ts
+++ b/apps/rush-lib/src/api/EnvironmentConfiguration.ts
@@ -180,7 +180,6 @@ export class EnvironmentConfiguration {
    * An override for the common/temp folder path.
    */
   public static get rushTempFolderOverride(): string | undefined {
-    //EnvironmentConfiguration._ensureInitialized();
     return EnvironmentConfiguration._rushTempFolderOverride;
   }
 

From c27501d62088978e4452b23d32418043dc6b2dbf Mon Sep 17 00:00:00 2001
From: Daniel Nadeau <3473356+D4N14L@users.noreply.github.com>
Date: Wed, 14 Jul 2021 17:35:23 -0700
Subject: [PATCH 011/155] Fix filtered installs by loading config files only
 when required

---
 .../src/logic/ProjectChangeAnalyzer.ts        | 60 ++++++++++---------
 .../logic/test/ProjectChangeAnalyzer.test.ts  |  3 +
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/apps/rush-lib/src/logic/ProjectChangeAnalyzer.ts b/apps/rush-lib/src/logic/ProjectChangeAnalyzer.ts
index c815f4df8ab..f1cbbb0b692 100644
--- a/apps/rush-lib/src/logic/ProjectChangeAnalyzer.ts
+++ b/apps/rush-lib/src/logic/ProjectChangeAnalyzer.ts
@@ -6,7 +6,7 @@ import * as crypto from 'crypto';
 import ignore, { Ignore } from 'ignore';
 
 import { getPackageDeps, getGitHashForFiles } from '@rushstack/package-deps-hash';
-import { Path, InternalError, FileSystem, Terminal, Async } from '@rushstack/node-core-library';
+import { Path, InternalError, FileSystem, Terminal } from '@rushstack/node-core-library';
 
 import { RushConfiguration } from '../api/RushConfiguration';
 import { RushProjectConfiguration } from '../api/RushProjectConfiguration';
@@ -61,14 +61,32 @@ export class ProjectChangeAnalyzer {
 
     if (this._data === undefined) {
       return undefined;
-    } else {
-      const result: Map<string, string> | undefined = this._data.get(projectName);
-      if (!result) {
-        throw new Error(`Project "${projectName}" does not exist in the current Rush configuration.`);
-      } else {
-        return result;
+    }
+
+    const project: RushConfigurationProject | undefined =
+      this._rushConfiguration.getProjectByName(projectName);
+    if (!project) {
+      throw new Error(`Project "${projectName}" does not exist in the current Rush configuration.`);
+    }
+
+    const unfilteredProjectData: Map<string, string> = this._data.get(projectName)!;
+    const filteredProjectData: Map<string, string> = new Map(unfilteredProjectData);
+
+    const ignoreMatcher: Ignore | undefined = await this._getIgnoreMatcherForProjectAsync(project, terminal);
+    if (ignoreMatcher) {
+      // At this point, `filePath` is guaranteed to start with `projectRelativeFolder`, so
+      // we can safely slice off the first N characters to get the file path relative to the
+      // root of the project.
+      for (const [filePath] of unfilteredProjectData) {
+        const relativePath: string = filePath.slice(project.projectRelativeFolder.length + 1);
+        if (ignoreMatcher.ignores(relativePath)) {
+          // Remove from the filtered data as we encounter the ignored files
+          filteredProjectData.delete(filePath);
+        }
       }
     }
+
+    return filteredProjectData;
   }
 
   /**
@@ -156,20 +174,6 @@ export class ProjectChangeAnalyzer {
     }
 
     const projectHashDeps: Map<string, Map<string, string>> = new Map<string, Map<string, string>>();
-    const ignoreMatcherForProject: Map<string, Ignore> = new Map<string, Ignore>();
-
-    // Initialize maps for each project asynchronously, up to 10 projects concurrently.
-    await Async.forEachAsync(
-      this._rushConfiguration.projects,
-      async (project: RushConfigurationProject): Promise<void> => {
-        projectHashDeps.set(project.packageName, new Map<string, string>());
-        ignoreMatcherForProject.set(
-          project.packageName,
-          await this._getIgnoreMatcherForProjectAsync(project, terminal)
-        );
-      },
-      { concurrency: 10 }
-    );
 
     // Sort each project folder into its own package deps hash
     for (const [filePath, fileHash] of repoDeps) {
@@ -178,14 +182,14 @@ export class ProjectChangeAnalyzer {
       const owningProject: RushConfigurationProject | undefined =
         this._rushConfiguration.findProjectForPosixRelativePath(filePath);
       if (owningProject) {
-        // At this point, `filePath` is guaranteed to start with `projectRelativeFolder`, so
-        // we can safely slice off the first N characters to get the file path relative to the
-        // root of the `owningProject`.
-        const relativePath: string = filePath.slice(owningProject.projectRelativeFolder.length + 1);
-        const ignoreMatcher: Ignore | undefined = ignoreMatcherForProject.get(owningProject.packageName);
-        if (!ignoreMatcher || !ignoreMatcher.ignores(relativePath)) {
-          projectHashDeps.get(owningProject.packageName)!.set(filePath, fileHash);
+        let owningProjectHashDeps: Map<string, string> | undefined = projectHashDeps.get(
+          owningProject.packageName
+        );
+        if (!owningProjectHashDeps) {
+          owningProjectHashDeps = new Map<string, string>();
+          projectHashDeps.set(owningProject.packageName, owningProjectHashDeps);
         }
+        owningProjectHashDeps!.set(filePath, fileHash);
       }
     }
 
diff --git a/apps/rush-lib/src/logic/test/ProjectChangeAnalyzer.test.ts b/apps/rush-lib/src/logic/test/ProjectChangeAnalyzer.test.ts
index 6c557ce93a5..22223fb8ca1 100644
--- a/apps/rush-lib/src/logic/test/ProjectChangeAnalyzer.test.ts
+++ b/apps/rush-lib/src/logic/test/ProjectChangeAnalyzer.test.ts
@@ -33,6 +33,9 @@ describe(ProjectChangeAnalyzer.name, () => {
       },
       findProjectForPosixRelativePath(path: string): object | undefined {
         return projects.find((project) => path.startsWith(project.projectRelativeFolder));
+      },
+      getProjectByName(name: string): object | undefined {
+        return projects.find((project) => project.packageName === name);
       }
     } as RushConfiguration;
 

From 8333a453e8382d168b12bf5f61a7f6f90ff8306b Mon Sep 17 00:00:00 2001
From: Daniel Nadeau <3473356+D4N14L@users.noreply.github.com>
Date: Wed, 14 Jul 2021 17:36:35 -0700
Subject: [PATCH 012/155] Rush change

---
 ...r-danade-FixFilteredInstalls_2021-07-15-00-36.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@microsoft/rush/user-danade-FixFilteredInstalls_2021-07-15-00-36.json

diff --git a/common/changes/@microsoft/rush/user-danade-FixFilteredInstalls_2021-07-15-00-36.json b/common/changes/@microsoft/rush/user-danade-FixFilteredInstalls_2021-07-15-00-36.json
new file mode 100644
index 00000000000..bc5015ef730
--- /dev/null
+++ b/common/changes/@microsoft/rush/user-danade-FixFilteredInstalls_2021-07-15-00-36.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Fix incremental build state calculation when using filtered installs",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "3473356+D4N14L@users.noreply.github.com"
+}
\ No newline at end of file

From 0ccd1b51a078d714f3bb46b699f5b4c3d2e95793 Mon Sep 17 00:00:00 2001
From: Daniel Nadeau <3473356+D4N14L@users.noreply.github.com>
Date: Wed, 14 Jul 2021 18:27:39 -0700
Subject: [PATCH 013/155] Invert ignore check

---
 .../src/logic/ProjectChangeAnalyzer.ts        | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/apps/rush-lib/src/logic/ProjectChangeAnalyzer.ts b/apps/rush-lib/src/logic/ProjectChangeAnalyzer.ts
index f1cbbb0b692..4421e65b5ab 100644
--- a/apps/rush-lib/src/logic/ProjectChangeAnalyzer.ts
+++ b/apps/rush-lib/src/logic/ProjectChangeAnalyzer.ts
@@ -34,6 +34,7 @@ export class ProjectChangeAnalyzer {
    * undefined === data isn't available (i.e. - git isn't present)
    */
   private _data: Map<string, Map<string, string>> | undefined | UNINITIALIZED = UNINITIALIZED;
+  private _filteredData: Map<string, Map<string, string>> = new Map<string, Map<string, string>>();
   private _projectStateCache: Map<string, string> = new Map<string, string>();
   private _rushConfiguration: RushConfiguration;
   private readonly _git: Git;
@@ -55,6 +56,12 @@ export class ProjectChangeAnalyzer {
     projectName: string,
     terminal: Terminal
   ): Promise<Map<string, string> | undefined> {
+    // Check the cache for any existing data
+    const existingData: Map<string, string> | undefined = this._filteredData.get(projectName);
+    if (existingData) {
+      return existingData;
+    }
+
     if (this._data === UNINITIALIZED) {
       this._data = await this._getDataAsync(terminal);
     }
@@ -70,22 +77,26 @@ export class ProjectChangeAnalyzer {
     }
 
     const unfilteredProjectData: Map<string, string> = this._data.get(projectName)!;
-    const filteredProjectData: Map<string, string> = new Map(unfilteredProjectData);
+    let filteredProjectData: Map<string, string> | undefined;
 
     const ignoreMatcher: Ignore | undefined = await this._getIgnoreMatcherForProjectAsync(project, terminal);
     if (ignoreMatcher) {
       // At this point, `filePath` is guaranteed to start with `projectRelativeFolder`, so
       // we can safely slice off the first N characters to get the file path relative to the
       // root of the project.
-      for (const [filePath] of unfilteredProjectData) {
+      filteredProjectData = new Map<string, string>();
+      for (const [filePath, fileHash] of unfilteredProjectData) {
         const relativePath: string = filePath.slice(project.projectRelativeFolder.length + 1);
-        if (ignoreMatcher.ignores(relativePath)) {
-          // Remove from the filtered data as we encounter the ignored files
-          filteredProjectData.delete(filePath);
+        if (!ignoreMatcher.ignores(relativePath)) {
+          // Add the file path to the filtered data if it is not ignored
+          filteredProjectData.set(filePath, fileHash);
         }
       }
+    } else {
+      filteredProjectData = unfilteredProjectData;
     }
 
+    this._filteredData.set(projectName, filteredProjectData);
     return filteredProjectData;
   }
 
@@ -189,7 +200,7 @@ export class ProjectChangeAnalyzer {
           owningProjectHashDeps = new Map<string, string>();
           projectHashDeps.set(owningProject.packageName, owningProjectHashDeps);
         }
-        owningProjectHashDeps!.set(filePath, fileHash);
+        owningProjectHashDeps.set(filePath, fileHash);
       }
     }
 

From 268816d242eca9a458ef262ca1ebd0724a4c9478 Mon Sep 17 00:00:00 2001
From: Daniel Nadeau <3473356+D4N14L@users.noreply.github.com>
Date: Wed, 14 Jul 2021 18:28:52 -0700
Subject: [PATCH 014/155] Update test typings

---
 apps/rush-lib/src/logic/test/ProjectChangeAnalyzer.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/rush-lib/src/logic/test/ProjectChangeAnalyzer.test.ts b/apps/rush-lib/src/logic/test/ProjectChangeAnalyzer.test.ts
index 22223fb8ca1..453cb0533f1 100644
--- a/apps/rush-lib/src/logic/test/ProjectChangeAnalyzer.test.ts
+++ b/apps/rush-lib/src/logic/test/ProjectChangeAnalyzer.test.ts
@@ -31,10 +31,10 @@ describe(ProjectChangeAnalyzer.name, () => {
       getCommittedShrinkwrapFilename(): string {
         return 'common/config/rush/pnpm-lock.yaml';
       },
-      findProjectForPosixRelativePath(path: string): object | undefined {
+      findProjectForPosixRelativePath(path: string): RushConfigurationProject | undefined {
         return projects.find((project) => path.startsWith(project.projectRelativeFolder));
       },
-      getProjectByName(name: string): object | undefined {
+      getProjectByName(name: string): RushConfigurationProject | undefined {
         return projects.find((project) => project.packageName === name);
       }
     } as RushConfiguration;

From 7c63510957dc380e5307c52b77492f8bf070b23c Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Thu, 15 Jul 2021 01:47:18 +0000
Subject: [PATCH 015/155] Deleting change files and updating change logs for
 package updates.

---
 apps/rush/CHANGELOG.json                             | 12 ++++++++++++
 apps/rush/CHANGELOG.md                               |  9 ++++++++-
 ...-danade-FixFilteredInstalls_2021-07-15-00-36.json | 11 -----------
 3 files changed, 20 insertions(+), 12 deletions(-)
 delete mode 100644 common/changes/@microsoft/rush/user-danade-FixFilteredInstalls_2021-07-15-00-36.json

diff --git a/apps/rush/CHANGELOG.json b/apps/rush/CHANGELOG.json
index 252131831d9..207d172fb87 100644
--- a/apps/rush/CHANGELOG.json
+++ b/apps/rush/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@microsoft/rush",
   "entries": [
+    {
+      "version": "5.49.2",
+      "tag": "@microsoft/rush_v5.49.2",
+      "date": "Thu, 15 Jul 2021 01:47:18 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "Fix incremental build state calculation when using filtered installs"
+          }
+        ]
+      }
+    },
     {
       "version": "5.49.1",
       "tag": "@microsoft/rush_v5.49.1",
diff --git a/apps/rush/CHANGELOG.md b/apps/rush/CHANGELOG.md
index ff46ce589bb..d6795c9af6e 100644
--- a/apps/rush/CHANGELOG.md
+++ b/apps/rush/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @microsoft/rush
 
-This log was last generated on Tue, 13 Jul 2021 23:03:01 GMT and should not be manually modified.
+This log was last generated on Thu, 15 Jul 2021 01:47:18 GMT and should not be manually modified.
+
+## 5.49.2
+Thu, 15 Jul 2021 01:47:18 GMT
+
+### Updates
+
+- Fix incremental build state calculation when using filtered installs
 
 ## 5.49.1
 Tue, 13 Jul 2021 23:03:01 GMT
diff --git a/common/changes/@microsoft/rush/user-danade-FixFilteredInstalls_2021-07-15-00-36.json b/common/changes/@microsoft/rush/user-danade-FixFilteredInstalls_2021-07-15-00-36.json
deleted file mode 100644
index bc5015ef730..00000000000
--- a/common/changes/@microsoft/rush/user-danade-FixFilteredInstalls_2021-07-15-00-36.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@microsoft/rush",
-      "comment": "Fix incremental build state calculation when using filtered installs",
-      "type": "none"
-    }
-  ],
-  "packageName": "@microsoft/rush",
-  "email": "3473356+D4N14L@users.noreply.github.com"
-}
\ No newline at end of file

From b79574c5704d40f0d912a862f7eb2e6c99e95560 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Thu, 15 Jul 2021 01:47:21 +0000
Subject: [PATCH 016/155] Applying package updates.

---
 apps/rush-lib/package.json               | 2 +-
 apps/rush/package.json                   | 2 +-
 common/config/rush/version-policies.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/rush-lib/package.json b/apps/rush-lib/package.json
index dbc8ef382e8..c3bac55c0ef 100644
--- a/apps/rush-lib/package.json
+++ b/apps/rush-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/rush-lib",
-  "version": "5.49.1",
+  "version": "5.49.2",
   "description": "A library for writing scripts that interact with the Rush tool",
   "repository": {
     "type": "git",
diff --git a/apps/rush/package.json b/apps/rush/package.json
index 03aa0d99dc9..3faa49e0e09 100644
--- a/apps/rush/package.json
+++ b/apps/rush/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/rush",
-  "version": "5.49.1",
+  "version": "5.49.2",
   "description": "A professional solution for consolidating all your JavaScript projects in one Git repo",
   "keywords": [
     "install",
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
index b93d375bf9f..f4fe1c0f42e 100644
--- a/common/config/rush/version-policies.json
+++ b/common/config/rush/version-policies.json
@@ -90,7 +90,7 @@
   {
     "policyName": "rush",
     "definitionName": "lockStepVersion",
-    "version": "5.49.1",
+    "version": "5.49.2",
     "nextBump": "patch",
     "mainProject": "@microsoft/rush"
   }

From e5e6f6430eee242023425be41b2350c86074504a Mon Sep 17 00:00:00 2001
From: Emmanuel Oluyomi <emmanueloluyomi@users.noreply.github.com>
Date: Thu, 15 Jul 2021 12:51:22 -0400
Subject: [PATCH 017/155] Changes to the implementation of vaalidate method and
 corrected errors

---
 .../src/api/EnvironmentConfiguration.ts       | 27 +++++++++----------
 .../api/test/EnvironmentConfiguration.test.ts |  9 +------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/apps/rush-lib/src/api/EnvironmentConfiguration.ts b/apps/rush-lib/src/api/EnvironmentConfiguration.ts
index 88e4c88ebcc..ba060e96d32 100644
--- a/apps/rush-lib/src/api/EnvironmentConfiguration.ts
+++ b/apps/rush-lib/src/api/EnvironmentConfiguration.ts
@@ -180,6 +180,7 @@ export class EnvironmentConfiguration {
    * An override for the common/temp folder path.
    */
   public static get rushTempFolderOverride(): string | undefined {
+    EnvironmentConfiguration._ensureValidated();
     return EnvironmentConfiguration._rushTempFolderOverride;
   }
 
@@ -188,7 +189,7 @@ export class EnvironmentConfiguration {
    * See {@link EnvironmentVariableNames.RUSH_ABSOLUTE_SYMLINKS}
    */
   public static get absoluteSymlinks(): boolean {
-    //EnvironmentConfiguration._ensureInitialized();
+    EnvironmentConfiguration._ensureValidated();
     return EnvironmentConfiguration._absoluteSymlinks;
   }
 
@@ -200,7 +201,7 @@ export class EnvironmentConfiguration {
    * See {@link EnvironmentVariableNames.RUSH_ALLOW_UNSUPPORTED_NODEJS}.
    */
   public static get allowUnsupportedNodeVersion(): boolean {
-    //EnvironmentConfiguration._ensureInitialized();
+    EnvironmentConfiguration._ensureValidated();
     return EnvironmentConfiguration._allowUnsupportedNodeVersion;
   }
 
@@ -210,7 +211,7 @@ export class EnvironmentConfiguration {
    * or `0` to disallow them. (See the comments in the command-line.json file for more information).
    */
   public static get allowWarningsInSuccessfulBuild(): boolean {
-    //EnvironmentConfiguration._ensureInitialized();
+    EnvironmentConfiguration._ensureValidated();
     return EnvironmentConfiguration._allowWarningsInSuccessfulBuild;
   }
 
@@ -219,7 +220,7 @@ export class EnvironmentConfiguration {
    * See {@link EnvironmentVariableNames.RUSH_PNPM_STORE_PATH}
    */
   public static get pnpmStorePathOverride(): string | undefined {
-    //EnvironmentConfiguration._ensureInitialized();
+    EnvironmentConfiguration._ensureValidated();
     return EnvironmentConfiguration._pnpmStorePathOverride;
   }
 
@@ -228,7 +229,7 @@ export class EnvironmentConfiguration {
    * See {@link EnvironmentVariableNames.RUSH_GLOBAL_FOLDER}
    */
   public static get rushGlobalFolderOverride(): string | undefined {
-    //EnvironmentConfiguration._ensureInitialized();
+    EnvironmentConfiguration._ensureValidated();
     return EnvironmentConfiguration._rushGlobalFolderOverride;
   }
 
@@ -237,7 +238,7 @@ export class EnvironmentConfiguration {
    * See {@link EnvironmentVariableNames.RUSH_BUILD_CACHE_CREDENTIAL}
    */
   public static get buildCacheCredential(): string | undefined {
-    //EnvironmentConfiguration._ensureInitialized();
+    EnvironmentConfiguration._ensureValidated();
     return EnvironmentConfiguration._buildCacheCredential;
   }
 
@@ -246,7 +247,7 @@ export class EnvironmentConfiguration {
    * See {@link EnvironmentVariableNames.RUSH_BUILD_CACHE_ENABLED}
    */
   public static get buildCacheEnabled(): boolean | undefined {
-    //EnvironmentConfiguration._ensureInitialized();
+    EnvironmentConfiguration._ensureValidated();
     return EnvironmentConfiguration._buildCacheEnabled;
   }
 
@@ -255,7 +256,7 @@ export class EnvironmentConfiguration {
    * See {@link EnvironmentVariableNames.RUSH_BUILD_CACHE_WRITE_ALLOWED}
    */
   public static get buildCacheWriteAllowed(): boolean | undefined {
-    //EnvironmentConfiguration._ensureInitialized();
+    EnvironmentConfiguration._ensureValidated();
     return EnvironmentConfiguration._buildCacheWriteAllowed;
   }
 
@@ -264,7 +265,7 @@ export class EnvironmentConfiguration {
    * See {@link EnvironmentVariableNames.RUSH_GIT_BINARY_PATH}
    */
   public static get gitBinaryPath(): string | undefined {
-    //EnvironmentConfiguration._ensureInitialized();
+    EnvironmentConfiguration._ensureValidated();
     return EnvironmentConfiguration._gitBinaryPath;
   }
 
@@ -421,13 +422,11 @@ export class EnvironmentConfiguration {
     EnvironmentConfiguration._hasBeenValidated = false;
   }
 
-  /**private static _ensureInitialized(): void {
+  private static _ensureValidated(): void {
     if (!EnvironmentConfiguration._hasBeenValidated) {
-      throw new InternalError(
-        'The EnvironmentConfiguration must be initialized before values can be accessed.'
-      );
+      EnvironmentConfiguration.validate();
     }
-  }**/
+  }
 
   public static parseBooleanEnvironmentVariable(
     name: string,
diff --git a/apps/rush-lib/src/api/test/EnvironmentConfiguration.test.ts b/apps/rush-lib/src/api/test/EnvironmentConfiguration.test.ts
index 677dd1b010b..5038fcada8a 100644
--- a/apps/rush-lib/src/api/test/EnvironmentConfiguration.test.ts
+++ b/apps/rush-lib/src/api/test/EnvironmentConfiguration.test.ts
@@ -32,7 +32,7 @@ describe('EnvironmentConfiguration', () => {
       expect(EnvironmentConfiguration.validate).toThrow();
     });
 
-    it('can be re-validated', () => {
+    it('can revalidate after a reset', () => {
       process.env['RUSH_TEMP_FOLDER'] = '/var/tempA'; // eslint-disable-line dot-notation
       EnvironmentConfiguration.validate({ doNotNormalizePaths: true });
 
@@ -46,10 +46,6 @@ describe('EnvironmentConfiguration', () => {
   });
 
   describe('rushTempDirOverride', () => {
-    /**it('throws if EnvironmentConfiguration is not validated', () => {
-      expect(() => EnvironmentConfiguration.rushTempFolderOverride).toThrow();
-    });**/
-
     it('returns undefined for unset environment variables', () => {
       EnvironmentConfiguration.validate();
 
@@ -67,9 +63,6 @@ describe('EnvironmentConfiguration', () => {
 
   describe('pnpmStorePathOverride', () => {
     const ENV_VAR: string = 'RUSH_PNPM_STORE_PATH';
-    /**it('throws if EnvironmentConfiguration is not validated', () => {
-      expect(() => EnvironmentConfiguration.pnpmStorePathOverride).toThrow();
-    });**/
 
     it('returns undefined for unset environment variable', () => {
       EnvironmentConfiguration.validate();

From 249970b8c296ff7ba23997519c4f641992564b99 Mon Sep 17 00:00:00 2001
From: Elliot Nelson <elliot-nelson@users.noreply.github.com>
Date: Thu, 15 Jul 2021 15:32:18 -0400
Subject: [PATCH 018/155] New verbiage for warnings, show regardless of
 incremental build status

---
 .../src/logic/taskRunner/ProjectBuilder.ts    | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts b/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts
index 6ad2b1ad80f..cb5697d2992 100644
--- a/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts
+++ b/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts
@@ -229,24 +229,18 @@ export class ProjectBuilder extends BaseBuilder {
           };
         } else if (this.isIncrementalBuildAllowed) {
           terminal.writeLine(
-            'Unable to calculate incremental build state. Instead running full rebuild. Ensure Git is present.'
+            'Warning: incremental builds, caching, and change detection are disabled.\n' +
+              'Ensure this workspace is tracked by git and git is available.'
           );
         }
       } catch (error) {
-        if (this.isIncrementalBuildAllowed) {
-          terminal.writeLine(
-            'Error calculating incremental build state. Instead running full rebuild. ' + error.toString()
-          );
-        }
+        terminal.writeLine(
+          'Error encountered calculating incremental build state: ' +
+            error.toString() +
+            '\nIncremental builds, caching, and change detection are disabled.'
+        );
       }
 
-      const isPackageUnchanged: boolean = !!(
-        lastProjectBuildDeps &&
-        projectBuildDeps &&
-        projectBuildDeps.arguments === lastProjectBuildDeps.arguments &&
-        _areShallowEqual(projectBuildDeps.files, lastProjectBuildDeps.files)
-      );
-
       // If the current command is allowed to do incremental builds, attempt to retrieve
       // the project from the build cache or skip building, if appropriate.
       if (this.isIncrementalBuildAllowed) {
@@ -260,7 +254,16 @@ export class ProjectBuilder extends BaseBuilder {
 
         if (restoreFromCacheSuccess) {
           return TaskStatus.FromCache;
-        } else if (isPackageUnchanged) {
+        }
+
+        const isPackageUnchanged: boolean = !!(
+          lastProjectBuildDeps &&
+          projectBuildDeps &&
+          projectBuildDeps.arguments === lastProjectBuildDeps.arguments &&
+          _areShallowEqual(projectBuildDeps.files, lastProjectBuildDeps.files)
+        );
+
+        if (isPackageUnchanged) {
           return TaskStatus.Skipped;
         }
       }

From 3874dd2b68e33922852c1c78b4c25f34a7f122fe Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Fri, 16 Jul 2021 17:55:54 -0700
Subject: [PATCH 019/155] Improve wording of error messages

---
 .../src/logic/taskRunner/ProjectBuilder.ts    | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts b/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts
index f048da46a73..6ba857d53ab 100644
--- a/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts
+++ b/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts
@@ -10,14 +10,16 @@ import {
   JsonObject,
   NewlineKind,
   InternalError,
-  Terminal
+  Terminal,
+  ColorValue
 } from '@rushstack/node-core-library';
 import {
   TerminalChunkKind,
   TextRewriterTransform,
   StderrLineTransform,
   SplitterTransform,
-  DiscardStdoutTransform
+  DiscardStdoutTransform,
+  PrintUtilities
 } from '@rushstack/terminal';
 import { CollatedTerminal } from '@rushstack/stream-collator';
 
@@ -226,17 +228,24 @@ export class ProjectBuilder extends BaseBuilder {
             arguments: this._commandToRun
           };
         } else if (this.isIncrementalBuildAllowed) {
-          terminal.writeLine(
-            'Warning: incremental builds, caching, and change detection are disabled.\n' +
-              'Ensure this workspace is tracked by git and git is available.'
-          );
+          // To test this code path:
+          // Remove the `.git` folder then run "rush build --verbose"
+          terminal.writeLine({
+            text: PrintUtilities.wrapWords(
+              'This workspace does not appear to be tracked by Git. ' +
+                'Rush will proceed without incremental build, caching, and change detection.'
+            ),
+            foregroundColor: ColorValue.Cyan
+          });
         }
       } catch (error) {
-        terminal.writeLine(
-          'Error encountered calculating incremental build state: ' +
-            error.toString() +
-            '\nIncremental builds, caching, and change detection are disabled.'
-        );
+        // To test this code path:
+        // Delete a project's ".rush/temp/shrinkwrap-deps.json" then run "rush build --verbose"
+        terminal.writeLine('Unable to calculate incremental build state: ' + error.toString());
+        terminal.writeLine({
+          text: 'Rush will proceed without incremental build, caching, and change detection.',
+          foregroundColor: ColorValue.Cyan
+        });
       }
 
       // If the current command is allowed to do incremental builds, attempt to retrieve

From a8e471f166bb2d9aae3cdd4d4b871de8c4f6f3e1 Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Fri, 16 Jul 2021 18:06:51 -0700
Subject: [PATCH 020/155] Prepare to publish a MINOR release of Rush

---
 common/config/rush/version-policies.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
index f4fe1c0f42e..c93c9e7bbf4 100644
--- a/common/config/rush/version-policies.json
+++ b/common/config/rush/version-policies.json
@@ -91,7 +91,7 @@
     "policyName": "rush",
     "definitionName": "lockStepVersion",
     "version": "5.49.2",
-    "nextBump": "patch",
+    "nextBump": "minor",
     "mainProject": "@microsoft/rush"
   }
 ]

From d5ebfba1ad279eff6c62bdd88e38490a73104405 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Sat, 17 Jul 2021 01:16:05 +0000
Subject: [PATCH 021/155] Deleting change files and updating change logs for
 package updates.

---
 apps/rush/CHANGELOG.json                        | 17 +++++++++++++++++
 apps/rush/CHANGELOG.md                          | 13 ++++++++++++-
 .../rush/rebuild_2021-07-09-20-31.json          | 11 -----------
 .../rush/rebuild_2021-07-13-21-32.json          | 11 -----------
 4 files changed, 29 insertions(+), 23 deletions(-)
 delete mode 100644 common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json
 delete mode 100644 common/changes/@microsoft/rush/rebuild_2021-07-13-21-32.json

diff --git a/apps/rush/CHANGELOG.json b/apps/rush/CHANGELOG.json
index 207d172fb87..3a284e2f2da 100644
--- a/apps/rush/CHANGELOG.json
+++ b/apps/rush/CHANGELOG.json
@@ -1,6 +1,23 @@
 {
   "name": "@microsoft/rush",
   "entries": [
+    {
+      "version": "5.50.0",
+      "tag": "@microsoft/rush_v5.50.0",
+      "date": "Sat, 17 Jul 2021 01:16:04 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "When the experimental build cache is enabled, \"rush rebuild\" now forces cached projects to be rebuilt  (GitHub #2802)"
+          }
+        ],
+        "minor": [
+          {
+            "comment": "(Breaking change) Remove the experimental \"--disable-build-cache\" command line parameter."
+          }
+        ]
+      }
+    },
     {
       "version": "5.49.2",
       "tag": "@microsoft/rush_v5.49.2",
diff --git a/apps/rush/CHANGELOG.md b/apps/rush/CHANGELOG.md
index d6795c9af6e..a7a816674ff 100644
--- a/apps/rush/CHANGELOG.md
+++ b/apps/rush/CHANGELOG.md
@@ -1,6 +1,17 @@
 # Change Log - @microsoft/rush
 
-This log was last generated on Thu, 15 Jul 2021 01:47:18 GMT and should not be manually modified.
+This log was last generated on Sat, 17 Jul 2021 01:16:04 GMT and should not be manually modified.
+
+## 5.50.0
+Sat, 17 Jul 2021 01:16:04 GMT
+
+### Minor changes
+
+- (Breaking change) Remove the experimental "--disable-build-cache" command line parameter.
+
+### Patches
+
+- When the experimental build cache is enabled, "rush rebuild" now forces cached projects to be rebuilt  (GitHub #2802)
 
 ## 5.49.2
 Thu, 15 Jul 2021 01:47:18 GMT
diff --git a/common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json b/common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json
deleted file mode 100644
index ea03e50f4f1..00000000000
--- a/common/changes/@microsoft/rush/rebuild_2021-07-09-20-31.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@microsoft/rush",
-      "comment": "When the experimental build cache is enabled, \"rush rebuild\" now forces cached projects to be rebuilt  (GitHub #2802)",
-      "type": "patch"
-    }
-  ],
-  "packageName": "@microsoft/rush",
-  "email": "elliot.nelson@users.noreply.github.com"
-}
diff --git a/common/changes/@microsoft/rush/rebuild_2021-07-13-21-32.json b/common/changes/@microsoft/rush/rebuild_2021-07-13-21-32.json
deleted file mode 100644
index 79fe55c7aeb..00000000000
--- a/common/changes/@microsoft/rush/rebuild_2021-07-13-21-32.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@microsoft/rush",
-      "comment": "(Breaking change) Remove the experimental \"--disable-build-cache\" command line parameter.",
-      "type": "minor"
-    }
-  ],
-  "packageName": "@microsoft/rush",
-  "email": "elliot-nelson@users.noreply.github.com"
-}

From 048607fe7cb43df7ae4dfa304d688d93c5e304ec Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Sat, 17 Jul 2021 01:16:07 +0000
Subject: [PATCH 022/155] Applying package updates.

---
 apps/rush-lib/package.json               | 2 +-
 apps/rush/package.json                   | 2 +-
 common/config/rush/version-policies.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/rush-lib/package.json b/apps/rush-lib/package.json
index c3bac55c0ef..58675051a9e 100644
--- a/apps/rush-lib/package.json
+++ b/apps/rush-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/rush-lib",
-  "version": "5.49.2",
+  "version": "5.50.0",
   "description": "A library for writing scripts that interact with the Rush tool",
   "repository": {
     "type": "git",
diff --git a/apps/rush/package.json b/apps/rush/package.json
index 3faa49e0e09..38d07dde227 100644
--- a/apps/rush/package.json
+++ b/apps/rush/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/rush",
-  "version": "5.49.2",
+  "version": "5.50.0",
   "description": "A professional solution for consolidating all your JavaScript projects in one Git repo",
   "keywords": [
     "install",
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
index c93c9e7bbf4..4b5014b8a77 100644
--- a/common/config/rush/version-policies.json
+++ b/common/config/rush/version-policies.json
@@ -90,7 +90,7 @@
   {
     "policyName": "rush",
     "definitionName": "lockStepVersion",
-    "version": "5.49.2",
+    "version": "5.50.0",
     "nextBump": "minor",
     "mainProject": "@microsoft/rush"
   }

From 9b37c6c70416e97633f1fbf89f25fb74f81bf8ba Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Sun, 18 Jul 2021 13:29:41 -0700
Subject: [PATCH 023/155] rush change

---
 .../rush/eoluyomi-EnvironConfig_2021-07-18-20-29.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@microsoft/rush/eoluyomi-EnvironConfig_2021-07-18-20-29.json

diff --git a/common/changes/@microsoft/rush/eoluyomi-EnvironConfig_2021-07-18-20-29.json b/common/changes/@microsoft/rush/eoluyomi-EnvironConfig_2021-07-18-20-29.json
new file mode 100644
index 00000000000..cbcdce528a0
--- /dev/null
+++ b/common/changes/@microsoft/rush/eoluyomi-EnvironConfig_2021-07-18-20-29.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "4673363+octogonz@users.noreply.github.com"
+}
\ No newline at end of file

From 6bcb88c350e462418bafae43702c8bf5994dfcba Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonasb@users.noreply.github.com>
Date: Mon, 19 Jul 2021 18:50:25 +0200
Subject: [PATCH 024/155] Update pnpm-lock.yaml after rush rebuild

---
 .../workspace/common/pnpm-lock.yaml           | 91 ++++++-------------
 1 file changed, 27 insertions(+), 64 deletions(-)

diff --git a/build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml b/build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml
index 7ace8310acf..6ae63d94e39 100644
--- a/build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml
+++ b/build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml
@@ -5,13 +5,13 @@ importers:
   typescript-newest-test:
     specifiers:
       '@rushstack/eslint-config': file:rushstack-eslint-config-2.4.0.tgz
-      '@rushstack/heft': file:rushstack-heft-0.34.6.tgz
+      '@rushstack/heft': file:rushstack-heft-0.34.8.tgz
       eslint: ~7.30.0
       tslint: ~5.20.1
       typescript: ~4.3.5
     devDependencies:
       '@rushstack/eslint-config': file:../temp/tarballs/rushstack-eslint-config-2.4.0.tgz_eslint@7.30.0+typescript@4.3.5
-      '@rushstack/heft': file:../temp/tarballs/rushstack-heft-0.34.6.tgz
+      '@rushstack/heft': file:../temp/tarballs/rushstack-heft-0.34.8.tgz
       eslint: 7.30.0
       tslint: 5.20.1_typescript@4.3.5
       typescript: 4.3.5
@@ -19,13 +19,13 @@ importers:
   typescript-v3-test:
     specifiers:
       '@rushstack/eslint-config': file:rushstack-eslint-config-2.4.0.tgz
-      '@rushstack/heft': file:rushstack-heft-0.34.6.tgz
+      '@rushstack/heft': file:rushstack-heft-0.34.8.tgz
       eslint: ~7.30.0
       tslint: ~5.20.1
       typescript: ~3.9.7
     devDependencies:
       '@rushstack/eslint-config': file:../temp/tarballs/rushstack-eslint-config-2.4.0.tgz_eslint@7.30.0+typescript@3.9.10
-      '@rushstack/heft': file:../temp/tarballs/rushstack-heft-0.34.6.tgz
+      '@rushstack/heft': file:../temp/tarballs/rushstack-heft-0.34.8.tgz
       eslint: 7.30.0
       tslint: 5.20.1_typescript@3.9.10
       typescript: 3.9.10
@@ -151,7 +151,7 @@ packages:
     dependencies:
       '@typescript-eslint/experimental-utils': 4.28.3_eslint@7.30.0+typescript@4.3.5
       '@typescript-eslint/parser': 4.28.3_eslint@7.30.0+typescript@4.3.5
-      '@typescript-eslint/scope-manager': 4.28.3_typescript@4.3.5
+      '@typescript-eslint/scope-manager': 4.28.3
       debug: 4.3.1
       eslint: 7.30.0
       functional-red-black-tree: 1.0.1
@@ -176,7 +176,7 @@ packages:
     dependencies:
       '@typescript-eslint/experimental-utils': 4.28.3_eslint@7.30.0+typescript@3.9.10
       '@typescript-eslint/parser': 4.28.3_eslint@7.30.0+typescript@3.9.10
-      '@typescript-eslint/scope-manager': 4.28.3_typescript@3.9.10
+      '@typescript-eslint/scope-manager': 4.28.3
       debug: 4.3.1
       eslint: 7.30.0
       functional-red-black-tree: 1.0.1
@@ -195,8 +195,8 @@ packages:
       eslint: '*'
     dependencies:
       '@types/json-schema': 7.0.7
-      '@typescript-eslint/scope-manager': 4.28.3_typescript@3.9.10
-      '@typescript-eslint/types': 4.28.3_typescript@3.9.10
+      '@typescript-eslint/scope-manager': 4.28.3
+      '@typescript-eslint/types': 4.28.3
       '@typescript-eslint/typescript-estree': 4.28.3_typescript@3.9.10
       eslint: 7.30.0
       eslint-scope: 5.1.1
@@ -213,8 +213,8 @@ packages:
       eslint: '*'
     dependencies:
       '@types/json-schema': 7.0.7
-      '@typescript-eslint/scope-manager': 4.28.3_typescript@4.3.5
-      '@typescript-eslint/types': 4.28.3_typescript@4.3.5
+      '@typescript-eslint/scope-manager': 4.28.3
+      '@typescript-eslint/types': 4.28.3
       '@typescript-eslint/typescript-estree': 4.28.3_typescript@4.3.5
       eslint: 7.30.0
       eslint-scope: 5.1.1
@@ -234,8 +234,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 4.28.3_typescript@3.9.10
-      '@typescript-eslint/types': 4.28.3_typescript@3.9.10
+      '@typescript-eslint/scope-manager': 4.28.3
+      '@typescript-eslint/types': 4.28.3
       '@typescript-eslint/typescript-estree': 4.28.3_typescript@3.9.10
       debug: 4.3.1
       eslint: 7.30.0
@@ -254,8 +254,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 4.28.3_typescript@4.3.5
-      '@typescript-eslint/types': 4.28.3_typescript@4.3.5
+      '@typescript-eslint/scope-manager': 4.28.3
+      '@typescript-eslint/types': 4.28.3
       '@typescript-eslint/typescript-estree': 4.28.3_typescript@4.3.5
       debug: 4.3.1
       eslint: 7.30.0
@@ -264,42 +264,17 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/scope-manager/4.28.3_typescript@3.9.10:
+  /@typescript-eslint/scope-manager/4.28.3:
     resolution: {integrity: sha512-/8lMisZ5NGIzGtJB+QizQ5eX4Xd8uxedFfMBXOKuJGP0oaBBVEMbJVddQKDXyyB0bPlmt8i6bHV89KbwOelJiQ==}
     engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
     dependencies:
-      '@typescript-eslint/types': 4.28.3_typescript@3.9.10
-      '@typescript-eslint/visitor-keys': 4.28.3_typescript@3.9.10
-    transitivePeerDependencies:
-      - typescript
-    dev: true
-
-  /@typescript-eslint/scope-manager/4.28.3_typescript@4.3.5:
-    resolution: {integrity: sha512-/8lMisZ5NGIzGtJB+QizQ5eX4Xd8uxedFfMBXOKuJGP0oaBBVEMbJVddQKDXyyB0bPlmt8i6bHV89KbwOelJiQ==}
-    engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
-    dependencies:
-      '@typescript-eslint/types': 4.28.3_typescript@4.3.5
-      '@typescript-eslint/visitor-keys': 4.28.3_typescript@4.3.5
-    transitivePeerDependencies:
-      - typescript
+      '@typescript-eslint/types': 4.28.3
+      '@typescript-eslint/visitor-keys': 4.28.3
     dev: true
 
-  /@typescript-eslint/types/4.28.3_typescript@3.9.10:
+  /@typescript-eslint/types/4.28.3:
     resolution: {integrity: sha512-kQFaEsQBQVtA9VGVyciyTbIg7S3WoKHNuOp/UF5RG40900KtGqfoiETWD/v0lzRXc+euVE9NXmfer9dLkUJrkA==}
     engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
-    peerDependencies:
-      typescript: '*'
-    dependencies:
-      typescript: 3.9.10
-    dev: true
-
-  /@typescript-eslint/types/4.28.3_typescript@4.3.5:
-    resolution: {integrity: sha512-kQFaEsQBQVtA9VGVyciyTbIg7S3WoKHNuOp/UF5RG40900KtGqfoiETWD/v0lzRXc+euVE9NXmfer9dLkUJrkA==}
-    engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
-    peerDependencies:
-      typescript: '*'
-    dependencies:
-      typescript: 4.3.5
     dev: true
 
   /@typescript-eslint/typescript-estree/4.28.3_typescript@3.9.10:
@@ -311,8 +286,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 4.28.3_typescript@3.9.10
-      '@typescript-eslint/visitor-keys': 4.28.3_typescript@3.9.10
+      '@typescript-eslint/types': 4.28.3
+      '@typescript-eslint/visitor-keys': 4.28.3
       debug: 4.3.1
       globby: 11.0.4
       is-glob: 4.0.1
@@ -332,8 +307,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 4.28.3_typescript@4.3.5
-      '@typescript-eslint/visitor-keys': 4.28.3_typescript@4.3.5
+      '@typescript-eslint/types': 4.28.3
+      '@typescript-eslint/visitor-keys': 4.28.3
       debug: 4.3.1
       globby: 11.0.4
       is-glob: 4.0.1
@@ -344,24 +319,12 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/visitor-keys/4.28.3_typescript@3.9.10:
+  /@typescript-eslint/visitor-keys/4.28.3:
     resolution: {integrity: sha512-ri1OzcLnk1HH4gORmr1dllxDzzrN6goUIz/P4MHFV0YZJDCADPR3RvYNp0PW2SetKTThar6wlbFTL00hV2Q+fg==}
     engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
     dependencies:
-      '@typescript-eslint/types': 4.28.3_typescript@3.9.10
+      '@typescript-eslint/types': 4.28.3
       eslint-visitor-keys: 2.1.0
-    transitivePeerDependencies:
-      - typescript
-    dev: true
-
-  /@typescript-eslint/visitor-keys/4.28.3_typescript@4.3.5:
-    resolution: {integrity: sha512-ri1OzcLnk1HH4gORmr1dllxDzzrN6goUIz/P4MHFV0YZJDCADPR3RvYNp0PW2SetKTThar6wlbFTL00hV2Q+fg==}
-    engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
-    dependencies:
-      '@typescript-eslint/types': 4.28.3_typescript@4.3.5
-      eslint-visitor-keys: 2.1.0
-    transitivePeerDependencies:
-      - typescript
     dev: true
 
   /abbrev/1.1.1:
@@ -3109,10 +3072,10 @@ packages:
       - typescript
     dev: true
 
-  file:../temp/tarballs/rushstack-heft-0.34.6.tgz:
-    resolution: {tarball: file:../temp/tarballs/rushstack-heft-0.34.6.tgz}
+  file:../temp/tarballs/rushstack-heft-0.34.8.tgz:
+    resolution: {tarball: file:../temp/tarballs/rushstack-heft-0.34.8.tgz}
     name: '@rushstack/heft'
-    version: 0.34.6
+    version: 0.34.8
     engines: {node: '>=10.13.0'}
     hasBin: true
     dependencies:

From a5f16cc3943ffd9eddf02662bedfb1df94ac845e Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonasb@users.noreply.github.com>
Date: Mon, 19 Jul 2021 18:30:33 +0200
Subject: [PATCH 025/155] Extract default sass plugin from heft to its own
 heft-sass-plugin

---
 apps/heft/package.json                        |  4 --
 .../heft/src/pluginFramework/PluginManager.ts |  2 -
 apps/heft/src/templates/sass.json             | 47 ----------------
 apps/heft/src/utilities/CoreConfigFiles.ts    | 23 --------
 apps/heft/tsconfig.json                       |  2 +-
 build-tests/heft-sass-test/config/heft.json   |  6 +++
 build-tests/heft-sass-test/package.json       |  1 +
 .../rush/browser-approved-packages.json       |  4 ++
 common/config/rush/pnpm-lock.yaml             | 45 +++++++++++++---
 common/config/rush/repo-state.json            |  2 +-
 common/reviews/api/heft-sass-plugin.api.md    | 13 +++++
 heft-plugins/heft-sass-plugin/.eslintrc.js    | 10 ++++
 heft-plugins/heft-sass-plugin/.npmignore      | 30 +++++++++++
 heft-plugins/heft-sass-plugin/LICENSE         | 24 +++++++++
 heft-plugins/heft-sass-plugin/README.md       | 11 ++++
 .../config/api-extractor.json                 | 16 ++++++
 heft-plugins/heft-sass-plugin/config/rig.json |  7 +++
 .../custom-typings/postcss-modules/index.d.ts |  0
 heft-plugins/heft-sass-plugin/package.json    | 39 ++++++++++++++
 .../src}/SassTypingsGenerator.ts              |  6 +--
 .../src}/SassTypingsPlugin.ts                 | 53 ++++++++++++++-----
 heft-plugins/heft-sass-plugin/src/index.ts    | 16 ++++++
 .../src/schemas/heft-sass-plugin.schema.json  |  0
 heft-plugins/heft-sass-plugin/tsconfig.json   |  8 +++
 rush.json                                     |  6 +++
 25 files changed, 273 insertions(+), 102 deletions(-)
 delete mode 100644 apps/heft/src/templates/sass.json
 create mode 100644 common/reviews/api/heft-sass-plugin.api.md
 create mode 100644 heft-plugins/heft-sass-plugin/.eslintrc.js
 create mode 100644 heft-plugins/heft-sass-plugin/.npmignore
 create mode 100644 heft-plugins/heft-sass-plugin/LICENSE
 create mode 100644 heft-plugins/heft-sass-plugin/README.md
 create mode 100644 heft-plugins/heft-sass-plugin/config/api-extractor.json
 create mode 100644 heft-plugins/heft-sass-plugin/config/rig.json
 rename {apps/heft => heft-plugins/heft-sass-plugin}/custom-typings/postcss-modules/index.d.ts (100%)
 create mode 100644 heft-plugins/heft-sass-plugin/package.json
 rename {apps/heft/src/plugins/SassTypingsPlugin => heft-plugins/heft-sass-plugin/src}/SassTypingsGenerator.ts (100%)
 rename {apps/heft/src/plugins/SassTypingsPlugin => heft-plugins/heft-sass-plugin/src}/SassTypingsPlugin.ts (56%)
 create mode 100644 heft-plugins/heft-sass-plugin/src/index.ts
 rename apps/heft/src/schemas/sass.schema.json => heft-plugins/heft-sass-plugin/src/schemas/heft-sass-plugin.schema.json (100%)
 create mode 100644 heft-plugins/heft-sass-plugin/tsconfig.json

diff --git a/apps/heft/package.json b/apps/heft/package.json
index eb2c1476b85..9ef1bbe6b85 100644
--- a/apps/heft/package.json
+++ b/apps/heft/package.json
@@ -42,9 +42,6 @@
     "fast-glob": "~3.2.4",
     "glob": "~7.0.5",
     "glob-escape": "~0.0.2",
-    "node-sass": "5.0.0",
-    "postcss": "7.0.32",
-    "postcss-modules": "~1.5.0",
     "prettier": "~2.3.0",
     "semver": "~7.3.0",
     "tapable": "1.1.3",
@@ -60,7 +57,6 @@
     "@types/glob": "7.1.1",
     "@types/heft-jest": "1.0.1",
     "@types/node": "10.17.13",
-    "@types/node-sass": "4.11.1",
     "@types/semver": "7.3.5",
     "colors": "~1.2.1",
     "tslint": "~5.20.1",
diff --git a/apps/heft/src/pluginFramework/PluginManager.ts b/apps/heft/src/pluginFramework/PluginManager.ts
index 74243950397..3da2fa7ea6a 100644
--- a/apps/heft/src/pluginFramework/PluginManager.ts
+++ b/apps/heft/src/pluginFramework/PluginManager.ts
@@ -20,7 +20,6 @@ import { DeleteGlobsPlugin } from '../plugins/DeleteGlobsPlugin';
 import { CopyStaticAssetsPlugin } from '../plugins/CopyStaticAssetsPlugin';
 import { RunScriptPlugin } from '../plugins/RunScriptPlugin';
 import { ApiExtractorPlugin } from '../plugins/ApiExtractorPlugin/ApiExtractorPlugin';
-import { SassTypingsPlugin } from '../plugins/SassTypingsPlugin/SassTypingsPlugin';
 import { ProjectValidatorPlugin } from '../plugins/ProjectValidatorPlugin';
 import { ToolPackageResolver } from '../utilities/ToolPackageResolver';
 import { NodeServicePlugin } from '../plugins/NodeServicePlugin';
@@ -53,7 +52,6 @@ export class PluginManager {
     this._applyPlugin(new DeleteGlobsPlugin());
     this._applyPlugin(new RunScriptPlugin());
     this._applyPlugin(new ApiExtractorPlugin(taskPackageResolver));
-    this._applyPlugin(new SassTypingsPlugin());
     this._applyPlugin(new ProjectValidatorPlugin());
     this._applyPlugin(new NodeServicePlugin());
   }
diff --git a/apps/heft/src/templates/sass.json b/apps/heft/src/templates/sass.json
deleted file mode 100644
index f2bbfd9fc32..00000000000
--- a/apps/heft/src/templates/sass.json
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Configures the Sass Typings plugin for the Heft build system.
- *
- * This optional additional file customizes Sass parsing, module resolution, and emitting of
- * typings files for the Typescript compiler.
- */
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/heft/sass.schema.json"
-
-  /**
-   * Source code root directory.
-   * This is where .css, .sass, and .scss files will be searched for to generate typings.
-   */
-  // "srcFolder": "src",
-
-  /**
-   * Output directory for generated Sass typings.
-   */
-  // "generatedTsFolder": "temp/sass-ts",
-
-  /**
-   * Determines if export values are wrapped in a default property, or not.
-   */
-  // "exportAsDefault": true,
-
-  /**
-   * Files with these extensions will pass through the Sass transpiler for typings generation.
-   */
-  // "fileExtensions": [
-  //   ".sass",
-  //   ".scss",
-  //   ".css
-  // ],
-
-  /**
-   * A list of paths used when resolving Sass imports.
-   */
-  // "importIncludePaths": [
-  //   "node_modules",
-  //   "src"
-  // ],
-
-  /**
-   * A list of file paths relative to the "src" folder that should be excluded from typings generation.
-   */
-  // "excludeFiles": []
-}
diff --git a/apps/heft/src/utilities/CoreConfigFiles.ts b/apps/heft/src/utilities/CoreConfigFiles.ts
index 7d4b66d594a..4850478866f 100644
--- a/apps/heft/src/utilities/CoreConfigFiles.ts
+++ b/apps/heft/src/utilities/CoreConfigFiles.ts
@@ -13,7 +13,6 @@ import { IApiExtractorPluginConfiguration } from '../plugins/ApiExtractorPlugin/
 import { ITypeScriptConfigurationJson } from '../plugins/TypeScriptPlugin/TypeScriptPlugin';
 import { HeftConfiguration } from '../configuration/HeftConfiguration';
 import { Terminal } from '@rushstack/node-core-library';
-import { ISassConfigurationJson } from '../plugins/SassTypingsPlugin/SassTypingsPlugin';
 import { INodeServicePluginConfiguration } from '../plugins/NodeServicePlugin';
 
 export enum HeftEvent {
@@ -125,7 +124,6 @@ export class CoreConfigFiles {
   private static _nodeServiceConfigurationLoader:
     | ConfigurationFile<INodeServicePluginConfiguration>
     | undefined;
-  private static _sassConfigurationFileLoader: ConfigurationFile<ISassConfigurationJson> | undefined;
 
   /**
    * Returns the loader for the `config/heft.json` config file.
@@ -283,27 +281,6 @@ export class CoreConfigFiles {
     return CoreConfigFiles._nodeServiceConfigurationLoader;
   }
 
-  public static get sassConfigurationFileLoader(): ConfigurationFile<ISassConfigurationJson> {
-    const schemaPath: string = path.resolve(__dirname, '..', 'schemas', 'sass.schema.json');
-    CoreConfigFiles._sassConfigurationFileLoader = new ConfigurationFile<ISassConfigurationJson>({
-      projectRelativeFilePath: 'config/sass.json',
-      jsonSchemaPath: schemaPath,
-      jsonPathMetadata: {
-        '$.importIncludePaths.*': {
-          pathResolutionMethod: PathResolutionMethod.resolvePathRelativeToProjectRoot
-        },
-        '$.generatedTsFolder.*': {
-          pathResolutionMethod: PathResolutionMethod.resolvePathRelativeToProjectRoot
-        },
-        '$.srcFolder.*': {
-          pathResolutionMethod: PathResolutionMethod.resolvePathRelativeToProjectRoot
-        }
-      }
-    });
-
-    return CoreConfigFiles._sassConfigurationFileLoader;
-  }
-
   private static _addEventActionToMap<TEventAction extends IHeftConfigurationJsonEventActionBase>(
     eventAction: TEventAction,
     map: Map<HeftEvent, TEventAction[]>
diff --git a/apps/heft/tsconfig.json b/apps/heft/tsconfig.json
index 5f8c39781a3..b7e85cd1768 100644
--- a/apps/heft/tsconfig.json
+++ b/apps/heft/tsconfig.json
@@ -5,5 +5,5 @@
     "typeRoots": ["./custom-typings", "./node_modules/@types/"],
     "types": ["heft-jest", "node"]
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx", "./custom-typings/**/*.ts"]
+  "include": ["src/**/*.ts", "src/**/*.tsx"]
 }
diff --git a/build-tests/heft-sass-test/config/heft.json b/build-tests/heft-sass-test/config/heft.json
index 5ba3c430247..1e7f17a677d 100644
--- a/build-tests/heft-sass-test/config/heft.json
+++ b/build-tests/heft-sass-test/config/heft.json
@@ -52,6 +52,12 @@
        * The path to the plugin package.
        */
       "plugin": "@rushstack/heft-jest-plugin"
+    },
+    {
+      /**
+       * The path to the plugin package.
+       */
+      "plugin": "@rushstack/heft-sass-plugin"
     }
   ]
 }
diff --git a/build-tests/heft-sass-test/package.json b/build-tests/heft-sass-test/package.json
index 78c33518cde..afff23c68fe 100644
--- a/build-tests/heft-sass-test/package.json
+++ b/build-tests/heft-sass-test/package.json
@@ -11,6 +11,7 @@
     "@rushstack/eslint-config": "workspace:*",
     "@rushstack/heft": "workspace:*",
     "@rushstack/heft-jest-plugin": "workspace:*",
+    "@rushstack/heft-sass-plugin": "workspace:*",
     "@rushstack/heft-webpack4-plugin": "workspace:*",
     "@types/heft-jest": "1.0.1",
     "@types/react-dom": "16.9.8",
diff --git a/common/config/rush/browser-approved-packages.json b/common/config/rush/browser-approved-packages.json
index 5e3f614e8b6..24be0af0202 100644
--- a/common/config/rush/browser-approved-packages.json
+++ b/common/config/rush/browser-approved-packages.json
@@ -2,6 +2,10 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/approved-packages.schema.json",
   "packages": [
+    {
+      "name": "@rushstack/heft-sass-plugin",
+      "allowedCategories": [ "tests" ]
+    },
     {
       "name": "react",
       "allowedCategories": [ "tests" ]
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index b6745b09f94..ce56ca3834f 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -122,7 +122,6 @@ importers:
       '@types/glob': 7.1.1
       '@types/heft-jest': 1.0.1
       '@types/node': 10.17.13
-      '@types/node-sass': 4.11.1
       '@types/semver': 7.3.5
       '@types/tapable': 1.0.6
       argparse: ~1.0.9
@@ -131,9 +130,6 @@ importers:
       fast-glob: ~3.2.4
       glob: ~7.0.5
       glob-escape: ~0.0.2
-      node-sass: 5.0.0
-      postcss: 7.0.32
-      postcss-modules: ~1.5.0
       prettier: ~2.3.0
       semver: ~7.3.0
       tapable: 1.1.3
@@ -152,9 +148,6 @@ importers:
       fast-glob: 3.2.7
       glob: 7.0.6
       glob-escape: 0.0.2
-      node-sass: 5.0.0
-      postcss: 7.0.32
-      postcss-modules: 1.5.0
       prettier: 2.3.2
       semver: 7.3.5
       tapable: 1.1.3
@@ -169,7 +162,6 @@ importers:
       '@types/glob': 7.1.1
       '@types/heft-jest': 1.0.1
       '@types/node': 10.17.13
-      '@types/node-sass': 4.11.1
       '@types/semver': 7.3.5
       colors: 1.2.5
       tslint: 5.20.1_typescript@3.9.10
@@ -757,6 +749,7 @@ importers:
       '@rushstack/eslint-config': workspace:*
       '@rushstack/heft': workspace:*
       '@rushstack/heft-jest-plugin': workspace:*
+      '@rushstack/heft-sass-plugin': workspace:*
       '@rushstack/heft-webpack4-plugin': workspace:*
       '@types/heft-jest': 1.0.1
       '@types/react': 16.9.45
@@ -782,6 +775,7 @@ importers:
       '@rushstack/eslint-config': link:../../stack/eslint-config
       '@rushstack/heft': link:../../apps/heft
       '@rushstack/heft-jest-plugin': link:../../heft-plugins/heft-jest-plugin
+      '@rushstack/heft-sass-plugin': link:../../heft-plugins/heft-sass-plugin
       '@rushstack/heft-webpack4-plugin': link:../../heft-plugins/heft-webpack4-plugin
       '@types/heft-jest': 1.0.1
       '@types/react': 16.9.45
@@ -1033,6 +1027,41 @@ importers:
       jest-environment-node: 25.4.0
       typescript: 3.9.10
 
+  ../../heft-plugins/heft-sass-plugin:
+    specifiers:
+      '@microsoft/api-extractor': workspace:*
+      '@rushstack/eslint-config': workspace:*
+      '@rushstack/heft': workspace:*
+      '@rushstack/heft-config-file': workspace:*
+      '@rushstack/heft-node-rig': workspace:*
+      '@rushstack/node-core-library': workspace:*
+      '@rushstack/typings-generator': workspace:*
+      '@types/heft-jest': 1.0.1
+      '@types/node': 10.17.13
+      '@types/node-sass': 4.11.1
+      eslint: ~7.30.0
+      node-sass: 5.0.0
+      postcss: 7.0.32
+      postcss-modules: ~1.5.0
+      typescript: ~3.9.7
+    dependencies:
+      '@rushstack/heft-config-file': link:../../libraries/heft-config-file
+      '@rushstack/node-core-library': link:../../libraries/node-core-library
+      '@rushstack/typings-generator': link:../../libraries/typings-generator
+      node-sass: 5.0.0
+      postcss: 7.0.32
+      postcss-modules: 1.5.0
+    devDependencies:
+      '@microsoft/api-extractor': link:../../apps/api-extractor
+      '@rushstack/eslint-config': link:../../stack/eslint-config
+      '@rushstack/heft': link:../../apps/heft
+      '@rushstack/heft-node-rig': link:../../rigs/heft-node-rig
+      '@types/heft-jest': 1.0.1
+      '@types/node': 10.17.13
+      '@types/node-sass': 4.11.1
+      eslint: 7.30.0
+      typescript: 3.9.10
+
   ../../heft-plugins/heft-webpack4-plugin:
     specifiers:
       '@rushstack/eslint-config': workspace:*
diff --git a/common/config/rush/repo-state.json b/common/config/rush/repo-state.json
index 303ff3c4193..1d371162ce7 100644
--- a/common/config/rush/repo-state.json
+++ b/common/config/rush/repo-state.json
@@ -1,5 +1,5 @@
 // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
 {
-  "pnpmShrinkwrapHash": "f45464cdd2ef1f79ab3446b3edd2384175b1e967",
+  "pnpmShrinkwrapHash": "90d9a6f48b14750485b141fc7547965bcb69bb9f",
   "preferredVersionsHash": "1fbc26d2c5b3248616b9edccd6bef064075243bc"
 }
diff --git a/common/reviews/api/heft-sass-plugin.api.md b/common/reviews/api/heft-sass-plugin.api.md
new file mode 100644
index 00000000000..b00a09a3568
--- /dev/null
+++ b/common/reviews/api/heft-sass-plugin.api.md
@@ -0,0 +1,13 @@
+## API Report File for "@rushstack/heft-sass-plugin"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import type { IHeftPlugin } from '@rushstack/heft';
+
+// @public (undocumented)
+const _default: IHeftPlugin<void>;
+export default _default;
+
+```
diff --git a/heft-plugins/heft-sass-plugin/.eslintrc.js b/heft-plugins/heft-sass-plugin/.eslintrc.js
new file mode 100644
index 00000000000..4c934799d67
--- /dev/null
+++ b/heft-plugins/heft-sass-plugin/.eslintrc.js
@@ -0,0 +1,10 @@
+// This is a workaround for https://github.com/eslint/eslint/issues/3458
+require('@rushstack/eslint-config/patch/modern-module-resolution');
+
+module.exports = {
+  extends: [
+    '@rushstack/eslint-config/profile/node-trusted-tool',
+    '@rushstack/eslint-config/mixins/friendly-locals'
+  ],
+  parserOptions: { tsconfigRootDir: __dirname }
+};
diff --git a/heft-plugins/heft-sass-plugin/.npmignore b/heft-plugins/heft-sass-plugin/.npmignore
new file mode 100644
index 00000000000..0164a20d7a9
--- /dev/null
+++ b/heft-plugins/heft-sass-plugin/.npmignore
@@ -0,0 +1,30 @@
+# THIS IS A STANDARD TEMPLATE FOR .npmignore FILES IN THIS REPO.
+
+# Ignore all files by default, to avoid accidentally publishing unintended files.
+*
+
+# Use negative patterns to bring back the specific things we want to publish.
+!/bin/**
+!/lib/**
+!/lib-*/**
+!/dist/**
+!ThirdPartyNotice.txt
+
+# Ignore certain patterns that should not get published.
+/dist/*.stats.*
+/lib/**/test/
+/lib-*/**/test/
+*.test.js
+
+# NOTE: These don't need to be specified, because NPM includes them automatically.
+#
+# package.json
+# README (and its variants)
+# CHANGELOG (and its variants)
+# LICENSE / LICENCE
+
+#--------------------------------------------
+# DO NOT MODIFY THE TEMPLATE ABOVE THIS LINE
+#--------------------------------------------
+
+# (Add your project-specific overrides here)
diff --git a/heft-plugins/heft-sass-plugin/LICENSE b/heft-plugins/heft-sass-plugin/LICENSE
new file mode 100644
index 00000000000..40e2a06dc72
--- /dev/null
+++ b/heft-plugins/heft-sass-plugin/LICENSE
@@ -0,0 +1,24 @@
+@rushstack/heft-sass-plugin
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/heft-plugins/heft-sass-plugin/README.md b/heft-plugins/heft-sass-plugin/README.md
new file mode 100644
index 00000000000..d8bc571794b
--- /dev/null
+++ b/heft-plugins/heft-sass-plugin/README.md
@@ -0,0 +1,11 @@
+# @rushstack/heft-sass-plugin
+
+This is a Heft plugin for using node-sass during the "build" stage.
+
+## Links
+
+- [CHANGELOG.md](
+  https://github.com/microsoft/rushstack/blob/master/heft-plugins/heft-sass-plugin/CHANGELOG.md) - Find
+  out what's new in the latest version
+
+Heft is part of the [Rush Stack](https://rushstack.io/) family of projects.
diff --git a/heft-plugins/heft-sass-plugin/config/api-extractor.json b/heft-plugins/heft-sass-plugin/config/api-extractor.json
new file mode 100644
index 00000000000..74590d3c4f8
--- /dev/null
+++ b/heft-plugins/heft-sass-plugin/config/api-extractor.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
+
+  "mainEntryPointFilePath": "<projectFolder>/lib/index.d.ts",
+  "apiReport": {
+    "enabled": true,
+    "reportFolder": "../../../common/reviews/api"
+  },
+  "docModel": {
+    "enabled": false
+  },
+  "dtsRollup": {
+    "enabled": true,
+    "betaTrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>.d.ts"
+  }
+}
diff --git a/heft-plugins/heft-sass-plugin/config/rig.json b/heft-plugins/heft-sass-plugin/config/rig.json
new file mode 100644
index 00000000000..6ac88a96368
--- /dev/null
+++ b/heft-plugins/heft-sass-plugin/config/rig.json
@@ -0,0 +1,7 @@
+{
+  // The "rig.json" file directs tools to look for their config files in an external package.
+  // 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": "@rushstack/heft-node-rig"
+}
diff --git a/apps/heft/custom-typings/postcss-modules/index.d.ts b/heft-plugins/heft-sass-plugin/custom-typings/postcss-modules/index.d.ts
similarity index 100%
rename from apps/heft/custom-typings/postcss-modules/index.d.ts
rename to heft-plugins/heft-sass-plugin/custom-typings/postcss-modules/index.d.ts
diff --git a/heft-plugins/heft-sass-plugin/package.json b/heft-plugins/heft-sass-plugin/package.json
new file mode 100644
index 00000000000..fbae5d4cb06
--- /dev/null
+++ b/heft-plugins/heft-sass-plugin/package.json
@@ -0,0 +1,39 @@
+{
+  "name": "@rushstack/heft-sass-plugin",
+  "version": "0.1.0",
+  "description": "Heft plugin for SASS",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/rushstack/tree/master/heft-plugins/heft-sass-plugin"
+  },
+  "homepage": "https://rushstack.io/pages/heft/overview/",
+  "main": "lib/index.js",
+  "types": "dist/heft-sass-plugin.d.ts",
+  "license": "MIT",
+  "scripts": {
+    "build": "heft test --clean",
+    "start": "heft test --clean --watch"
+  },
+  "peerDependencies": {
+    "@rushstack/heft": "^0.34.8"
+  },
+  "dependencies": {
+    "@rushstack/heft-config-file": "workspace:*",
+    "@rushstack/node-core-library": "workspace:*",
+    "@rushstack/typings-generator": "workspace:*",
+    "node-sass": "5.0.0",
+    "postcss": "7.0.32",
+    "postcss-modules": "~1.5.0"
+  },
+  "devDependencies": {
+    "@microsoft/api-extractor": "workspace:*",
+    "@rushstack/eslint-config": "workspace:*",
+    "@rushstack/heft": "workspace:*",
+    "@rushstack/heft-node-rig": "workspace:*",
+    "@types/heft-jest": "1.0.1",
+    "@types/node": "10.17.13",
+    "@types/node-sass": "4.11.1",
+    "eslint": "~7.30.0",
+    "typescript": "~3.9.7"
+  }
+}
diff --git a/apps/heft/src/plugins/SassTypingsPlugin/SassTypingsGenerator.ts b/heft-plugins/heft-sass-plugin/src/SassTypingsGenerator.ts
similarity index 100%
rename from apps/heft/src/plugins/SassTypingsPlugin/SassTypingsGenerator.ts
rename to heft-plugins/heft-sass-plugin/src/SassTypingsGenerator.ts
index 8ba7510cd8c..723ee004760 100644
--- a/apps/heft/src/plugins/SassTypingsPlugin/SassTypingsGenerator.ts
+++ b/heft-plugins/heft-sass-plugin/src/SassTypingsGenerator.ts
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import * as path from 'path';
+import { LegacyAdapters } from '@rushstack/node-core-library';
+import { IStringValueTypings, StringValuesTypingsGenerator } from '@rushstack/typings-generator';
 import { render, Result } from 'node-sass';
+import * as path from 'path';
 import postcss from 'postcss';
 import cssModules from 'postcss-modules';
-import { LegacyAdapters } from '@rushstack/node-core-library';
-import { IStringValueTypings, StringValuesTypingsGenerator } from '@rushstack/typings-generator';
 
 /**
  * @public
diff --git a/apps/heft/src/plugins/SassTypingsPlugin/SassTypingsPlugin.ts b/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
similarity index 56%
rename from apps/heft/src/plugins/SassTypingsPlugin/SassTypingsPlugin.ts
rename to heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
index 951cdc3cb73..f39f4c2e59b 100644
--- a/apps/heft/src/plugins/SassTypingsPlugin/SassTypingsPlugin.ts
+++ b/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
@@ -1,21 +1,28 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import { IHeftPlugin } from '../../pluginFramework/IHeftPlugin';
-import { HeftSession } from '../../pluginFramework/HeftSession';
-import { HeftConfiguration } from '../../configuration/HeftConfiguration';
-import { IBuildStageContext, IPreCompileSubstage } from '../../stages/BuildStage';
+import {
+  HeftConfiguration,
+  HeftSession,
+  IBuildStageContext,
+  IHeftPlugin,
+  IPreCompileSubstage,
+  ScopedLogger
+} from '@rushstack/heft';
+import { ConfigurationFile, PathResolutionMethod } from '@rushstack/heft-config-file';
+import { JsonSchema } from '@rushstack/node-core-library';
+import * as path from 'path';
 import { ISassConfiguration, SassTypingsGenerator } from './SassTypingsGenerator';
-import { CoreConfigFiles } from '../../utilities/CoreConfigFiles';
-import { ScopedLogger } from '../../pluginFramework/logging/ScopedLogger';
-import { Async } from '../../utilities/Async';
 
 export interface ISassConfigurationJson extends ISassConfiguration {}
 
 const PLUGIN_NAME: string = 'SassTypingsPlugin';
+const PLUGIN_SCHEMA_PATH: string = path.resolve(__dirname, 'schemas', 'heft-sass-plugin.schema.json');
+const SASS_CONFIGURATION_LOCATION: string = `config/sass.json`;
 
 export class SassTypingsPlugin implements IHeftPlugin {
   public readonly pluginName: string = PLUGIN_NAME;
+  public readonly optionsSchema: JsonSchema = JsonSchema.fromFile(PLUGIN_SCHEMA_PATH);
 
   /**
    * Generate typings for Sass files before TypeScript compilation.
@@ -51,7 +58,11 @@ export class SassTypingsPlugin implements IHeftPlugin {
 
     await sassTypingsGenerator.generateTypingsAsync();
     if (isWatchMode) {
-      Async.runWatcherWithErrorHandling(async () => await sassTypingsGenerator.runWatcherAsync(), logger);
+      try {
+        await sassTypingsGenerator.runWatcherAsync();
+      } catch (e) {
+        logger.emitError(e);
+      }
     }
   }
 
@@ -61,14 +72,30 @@ export class SassTypingsPlugin implements IHeftPlugin {
   ): Promise<ISassConfiguration> {
     const { buildFolder } = heftConfiguration;
     const sassConfigurationJson: ISassConfigurationJson | undefined =
-      await CoreConfigFiles.sassConfigurationFileLoader.tryLoadConfigurationFileForProjectAsync(
-        logger.terminal,
-        buildFolder,
-        heftConfiguration.rigConfig
-      );
+      await SassTypingsPlugin._getSassConfigurationLoader(
+        buildFolder
+      ).tryLoadConfigurationFileForProjectAsync(logger.terminal, buildFolder, heftConfiguration.rigConfig);
 
     return {
       ...sassConfigurationJson
     };
   }
+
+  private static _getSassConfigurationLoader(buildFolder: string): ConfigurationFile<ISassConfigurationJson> {
+    return new ConfigurationFile<ISassConfigurationJson>({
+      projectRelativeFilePath: SASS_CONFIGURATION_LOCATION,
+      jsonSchemaPath: PLUGIN_SCHEMA_PATH,
+      jsonPathMetadata: {
+        '$.importIncludePaths.*': {
+          pathResolutionMethod: PathResolutionMethod.resolvePathRelativeToProjectRoot
+        },
+        '$.generatedTsFolder.*': {
+          pathResolutionMethod: PathResolutionMethod.resolvePathRelativeToProjectRoot
+        },
+        '$.srcFolder.*': {
+          pathResolutionMethod: PathResolutionMethod.resolvePathRelativeToProjectRoot
+        }
+      }
+    });
+  }
 }
diff --git a/heft-plugins/heft-sass-plugin/src/index.ts b/heft-plugins/heft-sass-plugin/src/index.ts
new file mode 100644
index 00000000000..a454598eabf
--- /dev/null
+++ b/heft-plugins/heft-sass-plugin/src/index.ts
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
+
+/**
+ * A Heft plugin for using node-sass during the "build" stage.
+ *
+ * @packageDocumentation
+ */
+
+import type { IHeftPlugin } from '@rushstack/heft';
+import { SassTypingsPlugin } from './SassTypingsPlugin';
+
+/**
+ * @internal
+ */
+export default new SassTypingsPlugin() as IHeftPlugin;
diff --git a/apps/heft/src/schemas/sass.schema.json b/heft-plugins/heft-sass-plugin/src/schemas/heft-sass-plugin.schema.json
similarity index 100%
rename from apps/heft/src/schemas/sass.schema.json
rename to heft-plugins/heft-sass-plugin/src/schemas/heft-sass-plugin.schema.json
diff --git a/heft-plugins/heft-sass-plugin/tsconfig.json b/heft-plugins/heft-sass-plugin/tsconfig.json
new file mode 100644
index 00000000000..ff8c38a3615
--- /dev/null
+++ b/heft-plugins/heft-sass-plugin/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json",
+
+  "compilerOptions": {
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts", "./custom-typings/**/*.ts"]
+}
diff --git a/rush.json b/rush.json
index 1fc7c74ce02..52fa9c0bcdf 100644
--- a/rush.json
+++ b/rush.json
@@ -693,6 +693,12 @@
       "reviewCategory": "libraries",
       "shouldPublish": true
     },
+    {
+      "packageName": "@rushstack/heft-sass-plugin",
+      "projectFolder": "heft-plugins/heft-sass-plugin",
+      "reviewCategory": "libraries",
+      "shouldPublish": true
+    },
     {
       "packageName": "@rushstack/heft-webpack4-plugin",
       "projectFolder": "heft-plugins/heft-webpack4-plugin",

From d6e182db6a283e0c26934dc54300b4b5164932cb Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonasb@users.noreply.github.com>
Date: Mon, 19 Jul 2021 19:10:56 +0200
Subject: [PATCH 026/155] Add heft-sass-plugin to heft-web-rig

---
 common/config/rush/browser-approved-packages.json   | 2 +-
 common/config/rush/pnpm-lock.yaml                   | 2 ++
 common/config/rush/repo-state.json                  | 2 +-
 rigs/heft-web-rig/package.json                      | 1 +
 rigs/heft-web-rig/profiles/library/config/heft.json | 3 +++
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/config/rush/browser-approved-packages.json b/common/config/rush/browser-approved-packages.json
index 24be0af0202..71e1362d4cf 100644
--- a/common/config/rush/browser-approved-packages.json
+++ b/common/config/rush/browser-approved-packages.json
@@ -4,7 +4,7 @@
   "packages": [
     {
       "name": "@rushstack/heft-sass-plugin",
-      "allowedCategories": [ "tests" ]
+      "allowedCategories": [ "libraries", "tests" ]
     },
     {
       "name": "react",
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index ce56ca3834f..2394ba9a603 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -1440,12 +1440,14 @@ importers:
       '@microsoft/api-extractor': workspace:*
       '@rushstack/heft': workspace:*
       '@rushstack/heft-jest-plugin': workspace:*
+      '@rushstack/heft-sass-plugin': workspace:*
       '@rushstack/heft-webpack4-plugin': workspace:*
       eslint: ~7.30.0
       typescript: ~3.9.7
     dependencies:
       '@microsoft/api-extractor': link:../../apps/api-extractor
       '@rushstack/heft-jest-plugin': link:../../heft-plugins/heft-jest-plugin
+      '@rushstack/heft-sass-plugin': link:../../heft-plugins/heft-sass-plugin
       '@rushstack/heft-webpack4-plugin': link:../../heft-plugins/heft-webpack4-plugin
       eslint: 7.30.0
       typescript: 3.9.10
diff --git a/common/config/rush/repo-state.json b/common/config/rush/repo-state.json
index 1d371162ce7..244d049d3f1 100644
--- a/common/config/rush/repo-state.json
+++ b/common/config/rush/repo-state.json
@@ -1,5 +1,5 @@
 // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
 {
-  "pnpmShrinkwrapHash": "90d9a6f48b14750485b141fc7547965bcb69bb9f",
+  "pnpmShrinkwrapHash": "8fb763370a2c88dbe218ee6779ec6fd898cbcfa0",
   "preferredVersionsHash": "1fbc26d2c5b3248616b9edccd6bef064075243bc"
 }
diff --git a/rigs/heft-web-rig/package.json b/rigs/heft-web-rig/package.json
index 3ea4a6cac1f..0e35dcad249 100644
--- a/rigs/heft-web-rig/package.json
+++ b/rigs/heft-web-rig/package.json
@@ -16,6 +16,7 @@
   "dependencies": {
     "@microsoft/api-extractor": "workspace:*",
     "@rushstack/heft-jest-plugin": "workspace:*",
+    "@rushstack/heft-sass-plugin": "workspace:*",
     "@rushstack/heft-webpack4-plugin": "workspace:*",
     "eslint": "~7.30.0",
     "typescript": "~3.9.7"
diff --git a/rigs/heft-web-rig/profiles/library/config/heft.json b/rigs/heft-web-rig/profiles/library/config/heft.json
index 376ab2e6cce..890e3d75b94 100644
--- a/rigs/heft-web-rig/profiles/library/config/heft.json
+++ b/rigs/heft-web-rig/profiles/library/config/heft.json
@@ -49,6 +49,9 @@
     },
     {
       "plugin": "@rushstack/heft-jest-plugin"
+    },
+    {
+      "plugin": "@rushstack/heft-sass-plugin"
     }
   ]
 }

From 4c9027ebdee82e2de36127485047edb5ff547baf Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonasb@users.noreply.github.com>
Date: Mon, 19 Jul 2021 19:17:09 +0200
Subject: [PATCH 027/155] Update UPGRADING to reflect breaking change of
 heft-sass-plugin

---
 apps/heft/UPGRADING.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/apps/heft/UPGRADING.md b/apps/heft/UPGRADING.md
index 036f2ef781b..618a0a926bc 100644
--- a/apps/heft/UPGRADING.md
+++ b/apps/heft/UPGRADING.md
@@ -1,5 +1,25 @@
 # Upgrade notes for @rushstack/heft
 
+### Heft 0.XX.0
+
+This release of Heft removed the Sass plugin from the `@rushstack/heft` package
+and moved it into its own package (`@rushstack/heft-sass-plugin`). To reenable
+Sass support in a project, include a dependency on `@rushstack/heft-sass-plugin`
+and add the following option to the project's `config/heft.json` file:
+
+```JSON
+{
+  "heftPlugins": [
+    {
+      "plugin": "@rushstack/heft-sass-plugin"
+    }
+  ]
+}
+```
+
+If you are using `@rushstack/heft-web-rig`, upgrading the rig package will bring
+Sass support automatically.
+
 ### Heft 0.32.0
 
 Breaking change for Jest:  This release of Heft enables rig support for Jest config files.

From 60c689e7eca22aec937f9ccf3bac1bba230eecac Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonasb@users.noreply.github.com>
Date: Mon, 19 Jul 2021 19:25:46 +0200
Subject: [PATCH 028/155] rush change

---
 .../heft-sass-plugin/master_2021-07-19-17-25.json     | 11 +++++++++++
 .../heft-web-rig/master_2021-07-19-17-25.json         | 11 +++++++++++
 .../@rushstack/heft/master_2021-07-19-17-25.json      | 11 +++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 common/changes/@rushstack/heft-sass-plugin/master_2021-07-19-17-25.json
 create mode 100644 common/changes/@rushstack/heft-web-rig/master_2021-07-19-17-25.json
 create mode 100644 common/changes/@rushstack/heft/master_2021-07-19-17-25.json

diff --git a/common/changes/@rushstack/heft-sass-plugin/master_2021-07-19-17-25.json b/common/changes/@rushstack/heft-sass-plugin/master_2021-07-19-17-25.json
new file mode 100644
index 00000000000..63993880c86
--- /dev/null
+++ b/common/changes/@rushstack/heft-sass-plugin/master_2021-07-19-17-25.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/heft-sass-plugin",
+      "comment": "Extract default Sass plugin to separate package",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@rushstack/heft-sass-plugin",
+  "email": "jonasb@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-web-rig/master_2021-07-19-17-25.json b/common/changes/@rushstack/heft-web-rig/master_2021-07-19-17-25.json
new file mode 100644
index 00000000000..75f6daededb
--- /dev/null
+++ b/common/changes/@rushstack/heft-web-rig/master_2021-07-19-17-25.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/heft-web-rig",
+      "comment": "Use newly extracted Sass plugin (@rushstack/heft-sass-plugin)",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@rushstack/heft-web-rig",
+  "email": "jonasb@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft/master_2021-07-19-17-25.json b/common/changes/@rushstack/heft/master_2021-07-19-17-25.json
new file mode 100644
index 00000000000..85e2c0b3eae
--- /dev/null
+++ b/common/changes/@rushstack/heft/master_2021-07-19-17-25.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/heft",
+      "comment": "Extract default Sass plugin to separate @rushstack/heft-sass-plugin package",
+      "type": "major"
+    }
+  ],
+  "packageName": "@rushstack/heft",
+  "email": "jonasb@users.noreply.github.com"
+}
\ No newline at end of file

From 0d1c578a018d9d85cf55078c08977a83a5b2c645 Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonasb@users.noreply.github.com>
Date: Tue, 20 Jul 2021 11:33:56 +0200
Subject: [PATCH 029/155] Move heft-sass-plugin from browser-approved-packages
 to nonbrowser-approved-packages

---
 common/config/rush/browser-approved-packages.json    | 4 ----
 common/config/rush/nonbrowser-approved-packages.json | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/config/rush/browser-approved-packages.json b/common/config/rush/browser-approved-packages.json
index 71e1362d4cf..5e3f614e8b6 100644
--- a/common/config/rush/browser-approved-packages.json
+++ b/common/config/rush/browser-approved-packages.json
@@ -2,10 +2,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/approved-packages.schema.json",
   "packages": [
-    {
-      "name": "@rushstack/heft-sass-plugin",
-      "allowedCategories": [ "libraries", "tests" ]
-    },
     {
       "name": "react",
       "allowedCategories": [ "tests" ]
diff --git a/common/config/rush/nonbrowser-approved-packages.json b/common/config/rush/nonbrowser-approved-packages.json
index 9942da84d99..2d1c560521a 100644
--- a/common/config/rush/nonbrowser-approved-packages.json
+++ b/common/config/rush/nonbrowser-approved-packages.json
@@ -102,6 +102,10 @@
       "name": "@rushstack/heft-node-rig",
       "allowedCategories": [ "libraries", "tests" ]
     },
+    {
+      "name": "@rushstack/heft-sass-plugin",
+      "allowedCategories": [ "libraries", "tests" ]
+    },
     {
       "name": "@rushstack/heft-web-rig",
       "allowedCategories": [ "libraries", "tests" ]

From 2a3218a150da93d4433190c8b176e01eab80e63d Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonasb@users.noreply.github.com>
Date: Tue, 20 Jul 2021 11:44:20 +0200
Subject: [PATCH 030/155] Reorder imports and remove unused parameter in
 SassTypingsPlugin

---
 .../heft-sass-plugin/src/SassTypingsPlugin.ts      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts b/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
index f39f4c2e59b..d91b0a91ecc 100644
--- a/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
+++ b/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
+import * as path from 'path';
 import {
   HeftConfiguration,
   HeftSession,
@@ -11,14 +12,13 @@ import {
 } from '@rushstack/heft';
 import { ConfigurationFile, PathResolutionMethod } from '@rushstack/heft-config-file';
 import { JsonSchema } from '@rushstack/node-core-library';
-import * as path from 'path';
 import { ISassConfiguration, SassTypingsGenerator } from './SassTypingsGenerator';
 
 export interface ISassConfigurationJson extends ISassConfiguration {}
 
 const PLUGIN_NAME: string = 'SassTypingsPlugin';
 const PLUGIN_SCHEMA_PATH: string = path.resolve(__dirname, 'schemas', 'heft-sass-plugin.schema.json');
-const SASS_CONFIGURATION_LOCATION: string = `config/sass.json`;
+const SASS_CONFIGURATION_LOCATION: string = 'config/sass.json';
 
 export class SassTypingsPlugin implements IHeftPlugin {
   public readonly pluginName: string = PLUGIN_NAME;
@@ -72,16 +72,18 @@ export class SassTypingsPlugin implements IHeftPlugin {
   ): Promise<ISassConfiguration> {
     const { buildFolder } = heftConfiguration;
     const sassConfigurationJson: ISassConfigurationJson | undefined =
-      await SassTypingsPlugin._getSassConfigurationLoader(
-        buildFolder
-      ).tryLoadConfigurationFileForProjectAsync(logger.terminal, buildFolder, heftConfiguration.rigConfig);
+      await SassTypingsPlugin._getSassConfigurationLoader().tryLoadConfigurationFileForProjectAsync(
+        logger.terminal,
+        buildFolder,
+        heftConfiguration.rigConfig
+      );
 
     return {
       ...sassConfigurationJson
     };
   }
 
-  private static _getSassConfigurationLoader(buildFolder: string): ConfigurationFile<ISassConfigurationJson> {
+  private static _getSassConfigurationLoader(): ConfigurationFile<ISassConfigurationJson> {
     return new ConfigurationFile<ISassConfigurationJson>({
       projectRelativeFilePath: SASS_CONFIGURATION_LOCATION,
       jsonSchemaPath: PLUGIN_SCHEMA_PATH,

From ab53b26ce8e289a5fa633b3d63ad2eddfe9109e6 Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonasb@users.noreply.github.com>
Date: Tue, 20 Jul 2021 11:48:58 +0200
Subject: [PATCH 031/155] Cleanup tsconfig for heft

---
 apps/heft/tsconfig.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/heft/tsconfig.json b/apps/heft/tsconfig.json
index b7e85cd1768..fbc2f5c0a6c 100644
--- a/apps/heft/tsconfig.json
+++ b/apps/heft/tsconfig.json
@@ -2,8 +2,6 @@
   "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json",
 
   "compilerOptions": {
-    "typeRoots": ["./custom-typings", "./node_modules/@types/"],
     "types": ["heft-jest", "node"]
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx"]
+  }
 }

From 2abf8d5f7830719f872bbb11d1fdc12746bd4fa4 Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonasb@users.noreply.github.com>
Date: Tue, 20 Jul 2021 12:11:17 +0200
Subject: [PATCH 032/155] Use Async.runWatcherWithErrorHandling() from heft for
 heft-sass-plugin watch mode

---
 .../heft-sass-plugin/src/SassTypingsPlugin.ts      |  7 ++-----
 .../heft-sass-plugin/src/utilities/Async.ts        | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 heft-plugins/heft-sass-plugin/src/utilities/Async.ts

diff --git a/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts b/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
index d91b0a91ecc..a1409fb942c 100644
--- a/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
+++ b/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
@@ -13,6 +13,7 @@ import {
 import { ConfigurationFile, PathResolutionMethod } from '@rushstack/heft-config-file';
 import { JsonSchema } from '@rushstack/node-core-library';
 import { ISassConfiguration, SassTypingsGenerator } from './SassTypingsGenerator';
+import { Async } from './utilities/Async';
 
 export interface ISassConfigurationJson extends ISassConfiguration {}
 
@@ -58,11 +59,7 @@ export class SassTypingsPlugin implements IHeftPlugin {
 
     await sassTypingsGenerator.generateTypingsAsync();
     if (isWatchMode) {
-      try {
-        await sassTypingsGenerator.runWatcherAsync();
-      } catch (e) {
-        logger.emitError(e);
-      }
+      Async.runWatcherWithErrorHandling(async () => await sassTypingsGenerator.runWatcherAsync(), logger);
     }
   }
 
diff --git a/heft-plugins/heft-sass-plugin/src/utilities/Async.ts b/heft-plugins/heft-sass-plugin/src/utilities/Async.ts
new file mode 100644
index 00000000000..c3e3a4ba30a
--- /dev/null
+++ b/heft-plugins/heft-sass-plugin/src/utilities/Async.ts
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
+
+import { ScopedLogger } from '@rushstack/heft';
+
+export class Async {
+  public static runWatcherWithErrorHandling(fn: () => Promise<void>, scopedLogger: ScopedLogger): void {
+    try {
+      fn().catch((e) => scopedLogger.emitError(e));
+    } catch (e) {
+      scopedLogger.emitError(e);
+    }
+  }
+}

From 0979aba7a12e0b2a4416c78a4219838a0e572101 Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonasb@users.noreply.github.com>
Date: Tue, 20 Jul 2021 23:06:40 +0200
Subject: [PATCH 033/155] Specify next minor version in UPGRADING.md

---
 apps/heft/UPGRADING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/heft/UPGRADING.md b/apps/heft/UPGRADING.md
index 618a0a926bc..54586a55651 100644
--- a/apps/heft/UPGRADING.md
+++ b/apps/heft/UPGRADING.md
@@ -1,6 +1,6 @@
 # Upgrade notes for @rushstack/heft
 
-### Heft 0.XX.0
+### Heft 0.35.0
 
 This release of Heft removed the Sass plugin from the `@rushstack/heft` package
 and moved it into its own package (`@rushstack/heft-sass-plugin`). To reenable

From e196e3e93325fb037888bf75c7466a24e4ce907d Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonasb@users.noreply.github.com>
Date: Tue, 20 Jul 2021 23:07:55 +0200
Subject: [PATCH 034/155] Modify change of @rushstack/heft from major to minor

---
 common/changes/@rushstack/heft/master_2021-07-19-17-25.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/changes/@rushstack/heft/master_2021-07-19-17-25.json b/common/changes/@rushstack/heft/master_2021-07-19-17-25.json
index 85e2c0b3eae..b46d02785a9 100644
--- a/common/changes/@rushstack/heft/master_2021-07-19-17-25.json
+++ b/common/changes/@rushstack/heft/master_2021-07-19-17-25.json
@@ -3,7 +3,7 @@
     {
       "packageName": "@rushstack/heft",
       "comment": "Extract default Sass plugin to separate @rushstack/heft-sass-plugin package",
-      "type": "major"
+      "type": "minor"
     }
   ],
   "packageName": "@rushstack/heft",

From ebb2ee97358670c52e51260f2ae71fc59602c322 Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonasb@users.noreply.github.com>
Date: Tue, 20 Jul 2021 23:11:08 +0200
Subject: [PATCH 035/155] Reorder imports in SassTypingsGenerator

---
 heft-plugins/heft-sass-plugin/src/SassTypingsGenerator.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/heft-plugins/heft-sass-plugin/src/SassTypingsGenerator.ts b/heft-plugins/heft-sass-plugin/src/SassTypingsGenerator.ts
index 723ee004760..8ba7510cd8c 100644
--- a/heft-plugins/heft-sass-plugin/src/SassTypingsGenerator.ts
+++ b/heft-plugins/heft-sass-plugin/src/SassTypingsGenerator.ts
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import { LegacyAdapters } from '@rushstack/node-core-library';
-import { IStringValueTypings, StringValuesTypingsGenerator } from '@rushstack/typings-generator';
-import { render, Result } from 'node-sass';
 import * as path from 'path';
+import { render, Result } from 'node-sass';
 import postcss from 'postcss';
 import cssModules from 'postcss-modules';
+import { LegacyAdapters } from '@rushstack/node-core-library';
+import { IStringValueTypings, StringValuesTypingsGenerator } from '@rushstack/typings-generator';
 
 /**
  * @public

From f0fb51c5850ed134e11682673a4d32c80659d7f0 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Thu, 1 Jul 2021 17:24:42 -0700
Subject: [PATCH 036/155] Assorted Updates to ModuleMinifierPlugin

---
 .../reviews/api/module-minifier-plugin.api.md |  12 +-
 .../src/GenerateLicenseFileForAsset.ts        |  30 +-
 .../src/ModuleMinifierPlugin.ts               | 633 ++++++++++--------
 .../src/ModuleMinifierPlugin.types.ts         |  35 +-
 .../src/NoopMinifier.ts                       |   3 +-
 .../src/PortableMinifierIdsPlugin.ts          | 160 ++---
 .../src/WorkerPoolMinifier.ts                 |  14 +-
 .../src/terser/MinifySingleFile.ts            |  52 +-
 .../src/test/MinifySingleFile.test.ts         |  21 +
 .../src/test/RehydrateAsset.test.ts           |  19 -
 .../MinifySingleFile.test.ts.snap             |  10 +
 .../src/workerPool/WorkerPool.ts              |   2 +-
 12 files changed, 510 insertions(+), 481 deletions(-)
 create mode 100644 webpack/module-minifier-plugin/src/test/MinifySingleFile.test.ts
 create mode 100644 webpack/module-minifier-plugin/src/test/__snapshots__/MinifySingleFile.test.ts.snap

diff --git a/common/reviews/api/module-minifier-plugin.api.md b/common/reviews/api/module-minifier-plugin.api.md
index ebcfdb4af23..3b71010f217 100644
--- a/common/reviews/api/module-minifier-plugin.api.md
+++ b/common/reviews/api/module-minifier-plugin.api.md
@@ -24,7 +24,6 @@ export function generateLicenseFileForAsset(compilation: webpack.compilation.Com
 export interface IAssetInfo {
     chunk: webpack.compilation.Chunk;
     externalNames: Map<string, string>;
-    extractedComments: string[];
     fileName: string;
     modules: (string | number)[];
     source: Source;
@@ -50,14 +49,13 @@ export interface IExtendedModule extends webpack.compilation.Module {
     external?: boolean;
     id: string | number | null;
     identifier(): string;
+    modules?: IExtendedModule[];
     readableIdentifier(requestShortener: unknown): string;
     resource?: string;
-    skipMinification?: boolean;
 }
 
 // @public
 export interface IModuleInfo {
-    extractedComments: string[];
     module: IExtendedModule;
     source: Source;
 }
@@ -75,7 +73,6 @@ export interface IModuleMinificationCallback {
 export interface IModuleMinificationErrorResult {
     code?: undefined;
     error: Error;
-    extractedComments?: undefined;
     hash: string;
     map?: undefined;
 }
@@ -95,7 +92,6 @@ export type IModuleMinificationResult = IModuleMinificationErrorResult | IModule
 export interface IModuleMinificationSuccessResult {
     code: string;
     error: undefined;
-    extractedComments: string[];
     hash: string;
     map?: RawSourceMap;
 }
@@ -146,6 +142,12 @@ export interface ISynchronousMinifierOptions {
     terserOptions?: MinifyOptions;
 }
 
+// @internal
+export interface _IWebpackCompilationData {
+    // (undocumented)
+    normalModuleFactory: webpack.compilation.NormalModuleFactory;
+}
+
 // @public
 export interface IWorkerPoolMinifierOptions {
     maxThreads?: number;
diff --git a/webpack/module-minifier-plugin/src/GenerateLicenseFileForAsset.ts b/webpack/module-minifier-plugin/src/GenerateLicenseFileForAsset.ts
index f259016ce07..695069d0f4f 100644
--- a/webpack/module-minifier-plugin/src/GenerateLicenseFileForAsset.ts
+++ b/webpack/module-minifier-plugin/src/GenerateLicenseFileForAsset.ts
@@ -4,7 +4,25 @@
 import * as path from 'path';
 import * as webpack from 'webpack';
 import { ConcatSource } from 'webpack-sources';
-import { IAssetInfo, IModuleMap, IModuleInfo } from './ModuleMinifierPlugin.types';
+import { IAssetInfo, IModuleMap, IModuleInfo, IExtendedModule } from './ModuleMinifierPlugin.types';
+
+function* iterateAllComments(moduleIds: (string | number)[], minifiedModules: IModuleMap): Iterable<string> {
+  for (const moduleId of moduleIds) {
+    const mod: IModuleInfo | undefined = minifiedModules.get(moduleId);
+    if (!mod) {
+      continue;
+    }
+
+    const { module: webpackModule } = mod;
+    const modules: IExtendedModule[] = webpackModule.modules || [webpackModule];
+    for (const submodule of modules) {
+      const { comments: subModuleComments } = submodule.factoryMeta;
+      if (subModuleComments) {
+        yield* subModuleComments;
+      }
+    }
+  }
+}
 
 /**
  * Generates a companion asset containing all extracted comments. If it is non-empty, returns a banner comment directing users to said companion asset.
@@ -22,15 +40,7 @@ export function generateLicenseFileForAsset(
 ): string {
   // Extracted comments from the minified asset and from the modules.
   // The former generally will be nonexistent (since it contains only the runtime), but the modules may have some.
-  const comments: Set<string> = new Set(asset.extractedComments);
-  for (const moduleId of asset.modules) {
-    const mod: IModuleInfo | undefined = minifiedModules.get(moduleId);
-    if (mod) {
-      for (const comment of mod.extractedComments) {
-        comments.add(comment);
-      }
-    }
-  }
+  const comments: Set<string> = new Set(iterateAllComments(asset.modules, minifiedModules));
 
   const assetName: string = asset.fileName;
 
diff --git a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
index 22b450714fb..a14cf88ede0 100644
--- a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
+++ b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
@@ -28,7 +28,8 @@ import {
   IAssetMap,
   IExtendedModule,
   IModuleMinifierPluginHooks,
-  IDehydratedAssets
+  IDehydratedAssets,
+  _IWebpackCompilationData
 } from './ModuleMinifierPlugin.types';
 import { generateLicenseFileForAsset } from './GenerateLicenseFileForAsset';
 import { rehydrateAsset } from './RehydrateAsset';
@@ -53,6 +54,19 @@ interface IExtendedChunkTemplate {
   };
 }
 
+interface IAcornComment {
+  type: 'Line' | 'Block';
+  value: string;
+  start: number;
+  end: number;
+}
+
+interface IExtendedParser extends webpack.compilation.normalModuleFactory.Parser {
+  state: {
+    module: IExtendedModule;
+  };
+}
+
 /**
  * https://github.com/webpack/webpack/blob/30e747a55d9e796ae22f67445ae42c7a95a6aa48/lib/Template.js#L36-47
  * @param a first id to be sorted
@@ -102,6 +116,10 @@ function isMinificationResultError(
   return !!result.error;
 }
 
+function defaultLicenseCommentTest(comment: IAcornComment): boolean {
+  return /@preserve|@lic|@cc_on|^\**!/i.test(comment.value);
+}
+
 /**
  * Webpack plugin that minifies code on a per-module basis rather than per-asset. The actual minification is handled by the input `minifier` object.
  * @public
@@ -152,329 +170,352 @@ export class ModuleMinifierPlugin implements webpack.Plugin {
       stableIdsPlugin.apply(compiler);
     }
 
-    compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation: webpack.compilation.Compilation) => {
-      /**
-       * Set of local module ids that have been processed.
-       */
-      const submittedModules: Set<string | number> = new Set();
-
-      /**
-       * The text and comments of all minified modules.
-       */
-      const minifiedModules: IModuleMap = new Map();
-
-      /**
-       * The text and comments of all minified chunks. Most of these are trivial, but the runtime chunk is a bit larger.
-       */
-      const minifiedAssets: IAssetMap = new Map();
-
-      let pendingMinificationRequests: number = 0;
-      /**
-       * Indicates that all files have been sent to the minifier and therefore that when pending hits 0, assets can be rehydrated.
-       */
-      let allRequestsIssued: boolean = false;
-
-      let resolveMinifyPromise: () => void;
-
-      const getRealId: (id: number | string) => number | string | undefined = (id: number | string) =>
-        this.hooks.finalModuleId.call(id);
-
-      const postProcessCode: (code: ReplaceSource, context: string) => ReplaceSource = (
-        code: ReplaceSource,
-        context: string
-      ) => this.hooks.postProcessCodeFragment.call(code, context);
-
-      /**
-       * Callback to invoke when a file has finished minifying.
-       */
-      function onFileMinified(): void {
-        if (--pendingMinificationRequests === 0 && allRequestsIssued) {
-          resolveMinifyPromise();
+    compiler.hooks.thisCompilation.tap(
+      PLUGIN_NAME,
+      (compilation: webpack.compilation.Compilation, compilationData: _IWebpackCompilationData) => {
+        const { normalModuleFactory } = compilationData;
+
+        function addCommentExtraction(parser: webpack.compilation.normalModuleFactory.Parser): void {
+          parser.hooks.program.tap(PLUGIN_NAME, (program: unknown, comments: IAcornComment[]) => {
+            (parser as IExtendedParser).state.module.factoryMeta.comments =
+              comments.filter(defaultLicenseCommentTest);
+          });
         }
-      }
 
-      /**
-       * Callback to invoke for a chunk during render to replace the modules with CHUNK_MODULES_TOKEN
-       */
-      function dehydrateAsset(modules: Source, chunk: webpack.compilation.Chunk): Source {
-        for (const mod of chunk.modulesIterable) {
-          if (mod.id === null || !submittedModules.has(mod.id)) {
-            console.error(
-              `Chunk ${chunk.id} failed to render module ${mod.id} for ${(mod as IExtendedModule).resource}`
-            );
+        normalModuleFactory.hooks.parser.for('javascript/auto').tap(PLUGIN_NAME, addCommentExtraction);
+        normalModuleFactory.hooks.parser.for('javascript/dynamic').tap(PLUGIN_NAME, addCommentExtraction);
+        normalModuleFactory.hooks.parser.for('javascript/esm').tap(PLUGIN_NAME, addCommentExtraction);
+
+        /**
+         * Set of local module ids that have been processed.
+         */
+        const submittedModules: Set<string | number> = new Set();
+
+        /**
+         * The text and comments of all minified modules.
+         */
+        const minifiedModules: IModuleMap = new Map();
+
+        /**
+         * The text and comments of all minified chunks. Most of these are trivial, but the runtime chunk is a bit larger.
+         */
+        const minifiedAssets: IAssetMap = new Map();
+
+        let pendingMinificationRequests: number = 0;
+        /**
+         * Indicates that all files have been sent to the minifier and therefore that when pending hits 0, assets can be rehydrated.
+         */
+        let allRequestsIssued: boolean = false;
+
+        let resolveMinifyPromise: () => void;
+
+        const getRealId: (id: number | string) => number | string | undefined = (id: number | string) =>
+          this.hooks.finalModuleId.call(id);
+
+        const postProcessCode: (code: ReplaceSource, context: string) => ReplaceSource = (
+          code: ReplaceSource,
+          context: string
+        ) => this.hooks.postProcessCodeFragment.call(code, context);
+
+        /**
+         * Callback to invoke when a file has finished minifying.
+         */
+        function onFileMinified(): void {
+          if (--pendingMinificationRequests === 0 && allRequestsIssued) {
+            resolveMinifyPromise();
           }
         }
 
-        // Discard the rendered modules
-        return new RawSource(CHUNK_MODULES_TOKEN);
-      }
-
-      const { minifier } = this;
-
-      const cleanupMinifier: (() => Promise<void>) | undefined = minifier.ref && minifier.ref();
-
-      const requestShortener: webpack.compilation.RequestShortener =
-        compilation.runtimeTemplate.requestShortener;
-
-      /**
-       * Extracts the code for the module and sends it to be minified.
-       * Currently source maps are explicitly not supported.
-       * @param {Source} source
-       * @param {Module} mod
-       */
-      function minifyModule(source: Source, mod: IExtendedModule): Source {
-        const id: string | number | null = mod.id;
-
-        if (id !== null && !submittedModules.has(id)) {
-          // options.chunk contains the current chunk, if needed
-          // Render the source, then hash, then persist hash -> module, return a placeholder
-
-          // Initially populate the map with unminified version; replace during callback
-          submittedModules.add(id);
-
-          const realId: string | number | undefined = getRealId(id);
-
-          if (realId !== undefined && !mod.skipMinification) {
-            const wrapped: ConcatSource = new ConcatSource(
-              MODULE_WRAPPER_PREFIX + '\n',
-              source,
-              '\n' + MODULE_WRAPPER_SUFFIX
-            );
+        /**
+         * Callback to invoke for a chunk during render to replace the modules with CHUNK_MODULES_TOKEN
+         */
+        function dehydrateAsset(modules: Source, chunk: webpack.compilation.Chunk): Source {
+          for (const mod of chunk.modulesIterable) {
+            if (mod.id === null || !submittedModules.has(mod.id)) {
+              console.error(
+                `Chunk ${chunk.id} failed to render module ${mod.id} for ${(mod as IExtendedModule).resource}`
+              );
+            }
+          }
 
-            const nameForMap: string = `(modules)/${realId}`;
+          // Discard the rendered modules
+          return new RawSource(CHUNK_MODULES_TOKEN);
+        }
 
-            const { source: wrappedCode, map } = useSourceMaps
-              ? wrapped.sourceAndMap()
-              : {
-                  source: wrapped.source(),
-                  map: undefined
-                };
+        const { minifier } = this;
+
+        const cleanupMinifier: (() => Promise<void>) | undefined = minifier.ref && minifier.ref();
+
+        const requestShortener: webpack.compilation.RequestShortener =
+          compilation.runtimeTemplate.requestShortener;
+
+        /**
+         * Extracts the code for the module and sends it to be minified.
+         * Currently source maps are explicitly not supported.
+         * @param {Source} source
+         * @param {Module} mod
+         */
+        function minifyModule(source: Source, mod: IExtendedModule): Source {
+          const id: string | number | null = mod.id;
+
+          if (id !== null && !submittedModules.has(id)) {
+            // options.chunk contains the current chunk, if needed
+            // Render the source, then hash, then persist hash -> module, return a placeholder
+
+            // Initially populate the map with unminified version; replace during callback
+            submittedModules.add(id);
+
+            const realId: string | number | undefined = getRealId(id);
+
+            if (realId !== undefined && !mod.factoryMeta.skipMinification) {
+              const wrapped: ConcatSource = new ConcatSource(
+                MODULE_WRAPPER_PREFIX + '\n',
+                source,
+                '\n' + MODULE_WRAPPER_SUFFIX
+              );
+
+              const nameForMap: string = `(modules)/${realId}`;
+
+              const { source: wrappedCode, map } = useSourceMaps
+                ? wrapped.sourceAndMap()
+                : {
+                    source: wrapped.source(),
+                    map: undefined
+                  };
+
+              const hash: string = hashCodeFragment(wrappedCode);
+
+              ++pendingMinificationRequests;
+
+              minifier.minify(
+                {
+                  hash,
+                  code: wrappedCode,
+                  nameForMap: useSourceMaps ? nameForMap : undefined,
+                  externals: undefined
+                },
+                (result: IModuleMinificationResult) => {
+                  if (isMinificationResultError(result)) {
+                    compilation.errors.push(result.error);
+                  } else {
+                    try {
+                      // Have the source map display the module id instead of the minifier boilerplate
+                      const sourceForMap: string = `// ${mod.readableIdentifier(
+                        requestShortener
+                      )}${wrappedCode.slice(MODULE_WRAPPER_PREFIX.length, -MODULE_WRAPPER_SUFFIX.length)}`;
+
+                      const { code: minified, map: minifierMap } = result;
+
+                      const rawOutput: Source = useSourceMaps
+                        ? new SourceMapSource(
+                            minified, // Code
+                            nameForMap, // File
+                            minifierMap!, // Base source map
+                            sourceForMap, // Source from before transform
+                            map!, // Source Map from before transform
+                            false // Remove original source
+                          )
+                        : new RawSource(minified);
+
+                      const unwrapped: ReplaceSource = new ReplaceSource(rawOutput);
+                      const len: number = minified.length;
+
+                      unwrapped.replace(0, MODULE_WRAPPER_PREFIX.length - 1, '');
+                      unwrapped.replace(len - MODULE_WRAPPER_SUFFIX.length, len - 1, '');
+
+                      const withIds: Source = postProcessCode(unwrapped, mod.identifier());
+                      const cached: CachedSource = new CachedSource(withIds);
+
+                      const minifiedSize: number = Buffer.byteLength(cached.source(), 'utf-8');
+                      mod.factoryMeta.minifiedSize = minifiedSize;
+
+                      minifiedModules.set(realId, {
+                        source: cached,
+                        module: mod
+                      });
+                    } catch (err) {
+                      compilation.errors.push(err);
+                    }
+                  }
 
-            const hash: string = hashCodeFragment(wrappedCode);
+                  onFileMinified();
+                }
+              );
+            } else {
+              // Route any other modules straight through
+              const cached: CachedSource = new CachedSource(
+                postProcessCode(new ReplaceSource(source), mod.identifier())
+              );
+
+              const minifiedSize: number = Buffer.byteLength(cached.source(), 'utf-8');
+              mod.factoryMeta.minifiedSize = minifiedSize;
+
+              minifiedModules.set(realId !== undefined ? realId : id, {
+                source: cached,
+                module: mod
+              });
+            }
+          }
 
-            ++pendingMinificationRequests;
+          // Return something so that this stage still produces valid ECMAScript
+          return new RawSource('(function(){})');
+        }
 
-            minifier.minify(
-              {
-                hash,
-                code: wrappedCode,
-                nameForMap: useSourceMaps ? nameForMap : undefined,
-                externals: undefined
-              },
-              (result: IModuleMinificationResult) => {
-                if (isMinificationResultError(result)) {
-                  compilation.errors.push(result.error);
-                } else {
-                  try {
-                    // Have the source map display the module id instead of the minifier boilerplate
-                    const sourceForMap: string = `// ${mod.readableIdentifier(
-                      requestShortener
-                    )}${wrappedCode.slice(MODULE_WRAPPER_PREFIX.length, -MODULE_WRAPPER_SUFFIX.length)}`;
-
-                    const { code: minified, map: minifierMap, extractedComments } = result;
-
-                    const rawOutput: Source = useSourceMaps
-                      ? new SourceMapSource(
-                          minified, // Code
-                          nameForMap, // File
-                          minifierMap!, // Base source map
-                          sourceForMap, // Source from before transform
-                          map!, // Source Map from before transform
-                          false // Remove original source
-                        )
-                      : new RawSource(minified);
-
-                    const unwrapped: ReplaceSource = new ReplaceSource(rawOutput);
-                    const len: number = minified.length;
-
-                    unwrapped.replace(0, MODULE_WRAPPER_PREFIX.length - 1, '');
-                    unwrapped.replace(len - MODULE_WRAPPER_SUFFIX.length, len - 1, '');
-
-                    const withIds: Source = postProcessCode(unwrapped, mod.identifier());
-
-                    minifiedModules.set(realId, {
-                      source: new CachedSource(withIds),
-                      extractedComments,
-                      module: mod
-                    });
-                  } catch (err) {
-                    compilation.errors.push(err);
+        // During code generation, send the generated code to the minifier and replace with a placeholder
+        compilation.moduleTemplates.javascript.hooks.package.tap(TAP_AFTER, minifyModule);
+
+        // This should happen before any other tasks that operate during optimizeChunkAssets
+        compilation.hooks.optimizeChunkAssets.tapPromise(
+          TAP_BEFORE,
+          async (chunks: webpack.compilation.Chunk[]): Promise<void> => {
+            // Still need to minify the rendered assets
+            for (const chunk of chunks) {
+              const externals: string[] = [];
+              const externalNames: Map<string, string> = new Map();
+
+              const chunkModuleSet: Set<string | number> = new Set();
+              const allChunkModules: Iterable<IExtendedModule> =
+                chunk.modulesIterable as Iterable<IExtendedModule>;
+              let hasNonNumber: boolean = false;
+              for (const mod of allChunkModules) {
+                if (mod.id !== null) {
+                  if (typeof mod.id !== 'number') {
+                    hasNonNumber = true;
+                  }
+                  chunkModuleSet.add(mod.id);
+
+                  if (mod.external) {
+                    const key: string = `__WEBPACK_EXTERNAL_MODULE_${webpack.Template.toIdentifier(
+                      `${mod.id}`
+                    )}__`;
+                    // The first two identifiers are used for function (module, exports) at the module site
+                    const ordinal: number = 2 + externals.length;
+                    const miniId: string = getIdentifier(ordinal);
+                    externals.push(key);
+                    externalNames.set(key, miniId);
                   }
                 }
-
-                onFileMinified();
               }
-            );
-          } else {
-            // Route any other modules straight through
-            minifiedModules.set(realId !== undefined ? realId : id, {
-              source: new CachedSource(postProcessCode(new ReplaceSource(source), mod.identifier())),
-              extractedComments: [],
-              module: mod
-            });
-          }
-        }
 
-        // Return something so that this stage still produces valid ECMAScript
-        return new RawSource('(function(){})');
-      }
+              const chunkModules: (string | number)[] = Array.from(chunkModuleSet);
+              // Sort by id before rehydration in case we rehydrate a given chunk multiple times
+              chunkModules.sort(
+                hasNonNumber
+                  ? stringifyIdSortPredicate
+                  : (x: string | number, y: string | number) => (x as number) - (y as number)
+              );
+
+              for (const assetName of chunk.files) {
+                const asset: Source = compilation.assets[assetName];
+
+                // Verify that this is a JS asset
+                if (/\.m?js(\?.+)?$/.test(assetName)) {
+                  ++pendingMinificationRequests;
+
+                  const rawCode: string = asset.source() as string;
+                  const nameForMap: string = `(chunks)/${assetName}`;
+
+                  const hash: string = hashCodeFragment(rawCode);
+
+                  minifier.minify(
+                    {
+                      hash,
+                      code: rawCode,
+                      nameForMap: useSourceMaps ? nameForMap : undefined,
+                      externals
+                    },
+                    (result: IModuleMinificationResult) => {
+                      if (isMinificationResultError(result)) {
+                        compilation.errors.push(result.error);
+                        console.error(result.error);
+                      } else {
+                        try {
+                          const { code: minified, map: minifierMap } = result;
+
+                          let codeForMap: string = rawCode;
+                          if (useSourceMaps) {
+                            // Pretend the __WEBPACK_CHUNK_MODULES__ token is an array of module ids, so that the source map contains information about the module ids in the chunk
+                            codeForMap = codeForMap.replace(
+                              CHUNK_MODULES_TOKEN,
+                              JSON.stringify(chunkModules, undefined, 2)
+                            );
+                          }
+
+                          const rawOutput: Source = useSourceMaps
+                            ? new SourceMapSource(
+                                minified, // Code
+                                nameForMap, // File
+                                minifierMap!, // Base source map
+                                codeForMap, // Source from before transform
+                                undefined, // Source Map from before transform
+                                false // Remove original source
+                              )
+                            : new RawSource(minified);
+
+                          const withIds: Source = postProcessCode(new ReplaceSource(rawOutput), assetName);
+
+                          minifiedAssets.set(assetName, {
+                            source: new CachedSource(withIds),
+                            modules: chunkModules,
+                            chunk,
+                            fileName: assetName,
+                            externalNames
+                          });
+                        } catch (err) {
+                          compilation.errors.push(err);
+                        }
+                      }
 
-      // During code generation, send the generated code to the minifier and replace with a placeholder
-      compilation.moduleTemplates.javascript.hooks.package.tap(TAP_AFTER, minifyModule);
-
-      // This should happen before any other tasks that operate during optimizeChunkAssets
-      compilation.hooks.optimizeChunkAssets.tapPromise(
-        TAP_BEFORE,
-        async (chunks: webpack.compilation.Chunk[]): Promise<void> => {
-          // Still need to minify the rendered assets
-          for (const chunk of chunks) {
-            const externals: string[] = [];
-            const externalNames: Map<string, string> = new Map();
-
-            const chunkModuleSet: Set<string | number> = new Set();
-            const allChunkModules: Iterable<IExtendedModule> =
-              chunk.modulesIterable as Iterable<IExtendedModule>;
-            let hasNonNumber: boolean = false;
-            for (const mod of allChunkModules) {
-              if (mod.id !== null) {
-                if (typeof mod.id !== 'number') {
-                  hasNonNumber = true;
-                }
-                chunkModuleSet.add(mod.id);
-
-                if (mod.external) {
-                  const key: string = `__WEBPACK_EXTERNAL_MODULE_${webpack.Template.toIdentifier(
-                    `${mod.id}`
-                  )}__`;
-                  // The first two identifiers are used for function (module, exports) at the module site
-                  const ordinal: number = 2 + externals.length;
-                  const miniId: string = getIdentifier(ordinal);
-                  externals.push(key);
-                  externalNames.set(key, miniId);
+                      onFileMinified();
+                    }
+                  );
+                } else {
+                  // Skip minification for all other assets, though the modules still are
+                  minifiedAssets.set(assetName, {
+                    // Still need to restore ids
+                    source: postProcessCode(new ReplaceSource(asset), assetName),
+                    modules: chunkModules,
+                    chunk,
+                    fileName: assetName,
+                    externalNames
+                  });
                 }
               }
             }
 
-            const chunkModules: (string | number)[] = Array.from(chunkModuleSet);
-            // Sort by id before rehydration in case we rehydrate a given chunk multiple times
-            chunkModules.sort(
-              hasNonNumber
-                ? stringifyIdSortPredicate
-                : (x: string | number, y: string | number) => (x as number) - (y as number)
-            );
+            allRequestsIssued = true;
 
-            for (const assetName of chunk.files) {
-              const asset: Source = compilation.assets[assetName];
-
-              // Verify that this is a JS asset
-              if (/\.m?js(\?.+)?$/.test(assetName)) {
-                ++pendingMinificationRequests;
-
-                const rawCode: string = asset.source() as string;
-                const nameForMap: string = `(chunks)/${assetName}`;
-
-                const hash: string = hashCodeFragment(rawCode);
-
-                minifier.minify(
-                  {
-                    hash,
-                    code: rawCode,
-                    nameForMap: useSourceMaps ? nameForMap : undefined,
-                    externals
-                  },
-                  (result: IModuleMinificationResult) => {
-                    if (isMinificationResultError(result)) {
-                      compilation.errors.push(result.error);
-                      console.error(result.error);
-                    } else {
-                      try {
-                        const { code: minified, map: minifierMap, extractedComments } = result;
-
-                        let codeForMap: string = rawCode;
-                        if (useSourceMaps) {
-                          // Pretend the __WEBPACK_CHUNK_MODULES__ token is an array of module ids, so that the source map contains information about the module ids in the chunk
-                          codeForMap = codeForMap.replace(
-                            CHUNK_MODULES_TOKEN,
-                            JSON.stringify(chunkModules, undefined, 2)
-                          );
-                        }
-
-                        const rawOutput: Source = useSourceMaps
-                          ? new SourceMapSource(
-                              minified, // Code
-                              nameForMap, // File
-                              minifierMap!, // Base source map
-                              codeForMap, // Source from before transform
-                              undefined, // Source Map from before transform
-                              false // Remove original source
-                            )
-                          : new RawSource(minified);
-
-                        const withIds: Source = postProcessCode(new ReplaceSource(rawOutput), assetName);
-
-                        minifiedAssets.set(assetName, {
-                          source: new CachedSource(withIds),
-                          extractedComments,
-                          modules: chunkModules,
-                          chunk,
-                          fileName: assetName,
-                          externalNames
-                        });
-                      } catch (err) {
-                        compilation.errors.push(err);
-                      }
-                    }
+            if (pendingMinificationRequests) {
+              await new Promise<void>((resolve) => {
+                resolveMinifyPromise = resolve;
+              });
+            }
 
-                    onFileMinified();
-                  }
-                );
-              } else {
-                // Skip minification for all other assets, though the modules still are
-                minifiedAssets.set(assetName, {
-                  // Still need to restore ids
-                  source: postProcessCode(new ReplaceSource(asset), assetName),
-                  extractedComments: [],
-                  modules: chunkModules,
-                  chunk,
-                  fileName: assetName,
-                  externalNames
-                });
-              }
+            // Handle any error from the minifier.
+            if (cleanupMinifier) {
+              await cleanupMinifier();
             }
-          }
 
-          allRequestsIssued = true;
+            // All assets and modules have been minified, hand them off to be rehydrated
 
-          if (pendingMinificationRequests) {
-            await new Promise<void>((resolve) => {
-              resolveMinifyPromise = resolve;
-            });
-          }
+            // Clone the maps for safety, even though we won't be using them in the plugin anymore
+            const assets: IAssetMap = new Map(minifiedAssets);
+            const modules: IModuleMap = new Map(minifiedModules);
 
-          // Handle any error from the minifier.
-          if (cleanupMinifier) {
-            await cleanupMinifier();
+            await this.hooks.rehydrateAssets.promise(
+              {
+                assets,
+                modules
+              },
+              compilation
+            );
           }
+        );
 
-          // All assets and modules have been minified, hand them off to be rehydrated
-
-          // Clone the maps for safety, even though we won't be using them in the plugin anymore
-          const assets: IAssetMap = new Map(minifiedAssets);
-          const modules: IModuleMap = new Map(minifiedModules);
-
-          await this.hooks.rehydrateAssets.promise(
-            {
-              assets,
-              modules
-            },
-            compilation
-          );
+        for (const template of [compilation.chunkTemplate, compilation.mainTemplate]) {
+          (template as unknown as IExtendedChunkTemplate).hooks.modules.tap(TAP_AFTER, dehydrateAsset);
         }
-      );
-
-      for (const template of [compilation.chunkTemplate, compilation.mainTemplate]) {
-        (template as unknown as IExtendedChunkTemplate).hooks.modules.tap(TAP_AFTER, dehydrateAsset);
       }
-    });
+    );
   }
 }
diff --git a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.types.ts b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.types.ts
index 5dbf6b3cec5..5ba02b1386d 100644
--- a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.types.ts
+++ b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.types.ts
@@ -50,10 +50,6 @@ export interface IModuleMinificationErrorResult {
    * Marker property to always return the same result shape.
    */
   map?: undefined;
-  /**
-   * Marker property to always return the same result shape.
-   */
-  extractedComments?: undefined;
 }
 
 /**
@@ -77,10 +73,6 @@ export interface IModuleMinificationSuccessResult {
    * Marker property to always return the same result shape.
    */
   map?: RawSourceMap;
-  /**
-   * The array of extracted comments, usually these are license information for 3rd party libraries.
-   */
-  extractedComments: string[];
 }
 
 /**
@@ -112,11 +104,6 @@ export interface IAssetInfo {
    */
   fileName: string;
 
-  /**
-   * The extracted comments from the boilerplate. Will usually be empty unless the minifier configuration and a plugin inject a comment that needs extraction in the runtime.
-   */
-  extractedComments: string[];
-
   /**
    * The ids of the modules that are part of the chunk corresponding to this asset
    */
@@ -143,11 +130,6 @@ export interface IModuleInfo {
    */
   source: Source;
 
-  /**
-   * The extracted comments from this module, e.g. license information for a 3rd party library.
-   */
-  extractedComments: string[];
-
   /**
    * The raw module object from Webpack, in case information from it is necessary for reconstruction
    */
@@ -163,6 +145,10 @@ export interface IExtendedModule extends webpack.compilation.Module {
    * Is this module external?
    */
   external?: boolean;
+  /**
+   * Concatenated modules
+   */
+  modules?: IExtendedModule[];
   /**
    * Id for the module
    */
@@ -180,10 +166,6 @@ export interface IExtendedModule extends webpack.compilation.Module {
    * Path to the physical file this module represents
    */
   resource?: string;
-  /**
-   * If set, bypass the minifier for this module. Useful if the code is known to already be minified.
-   */
-  skipMinification?: boolean;
 }
 
 declare module 'webpack' {
@@ -199,6 +181,15 @@ declare module 'webpack' {
   }
 }
 
+/**
+ * This is the second parameter to the thisCompilation and compilation webpack.Compiler hooks.
+ * @internal
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export interface _IWebpackCompilationData {
+  normalModuleFactory: webpack.compilation.NormalModuleFactory;
+}
+
 /**
  * This is the second parameter to the NormalModuleFactory `module` hook
  * @internal
diff --git a/webpack/module-minifier-plugin/src/NoopMinifier.ts b/webpack/module-minifier-plugin/src/NoopMinifier.ts
index 75d688a1890..e28836ab145 100644
--- a/webpack/module-minifier-plugin/src/NoopMinifier.ts
+++ b/webpack/module-minifier-plugin/src/NoopMinifier.ts
@@ -24,8 +24,7 @@ export class NoopMinifier implements IModuleMinifier {
       hash,
       error: undefined,
       code,
-      map: undefined,
-      extractedComments: []
+      map: undefined
     });
   }
 }
diff --git a/webpack/module-minifier-plugin/src/PortableMinifierIdsPlugin.ts b/webpack/module-minifier-plugin/src/PortableMinifierIdsPlugin.ts
index 093c6a8a45f..155d83e50fd 100644
--- a/webpack/module-minifier-plugin/src/PortableMinifierIdsPlugin.ts
+++ b/webpack/module-minifier-plugin/src/PortableMinifierIdsPlugin.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import { compilation, Compiler, Plugin } from 'webpack';
+import webpack, { Compiler, Plugin } from 'webpack';
 import { ReplaceSource } from 'webpack-sources';
 import { createHash } from 'crypto';
 import { TapOptions } from 'tapable';
@@ -11,7 +11,8 @@ import { STAGE_AFTER, STAGE_BEFORE } from './Constants';
 import {
   _INormalModuleFactoryModuleData,
   IExtendedModule,
-  IModuleMinifierPluginHooks
+  IModuleMinifierPluginHooks,
+  _IWebpackCompilationData
 } from './ModuleMinifierPlugin.types';
 
 const PLUGIN_NAME: 'PortableMinifierModuleIdsPlugin' = 'PortableMinifierModuleIdsPlugin';
@@ -62,30 +63,6 @@ export class PortableMinifierModuleIdsPlugin implements Plugin {
       return nodeModulePath;
     };
 
-    const nameByResource: Map<string | undefined, string> = new Map();
-
-    /**
-     * Figure out portable ids for modules by using their id based on the node module resolution algorithm
-     */
-    compiler.hooks.normalModuleFactory.tap(PLUGIN_NAME, (nmf: compilation.NormalModuleFactory) => {
-      nmf.hooks.module.tap(PLUGIN_NAME, (mod: IExtendedModule, data: _INormalModuleFactoryModuleData) => {
-        const { resourceResolveData: resolveData } = data;
-
-        if (resolveData) {
-          const { descriptionFileData: packageJson, relativePath } = resolveData;
-
-          if (packageJson && relativePath) {
-            const nodeId: string = `${packageJson.name}${relativePath.slice(1).replace(/\.js(on)?$/, '')}`;
-            nameByResource.set(mod.resource, nodeId);
-            return mod;
-          }
-        }
-
-        console.error(`Missing resolution data for ${mod.resource}`);
-        return mod;
-      });
-    });
-
     const stableIdToFinalId: Map<string | number, string | number> = new Map();
 
     this._minifierHooks.finalModuleId.tap(PLUGIN_NAME, (id: string | number | undefined) => {
@@ -112,59 +89,92 @@ export class PortableMinifierModuleIdsPlugin implements Plugin {
       return source;
     });
 
-    compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation: compilation.Compilation) => {
-      stableIdToFinalId.clear();
-
-      // Make module ids portable immediately before rendering.
-      // Unfortunately, other means of altering these ids don't work in Webpack 4 without a lot more code and work.
-      // Namely, a number of functions reference "module.id" directly during code generation
-      compilation.hooks.beforeChunkAssets.tap(TAP_AFTER, () => {
-        // For tracking collisions
-        const resourceById: Map<string | number, string> = new Map();
-
-        for (const mod of compilation.modules) {
-          const originalId: string | number = mod.id;
-
-          // Need to handle ConcatenatedModules, which don't have the resource property directly
-          const resource: string = (mod.rootModule || mod).resource;
-
-          // Map to the friendly node module identifier
-          const preferredId: string | undefined = nameByResource.get(resource);
-          if (preferredId) {
-            const hashId: string = createHash('sha256').update(preferredId).digest('hex');
-
-            // This is designed to be an easily regex-findable string
-            const stableId: string = `${STABLE_MODULE_ID_PREFIX}${hashId}`;
-            const existingResource: string | undefined = resourceById.get(stableId);
-
-            if (existingResource) {
-              compilation.errors.push(
-                new Error(
-                  `Module id collision for ${resource} with ${existingResource}.\n This means you are bundling multiple versions of the same module.`
-                )
-              );
+    compiler.hooks.thisCompilation.tap(
+      PLUGIN_NAME,
+      (compilation: webpack.compilation.Compilation, compilationData: _IWebpackCompilationData) => {
+        const { normalModuleFactory } = compilationData;
+
+        normalModuleFactory.hooks.module.tap(
+          PLUGIN_NAME,
+          (mod: IExtendedModule, data: _INormalModuleFactoryModuleData) => {
+            const { resourceResolveData: resolveData } = data;
+
+            if (resolveData) {
+              mod.factoryMeta.resolveData = resolveData;
+              return;
             }
 
-            stableIdToFinalId.set(stableId, originalId);
+            console.error(`Missing resolution data for ${mod.resource}`);
+          }
+        );
+
+        compilation.hooks.succeedModule.tap(PLUGIN_NAME, (mod: webpack.compilation.Module) => {
+          const { resolveData } = mod.factoryMeta;
 
-            // Record to detect collisions
-            resourceById.set(stableId, resource);
-            mod.id = stableId;
+          if (!resolveData) {
+            return;
           }
-        }
-      });
-
-      // This is the hook immediately following chunk asset rendering. Fix the module ids.
-      compilation.hooks.additionalChunkAssets.tap(TAP_BEFORE, () => {
-        // Restore module ids in case any later hooks need them
-        for (const mod of compilation.modules) {
-          const stableId: string | number = mod.id;
-          const finalId: string | number | undefined = stableIdToFinalId.get(stableId);
-          if (finalId !== undefined) {
-            mod.id = finalId;
+
+          const { descriptionFileData: packageJson, relativePath } = resolveData;
+
+          if (packageJson && relativePath) {
+            const nodeId: string = `${packageJson.name}${relativePath.slice(1).replace(/\.js(on)?$/, '')}`;
+            mod.factoryMeta.nodeResource = nodeId;
           }
-        }
-      });
-    });
+        });
+
+        stableIdToFinalId.clear();
+
+        // Make module ids a pure function of the file path immediately before rendering.
+        // Unfortunately, other means of altering these ids don't work in Webpack 4 without a lot more code and work.
+        // Namely, a number of functions reference "module.id" directly during code generation
+
+        compilation.hooks.beforeChunkAssets.tap(TAP_AFTER, () => {
+          // For tracking collisions
+          const resourceById: Map<string | number, string> = new Map();
+
+          for (const mod of compilation.modules) {
+            const originalId: string | number = mod.id;
+
+            // Need to handle ConcatenatedModules, which don't have the resource property directly
+            const { resource } = mod.rootModule || mod;
+
+            if (resource) {
+              const hashId: string = createHash('sha256').update(resource).digest('hex');
+
+              // This is designed to be an easily regex-findable string
+              const stableId: string = `${STABLE_MODULE_ID_PREFIX}${hashId}`;
+              const existingResource: string | undefined = resourceById.get(stableId);
+
+              if (existingResource) {
+                compilation.errors.push(
+                  new Error(
+                    `Module id collision for ${resource} with ${existingResource}.\n This means you are bundling multiple versions of the same module.`
+                  )
+                );
+              }
+
+              stableIdToFinalId.set(stableId, originalId);
+
+              // Record to detect collisions
+              resourceById.set(stableId, resource);
+              mod.id = stableId;
+            }
+          }
+        });
+
+        // This is the hook immediately following chunk asset rendering. Fix the module ids.
+        compilation.hooks.additionalChunkAssets.tap(TAP_BEFORE, () => {
+          // Restore module ids in case any later hooks need them
+          for (const mod of compilation.modules) {
+            const stableId: string | number = mod.id;
+            const finalId: string | number | undefined = stableIdToFinalId.get(stableId);
+            if (finalId !== undefined) {
+              mod.id = finalId;
+            }
+          }
+        });
+      }
+    );
   }
 }
diff --git a/webpack/module-minifier-plugin/src/WorkerPoolMinifier.ts b/webpack/module-minifier-plugin/src/WorkerPoolMinifier.ts
index 69a1557fad5..1de237efee5 100644
--- a/webpack/module-minifier-plugin/src/WorkerPoolMinifier.ts
+++ b/webpack/module-minifier-plugin/src/WorkerPoolMinifier.ts
@@ -53,7 +53,9 @@ export class WorkerPoolMinifier implements IModuleMinifier {
       id: 'Minifier',
       maxWorkers: maxThreads,
       prepareWorker: (worker: Worker) => {
-        worker.on('message', (message: IModuleMinificationResult) => {
+        const cb: (message: IModuleMinificationResult) => void = (
+          message: IModuleMinificationResult
+        ): void => {
           const callbacks: IModuleMinificationCallback[] | undefined = activeRequests.get(message.hash)!;
           activeRequests.delete(message.hash);
           resultCache.set(message.hash, message);
@@ -61,7 +63,10 @@ export class WorkerPoolMinifier implements IModuleMinifier {
             callback(message);
           }
           terserPool.checkinWorker(worker);
-        });
+          worker.off('message', cb);
+        };
+
+        worker.on('message', cb);
       },
       workerData: terserOptions,
       workerScriptPath: require.resolve('./workerPool/MinifierWorker')
@@ -121,8 +126,7 @@ export class WorkerPoolMinifier implements IModuleMinifier {
             hash,
             error,
             code: undefined,
-            map: undefined,
-            extractedComments: undefined
+            map: undefined
           });
         }
       });
@@ -136,6 +140,8 @@ export class WorkerPoolMinifier implements IModuleMinifier {
     return async () => {
       if (--this._refCount === 0) {
         await this._pool.finishAsync();
+        this._resultCache.clear();
+        this._activeRequests.clear();
         console.log(`Module minification: ${this._deduped} Deduped, ${this._minified} Processed`);
       }
     };
diff --git a/webpack/module-minifier-plugin/src/terser/MinifySingleFile.ts b/webpack/module-minifier-plugin/src/terser/MinifySingleFile.ts
index dc48d4772ff..a51713e1e6b 100644
--- a/webpack/module-minifier-plugin/src/terser/MinifySingleFile.ts
+++ b/webpack/module-minifier-plugin/src/terser/MinifySingleFile.ts
@@ -12,31 +12,7 @@ declare module 'terser' {
   }
 }
 
-import {
-  IModuleMinificationRequest,
-  IModuleMinificationResult,
-  IModuleMinificationErrorResult
-} from '../ModuleMinifierPlugin.types';
-
-interface IComment {
-  value: string;
-  type: 'comment1' | 'comment2' | 'comment3' | 'comment4';
-  pos: number;
-  line: number;
-  col: number;
-}
-
-/**
- * The logic for Terser's default "some" comments setting for preservation
- * @see https://github.com/terser/terser/blob/8d8200c2331c695d37f139b5850b10b595bce1d8/lib/output.js#L164-170
- */
-function isSomeComments(comment: IComment): boolean {
-  // multiline comment
-  return (
-    (comment.type === 'comment2' || comment.type === 'comment1') &&
-    /@preserve|@lic|@cc_on|^\**!/i.test(comment.value)
-  );
-}
+import { IModuleMinificationRequest, IModuleMinificationResult } from '../ModuleMinifierPlugin.types';
 
 /**
  * Minifies a single chunk of code. Factored out for reuse between ThreadPoolMinifier and SynchronousMinifier
@@ -47,7 +23,6 @@ export function minifySingleFile(
   request: IModuleMinificationRequest,
   terserOptions: MinifyOptions
 ): IModuleMinificationResult {
-  const extractedComments: string[] = [];
   const output: MinifyOptions['output'] = terserOptions.output || {};
   const { mangle: originalMangle } = terserOptions;
 
@@ -59,22 +34,7 @@ export function minifySingleFile(
     output,
     mangle
   };
-
-  if (output.comments !== false) {
-    /**
-     * Comment extraction as performed by terser-webpack-plugin to ensure output parity in default configuration
-     * @see https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/src/minify.js#L129-142
-     */
-    output.comments = (astNode: unknown, comment: IComment) => {
-      if (isSomeComments(comment)) {
-        const commentText: string =
-          comment.type === 'comment2' ? `/*${comment.value}*/\n` : `//${comment.value}\n`;
-        extractedComments.push(commentText);
-      }
-
-      return false;
-    };
-  }
+  output.comments = false;
 
   const { code, nameForMap, hash, externals } = request;
 
@@ -100,16 +60,14 @@ export function minifySingleFile(
       error: minified.error,
       code: undefined,
       map: undefined,
-      hash,
-      extractedComments: undefined
-    } as IModuleMinificationErrorResult;
+      hash
+    };
   }
 
   return {
     error: undefined,
     code: minified.code!,
     map: minified.map as unknown as RawSourceMap,
-    hash,
-    extractedComments
+    hash
   };
 }
diff --git a/webpack/module-minifier-plugin/src/test/MinifySingleFile.test.ts b/webpack/module-minifier-plugin/src/test/MinifySingleFile.test.ts
new file mode 100644
index 00000000000..d0cb3638c77
--- /dev/null
+++ b/webpack/module-minifier-plugin/src/test/MinifySingleFile.test.ts
@@ -0,0 +1,21 @@
+import { minifySingleFile } from '../terser/MinifySingleFile';
+
+describe('minifySingleFile', () => {
+  it('uses consistent identifiers for webpack vars', () => {
+    const code: string = `__MINIFY_MODULE__(function (module, __webpack_exports__, __webpack_require__) {});`;
+
+    const minifierResult = minifySingleFile(
+      {
+        hash: 'foo',
+        code,
+        nameForMap: undefined,
+        externals: undefined
+      },
+      {
+        mangle: true
+      }
+    );
+
+    expect(minifierResult).toMatchSnapshot();
+  });
+});
diff --git a/webpack/module-minifier-plugin/src/test/RehydrateAsset.test.ts b/webpack/module-minifier-plugin/src/test/RehydrateAsset.test.ts
index 8102161fe4c..7f7caf0dc87 100644
--- a/webpack/module-minifier-plugin/src/test/RehydrateAsset.test.ts
+++ b/webpack/module-minifier-plugin/src/test/RehydrateAsset.test.ts
@@ -6,62 +6,51 @@ import { IAssetInfo, IModuleMap } from '../ModuleMinifierPlugin.types';
 const modules: IModuleMap = new Map();
 modules.set('a', {
   source: new RawSource('foo'),
-  extractedComments: [],
   module: undefined!
 });
 modules.set('b', {
   source: new RawSource('bar'),
-  extractedComments: [],
   module: undefined!
 });
 modules.set('0b', {
   source: new RawSource('baz'),
-  extractedComments: [],
   module: undefined!
 });
 modules.set('=', {
   source: new RawSource('bak'),
-  extractedComments: [],
   module: undefined!
 });
 modules.set('a0', {
   source: new RawSource('bal'),
-  extractedComments: [],
   module: undefined!
 });
 modules.set(0, {
   source: new RawSource('fizz'),
-  extractedComments: [],
   module: undefined!
 });
 modules.set(2, {
   source: new RawSource('buzz'),
-  extractedComments: [],
   module: undefined!
 });
 modules.set(255, {
   source: new RawSource('__WEBPACK_EXTERNAL_MODULE_fizz__'),
-  extractedComments: [],
   module: undefined!
 });
 for (let i: number = 14; i < 30; i++) {
   if (i !== 25) {
     modules.set(i, {
       source: new RawSource('bozz'),
-      extractedComments: [],
       module: undefined!
     });
   }
 }
 modules.set(25, {
   source: new RawSource('bang'),
-  extractedComments: [],
   module: undefined!
 });
 for (let i: number = 1000; i < 1010; i++) {
   modules.set(i, {
     source: new RawSource(`b${i}`),
-    extractedComments: [],
     module: undefined!
   });
 }
@@ -73,7 +62,6 @@ describe('rehydrateAsset', () => {
     const asset: IAssetInfo = {
       source: new RawSource(`<before>${CHUNK_MODULES_TOKEN}<after>`),
       modules: ['a', 'b', '0b', '=', 'a0'],
-      extractedComments: [],
       fileName: 'test',
       chunk: undefined!,
       externalNames: new Map()
@@ -91,7 +79,6 @@ describe('rehydrateAsset', () => {
     const asset: IAssetInfo = {
       source: new RawSource(`<before>${CHUNK_MODULES_TOKEN}<after>`),
       modules: [0, 25],
-      extractedComments: [],
       fileName: 'test',
       chunk: undefined!,
       externalNames: new Map()
@@ -109,7 +96,6 @@ describe('rehydrateAsset', () => {
     const asset: IAssetInfo = {
       source: new RawSource(`<before>${CHUNK_MODULES_TOKEN}<after>`),
       modules: [2],
-      extractedComments: [],
       fileName: 'test',
       chunk: undefined!,
       externalNames: new Map()
@@ -127,7 +113,6 @@ describe('rehydrateAsset', () => {
     const asset: IAssetInfo = {
       source: new RawSource(`<before>${CHUNK_MODULES_TOKEN}<after>`),
       modules: [14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29],
-      extractedComments: [],
       fileName: 'test',
       chunk: undefined!,
       externalNames: new Map()
@@ -145,7 +130,6 @@ describe('rehydrateAsset', () => {
     const asset: IAssetInfo = {
       source: new RawSource(`<before>${CHUNK_MODULES_TOKEN}<after>`),
       modules: [1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009],
-      extractedComments: [],
       fileName: 'test',
       chunk: undefined!,
       externalNames: new Map()
@@ -163,7 +147,6 @@ describe('rehydrateAsset', () => {
     const asset: IAssetInfo = {
       source: new RawSource(`<before>${CHUNK_MODULES_TOKEN}<after>`),
       modules: [0, 2, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009],
-      extractedComments: [],
       fileName: 'test',
       chunk: undefined!,
       externalNames: new Map()
@@ -181,7 +164,6 @@ describe('rehydrateAsset', () => {
     const asset: IAssetInfo = {
       source: new RawSource(`<before>${CHUNK_MODULES_TOKEN}<after>`),
       modules: [2, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009],
-      extractedComments: [],
       fileName: 'test',
       chunk: undefined!,
       externalNames: new Map()
@@ -199,7 +181,6 @@ describe('rehydrateAsset', () => {
     const asset: IAssetInfo = {
       source: new RawSource(`<before>${CHUNK_MODULES_TOKEN}<after>`),
       modules: [255],
-      extractedComments: [],
       fileName: 'test',
       chunk: undefined!,
       externalNames: new Map([['__WEBPACK_EXTERNAL_MODULE_fizz__', 'TREBLE']])
diff --git a/webpack/module-minifier-plugin/src/test/__snapshots__/MinifySingleFile.test.ts.snap b/webpack/module-minifier-plugin/src/test/__snapshots__/MinifySingleFile.test.ts.snap
new file mode 100644
index 00000000000..015c69d356a
--- /dev/null
+++ b/webpack/module-minifier-plugin/src/test/__snapshots__/MinifySingleFile.test.ts.snap
@@ -0,0 +1,10 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`minifySingleFile uses consistent identifiers for webpack vars 1`] = `
+Object {
+  "code": "__MINIFY_MODULE__((function(e,t,n){}));",
+  "error": undefined,
+  "hash": "foo",
+  "map": undefined,
+}
+`;
diff --git a/webpack/module-minifier-plugin/src/workerPool/WorkerPool.ts b/webpack/module-minifier-plugin/src/workerPool/WorkerPool.ts
index 3c19160f83a..6cd69a2774d 100644
--- a/webpack/module-minifier-plugin/src/workerPool/WorkerPool.ts
+++ b/webpack/module-minifier-plugin/src/workerPool/WorkerPool.ts
@@ -244,7 +244,7 @@ export class WorkerPool {
     }
 
     if (!this._alive.length && !this._error) {
-      for (const [resolve] of this._onComplete) {
+      for (const [resolve] of this._onComplete.splice(0)) {
         resolve();
       }
     }

From cee23853d26ba5dbf19ceafa2ab474d0469968d0 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Thu, 1 Jul 2021 17:30:55 -0700
Subject: [PATCH 037/155] Add change file

---
 ...module-minifier-enhancements_2021-07-02-00-30.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@rushstack/module-minifier-plugin/module-minifier-enhancements_2021-07-02-00-30.json

diff --git a/common/changes/@rushstack/module-minifier-plugin/module-minifier-enhancements_2021-07-02-00-30.json b/common/changes/@rushstack/module-minifier-plugin/module-minifier-enhancements_2021-07-02-00-30.json
new file mode 100644
index 00000000000..f39f56f1047
--- /dev/null
+++ b/common/changes/@rushstack/module-minifier-plugin/module-minifier-enhancements_2021-07-02-00-30.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/module-minifier-plugin",
+      "comment": "Separate comment extraction from minification.",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@rushstack/module-minifier-plugin",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file

From 7592ab0d155bb656cc5f51319cea92dc8dd78ebc Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Tue, 6 Jul 2021 16:16:57 -0700
Subject: [PATCH 038/155] Credit terser for license regex

---
 webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
index a14cf88ede0..c85c7eede67 100644
--- a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
+++ b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
@@ -116,7 +116,9 @@ function isMinificationResultError(
   return !!result.error;
 }
 
-function defaultLicenseCommentTest(comment: IAcornComment): boolean {
+// Matche behavior of terser's "some" option
+function isLicenseComment(comment: IAcornComment): boolean {
+  // https://github.com/terser/terser/blob/d3d924fa9e4c57bbe286b811c6068bcc7026e902/lib/output.js#L175
   return /@preserve|@lic|@cc_on|^\**!/i.test(comment.value);
 }
 
@@ -177,8 +179,7 @@ export class ModuleMinifierPlugin implements webpack.Plugin {
 
         function addCommentExtraction(parser: webpack.compilation.normalModuleFactory.Parser): void {
           parser.hooks.program.tap(PLUGIN_NAME, (program: unknown, comments: IAcornComment[]) => {
-            (parser as IExtendedParser).state.module.factoryMeta.comments =
-              comments.filter(defaultLicenseCommentTest);
+            (parser as IExtendedParser).state.module.factoryMeta.comments = comments.filter(isLicenseComment);
           });
         }
 

From 886ceff4ff179254b19e2cb6b94f324c6eda3b9d Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Tue, 6 Jul 2021 16:29:10 -0700
Subject: [PATCH 039/155] Address PR feedback

---
 .../src/GenerateLicenseFileForAsset.ts            | 15 ++++++++++-----
 .../src/ModuleMinifierPlugin.ts                   |  4 +++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/webpack/module-minifier-plugin/src/GenerateLicenseFileForAsset.ts b/webpack/module-minifier-plugin/src/GenerateLicenseFileForAsset.ts
index 695069d0f4f..5d960809156 100644
--- a/webpack/module-minifier-plugin/src/GenerateLicenseFileForAsset.ts
+++ b/webpack/module-minifier-plugin/src/GenerateLicenseFileForAsset.ts
@@ -6,7 +6,9 @@ import * as webpack from 'webpack';
 import { ConcatSource } from 'webpack-sources';
 import { IAssetInfo, IModuleMap, IModuleInfo, IExtendedModule } from './ModuleMinifierPlugin.types';
 
-function* iterateAllComments(moduleIds: (string | number)[], minifiedModules: IModuleMap): Iterable<string> {
+function getAllComments(moduleIds: (string | number)[], minifiedModules: IModuleMap): Set<string> {
+  const allComments: Set<string> = new Set();
+
   for (const moduleId of moduleIds) {
     const mod: IModuleInfo | undefined = minifiedModules.get(moduleId);
     if (!mod) {
@@ -18,10 +20,14 @@ function* iterateAllComments(moduleIds: (string | number)[], minifiedModules: IM
     for (const submodule of modules) {
       const { comments: subModuleComments } = submodule.factoryMeta;
       if (subModuleComments) {
-        yield* subModuleComments;
+        for (const comment of subModuleComments) {
+          allComments.add(comment);
+        }
       }
     }
   }
+
+  return allComments;
 }
 
 /**
@@ -38,9 +44,8 @@ export function generateLicenseFileForAsset(
   asset: IAssetInfo,
   minifiedModules: IModuleMap
 ): string {
-  // Extracted comments from the minified asset and from the modules.
-  // The former generally will be nonexistent (since it contains only the runtime), but the modules may have some.
-  const comments: Set<string> = new Set(iterateAllComments(asset.modules, minifiedModules));
+  // Extracted comments from the modules.
+  const comments: Set<string> = getAllComments(asset.modules, minifiedModules);
 
   const assetName: string = asset.fileName;
 
diff --git a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
index c85c7eede67..5caa5f846cb 100644
--- a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
+++ b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
@@ -245,7 +245,7 @@ export class ModuleMinifierPlugin implements webpack.Plugin {
 
         const { minifier } = this;
 
-        const cleanupMinifier: (() => Promise<void>) | undefined = minifier.ref && minifier.ref();
+        const cleanupMinifier: (() => Promise<void>) | undefined = minifier.ref?.();
 
         const requestShortener: webpack.compilation.RequestShortener =
           compilation.runtimeTemplate.requestShortener;
@@ -386,6 +386,8 @@ export class ModuleMinifierPlugin implements webpack.Plugin {
                   chunkModuleSet.add(mod.id);
 
                   if (mod.external) {
+                    // Match the identifiers generated in the AmdMainTemplatePlugin
+                    // https://github.com/webpack/webpack/blob/444e59f8a427f94f0064cae6765e5a3c4b78596d/lib/AmdMainTemplatePlugin.js#L49
                     const key: string = `__WEBPACK_EXTERNAL_MODULE_${webpack.Template.toIdentifier(
                       `${mod.id}`
                     )}__`;

From 55eb40708fcfb33b07e0eae81e6b8bae96627a63 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Tue, 20 Jul 2021 16:17:08 -0700
Subject: [PATCH 040/155] Support selection parameters for `rush list`

---
 apps/rush-lib/src/cli/actions/ListAction.ts   |  49 +++++----
 .../CommandLineHelp.test.ts.snap              | 100 ++++++++++++++++--
 2 files changed, 117 insertions(+), 32 deletions(-)

diff --git a/apps/rush-lib/src/cli/actions/ListAction.ts b/apps/rush-lib/src/cli/actions/ListAction.ts
index cfe2f9e8246..777d3cea924 100644
--- a/apps/rush-lib/src/cli/actions/ListAction.ts
+++ b/apps/rush-lib/src/cli/actions/ListAction.ts
@@ -1,11 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import { Import } from '@rushstack/node-core-library';
+import { Import, Sort } from '@rushstack/node-core-library';
 import { BaseRushAction } from './BaseRushAction';
 import { RushCommandLineParser } from '../RushCommandLineParser';
 import { CommandLineFlagParameter } from '@rushstack/ts-command-line';
 import { RushConfigurationProject } from '../../api/RushConfigurationProject';
+import { SelectionParameterSet } from '../SelectionParameterSet';
 
 const cliTable: typeof import('cli-table') = Import.lazy('cli-table', require);
 
@@ -25,6 +26,7 @@ export class ListAction extends BaseRushAction {
   private _path!: CommandLineFlagParameter;
   private _fullPath!: CommandLineFlagParameter;
   private _jsonFlag!: CommandLineFlagParameter;
+  private _selectionParameters!: SelectionParameterSet;
 
   public constructor(parser: RushCommandLineParser) {
     super({
@@ -57,7 +59,6 @@ export class ListAction extends BaseRushAction {
 
     this._fullPath = this.defineFlagParameter({
       parameterLongName: '--full-path',
-      parameterShortName: '-f',
       description:
         'If this flag is specified, the project full path will ' +
         'be displayed in a column along with the package name.'
@@ -67,29 +68,31 @@ export class ListAction extends BaseRushAction {
       parameterLongName: '--json',
       description: 'If this flag is specified, output will be in JSON format.'
     });
+
+    this._selectionParameters = new SelectionParameterSet(this.rushConfiguration, this);
   }
 
   protected async runAsync(): Promise<void> {
-    const allPackages: Map<string, RushConfigurationProject> = this.rushConfiguration.projectsByName;
+    const selection: Set<RushConfigurationProject> = this._selectionParameters.getSelectedProjects();
+    Sort.sortSetBy(selection, (x) => x.packageName);
+
     if (this._jsonFlag.value) {
-      this._printJson(allPackages);
+      this._printJson(selection);
     } else if (this._version.value || this._path.value || this._fullPath.value) {
-      this._printListTable(allPackages);
+      this._printListTable(selection);
     } else {
-      this._printList(allPackages);
+      this._printList(selection);
     }
   }
 
-  private _printJson(allPackages: Map<string, RushConfigurationProject>): void {
-    const projects: IJsonEntry[] = [];
-    allPackages.forEach((config: RushConfigurationProject, name: string) => {
-      const project: IJsonEntry = {
-        name: name,
+  private _printJson(selection: Set<RushConfigurationProject>): void {
+    const projects: IJsonEntry[] = Array.from(selection, (config: RushConfigurationProject): IJsonEntry => {
+      return {
+        name: config.packageName,
         version: config.packageJson.version,
         path: config.projectRelativeFolder,
         fullPath: config.projectFolder
       };
-      projects.push(project);
     });
 
     const output: IJsonOutput = {
@@ -98,13 +101,13 @@ export class ListAction extends BaseRushAction {
     console.log(JSON.stringify(output, undefined, 2));
   }
 
-  private _printList(allPackages: Map<string, RushConfigurationProject>): void {
-    allPackages.forEach((config: RushConfigurationProject, name: string) => {
-      console.log(name);
-    });
+  private _printList(selection: Set<RushConfigurationProject>): void {
+    for (const project of selection) {
+      console.log(project.packageName);
+    }
   }
 
-  private _printListTable(allPackages: Map<string, RushConfigurationProject>): void {
+  private _printListTable(selection: Set<RushConfigurationProject>): void {
     const tableHeader: string[] = ['Project'];
     if (this._version.value) {
       tableHeader.push('Version');
@@ -121,19 +124,19 @@ export class ListAction extends BaseRushAction {
       head: tableHeader
     });
 
-    allPackages.forEach((config: RushConfigurationProject, name: string) => {
-      const packageRow: string[] = [name];
+    for (const project of selection) {
+      const packageRow: string[] = [project.packageName];
       if (this._version.value) {
-        packageRow.push(config.packageJson.version);
+        packageRow.push(project.packageJson.version);
       }
       if (this._path.value) {
-        packageRow.push(config.projectRelativeFolder);
+        packageRow.push(project.projectRelativeFolder);
       }
       if (this._fullPath.value) {
-        packageRow.push(config.projectFolder);
+        packageRow.push(project.projectFolder);
       }
       table.push(packageRow);
-    });
+    }
     console.log(table.toString());
   }
 }
diff --git a/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap b/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap
index 51db5a26052..471c3eaf5fd 100644
--- a/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap
+++ b/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap
@@ -676,20 +676,102 @@ Optional arguments:
 `;
 
 exports[`CommandLineHelp prints the help for each action: list 1`] = `
-"usage: rush list [-h] [-v] [-p] [-f] [--json]
+"usage: rush list [-h] [-v] [-p] [--full-path] [--json] [-t PROJECT]
+                 [-T PROJECT] [-f PROJECT] [-o PROJECT] [-i PROJECT]
+                 [-I PROJECT] [--to-version-policy VERSION_POLICY_NAME]
+                 [--from-version-policy VERSION_POLICY_NAME]
+                 
 
 List package names, and optionally version (--version) and path (--path) or 
 full path (--full-path), for projects in the current rush config.
 
 Optional arguments:
-  -h, --help       Show this help message and exit.
-  -v, --version    If this flag is specified, the project version will be 
-                   displayed in a column along with the package name.
-  -p, --path       If this flag is specified, the project path will be 
-                   displayed in a column along with the package name.
-  -f, --full-path  If this flag is specified, the project full path will be 
-                   displayed in a column along with the package name.
-  --json           If this flag is specified, output will be in JSON format.
+  -h, --help            Show this help message and exit.
+  -v, --version         If this flag is specified, the project version will 
+                        be displayed in a column along with the package name.
+  -p, --path            If this flag is specified, the project path will be 
+                        displayed in a column along with the package name.
+  --full-path           If this flag is specified, the project full path will 
+                        be displayed in a column along with the package name.
+  --json                If this flag is specified, output will be in JSON 
+                        format.
+  -t PROJECT, --to PROJECT
+                        Normally all projects in the monorepo will be 
+                        processed; adding this parameter will instead select 
+                        a subset of projects. Each \\"--to\\" parameter expands 
+                        this selection to include PROJECT and all its 
+                        dependencies. \\".\\" can be used as shorthand for the 
+                        project in the current working directory. For details,
+                         refer to the website article \\"Selecting subsets of 
+                        projects\\".
+  -T PROJECT, --to-except PROJECT
+                        Normally all projects in the monorepo will be 
+                        processed; adding this parameter will instead select 
+                        a subset of projects. Each \\"--to-except\\" parameter 
+                        expands this selection to include all dependencies of 
+                        PROJECT, but not PROJECT itself. \\".\\" can be used as 
+                        shorthand for the project in the current working 
+                        directory. For details, refer to the website article 
+                        \\"Selecting subsets of projects\\".
+  -f PROJECT, --from PROJECT
+                        Normally all projects in the monorepo will be 
+                        processed; adding this parameter will instead select 
+                        a subset of projects. Each \\"--from\\" parameter expands 
+                        this selection to include PROJECT and all projects 
+                        that depend on it, plus all dependencies of this set. 
+                        \\".\\" can be used as shorthand for the project in the 
+                        current working directory. For details, refer to the 
+                        website article \\"Selecting subsets of projects\\".
+  -o PROJECT, --only PROJECT
+                        Normally all projects in the monorepo will be 
+                        processed; adding this parameter will instead select 
+                        a subset of projects. Each \\"--only\\" parameter expands 
+                        this selection to include PROJECT; its dependencies 
+                        are not added. \\".\\" can be used as shorthand for the 
+                        project in the current working directory. Note that 
+                        this parameter is \\"unsafe\\" as it may produce a 
+                        selection that excludes some dependencies. For 
+                        details, refer to the website article \\"Selecting 
+                        subsets of projects\\".
+  -i PROJECT, --impacted-by PROJECT
+                        Normally all projects in the monorepo will be 
+                        processed; adding this parameter will instead select 
+                        a subset of projects. Each \\"--impacted-by\\" parameter 
+                        expands this selection to include PROJECT and any 
+                        projects that depend on PROJECT (and thus might be 
+                        broken by changes to PROJECT). \\".\\" can be used as 
+                        shorthand for the project in the current working 
+                        directory. Note that this parameter is \\"unsafe\\" as it 
+                        may produce a selection that excludes some 
+                        dependencies. For details, refer to the website 
+                        article \\"Selecting subsets of projects\\".
+  -I PROJECT, --impacted-by-except PROJECT
+                        Normally all projects in the monorepo will be 
+                        processed; adding this parameter will instead select 
+                        a subset of projects. Each \\"--impacted-by-except\\" 
+                        parameter works the same as \\"--impacted-by\\" except 
+                        that PROJECT itself is not added to the selection. \\".
+                        \\" can be used as shorthand for the project in the 
+                        current working directory. Note that this parameter 
+                        is \\"unsafe\\" as it may produce a selection that 
+                        excludes some dependencies. For details, refer to the 
+                        website article \\"Selecting subsets of projects\\".
+  --to-version-policy VERSION_POLICY_NAME
+                        Normally all projects in the monorepo will be 
+                        processed; adding this parameter will instead select 
+                        a subset of projects. The \\"--to-version-policy\\" 
+                        parameter is equivalent to specifying \\"--to\\" for each 
+                        of the projects belonging to VERSION_POLICY_NAME. For 
+                        details, refer to the website article \\"Selecting 
+                        subsets of projects\\".
+  --from-version-policy VERSION_POLICY_NAME
+                        Normally all projects in the monorepo will be 
+                        processed; adding this parameter will instead select 
+                        a subset of projects. The \\"--from-version-policy\\" 
+                        parameter is equivalent to specifying \\"--from\\" for 
+                        each of the projects belonging to VERSION_POLICY_NAME.
+                         For details, refer to the website article \\"Selecting 
+                        subsets of projects\\".
 "
 `;
 

From 08a2285017c3598423c0203e6af4f2103e183ee7 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Tue, 20 Jul 2021 16:19:19 -0700
Subject: [PATCH 041/155] Add change file

---
 .../rush/rush-list-selectors_2021-07-20-23-18.json    | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@microsoft/rush/rush-list-selectors_2021-07-20-23-18.json

diff --git a/common/changes/@microsoft/rush/rush-list-selectors_2021-07-20-23-18.json b/common/changes/@microsoft/rush/rush-list-selectors_2021-07-20-23-18.json
new file mode 100644
index 00000000000..c384890419f
--- /dev/null
+++ b/common/changes/@microsoft/rush/rush-list-selectors_2021-07-20-23-18.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Adds support for the project subset selection parameters (\"--to\", \"--from\", etc., documented at https://rushjs.io/pages/developer/selecting_subsets/) to the \"rush list\" command.",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file

From 712b7b019b53165be4d2fc4c9614ff3017ec0b54 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Tue, 20 Jul 2021 16:23:18 -0700
Subject: [PATCH 042/155] Revise compilation target to support node 12

---
 webpack/module-minifier-plugin/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack/module-minifier-plugin/tsconfig.json b/webpack/module-minifier-plugin/tsconfig.json
index b620ff7f9f6..33d9cce21ee 100644
--- a/webpack/module-minifier-plugin/tsconfig.json
+++ b/webpack/module-minifier-plugin/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json",
   "compilerOptions": {
-    "target": "ESNext",
+    "target": "ES2018",
     "types": ["heft-jest", "node"],
     "noImplicitAny": false // Some typings are missing
   }

From e4ec67bd137c477e53f4fa620ff6c6c00db7493b Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Tue, 20 Jul 2021 16:25:55 -0700
Subject: [PATCH 043/155] Revise

---
 .../src/ParallelCompiler.ts                   | 23 +++++++++++--------
 webpack/module-minifier-plugin/tsconfig.json  |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/webpack/module-minifier-plugin/src/ParallelCompiler.ts b/webpack/module-minifier-plugin/src/ParallelCompiler.ts
index d727c5802f3..bfea3285a48 100644
--- a/webpack/module-minifier-plugin/src/ParallelCompiler.ts
+++ b/webpack/module-minifier-plugin/src/ParallelCompiler.ts
@@ -16,27 +16,30 @@ export interface IParallelWebpackOptions {
   usePortableModules?: boolean;
 }
 
+const ZERO: bigint = BigInt(0);
+const THOUSAND: bigint = BigInt(1e3);
+
 /**
  * Formats a delta of `process.hrtime.bigint()` values as a string
  * @param timeNs
  */
 function formatTime(timeNs: bigint): string {
   let unit: string = 'ns';
-  let fraction: bigint = 0n;
-  if (timeNs > 1e3) {
+  let fraction: bigint = ZERO;
+  if (timeNs > THOUSAND) {
     unit = 'us';
-    fraction = timeNs % 1000n;
-    timeNs /= 1000n;
+    fraction = timeNs % THOUSAND;
+    timeNs /= THOUSAND;
   }
-  if (timeNs > 1e3) {
+  if (timeNs > THOUSAND) {
     unit = 'ms';
-    fraction = timeNs % 1000n;
-    timeNs /= 1000n;
+    fraction = timeNs % THOUSAND;
+    timeNs /= THOUSAND;
   }
-  if (timeNs > 1e3) {
+  if (timeNs > THOUSAND) {
     unit = 's';
-    fraction = timeNs % 1000n;
-    timeNs /= 1000n;
+    fraction = timeNs % THOUSAND;
+    timeNs /= THOUSAND;
   }
 
   return `${timeNs}.${('000' + fraction).slice(-3, -1)} ${unit}`;
diff --git a/webpack/module-minifier-plugin/tsconfig.json b/webpack/module-minifier-plugin/tsconfig.json
index 33d9cce21ee..68a3b128705 100644
--- a/webpack/module-minifier-plugin/tsconfig.json
+++ b/webpack/module-minifier-plugin/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json",
   "compilerOptions": {
-    "target": "ES2018",
+    "target": "ES2019",
     "types": ["heft-jest", "node"],
     "noImplicitAny": false // Some typings are missing
   }

From 428b8a02a7cd64e16af0541e5442b78e2788105b Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonasb@users.noreply.github.com>
Date: Wed, 21 Jul 2021 15:19:13 +0200
Subject: [PATCH 044/155] Warn user if config/sass.json exists without
 SassTyping plugin being loaded

---
 apps/heft/src/plugins/ProjectValidatorPlugin.ts | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/heft/src/plugins/ProjectValidatorPlugin.ts b/apps/heft/src/plugins/ProjectValidatorPlugin.ts
index bfa642a6c59..19e4dee8043 100644
--- a/apps/heft/src/plugins/ProjectValidatorPlugin.ts
+++ b/apps/heft/src/plugins/ProjectValidatorPlugin.ts
@@ -80,6 +80,19 @@ export class ProjectValidatorPlugin implements IHeftPlugin {
         );
       });
     });
+
+    heftSession.hooks.build.tap(PLUGIN_NAME, (build: IBuildStageContext) => {
+      build.hooks.preCompile.tap(PLUGIN_NAME, async () => {
+        await this._checkPluginIsMissingAsync(
+          'SassTypingsPlugin',
+          Path.convertToSlashes(`${heftConfiguration.buildFolder}/config/sass.json`),
+          ['@rushstack/heft-sass-plugin'],
+          'https://rushstack.io/pages/heft_tasks/sass-typings/',
+          build.hooks.preCompile,
+          logger
+        );
+      });
+    });
   }
 
   private async _scanHeftDataFolderAsync(
@@ -140,7 +153,7 @@ export class ProjectValidatorPlugin implements IHeftPlugin {
     configFilePath: string,
     missingPluginCandidatePackageNames: string[],
     missingPluginDocumentationUrl: string,
-    hookToTap: Hook<unknown, unknown, unknown, unknown, unknown>,
+    hookToTap: Hook,
     logger: ScopedLogger
   ): Promise<boolean> {
     // If we have the plugin, we don't need to check anything else

From 803116f1e31939cd91ad84d43fbb059188d12172 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Thu, 22 Jul 2021 15:07:19 +0000
Subject: [PATCH 045/155] Deleting change files and updating change logs for
 package updates.

---
 ...odule-minifier-enhancements_2021-07-02-00-30.json | 11 -----------
 webpack/module-minifier-plugin/CHANGELOG.json        | 12 ++++++++++++
 webpack/module-minifier-plugin/CHANGELOG.md          |  9 ++++++++-
 3 files changed, 20 insertions(+), 12 deletions(-)
 delete mode 100644 common/changes/@rushstack/module-minifier-plugin/module-minifier-enhancements_2021-07-02-00-30.json

diff --git a/common/changes/@rushstack/module-minifier-plugin/module-minifier-enhancements_2021-07-02-00-30.json b/common/changes/@rushstack/module-minifier-plugin/module-minifier-enhancements_2021-07-02-00-30.json
deleted file mode 100644
index f39f56f1047..00000000000
--- a/common/changes/@rushstack/module-minifier-plugin/module-minifier-enhancements_2021-07-02-00-30.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/module-minifier-plugin",
-      "comment": "Separate comment extraction from minification.",
-      "type": "minor"
-    }
-  ],
-  "packageName": "@rushstack/module-minifier-plugin",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/webpack/module-minifier-plugin/CHANGELOG.json b/webpack/module-minifier-plugin/CHANGELOG.json
index 20ece291221..dbd178f4859 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.json
+++ b/webpack/module-minifier-plugin/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/module-minifier-plugin",
   "entries": [
+    {
+      "version": "0.4.0",
+      "tag": "@rushstack/module-minifier-plugin_v0.4.0",
+      "date": "Thu, 22 Jul 2021 15:07:19 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Separate comment extraction from minification."
+          }
+        ]
+      }
+    },
     {
       "version": "0.3.75",
       "tag": "@rushstack/module-minifier-plugin_v0.3.75",
diff --git a/webpack/module-minifier-plugin/CHANGELOG.md b/webpack/module-minifier-plugin/CHANGELOG.md
index 45d99353dd6..3ec3ec62383 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.md
+++ b/webpack/module-minifier-plugin/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/module-minifier-plugin
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Thu, 22 Jul 2021 15:07:19 GMT and should not be manually modified.
+
+## 0.4.0
+Thu, 22 Jul 2021 15:07:19 GMT
+
+### Minor changes
+
+- Separate comment extraction from minification.
 
 ## 0.3.75
 Wed, 14 Jul 2021 15:06:29 GMT

From 2999d09f39a5c2b8fef5c86fdc9a8767ffeba100 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Thu, 22 Jul 2021 15:07:21 +0000
Subject: [PATCH 046/155] Applying package updates.

---
 webpack/module-minifier-plugin/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack/module-minifier-plugin/package.json b/webpack/module-minifier-plugin/package.json
index 2d5e1ccdd35..1fd39e32a1d 100644
--- a/webpack/module-minifier-plugin/package.json
+++ b/webpack/module-minifier-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/module-minifier-plugin",
-  "version": "0.3.75",
+  "version": "0.4.0",
   "description": "This plugin splits minification of webpack compilations into smaller units.",
   "main": "lib/index.js",
   "typings": "dist/module-minifier-plugin.d.ts",

From 3cdbd6409b1cbc30bdce1549de1252f105abf801 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Thu, 22 Jul 2021 14:38:58 -0700
Subject: [PATCH 047/155] Fix license comment file generation

---
 common/reviews/api/module-minifier-plugin.api.md   | 12 ++++++++++++
 .../src/GenerateLicenseFileForAsset.ts             | 14 +++++++++++---
 .../src/ModuleMinifierPlugin.ts                    | 14 ++++----------
 .../src/ModuleMinifierPlugin.types.ts              | 11 +++++++++++
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/common/reviews/api/module-minifier-plugin.api.md b/common/reviews/api/module-minifier-plugin.api.md
index 3b71010f217..c99334ae5c8 100644
--- a/common/reviews/api/module-minifier-plugin.api.md
+++ b/common/reviews/api/module-minifier-plugin.api.md
@@ -20,6 +20,18 @@ export const CHUNK_MODULES_TOKEN: '__WEBPACK_CHUNK_MODULES__';
 // @public
 export function generateLicenseFileForAsset(compilation: webpack.compilation.Compilation, asset: IAssetInfo, minifiedModules: IModuleMap): string;
 
+// @internal
+export interface _IAcornComment {
+    // (undocumented)
+    end: number;
+    // (undocumented)
+    start: number;
+    // (undocumented)
+    type: 'Line' | 'Block';
+    // (undocumented)
+    value: string;
+}
+
 // @public
 export interface IAssetInfo {
     chunk: webpack.compilation.Chunk;
diff --git a/webpack/module-minifier-plugin/src/GenerateLicenseFileForAsset.ts b/webpack/module-minifier-plugin/src/GenerateLicenseFileForAsset.ts
index 5d960809156..eef4ad1ec57 100644
--- a/webpack/module-minifier-plugin/src/GenerateLicenseFileForAsset.ts
+++ b/webpack/module-minifier-plugin/src/GenerateLicenseFileForAsset.ts
@@ -4,7 +4,13 @@
 import * as path from 'path';
 import * as webpack from 'webpack';
 import { ConcatSource } from 'webpack-sources';
-import { IAssetInfo, IModuleMap, IModuleInfo, IExtendedModule } from './ModuleMinifierPlugin.types';
+import {
+  IAssetInfo,
+  IModuleMap,
+  IModuleInfo,
+  IExtendedModule,
+  _IAcornComment
+} from './ModuleMinifierPlugin.types';
 
 function getAllComments(moduleIds: (string | number)[], minifiedModules: IModuleMap): Set<string> {
   const allComments: Set<string> = new Set();
@@ -18,10 +24,12 @@ function getAllComments(moduleIds: (string | number)[], minifiedModules: IModule
     const { module: webpackModule } = mod;
     const modules: IExtendedModule[] = webpackModule.modules || [webpackModule];
     for (const submodule of modules) {
-      const { comments: subModuleComments } = submodule.factoryMeta;
+      const { comments: subModuleComments } = submodule.factoryMeta as {
+        comments?: Set<_IAcornComment>;
+      };
       if (subModuleComments) {
         for (const comment of subModuleComments) {
-          allComments.add(comment);
+          allComments.add(comment.value);
         }
       }
     }
diff --git a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
index 5caa5f846cb..20c84fcdcfe 100644
--- a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
+++ b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
@@ -29,7 +29,8 @@ import {
   IExtendedModule,
   IModuleMinifierPluginHooks,
   IDehydratedAssets,
-  _IWebpackCompilationData
+  _IWebpackCompilationData,
+  _IAcornComment
 } from './ModuleMinifierPlugin.types';
 import { generateLicenseFileForAsset } from './GenerateLicenseFileForAsset';
 import { rehydrateAsset } from './RehydrateAsset';
@@ -54,13 +55,6 @@ interface IExtendedChunkTemplate {
   };
 }
 
-interface IAcornComment {
-  type: 'Line' | 'Block';
-  value: string;
-  start: number;
-  end: number;
-}
-
 interface IExtendedParser extends webpack.compilation.normalModuleFactory.Parser {
   state: {
     module: IExtendedModule;
@@ -117,7 +111,7 @@ function isMinificationResultError(
 }
 
 // Matche behavior of terser's "some" option
-function isLicenseComment(comment: IAcornComment): boolean {
+function isLicenseComment(comment: _IAcornComment): boolean {
   // https://github.com/terser/terser/blob/d3d924fa9e4c57bbe286b811c6068bcc7026e902/lib/output.js#L175
   return /@preserve|@lic|@cc_on|^\**!/i.test(comment.value);
 }
@@ -178,7 +172,7 @@ export class ModuleMinifierPlugin implements webpack.Plugin {
         const { normalModuleFactory } = compilationData;
 
         function addCommentExtraction(parser: webpack.compilation.normalModuleFactory.Parser): void {
-          parser.hooks.program.tap(PLUGIN_NAME, (program: unknown, comments: IAcornComment[]) => {
+          parser.hooks.program.tap(PLUGIN_NAME, (program: unknown, comments: _IAcornComment[]) => {
             (parser as IExtendedParser).state.module.factoryMeta.comments = comments.filter(isLicenseComment);
           });
         }
diff --git a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.types.ts b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.types.ts
index 5ba02b1386d..d66b671981c 100644
--- a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.types.ts
+++ b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.types.ts
@@ -313,3 +313,14 @@ export interface IModuleMinifierPluginHooks {
    */
   postProcessCodeFragment: SyncWaterfallHook<ReplaceSource, string>;
 }
+
+/**
+ * The comment objects from the Acorn parser inside of webpack
+ * @internal
+ */
+export interface _IAcornComment {
+  type: 'Line' | 'Block';
+  value: string;
+  start: number;
+  end: number;
+}

From da34f8b1d81b98116b20f202d08d754e6d36dc42 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Thu, 22 Jul 2021 14:40:41 -0700
Subject: [PATCH 048/155] Fix eslint

---
 webpack/module-minifier-plugin/src/ModuleMinifierPlugin.types.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.types.ts b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.types.ts
index d66b671981c..0e14c2704cf 100644
--- a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.types.ts
+++ b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.types.ts
@@ -318,6 +318,7 @@ export interface IModuleMinifierPluginHooks {
  * The comment objects from the Acorn parser inside of webpack
  * @internal
  */
+// eslint-disable-next-line @typescript-eslint/naming-convention
 export interface _IAcornComment {
   type: 'Line' | 'Block';
   value: string;

From 83a79462191692f04f953821bfbc9ca6f3a527e0 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Thu, 22 Jul 2021 14:46:16 -0700
Subject: [PATCH 049/155] Fix comment testing

---
 build-tests/localization-plugin-test-02/src/indexA.ts     | 8 ++++++++
 .../src/GenerateLicenseFileForAsset.ts                    | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/build-tests/localization-plugin-test-02/src/indexA.ts b/build-tests/localization-plugin-test-02/src/indexA.ts
index b8fa76cb941..7f1cfd4cbf7 100644
--- a/build-tests/localization-plugin-test-02/src/indexA.ts
+++ b/build-tests/localization-plugin-test-02/src/indexA.ts
@@ -5,6 +5,14 @@ import * as strings5 from './strings5.resx';
 console.log(string1);
 
 console.log(strings3.string2);
+/*! Preserved comment */
+//@preserve Another comment
+// Blah @lic Foo
+// Foo @cc_on bar
+/**
+ * Stuff
+ * @lic Blah
+ */
 
 import(/* webpackChunkName: 'chunk-with-strings' */ './chunks/chunkWithStrings').then(
   ({ ChunkWithStringsClass }) => {
diff --git a/webpack/module-minifier-plugin/src/GenerateLicenseFileForAsset.ts b/webpack/module-minifier-plugin/src/GenerateLicenseFileForAsset.ts
index eef4ad1ec57..314eb8f0b7b 100644
--- a/webpack/module-minifier-plugin/src/GenerateLicenseFileForAsset.ts
+++ b/webpack/module-minifier-plugin/src/GenerateLicenseFileForAsset.ts
@@ -29,7 +29,8 @@ function getAllComments(moduleIds: (string | number)[], minifiedModules: IModule
       };
       if (subModuleComments) {
         for (const comment of subModuleComments) {
-          allComments.add(comment.value);
+          const value: string = comment.type === 'Line' ? `//${comment.value}\n` : `/*${comment.value}*/\n`;
+          allComments.add(value);
         }
       }
     }

From 3be60d35d6f2a37c04de7fc11d87b6ff09f43ded Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Thu, 22 Jul 2021 14:47:21 -0700
Subject: [PATCH 050/155] Add change file

---
 ...-minifier-comment-extraction_2021-07-22-21-47.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@rushstack/module-minifier-plugin/fix-minifier-comment-extraction_2021-07-22-21-47.json

diff --git a/common/changes/@rushstack/module-minifier-plugin/fix-minifier-comment-extraction_2021-07-22-21-47.json b/common/changes/@rushstack/module-minifier-plugin/fix-minifier-comment-extraction_2021-07-22-21-47.json
new file mode 100644
index 00000000000..ed44ffd82a1
--- /dev/null
+++ b/common/changes/@rushstack/module-minifier-plugin/fix-minifier-comment-extraction_2021-07-22-21-47.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/module-minifier-plugin",
+      "comment": "Fix comment file generation logic. Add to build test.",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@rushstack/module-minifier-plugin",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file

From 56842efbb701775e607e952dc1bd7a15e4f94482 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Thu, 22 Jul 2021 15:10:29 -0700
Subject: [PATCH 051/155] Fix WorkerPoolMinifier

---
 .../webpack.config.js                         |  6 ++-
 .../reviews/api/module-minifier-plugin.api.md |  1 +
 .../src/WorkerPoolMinifier.ts                 | 49 ++++++++++++-------
 3 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/build-tests/localization-plugin-test-02/webpack.config.js b/build-tests/localization-plugin-test-02/webpack.config.js
index 8ed5ba5a51a..3866b0b0ebb 100644
--- a/build-tests/localization-plugin-test-02/webpack.config.js
+++ b/build-tests/localization-plugin-test-02/webpack.config.js
@@ -4,7 +4,7 @@ const path = require('path');
 const webpack = require('webpack');
 
 const { LocalizationPlugin } = require('@rushstack/localization-plugin');
-const { ModuleMinifierPlugin, SynchronousMinifier } = require('@rushstack/module-minifier-plugin');
+const { ModuleMinifierPlugin, WorkerPoolMinifier } = require('@rushstack/module-minifier-plugin');
 const { SetPublicPathPlugin } = require('@rushstack/set-webpack-public-path-plugin');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
@@ -42,7 +42,9 @@ function generateConfiguration(mode, outputFolderName) {
     optimization: {
       minimizer: [
         new ModuleMinifierPlugin({
-          minifier: new SynchronousMinifier(),
+          minifier: new WorkerPoolMinifier({
+            verbose: true
+          }),
           sourceMap: true,
           usePortableModules: true
         })
diff --git a/common/reviews/api/module-minifier-plugin.api.md b/common/reviews/api/module-minifier-plugin.api.md
index c99334ae5c8..e43cd6e61bf 100644
--- a/common/reviews/api/module-minifier-plugin.api.md
+++ b/common/reviews/api/module-minifier-plugin.api.md
@@ -164,6 +164,7 @@ export interface _IWebpackCompilationData {
 export interface IWorkerPoolMinifierOptions {
     maxThreads?: number;
     terserOptions?: MinifyOptions;
+    verbose?: boolean;
 }
 
 // @public
diff --git a/webpack/module-minifier-plugin/src/WorkerPoolMinifier.ts b/webpack/module-minifier-plugin/src/WorkerPoolMinifier.ts
index 1de237efee5..281987ecf20 100644
--- a/webpack/module-minifier-plugin/src/WorkerPoolMinifier.ts
+++ b/webpack/module-minifier-plugin/src/WorkerPoolMinifier.ts
@@ -8,7 +8,6 @@ import {
   IModuleMinifier
 } from './ModuleMinifierPlugin.types';
 import { MinifyOptions } from 'terser';
-import { Worker } from 'worker_threads';
 import { WorkerPool } from './workerPool/WorkerPool';
 import { cpus } from 'os';
 
@@ -29,6 +28,11 @@ export interface IWorkerPoolMinifierOptions {
    * `output.comments` is currently not configurable and will always extract license comments to a separate file.
    */
   terserOptions?: MinifyOptions;
+
+  /**
+   * If true, log to the console about the minification results.
+   */
+  verbose?: boolean;
 }
 
 /**
@@ -37,37 +41,23 @@ export interface IWorkerPoolMinifierOptions {
  */
 export class WorkerPoolMinifier implements IModuleMinifier {
   private readonly _pool: WorkerPool;
+  private readonly _verbose: boolean;
 
   private _refCount: number;
   private _deduped: number;
   private _minified: number;
+
   private readonly _resultCache: Map<string, IModuleMinificationResult>;
   private readonly _activeRequests: Map<string, IModuleMinificationCallback[]>;
 
   public constructor(options: IWorkerPoolMinifierOptions) {
-    const { maxThreads = cpus().length, terserOptions = {} } = options || {};
+    const { maxThreads = cpus().length, terserOptions = {}, verbose = false } = options || {};
 
     const activeRequests: Map<string, IModuleMinificationCallback[]> = new Map();
     const resultCache: Map<string, IModuleMinificationResult> = new Map();
     const terserPool: WorkerPool = new WorkerPool({
       id: 'Minifier',
       maxWorkers: maxThreads,
-      prepareWorker: (worker: Worker) => {
-        const cb: (message: IModuleMinificationResult) => void = (
-          message: IModuleMinificationResult
-        ): void => {
-          const callbacks: IModuleMinificationCallback[] | undefined = activeRequests.get(message.hash)!;
-          activeRequests.delete(message.hash);
-          resultCache.set(message.hash, message);
-          for (const callback of callbacks) {
-            callback(message);
-          }
-          terserPool.checkinWorker(worker);
-          worker.off('message', cb);
-        };
-
-        worker.on('message', cb);
-      },
       workerData: terserOptions,
       workerScriptPath: require.resolve('./workerPool/MinifierWorker')
     });
@@ -76,6 +66,7 @@ export class WorkerPoolMinifier implements IModuleMinifier {
     this._refCount = 0;
     this._resultCache = resultCache;
     this._pool = terserPool;
+    this._verbose = verbose;
 
     this._deduped = 0;
     this._minified = 0;
@@ -117,6 +108,21 @@ export class WorkerPoolMinifier implements IModuleMinifier {
     this._pool
       .checkoutWorkerAsync(true)
       .then((worker) => {
+        const cb: (message: IModuleMinificationResult) => void = (
+          message: IModuleMinificationResult
+        ): void => {
+          worker.off('message', cb);
+          const callbacks: IModuleMinificationCallback[] | undefined = activeRequests.get(message.hash)!;
+          activeRequests.delete(message.hash);
+          this._resultCache.set(message.hash, message);
+          for (const callback of callbacks) {
+            callback(message);
+          }
+          // This should always be the last thing done with the worker
+          this._pool.checkinWorker(worker);
+        };
+
+        worker.on('message', cb);
         worker.postMessage(request);
       })
       .catch((error: Error) => {
@@ -139,10 +145,15 @@ export class WorkerPoolMinifier implements IModuleMinifier {
 
     return async () => {
       if (--this._refCount === 0) {
+        if (this._verbose) {
+          console.log(`Shutting down minifier worker pool`);
+        }
         await this._pool.finishAsync();
         this._resultCache.clear();
         this._activeRequests.clear();
-        console.log(`Module minification: ${this._deduped} Deduped, ${this._minified} Processed`);
+        if (this._verbose) {
+          console.log(`Module minification: ${this._deduped} Deduped, ${this._minified} Processed`);
+        }
       }
     };
   }

From b03623ab6b1b7e2b2a55647120a6b8540a52c22b Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Thu, 22 Jul 2021 15:11:49 -0700
Subject: [PATCH 052/155] Update change file

---
 .../fix-minifier-comment-extraction_2021-07-22-21-47.json       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/changes/@rushstack/module-minifier-plugin/fix-minifier-comment-extraction_2021-07-22-21-47.json b/common/changes/@rushstack/module-minifier-plugin/fix-minifier-comment-extraction_2021-07-22-21-47.json
index ed44ffd82a1..4f917fedd54 100644
--- a/common/changes/@rushstack/module-minifier-plugin/fix-minifier-comment-extraction_2021-07-22-21-47.json
+++ b/common/changes/@rushstack/module-minifier-plugin/fix-minifier-comment-extraction_2021-07-22-21-47.json
@@ -2,7 +2,7 @@
   "changes": [
     {
       "packageName": "@rushstack/module-minifier-plugin",
-      "comment": "Fix comment file generation logic. Add to build test.",
+      "comment": "Fix comment file generation logic. Fix WorkerPoolMinifier hanging the process.",
       "type": "patch"
     }
   ],

From 49bae356fab8b77f7be38feb8c86ce1583834ba6 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Thu, 22 Jul 2021 22:31:41 +0000
Subject: [PATCH 053/155] Deleting change files and updating change logs for
 package updates.

---
 ...minifier-comment-extraction_2021-07-22-21-47.json | 11 -----------
 webpack/module-minifier-plugin/CHANGELOG.json        | 12 ++++++++++++
 webpack/module-minifier-plugin/CHANGELOG.md          |  9 ++++++++-
 3 files changed, 20 insertions(+), 12 deletions(-)
 delete mode 100644 common/changes/@rushstack/module-minifier-plugin/fix-minifier-comment-extraction_2021-07-22-21-47.json

diff --git a/common/changes/@rushstack/module-minifier-plugin/fix-minifier-comment-extraction_2021-07-22-21-47.json b/common/changes/@rushstack/module-minifier-plugin/fix-minifier-comment-extraction_2021-07-22-21-47.json
deleted file mode 100644
index 4f917fedd54..00000000000
--- a/common/changes/@rushstack/module-minifier-plugin/fix-minifier-comment-extraction_2021-07-22-21-47.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/module-minifier-plugin",
-      "comment": "Fix comment file generation logic. Fix WorkerPoolMinifier hanging the process.",
-      "type": "patch"
-    }
-  ],
-  "packageName": "@rushstack/module-minifier-plugin",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/webpack/module-minifier-plugin/CHANGELOG.json b/webpack/module-minifier-plugin/CHANGELOG.json
index dbd178f4859..8ad966ccdc5 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.json
+++ b/webpack/module-minifier-plugin/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/module-minifier-plugin",
   "entries": [
+    {
+      "version": "0.4.1",
+      "tag": "@rushstack/module-minifier-plugin_v0.4.1",
+      "date": "Thu, 22 Jul 2021 22:31:41 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Fix comment file generation logic. Fix WorkerPoolMinifier hanging the process."
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.0",
       "tag": "@rushstack/module-minifier-plugin_v0.4.0",
diff --git a/webpack/module-minifier-plugin/CHANGELOG.md b/webpack/module-minifier-plugin/CHANGELOG.md
index 3ec3ec62383..3426cae0445 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.md
+++ b/webpack/module-minifier-plugin/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/module-minifier-plugin
 
-This log was last generated on Thu, 22 Jul 2021 15:07:19 GMT and should not be manually modified.
+This log was last generated on Thu, 22 Jul 2021 22:31:41 GMT and should not be manually modified.
+
+## 0.4.1
+Thu, 22 Jul 2021 22:31:41 GMT
+
+### Patches
+
+- Fix comment file generation logic. Fix WorkerPoolMinifier hanging the process.
 
 ## 0.4.0
 Thu, 22 Jul 2021 15:07:19 GMT

From 47e2d7761c7cab1cdce5bb4dbad46ecf42ea1630 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Thu, 22 Jul 2021 22:31:43 +0000
Subject: [PATCH 054/155] Applying package updates.

---
 webpack/module-minifier-plugin/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack/module-minifier-plugin/package.json b/webpack/module-minifier-plugin/package.json
index 1fd39e32a1d..514f5b7ac2d 100644
--- a/webpack/module-minifier-plugin/package.json
+++ b/webpack/module-minifier-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/module-minifier-plugin",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "This plugin splits minification of webpack compilations into smaller units.",
   "main": "lib/index.js",
   "typings": "dist/module-minifier-plugin.d.ts",

From a212e150357d4389736df59dc7577f617b281e25 Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonas.b@gmail.com>
Date: Sat, 24 Jul 2021 11:53:18 +0200
Subject: [PATCH 055/155] Update
 common/changes/@rushstack/heft-sass-plugin/master_2021-07-19-17-25.json

Co-authored-by: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
---
 .../@rushstack/heft-sass-plugin/master_2021-07-19-17-25.json  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/changes/@rushstack/heft-sass-plugin/master_2021-07-19-17-25.json b/common/changes/@rushstack/heft-sass-plugin/master_2021-07-19-17-25.json
index 63993880c86..840de8e5228 100644
--- a/common/changes/@rushstack/heft-sass-plugin/master_2021-07-19-17-25.json
+++ b/common/changes/@rushstack/heft-sass-plugin/master_2021-07-19-17-25.json
@@ -3,9 +3,9 @@
     {
       "packageName": "@rushstack/heft-sass-plugin",
       "comment": "Extract default Sass plugin to separate package",
-      "type": "patch"
+      "type": "minor"
     }
   ],
   "packageName": "@rushstack/heft-sass-plugin",
   "email": "jonasb@users.noreply.github.com"
-}
\ No newline at end of file
+}

From c7efbf4884e923e080ca85a9ef985fc62d6e7b1b Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonas.b@gmail.com>
Date: Sat, 24 Jul 2021 11:53:37 +0200
Subject: [PATCH 056/155] Update
 common/changes/@rushstack/heft/master_2021-07-19-17-25.json

Co-authored-by: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
---
 common/changes/@rushstack/heft/master_2021-07-19-17-25.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/changes/@rushstack/heft/master_2021-07-19-17-25.json b/common/changes/@rushstack/heft/master_2021-07-19-17-25.json
index b46d02785a9..af58529ec5d 100644
--- a/common/changes/@rushstack/heft/master_2021-07-19-17-25.json
+++ b/common/changes/@rushstack/heft/master_2021-07-19-17-25.json
@@ -2,10 +2,10 @@
   "changes": [
     {
       "packageName": "@rushstack/heft",
-      "comment": "Extract default Sass plugin to separate @rushstack/heft-sass-plugin package",
+      "comment": "(BREAKING CHANGE) Extract default Sass plugin to separate @rushstack/heft-sass-plugin package",
       "type": "minor"
     }
   ],
   "packageName": "@rushstack/heft",
   "email": "jonasb@users.noreply.github.com"
-}
\ No newline at end of file
+}

From f6d7ab099dd926588f6a089e71126418095ed1c8 Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonas.b@gmail.com>
Date: Sat, 24 Jul 2021 11:53:47 +0200
Subject: [PATCH 057/155] Update heft-plugins/heft-sass-plugin/package.json

Co-authored-by: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
---
 heft-plugins/heft-sass-plugin/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/heft-plugins/heft-sass-plugin/package.json b/heft-plugins/heft-sass-plugin/package.json
index fbae5d4cb06..ebeb8649bba 100644
--- a/heft-plugins/heft-sass-plugin/package.json
+++ b/heft-plugins/heft-sass-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-sass-plugin",
-  "version": "0.1.0",
+  "version": "0.0.0",
   "description": "Heft plugin for SASS",
   "repository": {
     "type": "git",

From 24c7d51ffb5929ef3315f1adc5d3e2a9dcc22644 Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonas.b@gmail.com>
Date: Sat, 24 Jul 2021 11:58:48 +0200
Subject: [PATCH 058/155] Update
 heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts

Co-authored-by: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
---
 heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts b/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
index a1409fb942c..58fef8dbac6 100644
--- a/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
+++ b/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
@@ -2,7 +2,7 @@
 // See LICENSE in the project root for license information.
 
 import * as path from 'path';
-import {
+import type {
   HeftConfiguration,
   HeftSession,
   IBuildStageContext,

From 044406a7ce7c8c7d78edcf0a148dff5c323e83a1 Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonasb@users.noreply.github.com>
Date: Sat, 24 Jul 2021 12:04:41 +0200
Subject: [PATCH 059/155] Memoize SassConfigurationLoader in SassTypingsPlugin

---
 .../heft-sass-plugin/src/SassTypingsPlugin.ts | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts b/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
index 58fef8dbac6..855a88afcc1 100644
--- a/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
+++ b/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
@@ -22,6 +22,8 @@ const PLUGIN_SCHEMA_PATH: string = path.resolve(__dirname, 'schemas', 'heft-sass
 const SASS_CONFIGURATION_LOCATION: string = 'config/sass.json';
 
 export class SassTypingsPlugin implements IHeftPlugin {
+  private static _sassConfigurationLoader: ConfigurationFile<ISassConfigurationJson> | undefined;
+
   public readonly pluginName: string = PLUGIN_NAME;
   public readonly optionsSchema: JsonSchema = JsonSchema.fromFile(PLUGIN_SCHEMA_PATH);
 
@@ -81,20 +83,23 @@ export class SassTypingsPlugin implements IHeftPlugin {
   }
 
   private static _getSassConfigurationLoader(): ConfigurationFile<ISassConfigurationJson> {
-    return new ConfigurationFile<ISassConfigurationJson>({
-      projectRelativeFilePath: SASS_CONFIGURATION_LOCATION,
-      jsonSchemaPath: PLUGIN_SCHEMA_PATH,
-      jsonPathMetadata: {
-        '$.importIncludePaths.*': {
-          pathResolutionMethod: PathResolutionMethod.resolvePathRelativeToProjectRoot
-        },
-        '$.generatedTsFolder.*': {
-          pathResolutionMethod: PathResolutionMethod.resolvePathRelativeToProjectRoot
-        },
-        '$.srcFolder.*': {
-          pathResolutionMethod: PathResolutionMethod.resolvePathRelativeToProjectRoot
+    if (!SassTypingsPlugin._sassConfigurationLoader) {
+      SassTypingsPlugin._sassConfigurationLoader = new ConfigurationFile<ISassConfigurationJson>({
+        projectRelativeFilePath: SASS_CONFIGURATION_LOCATION,
+        jsonSchemaPath: PLUGIN_SCHEMA_PATH,
+        jsonPathMetadata: {
+          '$.importIncludePaths.*': {
+            pathResolutionMethod: PathResolutionMethod.resolvePathRelativeToProjectRoot
+          },
+          '$.generatedTsFolder.*': {
+            pathResolutionMethod: PathResolutionMethod.resolvePathRelativeToProjectRoot
+          },
+          '$.srcFolder.*': {
+            pathResolutionMethod: PathResolutionMethod.resolvePathRelativeToProjectRoot
+          }
         }
-      }
-    });
+      });
+    }
+    return SassTypingsPlugin._sassConfigurationLoader;
   }
 }

From fdc9f327ec83a2083c77782c09a2bd08b1e825d2 Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Tue, 27 Jul 2021 14:47:37 -0700
Subject: [PATCH 060/155] Update node-forge

---
 common/config/rush/pnpm-lock.yaml                | 16 ++++++----------
 common/config/rush/repo-state.json               |  2 +-
 libraries/debug-certificate-manager/package.json |  4 ++--
 .../src/CertificateManager.ts                    | 15 ++++++++-------
 libraries/debug-certificate-manager/src/exec.ts  |  4 ++--
 5 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index b6745b09f94..734d360caca 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -1085,12 +1085,12 @@ importers:
       '@rushstack/node-core-library': workspace:*
       '@types/heft-jest': 1.0.1
       '@types/node': 10.17.13
-      '@types/node-forge': 0.9.1
-      node-forge: ~0.7.1
+      '@types/node-forge': 0.10.2
+      node-forge: ~0.10.0
       sudo: ~1.0.3
     dependencies:
       '@rushstack/node-core-library': link:../node-core-library
-      node-forge: 0.7.6
+      node-forge: 0.10.0
       sudo: 1.0.3
     devDependencies:
       '@rushstack/eslint-config': link:../../stack/eslint-config
@@ -1098,7 +1098,7 @@ importers:
       '@rushstack/heft-node-rig': link:../../rigs/heft-node-rig
       '@types/heft-jest': 1.0.1
       '@types/node': 10.17.13
-      '@types/node-forge': 0.9.1
+      '@types/node-forge': 0.10.2
 
   ../../libraries/heft-config-file:
     specifiers:
@@ -3165,8 +3165,8 @@ packages:
       form-data: 3.0.1
     dev: false
 
-  /@types/node-forge/0.9.1:
-    resolution: {integrity: sha512-xNO6BfB4Du8DSChdbqyTf488gQwCEUjkxVQq8CeigoG6N7INc8TTRHJK+88IcrnJ0Q8HWPLK4X8pwC8Rcx+sYg==}
+  /@types/node-forge/0.10.2:
+    resolution: {integrity: sha512-nEWO3mkJ1j7eGxGUu32jaGFJj+YSvUt/zG4sEAXbUDbjkQMf9u98Bf3peC4oGFR3zA1n3M3KaXcw6xQyZpl5jg==}
     dependencies:
       '@types/node': 10.17.13
     dev: true
@@ -8477,10 +8477,6 @@ packages:
     engines: {node: '>= 6.0.0'}
     dev: false
 
-  /node-forge/0.7.6:
-    resolution: {integrity: sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==}
-    dev: false
-
   /node-gyp/7.1.2:
     resolution: {integrity: sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==}
     engines: {node: '>= 10.12.0'}
diff --git a/common/config/rush/repo-state.json b/common/config/rush/repo-state.json
index 303ff3c4193..ec55294680a 100644
--- a/common/config/rush/repo-state.json
+++ b/common/config/rush/repo-state.json
@@ -1,5 +1,5 @@
 // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
 {
-  "pnpmShrinkwrapHash": "f45464cdd2ef1f79ab3446b3edd2384175b1e967",
+  "pnpmShrinkwrapHash": "803697b395109817287ec4be1099c161ddb1fd09",
   "preferredVersionsHash": "1fbc26d2c5b3248616b9edccd6bef064075243bc"
 }
diff --git a/libraries/debug-certificate-manager/package.json b/libraries/debug-certificate-manager/package.json
index 6c31a067cf1..841054bb0be 100644
--- a/libraries/debug-certificate-manager/package.json
+++ b/libraries/debug-certificate-manager/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@rushstack/node-core-library": "workspace:*",
-    "node-forge": "~0.7.1",
+    "node-forge": "~0.10.0",
     "sudo": "~1.0.3"
   },
   "devDependencies": {
@@ -22,6 +22,6 @@
     "@rushstack/heft-node-rig": "workspace:*",
     "@types/heft-jest": "1.0.1",
     "@types/node": "10.17.13",
-    "@types/node-forge": "0.9.1"
+    "@types/node-forge": "0.10.2"
   }
 }
diff --git a/libraries/debug-certificate-manager/src/CertificateManager.ts b/libraries/debug-certificate-manager/src/CertificateManager.ts
index adbc47a237f..18ce86a4176 100644
--- a/libraries/debug-certificate-manager/src/CertificateManager.ts
+++ b/libraries/debug-certificate-manager/src/CertificateManager.ts
@@ -1,15 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import * as forge from 'node-forge';
+import type { pki } from 'node-forge';
 import * as path from 'path';
 import * as child_process from 'child_process';
 import { EOL } from 'os';
-import { FileSystem, Terminal } from '@rushstack/node-core-library';
+import { FileSystem, Terminal, Import } from '@rushstack/node-core-library';
 
 import { runSudoAsync, IRunResult, runAsync } from './exec';
 import { CertificateStore } from './CertificateStore';
 
+const forge: typeof import('node-forge') = Import.lazy('node-forge', require);
+
 const SERIAL_NUMBER: string = '731c321744e34650a202e3ef91c3c1b0';
 const FRIENDLY_NAME: string = 'debug-certificate-manager Development Certificate';
 const MAC_KEYCHAIN: string = '/Library/Keychains/System.keychain';
@@ -39,7 +41,6 @@ export interface ICertificate {
  */
 export class CertificateManager {
   private _certificateStore: CertificateStore;
-  private _getCertUtilPathPromise: Promise<string | undefined> | undefined;
 
   public constructor() {
     this._certificateStore = new CertificateStore();
@@ -171,8 +172,8 @@ export class CertificateManager {
   }
 
   private _createDevelopmentCertificate(): ICertificate {
-    const keys: forge.pki.KeyPair = forge.pki.rsa.generateKeyPair(2048);
-    const certificate: forge.pki.Certificate = forge.pki.createCertificate();
+    const keys: pki.KeyPair = forge.pki.rsa.generateKeyPair(2048);
+    const certificate: pki.Certificate = forge.pki.createCertificate();
     certificate.publicKey = keys.publicKey;
 
     certificate.serialNumber = SERIAL_NUMBER;
@@ -182,7 +183,7 @@ export class CertificateManager {
     // Valid for 3 years
     certificate.validity.notAfter.setFullYear(certificate.validity.notBefore.getFullYear() + 3);
 
-    const attrs: forge.pki.CertificateField[] = [
+    const attrs: pki.CertificateField[] = [
       {
         name: 'commonName',
         value: 'localhost'
@@ -400,7 +401,7 @@ export class CertificateManager {
     if (!certificateData) {
       return false;
     }
-    const certificate: forge.pki.Certificate = forge.pki.certificateFromPem(certificateData);
+    const certificate: pki.Certificate = forge.pki.certificateFromPem(certificateData);
     return !!certificate.getExtension('subjectAltName');
   }
 }
diff --git a/libraries/debug-certificate-manager/src/exec.ts b/libraries/debug-certificate-manager/src/exec.ts
index 2be95ddd5aa..6db888eabd0 100644
--- a/libraries/debug-certificate-manager/src/exec.ts
+++ b/libraries/debug-certificate-manager/src/exec.ts
@@ -3,8 +3,6 @@
 
 import { Executable } from '@rushstack/node-core-library';
 import * as child_process from 'child_process';
-// eslint-disable-next-line
-const sudo: (args: string[], options: any) => child_process.ChildProcess = require('sudo');
 
 export interface IRunResult {
   stdout: string[];
@@ -13,6 +11,8 @@ export interface IRunResult {
 }
 
 export async function runSudoAsync(command: string, params: string[]): Promise<IRunResult> {
+  // eslint-disable-next-line
+  const sudo: (args: string[], options: any) => child_process.ChildProcess = require('sudo');
   const result: child_process.ChildProcess = sudo([command, ...params], {
     cachePassword: false,
     prompt: 'Enter your password: '

From e8b292e747112f7c37055ff16135d753c5d9cb89 Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Tue, 27 Jul 2021 14:50:40 -0700
Subject: [PATCH 061/155] Rush change.

---
 .../ianc-update-node-forge_2021-07-27-21-50.json      | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@rushstack/debug-certificate-manager/ianc-update-node-forge_2021-07-27-21-50.json

diff --git a/common/changes/@rushstack/debug-certificate-manager/ianc-update-node-forge_2021-07-27-21-50.json b/common/changes/@rushstack/debug-certificate-manager/ianc-update-node-forge_2021-07-27-21-50.json
new file mode 100644
index 00000000000..c33895c89c4
--- /dev/null
+++ b/common/changes/@rushstack/debug-certificate-manager/ianc-update-node-forge_2021-07-27-21-50.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/debug-certificate-manager",
+      "comment": "Update node-forge to version ~0.10.0.",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@rushstack/debug-certificate-manager",
+  "email": "iclanton@users.noreply.github.com"
+}
\ No newline at end of file

From cf7d774d5acbffad6664a1e59b8b1093bc1c00cb Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Tue, 27 Jul 2021 15:09:40 -0700
Subject: [PATCH 062/155] Lazy-load webpack in the heft plugins

---
 .../src/WebpackConfigurationLoader.ts         |  2 +-
 .../heft-webpack4-plugin/src/WebpackPlugin.ts | 59 +++++++++++-----
 .../heft-webpack4-plugin/src/shared.ts        | 29 +-------
 .../src/WebpackConfigurationLoader.ts         |  2 +-
 .../heft-webpack5-plugin/src/WebpackPlugin.ts | 67 ++++++++++++++-----
 .../heft-webpack5-plugin/src/shared.ts        | 29 +-------
 6 files changed, 99 insertions(+), 89 deletions(-)

diff --git a/heft-plugins/heft-webpack4-plugin/src/WebpackConfigurationLoader.ts b/heft-plugins/heft-webpack4-plugin/src/WebpackConfigurationLoader.ts
index 6fa2134c511..bb47cf34b12 100644
--- a/heft-plugins/heft-webpack4-plugin/src/WebpackConfigurationLoader.ts
+++ b/heft-plugins/heft-webpack4-plugin/src/WebpackConfigurationLoader.ts
@@ -3,7 +3,7 @@
 
 import * as path from 'path';
 import { FileSystem } from '@rushstack/node-core-library';
-import * as webpack from 'webpack';
+import type * as webpack from 'webpack';
 import type { IBuildStageProperties, ScopedLogger } from '@rushstack/heft';
 
 import { IWebpackConfiguration } from './shared';
diff --git a/heft-plugins/heft-webpack4-plugin/src/WebpackPlugin.ts b/heft-plugins/heft-webpack4-plugin/src/WebpackPlugin.ts
index e8df24e72c0..a1bc8f597c7 100644
--- a/heft-plugins/heft-webpack4-plugin/src/WebpackPlugin.ts
+++ b/heft-plugins/heft-webpack4-plugin/src/WebpackPlugin.ts
@@ -1,9 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import webpack from 'webpack';
+import type {
+  Compiler as WebpackCompiler,
+  MultiCompiler as WebpackMultiCompiler,
+  Stats as WebpackStats,
+  compilation as WebpackCompilation
+} from 'webpack';
 import type TWebpackDevServer from 'webpack-dev-server';
-import { LegacyAdapters } from '@rushstack/node-core-library';
+import { LegacyAdapters, Import, IPackageJson, PackageJsonLookup } from '@rushstack/node-core-library';
 import type {
   HeftConfiguration,
   HeftSession,
@@ -13,32 +18,56 @@ import type {
   IHeftPlugin,
   ScopedLogger
 } from '@rushstack/heft';
-import {
+import type {
   IWebpackConfiguration,
   IWebpackBundleSubstageProperties,
-  IWebpackBuildStageProperties,
-  IWebpackVersions,
-  getWebpackVersions
+  IWebpackBuildStageProperties
 } from './shared';
 import { WebpackConfigurationLoader } from './WebpackConfigurationLoader';
 
+const webpack: typeof import('webpack') = Import.lazy('webpack', require);
+
 const PLUGIN_NAME: string = 'WebpackPlugin';
 const WEBPACK_DEV_SERVER_PACKAGE_NAME: string = 'webpack-dev-server';
 const WEBPACK_DEV_SERVER_ENV_VAR_NAME: string = 'WEBPACK_DEV_SERVER';
 
+interface IWebpackVersions {
+  webpackVersion: string;
+  webpackDevServerVersion: string;
+}
+
 /**
  * @internal
  */
 export class WebpackPlugin implements IHeftPlugin {
   public readonly pluginName: string = PLUGIN_NAME;
 
+  private static _webpackVersions: IWebpackVersions | undefined;
+  private static _getWebpackVersions(): IWebpackVersions {
+    if (!WebpackPlugin._webpackVersions) {
+      const webpackDevServerPackageJsonPath: string = Import.resolveModule({
+        modulePath: 'webpack-dev-server/package.json',
+        baseFolderPath: __dirname
+      });
+      const webpackDevServerPackageJson: IPackageJson = PackageJsonLookup.instance.loadPackageJson(
+        webpackDevServerPackageJsonPath
+      );
+      WebpackPlugin._webpackVersions = {
+        webpackVersion: webpack.version!,
+        webpackDevServerVersion: webpackDevServerPackageJson.version
+      };
+    }
+
+    return WebpackPlugin._webpackVersions;
+  }
+
   public apply(heftSession: HeftSession, heftConfiguration: HeftConfiguration): void {
     heftSession.hooks.build.tap(PLUGIN_NAME, (build: IBuildStageContext) => {
       build.hooks.bundle.tap(PLUGIN_NAME, (bundle: IBundleSubstage) => {
         bundle.hooks.configureWebpack.tap(
           { name: PLUGIN_NAME, stage: Number.MIN_SAFE_INTEGER },
           (webpackConfiguration: unknown) => {
-            const webpackVersions: IWebpackVersions = getWebpackVersions();
+            const webpackVersions: IWebpackVersions = WebpackPlugin._getWebpackVersions();
             bundle.properties.webpackVersion = webpack.version;
             bundle.properties.webpackDevServerVersion = webpackVersions.webpackDevServerVersion;
 
@@ -86,7 +115,7 @@ export class WebpackPlugin implements IHeftPlugin {
     }
 
     const logger: ScopedLogger = heftSession.requestScopedLogger('webpack');
-    const webpackVersions: IWebpackVersions = getWebpackVersions();
+    const webpackVersions: IWebpackVersions = WebpackPlugin._getWebpackVersions();
     if (bundleSubstageProperties.webpackVersion !== webpackVersions.webpackVersion) {
       logger.emitError(
         new Error(
@@ -109,7 +138,7 @@ export class WebpackPlugin implements IHeftPlugin {
 
     logger.terminal.writeLine(`Using Webpack version ${webpack.version}`);
 
-    const compiler: webpack.Compiler | webpack.MultiCompiler = Array.isArray(webpackConfiguration)
+    const compiler: WebpackCompiler | WebpackMultiCompiler = Array.isArray(webpackConfiguration)
       ? webpack(webpackConfiguration) /* (webpack.Compilation[]) => webpack.MultiCompiler */
       : webpack(webpackConfiguration); /* (webpack.Compilation) => webpack.Compiler */
 
@@ -151,7 +180,7 @@ export class WebpackPlugin implements IHeftPlugin {
       // so we can move on to post-build
       let firstCompilationDoneCallback: (() => void) | undefined;
       const originalBeforeCallback: typeof options.before | undefined = options.before;
-      options.before = (app, devServer, compiler: webpack.Compiler) => {
+      options.before = (app, devServer, compiler: WebpackCompiler) => {
         compiler.hooks.done.tap('heft-webpack-plugin', () => {
           if (firstCompilationDoneCallback) {
             firstCompilationDoneCallback();
@@ -192,11 +221,11 @@ export class WebpackPlugin implements IHeftPlugin {
         );
       }
 
-      let stats: webpack.Stats | webpack.compilation.MultiStats | undefined;
+      let stats: WebpackStats | WebpackCompilation.MultiStats | undefined;
       if (buildProperties.watchMode) {
         try {
           stats = await LegacyAdapters.convertCallbackToPromise(
-            (compiler as webpack.Compiler).watch.bind(compiler),
+            (compiler as WebpackCompiler).watch.bind(compiler),
             {}
           );
         } catch (e) {
@@ -205,7 +234,7 @@ export class WebpackPlugin implements IHeftPlugin {
       } else {
         try {
           stats = await LegacyAdapters.convertCallbackToPromise(
-            (compiler as webpack.Compiler).run.bind(compiler)
+            (compiler as WebpackCompiler).run.bind(compiler)
           );
         } catch (e) {
           logger.emitError(e);
@@ -221,9 +250,9 @@ export class WebpackPlugin implements IHeftPlugin {
     }
   }
 
-  private _emitErrors(logger: ScopedLogger, stats: webpack.Stats | webpack.compilation.MultiStats): void {
+  private _emitErrors(logger: ScopedLogger, stats: WebpackStats | WebpackCompilation.MultiStats): void {
     if (stats.hasErrors() || stats.hasWarnings()) {
-      const serializedStats: webpack.Stats.ToJsonOutput = stats.toJson('errors-warnings');
+      const serializedStats: WebpackStats.ToJsonOutput = stats.toJson('errors-warnings');
 
       for (const warning of serializedStats.warnings as (string | Error)[]) {
         logger.emitWarning(warning instanceof Error ? warning : new Error(warning));
diff --git a/heft-plugins/heft-webpack4-plugin/src/shared.ts b/heft-plugins/heft-webpack4-plugin/src/shared.ts
index 47abc41d7aa..455cb19b3c2 100644
--- a/heft-plugins/heft-webpack4-plugin/src/shared.ts
+++ b/heft-plugins/heft-webpack4-plugin/src/shared.ts
@@ -1,10 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import { Configuration as WebpackDevServerConfiguration } from 'webpack-dev-server';
-import * as webpack from 'webpack';
+import type { Configuration as WebpackDevServerConfiguration } from 'webpack-dev-server';
+import type * as webpack from 'webpack';
 import type { IBuildStageProperties, IBundleSubstageProperties } from '@rushstack/heft';
-import { Import, IPackageJson, PackageJsonLookup } from '@rushstack/node-core-library';
 
 /**
  * @public
@@ -40,27 +39,3 @@ export interface IWebpackBundleSubstageProperties extends IBundleSubstagePropert
 export interface IWebpackBuildStageProperties extends IBuildStageProperties {
   webpackStats?: webpack.Stats | webpack.compilation.MultiStats;
 }
-
-export interface IWebpackVersions {
-  webpackVersion: string;
-  webpackDevServerVersion: string;
-}
-
-let _webpackVersions: IWebpackVersions | undefined;
-export function getWebpackVersions(): IWebpackVersions {
-  if (!_webpackVersions) {
-    const webpackDevServerPackageJsonPath: string = Import.resolveModule({
-      modulePath: 'webpack-dev-server/package.json',
-      baseFolderPath: __dirname
-    });
-    const webpackDevServerPackageJson: IPackageJson = PackageJsonLookup.instance.loadPackageJson(
-      webpackDevServerPackageJsonPath
-    );
-    _webpackVersions = {
-      webpackVersion: webpack.version!,
-      webpackDevServerVersion: webpackDevServerPackageJson.version
-    };
-  }
-
-  return _webpackVersions;
-}
diff --git a/heft-plugins/heft-webpack5-plugin/src/WebpackConfigurationLoader.ts b/heft-plugins/heft-webpack5-plugin/src/WebpackConfigurationLoader.ts
index 6fa2134c511..bb47cf34b12 100644
--- a/heft-plugins/heft-webpack5-plugin/src/WebpackConfigurationLoader.ts
+++ b/heft-plugins/heft-webpack5-plugin/src/WebpackConfigurationLoader.ts
@@ -3,7 +3,7 @@
 
 import * as path from 'path';
 import { FileSystem } from '@rushstack/node-core-library';
-import * as webpack from 'webpack';
+import type * as webpack from 'webpack';
 import type { IBuildStageProperties, ScopedLogger } from '@rushstack/heft';
 
 import { IWebpackConfiguration } from './shared';
diff --git a/heft-plugins/heft-webpack5-plugin/src/WebpackPlugin.ts b/heft-plugins/heft-webpack5-plugin/src/WebpackPlugin.ts
index 6f7469f1b43..991c646cf5c 100644
--- a/heft-plugins/heft-webpack5-plugin/src/WebpackPlugin.ts
+++ b/heft-plugins/heft-webpack5-plugin/src/WebpackPlugin.ts
@@ -2,9 +2,16 @@
 // See LICENSE in the project root for license information.
 
 import * as nodePath from 'path';
-import webpack from 'webpack';
+import type {
+  Compiler as WebpackCompiler,
+  MultiCompiler as WebpackMultiCompiler,
+  Stats as WebpackStats,
+  MultiStats as WebpackMultiStats,
+  StatsCompilation as WebpackStatsCompilation,
+  StatsError as WebpackStatsError
+} from 'webpack';
 import type TWebpackDevServer from 'webpack-dev-server';
-import { LegacyAdapters, Path } from '@rushstack/node-core-library';
+import { LegacyAdapters, Path, Import, IPackageJson, PackageJsonLookup } from '@rushstack/node-core-library';
 import type {
   HeftConfiguration,
   HeftSession,
@@ -14,32 +21,56 @@ import type {
   IHeftPlugin,
   ScopedLogger
 } from '@rushstack/heft';
-import {
+import type {
   IWebpackConfiguration,
   IWebpackBundleSubstageProperties,
-  IWebpackBuildStageProperties,
-  IWebpackVersions,
-  getWebpackVersions
+  IWebpackBuildStageProperties
 } from './shared';
 import { WebpackConfigurationLoader } from './WebpackConfigurationLoader';
 
+const webpack: typeof import('webpack') = Import.lazy('webpack', require);
+
 const PLUGIN_NAME: string = 'WebpackPlugin';
 const WEBPACK_DEV_SERVER_PACKAGE_NAME: string = 'webpack-dev-server';
 const WEBPACK_DEV_SERVER_ENV_VAR_NAME: string = 'WEBPACK_DEV_SERVER';
 
+interface IWebpackVersions {
+  webpackVersion: string;
+  webpackDevServerVersion: string;
+}
+
 /**
  * @internal
  */
 export class WebpackPlugin implements IHeftPlugin {
   public readonly pluginName: string = PLUGIN_NAME;
 
+  private static _webpackVersions: IWebpackVersions | undefined;
+  private static _getWebpackVersions(): IWebpackVersions {
+    if (!WebpackPlugin._webpackVersions) {
+      const webpackDevServerPackageJsonPath: string = Import.resolveModule({
+        modulePath: 'webpack-dev-server/package.json',
+        baseFolderPath: __dirname
+      });
+      const webpackDevServerPackageJson: IPackageJson = PackageJsonLookup.instance.loadPackageJson(
+        webpackDevServerPackageJsonPath
+      );
+      WebpackPlugin._webpackVersions = {
+        webpackVersion: webpack.version!,
+        webpackDevServerVersion: webpackDevServerPackageJson.version
+      };
+    }
+
+    return WebpackPlugin._webpackVersions;
+  }
+
   public apply(heftSession: HeftSession, heftConfiguration: HeftConfiguration): void {
     heftSession.hooks.build.tap(PLUGIN_NAME, (build: IBuildStageContext) => {
       build.hooks.bundle.tap(PLUGIN_NAME, (bundle: IBundleSubstage) => {
         bundle.hooks.configureWebpack.tap(
           { name: PLUGIN_NAME, stage: Number.MIN_SAFE_INTEGER },
           (webpackConfiguration: unknown) => {
-            const webpackVersions: IWebpackVersions = getWebpackVersions();
+            const webpackVersions: IWebpackVersions = WebpackPlugin._getWebpackVersions();
             bundle.properties.webpackVersion = webpack.version;
             bundle.properties.webpackDevServerVersion = webpackVersions.webpackDevServerVersion;
 
@@ -89,7 +120,7 @@ export class WebpackPlugin implements IHeftPlugin {
     }
 
     const logger: ScopedLogger = heftSession.requestScopedLogger('webpack');
-    const webpackVersions: IWebpackVersions = getWebpackVersions();
+    const webpackVersions: IWebpackVersions = WebpackPlugin._getWebpackVersions();
     if (bundleSubstageProperties.webpackVersion !== webpackVersions.webpackVersion) {
       logger.emitError(
         new Error(
@@ -112,9 +143,9 @@ export class WebpackPlugin implements IHeftPlugin {
 
     logger.terminal.writeLine(`Using Webpack version ${webpack.version}`);
 
-    const compiler: webpack.Compiler | webpack.MultiCompiler = Array.isArray(webpackConfiguration)
-      ? webpack(webpackConfiguration) /* (webpack.Compilation[]) => webpack.MultiCompiler */
-      : webpack(webpackConfiguration); /* (webpack.Compilation) => webpack.Compiler */
+    const compiler: WebpackCompiler | WebpackMultiCompiler = Array.isArray(webpackConfiguration)
+      ? webpack(webpackConfiguration) /* (webpack.Compilation[]) => MultiCompiler */
+      : webpack(webpackConfiguration); /* (webpack.Compilation) => Compiler */
 
     if (buildProperties.serveMode) {
       const defaultDevServerOptions: TWebpackDevServer.Configuration = {
@@ -154,7 +185,7 @@ export class WebpackPlugin implements IHeftPlugin {
       // so we can move on to post-build
       let firstCompilationDoneCallback: (() => void) | undefined;
       const originalBeforeCallback: typeof options.before | undefined = options.before;
-      options.before = (app, devServer, compiler: webpack.Compiler) => {
+      options.before = (app, devServer, compiler: WebpackCompiler) => {
         compiler.hooks.done.tap('heft-webpack-plugin', () => {
           if (firstCompilationDoneCallback) {
             firstCompilationDoneCallback();
@@ -195,11 +226,11 @@ export class WebpackPlugin implements IHeftPlugin {
         );
       }
 
-      let stats: webpack.Stats | webpack.MultiStats | undefined;
+      let stats: WebpackStats | WebpackMultiStats | undefined;
       if (buildProperties.watchMode) {
         try {
           stats = await LegacyAdapters.convertCallbackToPromise(
-            (compiler as webpack.Compiler).watch.bind(compiler),
+            (compiler as WebpackCompiler).watch.bind(compiler),
             {}
           );
         } catch (e) {
@@ -208,7 +239,7 @@ export class WebpackPlugin implements IHeftPlugin {
       } else {
         try {
           stats = await LegacyAdapters.convertCallbackToPromise(
-            (compiler as webpack.Compiler).run.bind(compiler)
+            (compiler as WebpackCompiler).run.bind(compiler)
           );
           await LegacyAdapters.convertCallbackToPromise(compiler.close.bind(compiler));
         } catch (e) {
@@ -228,10 +259,10 @@ export class WebpackPlugin implements IHeftPlugin {
   private _emitErrors(
     logger: ScopedLogger,
     buildFolder: string,
-    stats: webpack.Stats | webpack.MultiStats
+    stats: WebpackStats | WebpackMultiStats
   ): void {
     if (stats.hasErrors() || stats.hasWarnings()) {
-      const serializedStats: webpack.StatsCompilation = stats.toJson('errors-warnings');
+      const serializedStats: WebpackStatsCompilation = stats.toJson('errors-warnings');
 
       if (serializedStats.warnings) {
         for (const warning of serializedStats.warnings) {
@@ -247,7 +278,7 @@ export class WebpackPlugin implements IHeftPlugin {
     }
   }
 
-  private _normalizeError(buildFolder: string, error: webpack.StatsError): Error {
+  private _normalizeError(buildFolder: string, error: WebpackStatsError): Error {
     if (error instanceof Error) {
       return error;
     } else {
diff --git a/heft-plugins/heft-webpack5-plugin/src/shared.ts b/heft-plugins/heft-webpack5-plugin/src/shared.ts
index 3f0030d4af1..7f65b682748 100644
--- a/heft-plugins/heft-webpack5-plugin/src/shared.ts
+++ b/heft-plugins/heft-webpack5-plugin/src/shared.ts
@@ -1,10 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import { Configuration as WebpackDevServerConfiguration } from 'webpack-dev-server';
-import * as webpack from 'webpack';
+import type { Configuration as WebpackDevServerConfiguration } from 'webpack-dev-server';
+import type * as webpack from 'webpack';
 import type { IBuildStageProperties, IBundleSubstageProperties } from '@rushstack/heft';
-import { Import, IPackageJson, PackageJsonLookup } from '@rushstack/node-core-library';
 
 /**
  * @public
@@ -40,27 +39,3 @@ export interface IWebpackBundleSubstageProperties extends IBundleSubstagePropert
 export interface IWebpackBuildStageProperties extends IBuildStageProperties {
   webpackStats?: webpack.Stats | webpack.MultiStats;
 }
-
-export interface IWebpackVersions {
-  webpackVersion: string;
-  webpackDevServerVersion: string;
-}
-
-let _webpackVersions: IWebpackVersions | undefined;
-export function getWebpackVersions(): IWebpackVersions {
-  if (!_webpackVersions) {
-    const webpackDevServerPackageJsonPath: string = Import.resolveModule({
-      modulePath: 'webpack-dev-server/package.json',
-      baseFolderPath: __dirname
-    });
-    const webpackDevServerPackageJson: IPackageJson = PackageJsonLookup.instance.loadPackageJson(
-      webpackDevServerPackageJsonPath
-    );
-    _webpackVersions = {
-      webpackVersion: webpack.version!,
-      webpackDevServerVersion: webpackDevServerPackageJson.version
-    };
-  }
-
-  return _webpackVersions;
-}

From 7298445e26b65cf494b436812ee3610daa14934c Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Tue, 27 Jul 2021 15:12:11 -0700
Subject: [PATCH 063/155] Rush change.

---
 .../ianc-lazy-load-webpack_2021-07-27-22-11.json      | 11 +++++++++++
 .../ianc-lazy-load-webpack_2021-07-27-22-11.json      | 11 +++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 common/changes/@rushstack/heft-webpack4-plugin/ianc-lazy-load-webpack_2021-07-27-22-11.json
 create mode 100644 common/changes/@rushstack/heft-webpack5-plugin/ianc-lazy-load-webpack_2021-07-27-22-11.json

diff --git a/common/changes/@rushstack/heft-webpack4-plugin/ianc-lazy-load-webpack_2021-07-27-22-11.json b/common/changes/@rushstack/heft-webpack4-plugin/ianc-lazy-load-webpack_2021-07-27-22-11.json
new file mode 100644
index 00000000000..34f4e91540f
--- /dev/null
+++ b/common/changes/@rushstack/heft-webpack4-plugin/ianc-lazy-load-webpack_2021-07-27-22-11.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Update webpack to be lazy-loaded.",
+      "type": "minor",
+      "packageName": "@rushstack/heft-webpack4-plugin"
+    }
+  ],
+  "packageName": "@rushstack/heft-webpack4-plugin",
+  "email": "iclanton@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-webpack5-plugin/ianc-lazy-load-webpack_2021-07-27-22-11.json b/common/changes/@rushstack/heft-webpack5-plugin/ianc-lazy-load-webpack_2021-07-27-22-11.json
new file mode 100644
index 00000000000..b80163559f0
--- /dev/null
+++ b/common/changes/@rushstack/heft-webpack5-plugin/ianc-lazy-load-webpack_2021-07-27-22-11.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Update webpack to be lazy-loaded.",
+      "type": "minor",
+      "packageName": "@rushstack/heft-webpack5-plugin"
+    }
+  ],
+  "packageName": "@rushstack/heft-webpack5-plugin",
+  "email": "iclanton@users.noreply.github.com"
+}
\ No newline at end of file

From f16d80834dbaa3189a1d7fc8e3e64b3850ffbb0c Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Tue, 27 Jul 2021 15:13:56 -0700
Subject: [PATCH 064/155] Update API review files.

---
 common/reviews/api/heft-webpack4-plugin.api.md | 4 ++--
 common/reviews/api/heft-webpack5-plugin.api.md | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/reviews/api/heft-webpack4-plugin.api.md b/common/reviews/api/heft-webpack4-plugin.api.md
index 65ace0830f2..10f1d945764 100644
--- a/common/reviews/api/heft-webpack4-plugin.api.md
+++ b/common/reviews/api/heft-webpack4-plugin.api.md
@@ -4,11 +4,11 @@
 
 ```ts
 
-import { Configuration } from 'webpack-dev-server';
+import type { Configuration } from 'webpack-dev-server';
 import type { IBuildStageProperties } from '@rushstack/heft';
 import type { IBundleSubstageProperties } from '@rushstack/heft';
 import type { IHeftPlugin } from '@rushstack/heft';
-import * as webpack from 'webpack';
+import type * as webpack from 'webpack';
 
 // @public (undocumented)
 const _default: IHeftPlugin<void>;
diff --git a/common/reviews/api/heft-webpack5-plugin.api.md b/common/reviews/api/heft-webpack5-plugin.api.md
index 1ded530e754..cbfb36d036d 100644
--- a/common/reviews/api/heft-webpack5-plugin.api.md
+++ b/common/reviews/api/heft-webpack5-plugin.api.md
@@ -4,11 +4,11 @@
 
 ```ts
 
-import { Configuration } from 'webpack-dev-server';
+import type { Configuration } from 'webpack-dev-server';
 import type { IBuildStageProperties } from '@rushstack/heft';
 import type { IBundleSubstageProperties } from '@rushstack/heft';
 import type { IHeftPlugin } from '@rushstack/heft';
-import * as webpack from 'webpack';
+import type * as webpack from 'webpack';
 
 // @public (undocumented)
 const _default: IHeftPlugin<void>;

From 12c16053be11760090d3d191727100b631c9d8f0 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Tue, 27 Jul 2021 22:31:03 +0000
Subject: [PATCH 065/155] Deleting change files and updating change logs for
 package updates.

---
 .../ianc-update-node-forge_2021-07-27-21-50.json     | 11 -----------
 .../ianc-lazy-load-webpack_2021-07-27-22-11.json     | 11 -----------
 .../ianc-lazy-load-webpack_2021-07-27-22-11.json     | 11 -----------
 heft-plugins/heft-webpack4-plugin/CHANGELOG.json     | 12 ++++++++++++
 heft-plugins/heft-webpack4-plugin/CHANGELOG.md       |  9 ++++++++-
 heft-plugins/heft-webpack5-plugin/CHANGELOG.json     | 12 ++++++++++++
 heft-plugins/heft-webpack5-plugin/CHANGELOG.md       |  9 ++++++++-
 libraries/debug-certificate-manager/CHANGELOG.json   | 12 ++++++++++++
 libraries/debug-certificate-manager/CHANGELOG.md     |  9 ++++++++-
 libraries/load-themed-styles/CHANGELOG.json          | 12 ++++++++++++
 libraries/load-themed-styles/CHANGELOG.md            |  7 ++++++-
 rigs/heft-web-rig/CHANGELOG.json                     | 12 ++++++++++++
 rigs/heft-web-rig/CHANGELOG.md                       |  7 ++++++-
 webpack/loader-load-themed-styles/CHANGELOG.json     | 12 ++++++++++++
 webpack/loader-load-themed-styles/CHANGELOG.md       |  7 ++++++-
 15 files changed, 114 insertions(+), 39 deletions(-)
 delete mode 100644 common/changes/@rushstack/debug-certificate-manager/ianc-update-node-forge_2021-07-27-21-50.json
 delete mode 100644 common/changes/@rushstack/heft-webpack4-plugin/ianc-lazy-load-webpack_2021-07-27-22-11.json
 delete mode 100644 common/changes/@rushstack/heft-webpack5-plugin/ianc-lazy-load-webpack_2021-07-27-22-11.json

diff --git a/common/changes/@rushstack/debug-certificate-manager/ianc-update-node-forge_2021-07-27-21-50.json b/common/changes/@rushstack/debug-certificate-manager/ianc-update-node-forge_2021-07-27-21-50.json
deleted file mode 100644
index c33895c89c4..00000000000
--- a/common/changes/@rushstack/debug-certificate-manager/ianc-update-node-forge_2021-07-27-21-50.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/debug-certificate-manager",
-      "comment": "Update node-forge to version ~0.10.0.",
-      "type": "patch"
-    }
-  ],
-  "packageName": "@rushstack/debug-certificate-manager",
-  "email": "iclanton@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-webpack4-plugin/ianc-lazy-load-webpack_2021-07-27-22-11.json b/common/changes/@rushstack/heft-webpack4-plugin/ianc-lazy-load-webpack_2021-07-27-22-11.json
deleted file mode 100644
index 34f4e91540f..00000000000
--- a/common/changes/@rushstack/heft-webpack4-plugin/ianc-lazy-load-webpack_2021-07-27-22-11.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "comment": "Update webpack to be lazy-loaded.",
-      "type": "minor",
-      "packageName": "@rushstack/heft-webpack4-plugin"
-    }
-  ],
-  "packageName": "@rushstack/heft-webpack4-plugin",
-  "email": "iclanton@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-webpack5-plugin/ianc-lazy-load-webpack_2021-07-27-22-11.json b/common/changes/@rushstack/heft-webpack5-plugin/ianc-lazy-load-webpack_2021-07-27-22-11.json
deleted file mode 100644
index b80163559f0..00000000000
--- a/common/changes/@rushstack/heft-webpack5-plugin/ianc-lazy-load-webpack_2021-07-27-22-11.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "comment": "Update webpack to be lazy-loaded.",
-      "type": "minor",
-      "packageName": "@rushstack/heft-webpack5-plugin"
-    }
-  ],
-  "packageName": "@rushstack/heft-webpack5-plugin",
-  "email": "iclanton@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
index 71ae1b74835..ca29d77fc64 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
   "entries": [
+    {
+      "version": "0.2.0",
+      "tag": "@rushstack/heft-webpack4-plugin_v0.2.0",
+      "date": "Tue, 27 Jul 2021 22:31:02 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Update webpack to be lazy-loaded."
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.38",
       "tag": "@rushstack/heft-webpack4-plugin_v0.1.38",
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
index efd284e5421..6ca89de530d 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/heft-webpack4-plugin
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Tue, 27 Jul 2021 22:31:02 GMT and should not be manually modified.
+
+## 0.2.0
+Tue, 27 Jul 2021 22:31:02 GMT
+
+### Minor changes
+
+- Update webpack to be lazy-loaded.
 
 ## 0.1.38
 Wed, 14 Jul 2021 15:06:29 GMT
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
index 5705b232285..3cf65a752a2 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
   "entries": [
+    {
+      "version": "0.2.0",
+      "tag": "@rushstack/heft-webpack5-plugin_v0.2.0",
+      "date": "Tue, 27 Jul 2021 22:31:02 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Update webpack to be lazy-loaded."
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.38",
       "tag": "@rushstack/heft-webpack5-plugin_v0.1.38",
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
index 4fabe17d1b6..f4aa478e5d0 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/heft-webpack5-plugin
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Tue, 27 Jul 2021 22:31:02 GMT and should not be manually modified.
+
+## 0.2.0
+Tue, 27 Jul 2021 22:31:02 GMT
+
+### Minor changes
+
+- Update webpack to be lazy-loaded.
 
 ## 0.1.38
 Wed, 14 Jul 2021 15:06:29 GMT
diff --git a/libraries/debug-certificate-manager/CHANGELOG.json b/libraries/debug-certificate-manager/CHANGELOG.json
index 56d406a9460..967c9cca2ea 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.json
+++ b/libraries/debug-certificate-manager/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/debug-certificate-manager",
   "entries": [
+    {
+      "version": "1.0.50",
+      "tag": "@rushstack/debug-certificate-manager_v1.0.50",
+      "date": "Tue, 27 Jul 2021 22:31:02 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Update node-forge to version ~0.10.0."
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.49",
       "tag": "@rushstack/debug-certificate-manager_v1.0.49",
diff --git a/libraries/debug-certificate-manager/CHANGELOG.md b/libraries/debug-certificate-manager/CHANGELOG.md
index 9641fcab255..b23a5cceb0d 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.md
+++ b/libraries/debug-certificate-manager/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/debug-certificate-manager
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Tue, 27 Jul 2021 22:31:02 GMT and should not be manually modified.
+
+## 1.0.50
+Tue, 27 Jul 2021 22:31:02 GMT
+
+### Patches
+
+- Update node-forge to version ~0.10.0.
 
 ## 1.0.49
 Wed, 14 Jul 2021 15:06:29 GMT
diff --git a/libraries/load-themed-styles/CHANGELOG.json b/libraries/load-themed-styles/CHANGELOG.json
index bc506238f60..aa977c6809c 100644
--- a/libraries/load-themed-styles/CHANGELOG.json
+++ b/libraries/load-themed-styles/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@microsoft/load-themed-styles",
   "entries": [
+    {
+      "version": "1.10.196",
+      "tag": "@microsoft/load-themed-styles_v1.10.196",
+      "date": "Tue, 27 Jul 2021 22:31:02 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-web-rig\" to `0.3.14`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.10.195",
       "tag": "@microsoft/load-themed-styles_v1.10.195",
diff --git a/libraries/load-themed-styles/CHANGELOG.md b/libraries/load-themed-styles/CHANGELOG.md
index 921f97b9f66..3b5e97d395f 100644
--- a/libraries/load-themed-styles/CHANGELOG.md
+++ b/libraries/load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/load-themed-styles
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Tue, 27 Jul 2021 22:31:02 GMT and should not be manually modified.
+
+## 1.10.196
+Tue, 27 Jul 2021 22:31:02 GMT
+
+_Version update only_
 
 ## 1.10.195
 Wed, 14 Jul 2021 15:06:29 GMT
diff --git a/rigs/heft-web-rig/CHANGELOG.json b/rigs/heft-web-rig/CHANGELOG.json
index c9e719cc6dc..7895561db2a 100644
--- a/rigs/heft-web-rig/CHANGELOG.json
+++ b/rigs/heft-web-rig/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/heft-web-rig",
   "entries": [
+    {
+      "version": "0.3.14",
+      "tag": "@rushstack/heft-web-rig_v0.3.14",
+      "date": "Tue, 27 Jul 2021 22:31:02 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-webpack4-plugin\" to `0.2.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.3.13",
       "tag": "@rushstack/heft-web-rig_v0.3.13",
diff --git a/rigs/heft-web-rig/CHANGELOG.md b/rigs/heft-web-rig/CHANGELOG.md
index 3aa8c165472..55dfa3d5960 100644
--- a/rigs/heft-web-rig/CHANGELOG.md
+++ b/rigs/heft-web-rig/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-web-rig
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Tue, 27 Jul 2021 22:31:02 GMT and should not be manually modified.
+
+## 0.3.14
+Tue, 27 Jul 2021 22:31:02 GMT
+
+_Version update only_
 
 ## 0.3.13
 Wed, 14 Jul 2021 15:06:29 GMT
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.json b/webpack/loader-load-themed-styles/CHANGELOG.json
index 8b90b7fb0e5..884a79efb7f 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.json
+++ b/webpack/loader-load-themed-styles/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
   "entries": [
+    {
+      "version": "1.9.77",
+      "tag": "@microsoft/loader-load-themed-styles_v1.9.77",
+      "date": "Tue, 27 Jul 2021 22:31:02 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/load-themed-styles\" to `1.10.196`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.9.76",
       "tag": "@microsoft/loader-load-themed-styles_v1.9.76",
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.md b/webpack/loader-load-themed-styles/CHANGELOG.md
index c78939de26f..708ca70b0eb 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.md
+++ b/webpack/loader-load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/loader-load-themed-styles
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Tue, 27 Jul 2021 22:31:02 GMT and should not be manually modified.
+
+## 1.9.77
+Tue, 27 Jul 2021 22:31:02 GMT
+
+_Version update only_
 
 ## 1.9.76
 Wed, 14 Jul 2021 15:06:29 GMT

From f069814c1e4224feafba8e91dba5a1168e81b213 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Tue, 27 Jul 2021 22:31:05 +0000
Subject: [PATCH 066/155] Applying package updates.

---
 heft-plugins/heft-webpack4-plugin/package.json   | 2 +-
 heft-plugins/heft-webpack5-plugin/package.json   | 2 +-
 libraries/debug-certificate-manager/package.json | 2 +-
 libraries/load-themed-styles/package.json        | 2 +-
 rigs/heft-web-rig/package.json                   | 2 +-
 webpack/loader-load-themed-styles/package.json   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/heft-plugins/heft-webpack4-plugin/package.json b/heft-plugins/heft-webpack4-plugin/package.json
index 1404ebfc6d9..ee89e9f9f57 100644
--- a/heft-plugins/heft-webpack4-plugin/package.json
+++ b/heft-plugins/heft-webpack4-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
-  "version": "0.1.38",
+  "version": "0.2.0",
   "description": "Heft plugin for Webpack 4",
   "repository": {
     "type": "git",
diff --git a/heft-plugins/heft-webpack5-plugin/package.json b/heft-plugins/heft-webpack5-plugin/package.json
index 2333da6987c..34cd9859ad7 100644
--- a/heft-plugins/heft-webpack5-plugin/package.json
+++ b/heft-plugins/heft-webpack5-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
-  "version": "0.1.38",
+  "version": "0.2.0",
   "description": "Heft plugin for Webpack 5",
   "repository": {
     "type": "git",
diff --git a/libraries/debug-certificate-manager/package.json b/libraries/debug-certificate-manager/package.json
index 841054bb0be..aa68bfa7677 100644
--- a/libraries/debug-certificate-manager/package.json
+++ b/libraries/debug-certificate-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/debug-certificate-manager",
-  "version": "1.0.49",
+  "version": "1.0.50",
   "description": "Cross-platform functionality to create debug ssl certificates.",
   "main": "lib/index.js",
   "typings": "dist/debug-certificate-manager.d.ts",
diff --git a/libraries/load-themed-styles/package.json b/libraries/load-themed-styles/package.json
index 3dbe1fce897..ae451cac5f4 100644
--- a/libraries/load-themed-styles/package.json
+++ b/libraries/load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/load-themed-styles",
-  "version": "1.10.195",
+  "version": "1.10.196",
   "description": "Loads themed styles.",
   "license": "MIT",
   "repository": {
diff --git a/rigs/heft-web-rig/package.json b/rigs/heft-web-rig/package.json
index 3ea4a6cac1f..feb1a4baccc 100644
--- a/rigs/heft-web-rig/package.json
+++ b/rigs/heft-web-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-web-rig",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "description": "A rig package for web browser projects that build using Heft",
   "license": "MIT",
   "scripts": {
diff --git a/webpack/loader-load-themed-styles/package.json b/webpack/loader-load-themed-styles/package.json
index 0d85555f7de..4c65043f5bf 100644
--- a/webpack/loader-load-themed-styles/package.json
+++ b/webpack/loader-load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
-  "version": "1.9.76",
+  "version": "1.9.77",
   "description": "This simple loader wraps the loading of CSS in script equivalent to `require('load-themed-styles').loadStyles( /* css text */ )`. It is designed to be a replacement for style-loader.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

From dc81322e12b4bda195e5723e1aae5f818f89df46 Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Fri, 30 Jul 2021 16:55:00 -0700
Subject: [PATCH 067/155] Apply suggestions from code review

---
 heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts b/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
index 855a88afcc1..95e18ee9872 100644
--- a/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
+++ b/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
@@ -18,7 +18,7 @@ import { Async } from './utilities/Async';
 export interface ISassConfigurationJson extends ISassConfiguration {}
 
 const PLUGIN_NAME: string = 'SassTypingsPlugin';
-const PLUGIN_SCHEMA_PATH: string = path.resolve(__dirname, 'schemas', 'heft-sass-plugin.schema.json');
+const PLUGIN_SCHEMA_PATH: string = `${__dirname}/schemas/heft-sass-plugin.schema.json`;
 const SASS_CONFIGURATION_LOCATION: string = 'config/sass.json';
 
 export class SassTypingsPlugin implements IHeftPlugin {

From e10c6d3c071abe70700b42733a9719c95459680a Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Fri, 30 Jul 2021 17:36:42 -0700
Subject: [PATCH 068/155] Remove unused import

---
 heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts b/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
index 95e18ee9872..4e3b58f5218 100644
--- a/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
+++ b/heft-plugins/heft-sass-plugin/src/SassTypingsPlugin.ts
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import * as path from 'path';
 import type {
   HeftConfiguration,
   HeftSession,

From dadae944b3c6d5c9ca98a14b9fff633955d2aca3 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Sat, 31 Jul 2021 00:52:12 +0000
Subject: [PATCH 069/155] Deleting change files and updating change logs for
 package updates.

---
 apps/api-documenter/CHANGELOG.json            | 15 ++++++++++
 apps/api-documenter/CHANGELOG.md              |  7 ++++-
 apps/heft/CHANGELOG.json                      | 12 ++++++++
 apps/heft/CHANGELOG.md                        |  9 +++++-
 apps/rundown/CHANGELOG.json                   | 15 ++++++++++
 apps/rundown/CHANGELOG.md                     |  7 ++++-
 .../master_2021-07-19-17-25.json              | 11 -------
 .../heft-web-rig/master_2021-07-19-17-25.json | 11 -------
 .../heft/master_2021-07-19-17-25.json         | 11 -------
 heft-plugins/heft-jest-plugin/CHANGELOG.json  | 15 ++++++++++
 heft-plugins/heft-jest-plugin/CHANGELOG.md    |  7 ++++-
 heft-plugins/heft-sass-plugin/CHANGELOG.json  | 28 ++++++++++++++++++
 heft-plugins/heft-sass-plugin/CHANGELOG.md    | 11 +++++++
 .../heft-webpack4-plugin/CHANGELOG.json       | 18 ++++++++++++
 .../heft-webpack4-plugin/CHANGELOG.md         |  7 ++++-
 .../heft-webpack5-plugin/CHANGELOG.json       | 18 ++++++++++++
 .../heft-webpack5-plugin/CHANGELOG.md         |  7 ++++-
 .../debug-certificate-manager/CHANGELOG.json  | 15 ++++++++++
 .../debug-certificate-manager/CHANGELOG.md    |  7 ++++-
 libraries/load-themed-styles/CHANGELOG.json   | 15 ++++++++++
 libraries/load-themed-styles/CHANGELOG.md     |  7 ++++-
 libraries/package-deps-hash/CHANGELOG.json    | 15 ++++++++++
 libraries/package-deps-hash/CHANGELOG.md      |  7 ++++-
 libraries/stream-collator/CHANGELOG.json      | 18 ++++++++++++
 libraries/stream-collator/CHANGELOG.md        |  7 ++++-
 libraries/terminal/CHANGELOG.json             | 15 ++++++++++
 libraries/terminal/CHANGELOG.md               |  7 ++++-
 rigs/heft-node-rig/CHANGELOG.json             | 18 ++++++++++++
 rigs/heft-node-rig/CHANGELOG.md               |  7 ++++-
 rigs/heft-web-rig/CHANGELOG.json              | 29 +++++++++++++++++++
 rigs/heft-web-rig/CHANGELOG.md                |  9 +++++-
 .../loader-load-themed-styles/CHANGELOG.json  | 18 ++++++++++++
 .../loader-load-themed-styles/CHANGELOG.md    |  7 ++++-
 webpack/loader-raw-script/CHANGELOG.json      | 15 ++++++++++
 webpack/loader-raw-script/CHANGELOG.md        |  7 ++++-
 webpack/localization-plugin/CHANGELOG.json    | 21 ++++++++++++++
 webpack/localization-plugin/CHANGELOG.md      |  7 ++++-
 webpack/module-minifier-plugin/CHANGELOG.json | 15 ++++++++++
 webpack/module-minifier-plugin/CHANGELOG.md   |  7 ++++-
 .../CHANGELOG.json                            | 15 ++++++++++
 .../CHANGELOG.md                              |  7 ++++-
 41 files changed, 453 insertions(+), 51 deletions(-)
 delete mode 100644 common/changes/@rushstack/heft-sass-plugin/master_2021-07-19-17-25.json
 delete mode 100644 common/changes/@rushstack/heft-web-rig/master_2021-07-19-17-25.json
 delete mode 100644 common/changes/@rushstack/heft/master_2021-07-19-17-25.json
 create mode 100644 heft-plugins/heft-sass-plugin/CHANGELOG.json
 create mode 100644 heft-plugins/heft-sass-plugin/CHANGELOG.md

diff --git a/apps/api-documenter/CHANGELOG.json b/apps/api-documenter/CHANGELOG.json
index 9167fccf2ec..3ec53822fef 100644
--- a/apps/api-documenter/CHANGELOG.json
+++ b/apps/api-documenter/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@microsoft/api-documenter",
   "entries": [
+    {
+      "version": "7.13.34",
+      "tag": "@microsoft/api-documenter_v7.13.34",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.14`"
+          }
+        ]
+      }
+    },
     {
       "version": "7.13.33",
       "tag": "@microsoft/api-documenter_v7.13.33",
diff --git a/apps/api-documenter/CHANGELOG.md b/apps/api-documenter/CHANGELOG.md
index b2a2798c6b3..10261d5f2c2 100644
--- a/apps/api-documenter/CHANGELOG.md
+++ b/apps/api-documenter/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/api-documenter
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 7.13.34
+Sat, 31 Jul 2021 00:52:11 GMT
+
+_Version update only_
 
 ## 7.13.33
 Wed, 14 Jul 2021 15:06:29 GMT
diff --git a/apps/heft/CHANGELOG.json b/apps/heft/CHANGELOG.json
index f7ba4c8cc46..7fb72d9055d 100644
--- a/apps/heft/CHANGELOG.json
+++ b/apps/heft/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/heft",
   "entries": [
+    {
+      "version": "0.35.0",
+      "tag": "@rushstack/heft_v0.35.0",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "(BREAKING CHANGE) Extract default Sass plugin to separate @rushstack/heft-sass-plugin package"
+          }
+        ]
+      }
+    },
     {
       "version": "0.34.8",
       "tag": "@rushstack/heft_v0.34.8",
diff --git a/apps/heft/CHANGELOG.md b/apps/heft/CHANGELOG.md
index aba1ca25185..27648ba529b 100644
--- a/apps/heft/CHANGELOG.md
+++ b/apps/heft/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/heft
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 0.35.0
+Sat, 31 Jul 2021 00:52:11 GMT
+
+### Minor changes
+
+- (BREAKING CHANGE) Extract default Sass plugin to separate @rushstack/heft-sass-plugin package
 
 ## 0.34.8
 Wed, 14 Jul 2021 15:06:29 GMT
diff --git a/apps/rundown/CHANGELOG.json b/apps/rundown/CHANGELOG.json
index e3f6315a874..2af45e219a0 100644
--- a/apps/rundown/CHANGELOG.json
+++ b/apps/rundown/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/rundown",
   "entries": [
+    {
+      "version": "1.0.126",
+      "tag": "@rushstack/rundown_v1.0.126",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.14`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.125",
       "tag": "@rushstack/rundown_v1.0.125",
diff --git a/apps/rundown/CHANGELOG.md b/apps/rundown/CHANGELOG.md
index 515c5f71d24..846a63f5a09 100644
--- a/apps/rundown/CHANGELOG.md
+++ b/apps/rundown/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/rundown
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 1.0.126
+Sat, 31 Jul 2021 00:52:11 GMT
+
+_Version update only_
 
 ## 1.0.125
 Wed, 14 Jul 2021 15:06:29 GMT
diff --git a/common/changes/@rushstack/heft-sass-plugin/master_2021-07-19-17-25.json b/common/changes/@rushstack/heft-sass-plugin/master_2021-07-19-17-25.json
deleted file mode 100644
index 840de8e5228..00000000000
--- a/common/changes/@rushstack/heft-sass-plugin/master_2021-07-19-17-25.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/heft-sass-plugin",
-      "comment": "Extract default Sass plugin to separate package",
-      "type": "minor"
-    }
-  ],
-  "packageName": "@rushstack/heft-sass-plugin",
-  "email": "jonasb@users.noreply.github.com"
-}
diff --git a/common/changes/@rushstack/heft-web-rig/master_2021-07-19-17-25.json b/common/changes/@rushstack/heft-web-rig/master_2021-07-19-17-25.json
deleted file mode 100644
index 75f6daededb..00000000000
--- a/common/changes/@rushstack/heft-web-rig/master_2021-07-19-17-25.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/heft-web-rig",
-      "comment": "Use newly extracted Sass plugin (@rushstack/heft-sass-plugin)",
-      "type": "patch"
-    }
-  ],
-  "packageName": "@rushstack/heft-web-rig",
-  "email": "jonasb@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft/master_2021-07-19-17-25.json b/common/changes/@rushstack/heft/master_2021-07-19-17-25.json
deleted file mode 100644
index af58529ec5d..00000000000
--- a/common/changes/@rushstack/heft/master_2021-07-19-17-25.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/heft",
-      "comment": "(BREAKING CHANGE) Extract default Sass plugin to separate @rushstack/heft-sass-plugin package",
-      "type": "minor"
-    }
-  ],
-  "packageName": "@rushstack/heft",
-  "email": "jonasb@users.noreply.github.com"
-}
diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.json b/heft-plugins/heft-jest-plugin/CHANGELOG.json
index bd1f6743e99..dd54a8bb4e5 100644
--- a/heft-plugins/heft-jest-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-jest-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/heft-jest-plugin",
   "entries": [
+    {
+      "version": "0.1.15",
+      "tag": "@rushstack/heft-jest-plugin_v0.1.15",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.34.8` to `^0.35.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.14",
       "tag": "@rushstack/heft-jest-plugin_v0.1.14",
diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.md b/heft-plugins/heft-jest-plugin/CHANGELOG.md
index 3624c901924..c2e14f87f45 100644
--- a/heft-plugins/heft-jest-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-jest-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-jest-plugin
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 0.1.15
+Sat, 31 Jul 2021 00:52:11 GMT
+
+_Version update only_
 
 ## 0.1.14
 Wed, 14 Jul 2021 15:06:29 GMT
diff --git a/heft-plugins/heft-sass-plugin/CHANGELOG.json b/heft-plugins/heft-sass-plugin/CHANGELOG.json
new file mode 100644
index 00000000000..0ca7bdc2c57
--- /dev/null
+++ b/heft-plugins/heft-sass-plugin/CHANGELOG.json
@@ -0,0 +1,28 @@
+{
+  "name": "@rushstack/heft-sass-plugin",
+  "entries": [
+    {
+      "version": "0.1.0",
+      "tag": "@rushstack/heft-sass-plugin_v0.1.0",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Extract default Sass plugin to separate package"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.14`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.34.8` to `^0.35.0`"
+          }
+        ]
+      }
+    }
+  ]
+}
diff --git a/heft-plugins/heft-sass-plugin/CHANGELOG.md b/heft-plugins/heft-sass-plugin/CHANGELOG.md
new file mode 100644
index 00000000000..69400dc4f21
--- /dev/null
+++ b/heft-plugins/heft-sass-plugin/CHANGELOG.md
@@ -0,0 +1,11 @@
+# Change Log - @rushstack/heft-sass-plugin
+
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 0.1.0
+Sat, 31 Jul 2021 00:52:11 GMT
+
+### Minor changes
+
+- Extract default Sass plugin to separate package
+
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
index ca29d77fc64..06136181240 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
   "entries": [
+    {
+      "version": "0.2.1",
+      "tag": "@rushstack/heft-webpack4-plugin_v0.2.1",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.14`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.34.8` to `^0.35.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.0",
       "tag": "@rushstack/heft-webpack4-plugin_v0.2.0",
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
index 6ca89de530d..f2adbe11087 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-webpack4-plugin
 
-This log was last generated on Tue, 27 Jul 2021 22:31:02 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 0.2.1
+Sat, 31 Jul 2021 00:52:11 GMT
+
+_Version update only_
 
 ## 0.2.0
 Tue, 27 Jul 2021 22:31:02 GMT
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
index 3cf65a752a2..517a26147ab 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
   "entries": [
+    {
+      "version": "0.2.1",
+      "tag": "@rushstack/heft-webpack5-plugin_v0.2.1",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.14`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.34.8` to `^0.35.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.0",
       "tag": "@rushstack/heft-webpack5-plugin_v0.2.0",
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
index f4aa478e5d0..69ea06bd90c 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-webpack5-plugin
 
-This log was last generated on Tue, 27 Jul 2021 22:31:02 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 0.2.1
+Sat, 31 Jul 2021 00:52:11 GMT
+
+_Version update only_
 
 ## 0.2.0
 Tue, 27 Jul 2021 22:31:02 GMT
diff --git a/libraries/debug-certificate-manager/CHANGELOG.json b/libraries/debug-certificate-manager/CHANGELOG.json
index 967c9cca2ea..e083d6872f8 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.json
+++ b/libraries/debug-certificate-manager/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/debug-certificate-manager",
   "entries": [
+    {
+      "version": "1.0.51",
+      "tag": "@rushstack/debug-certificate-manager_v1.0.51",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.14`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.50",
       "tag": "@rushstack/debug-certificate-manager_v1.0.50",
diff --git a/libraries/debug-certificate-manager/CHANGELOG.md b/libraries/debug-certificate-manager/CHANGELOG.md
index b23a5cceb0d..cb7f6638314 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.md
+++ b/libraries/debug-certificate-manager/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/debug-certificate-manager
 
-This log was last generated on Tue, 27 Jul 2021 22:31:02 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 1.0.51
+Sat, 31 Jul 2021 00:52:11 GMT
+
+_Version update only_
 
 ## 1.0.50
 Tue, 27 Jul 2021 22:31:02 GMT
diff --git a/libraries/load-themed-styles/CHANGELOG.json b/libraries/load-themed-styles/CHANGELOG.json
index aa977c6809c..c88ee593581 100644
--- a/libraries/load-themed-styles/CHANGELOG.json
+++ b/libraries/load-themed-styles/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@microsoft/load-themed-styles",
   "entries": [
+    {
+      "version": "1.10.197",
+      "tag": "@microsoft/load-themed-styles_v1.10.197",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-web-rig\" to `0.3.15`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.10.196",
       "tag": "@microsoft/load-themed-styles_v1.10.196",
diff --git a/libraries/load-themed-styles/CHANGELOG.md b/libraries/load-themed-styles/CHANGELOG.md
index 3b5e97d395f..f8c4508073a 100644
--- a/libraries/load-themed-styles/CHANGELOG.md
+++ b/libraries/load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/load-themed-styles
 
-This log was last generated on Tue, 27 Jul 2021 22:31:02 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 1.10.197
+Sat, 31 Jul 2021 00:52:11 GMT
+
+_Version update only_
 
 ## 1.10.196
 Tue, 27 Jul 2021 22:31:02 GMT
diff --git a/libraries/package-deps-hash/CHANGELOG.json b/libraries/package-deps-hash/CHANGELOG.json
index 8c582f3e743..dbb76b02dc3 100644
--- a/libraries/package-deps-hash/CHANGELOG.json
+++ b/libraries/package-deps-hash/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/package-deps-hash",
   "entries": [
+    {
+      "version": "3.0.55",
+      "tag": "@rushstack/package-deps-hash_v3.0.55",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.14`"
+          }
+        ]
+      }
+    },
     {
       "version": "3.0.54",
       "tag": "@rushstack/package-deps-hash_v3.0.54",
diff --git a/libraries/package-deps-hash/CHANGELOG.md b/libraries/package-deps-hash/CHANGELOG.md
index 61a365bd8df..a3294b55fab 100644
--- a/libraries/package-deps-hash/CHANGELOG.md
+++ b/libraries/package-deps-hash/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/package-deps-hash
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 3.0.55
+Sat, 31 Jul 2021 00:52:11 GMT
+
+_Version update only_
 
 ## 3.0.54
 Wed, 14 Jul 2021 15:06:29 GMT
diff --git a/libraries/stream-collator/CHANGELOG.json b/libraries/stream-collator/CHANGELOG.json
index 2f1978c6102..f4b7672cbee 100644
--- a/libraries/stream-collator/CHANGELOG.json
+++ b/libraries/stream-collator/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/stream-collator",
   "entries": [
+    {
+      "version": "4.0.110",
+      "tag": "@rushstack/stream-collator_v4.0.110",
+      "date": "Sat, 31 Jul 2021 00:52:12 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/terminal\" to `0.2.12`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.14`"
+          }
+        ]
+      }
+    },
     {
       "version": "4.0.109",
       "tag": "@rushstack/stream-collator_v4.0.109",
diff --git a/libraries/stream-collator/CHANGELOG.md b/libraries/stream-collator/CHANGELOG.md
index 768f939e682..8ab8fc317b9 100644
--- a/libraries/stream-collator/CHANGELOG.md
+++ b/libraries/stream-collator/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/stream-collator
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:12 GMT and should not be manually modified.
+
+## 4.0.110
+Sat, 31 Jul 2021 00:52:12 GMT
+
+_Version update only_
 
 ## 4.0.109
 Wed, 14 Jul 2021 15:06:29 GMT
diff --git a/libraries/terminal/CHANGELOG.json b/libraries/terminal/CHANGELOG.json
index 3824acb6a14..4ff01e87d7e 100644
--- a/libraries/terminal/CHANGELOG.json
+++ b/libraries/terminal/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/terminal",
   "entries": [
+    {
+      "version": "0.2.12",
+      "tag": "@rushstack/terminal_v0.2.12",
+      "date": "Sat, 31 Jul 2021 00:52:12 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.14`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.11",
       "tag": "@rushstack/terminal_v0.2.11",
diff --git a/libraries/terminal/CHANGELOG.md b/libraries/terminal/CHANGELOG.md
index a61a5cb3eb7..507dc5da679 100644
--- a/libraries/terminal/CHANGELOG.md
+++ b/libraries/terminal/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/terminal
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:12 GMT and should not be manually modified.
+
+## 0.2.12
+Sat, 31 Jul 2021 00:52:12 GMT
+
+_Version update only_
 
 ## 0.2.11
 Wed, 14 Jul 2021 15:06:29 GMT
diff --git a/rigs/heft-node-rig/CHANGELOG.json b/rigs/heft-node-rig/CHANGELOG.json
index 5c412e2c54f..5b4ff57f1cc 100644
--- a/rigs/heft-node-rig/CHANGELOG.json
+++ b/rigs/heft-node-rig/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-node-rig",
   "entries": [
+    {
+      "version": "1.1.14",
+      "tag": "@rushstack/heft-node-rig_v1.1.14",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-jest-plugin\" to `0.1.15`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.34.8` to `^0.35.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.1.13",
       "tag": "@rushstack/heft-node-rig_v1.1.13",
diff --git a/rigs/heft-node-rig/CHANGELOG.md b/rigs/heft-node-rig/CHANGELOG.md
index 19281406337..c840d2aeeda 100644
--- a/rigs/heft-node-rig/CHANGELOG.md
+++ b/rigs/heft-node-rig/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-node-rig
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 1.1.14
+Sat, 31 Jul 2021 00:52:11 GMT
+
+_Version update only_
 
 ## 1.1.13
 Wed, 14 Jul 2021 15:06:29 GMT
diff --git a/rigs/heft-web-rig/CHANGELOG.json b/rigs/heft-web-rig/CHANGELOG.json
index 7895561db2a..1e7f718ea6b 100644
--- a/rigs/heft-web-rig/CHANGELOG.json
+++ b/rigs/heft-web-rig/CHANGELOG.json
@@ -1,6 +1,35 @@
 {
   "name": "@rushstack/heft-web-rig",
   "entries": [
+    {
+      "version": "0.3.15",
+      "tag": "@rushstack/heft-web-rig_v0.3.15",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Use newly extracted Sass plugin (@rushstack/heft-sass-plugin)"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-jest-plugin\" to `0.1.15`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-sass-plugin\" to `0.1.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-webpack4-plugin\" to `0.2.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.34.8` to `^0.35.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.3.14",
       "tag": "@rushstack/heft-web-rig_v0.3.14",
diff --git a/rigs/heft-web-rig/CHANGELOG.md b/rigs/heft-web-rig/CHANGELOG.md
index 55dfa3d5960..871a37f047f 100644
--- a/rigs/heft-web-rig/CHANGELOG.md
+++ b/rigs/heft-web-rig/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/heft-web-rig
 
-This log was last generated on Tue, 27 Jul 2021 22:31:02 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 0.3.15
+Sat, 31 Jul 2021 00:52:11 GMT
+
+### Patches
+
+- Use newly extracted Sass plugin (@rushstack/heft-sass-plugin)
 
 ## 0.3.14
 Tue, 27 Jul 2021 22:31:02 GMT
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.json b/webpack/loader-load-themed-styles/CHANGELOG.json
index 884a79efb7f..c6e0bbc312d 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.json
+++ b/webpack/loader-load-themed-styles/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
   "entries": [
+    {
+      "version": "1.9.78",
+      "tag": "@microsoft/loader-load-themed-styles_v1.9.78",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/load-themed-styles\" to `1.10.197`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.14`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.9.77",
       "tag": "@microsoft/loader-load-themed-styles_v1.9.77",
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.md b/webpack/loader-load-themed-styles/CHANGELOG.md
index 708ca70b0eb..f34c5fceace 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.md
+++ b/webpack/loader-load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/loader-load-themed-styles
 
-This log was last generated on Tue, 27 Jul 2021 22:31:02 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 1.9.78
+Sat, 31 Jul 2021 00:52:11 GMT
+
+_Version update only_
 
 ## 1.9.77
 Tue, 27 Jul 2021 22:31:02 GMT
diff --git a/webpack/loader-raw-script/CHANGELOG.json b/webpack/loader-raw-script/CHANGELOG.json
index 39243889b82..a91ed5850ae 100644
--- a/webpack/loader-raw-script/CHANGELOG.json
+++ b/webpack/loader-raw-script/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/loader-raw-script",
   "entries": [
+    {
+      "version": "1.3.164",
+      "tag": "@rushstack/loader-raw-script_v1.3.164",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.14`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.3.163",
       "tag": "@rushstack/loader-raw-script_v1.3.163",
diff --git a/webpack/loader-raw-script/CHANGELOG.md b/webpack/loader-raw-script/CHANGELOG.md
index 8a2fd92247a..a63c72da41c 100644
--- a/webpack/loader-raw-script/CHANGELOG.md
+++ b/webpack/loader-raw-script/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/loader-raw-script
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 1.3.164
+Sat, 31 Jul 2021 00:52:11 GMT
+
+_Version update only_
 
 ## 1.3.163
 Wed, 14 Jul 2021 15:06:29 GMT
diff --git a/webpack/localization-plugin/CHANGELOG.json b/webpack/localization-plugin/CHANGELOG.json
index f5febcc4582..ec4f530a624 100644
--- a/webpack/localization-plugin/CHANGELOG.json
+++ b/webpack/localization-plugin/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@rushstack/localization-plugin",
   "entries": [
+    {
+      "version": "0.6.38",
+      "tag": "@rushstack/localization-plugin_v0.6.38",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.14`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/set-webpack-public-path-plugin\" to `3.2.58`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/set-webpack-public-path-plugin\" from `^3.2.57` to `^3.2.58`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.6.37",
       "tag": "@rushstack/localization-plugin_v0.6.37",
diff --git a/webpack/localization-plugin/CHANGELOG.md b/webpack/localization-plugin/CHANGELOG.md
index 8aa320d9fec..847bc704504 100644
--- a/webpack/localization-plugin/CHANGELOG.md
+++ b/webpack/localization-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/localization-plugin
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 0.6.38
+Sat, 31 Jul 2021 00:52:11 GMT
+
+_Version update only_
 
 ## 0.6.37
 Wed, 14 Jul 2021 15:06:29 GMT
diff --git a/webpack/module-minifier-plugin/CHANGELOG.json b/webpack/module-minifier-plugin/CHANGELOG.json
index 8ad966ccdc5..de3b7b1fde7 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.json
+++ b/webpack/module-minifier-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/module-minifier-plugin",
   "entries": [
+    {
+      "version": "0.4.2",
+      "tag": "@rushstack/module-minifier-plugin_v0.4.2",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.14`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.1",
       "tag": "@rushstack/module-minifier-plugin_v0.4.1",
diff --git a/webpack/module-minifier-plugin/CHANGELOG.md b/webpack/module-minifier-plugin/CHANGELOG.md
index 3426cae0445..61390ebf271 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.md
+++ b/webpack/module-minifier-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/module-minifier-plugin
 
-This log was last generated on Thu, 22 Jul 2021 22:31:41 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 0.4.2
+Sat, 31 Jul 2021 00:52:11 GMT
+
+_Version update only_
 
 ## 0.4.1
 Thu, 22 Jul 2021 22:31:41 GMT
diff --git a/webpack/set-webpack-public-path-plugin/CHANGELOG.json b/webpack/set-webpack-public-path-plugin/CHANGELOG.json
index 53699a64072..4b8609937d4 100644
--- a/webpack/set-webpack-public-path-plugin/CHANGELOG.json
+++ b/webpack/set-webpack-public-path-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/set-webpack-public-path-plugin",
   "entries": [
+    {
+      "version": "3.2.58",
+      "tag": "@rushstack/set-webpack-public-path-plugin_v3.2.58",
+      "date": "Sat, 31 Jul 2021 00:52:11 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.14`"
+          }
+        ]
+      }
+    },
     {
       "version": "3.2.57",
       "tag": "@rushstack/set-webpack-public-path-plugin_v3.2.57",
diff --git a/webpack/set-webpack-public-path-plugin/CHANGELOG.md b/webpack/set-webpack-public-path-plugin/CHANGELOG.md
index d641418cdea..8f40fa9e0dc 100644
--- a/webpack/set-webpack-public-path-plugin/CHANGELOG.md
+++ b/webpack/set-webpack-public-path-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/set-webpack-public-path-plugin
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+
+## 3.2.58
+Sat, 31 Jul 2021 00:52:11 GMT
+
+_Version update only_
 
 ## 3.2.57
 Wed, 14 Jul 2021 15:06:29 GMT

From cb1d65a72aa45816705d985b090e0fdd862b741a Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Sat, 31 Jul 2021 00:52:14 +0000
Subject: [PATCH 070/155] Applying package updates.

---
 apps/api-documenter/package.json                    | 2 +-
 apps/heft/package.json                              | 2 +-
 apps/rundown/package.json                           | 2 +-
 heft-plugins/heft-jest-plugin/package.json          | 4 ++--
 heft-plugins/heft-sass-plugin/package.json          | 4 ++--
 heft-plugins/heft-webpack4-plugin/package.json      | 4 ++--
 heft-plugins/heft-webpack5-plugin/package.json      | 4 ++--
 libraries/debug-certificate-manager/package.json    | 2 +-
 libraries/load-themed-styles/package.json           | 2 +-
 libraries/package-deps-hash/package.json            | 2 +-
 libraries/stream-collator/package.json              | 2 +-
 libraries/terminal/package.json                     | 2 +-
 rigs/heft-node-rig/package.json                     | 4 ++--
 rigs/heft-web-rig/package.json                      | 4 ++--
 webpack/loader-load-themed-styles/package.json      | 2 +-
 webpack/loader-raw-script/package.json              | 2 +-
 webpack/localization-plugin/package.json            | 4 ++--
 webpack/module-minifier-plugin/package.json         | 2 +-
 webpack/set-webpack-public-path-plugin/package.json | 2 +-
 19 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/apps/api-documenter/package.json b/apps/api-documenter/package.json
index 86ae37b86ba..89ac22bfd1e 100644
--- a/apps/api-documenter/package.json
+++ b/apps/api-documenter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/api-documenter",
-  "version": "7.13.33",
+  "version": "7.13.34",
   "description": "Read JSON files from api-extractor, generate documentation pages",
   "repository": {
     "type": "git",
diff --git a/apps/heft/package.json b/apps/heft/package.json
index 9ef1bbe6b85..da42d9e4ced 100644
--- a/apps/heft/package.json
+++ b/apps/heft/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft",
-  "version": "0.34.8",
+  "version": "0.35.0",
   "description": "Build all your JavaScript projects the same way: A way that works.",
   "keywords": [
     "toolchain",
diff --git a/apps/rundown/package.json b/apps/rundown/package.json
index 195c800bd60..461251690e8 100644
--- a/apps/rundown/package.json
+++ b/apps/rundown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/rundown",
-  "version": "1.0.125",
+  "version": "1.0.126",
   "description": "Detect load time regressions by running an app, tracing require() calls, and generating a deterministic report",
   "repository": {
     "type": "git",
diff --git a/heft-plugins/heft-jest-plugin/package.json b/heft-plugins/heft-jest-plugin/package.json
index 4dea090914d..6a0e5020488 100644
--- a/heft-plugins/heft-jest-plugin/package.json
+++ b/heft-plugins/heft-jest-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-jest-plugin",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "Heft plugin for Jest",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.34.8"
+    "@rushstack/heft": "^0.35.0"
   },
   "dependencies": {
     "@jest/core": "~25.4.0",
diff --git a/heft-plugins/heft-sass-plugin/package.json b/heft-plugins/heft-sass-plugin/package.json
index ebeb8649bba..a5b5550c861 100644
--- a/heft-plugins/heft-sass-plugin/package.json
+++ b/heft-plugins/heft-sass-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-sass-plugin",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "description": "Heft plugin for SASS",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.34.8"
+    "@rushstack/heft": "^0.35.0"
   },
   "dependencies": {
     "@rushstack/heft-config-file": "workspace:*",
diff --git a/heft-plugins/heft-webpack4-plugin/package.json b/heft-plugins/heft-webpack4-plugin/package.json
index ee89e9f9f57..8ce4470e192 100644
--- a/heft-plugins/heft-webpack4-plugin/package.json
+++ b/heft-plugins/heft-webpack4-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Heft plugin for Webpack 4",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.34.8"
+    "@rushstack/heft": "^0.35.0"
   },
   "dependencies": {
     "@rushstack/node-core-library": "workspace:*",
diff --git a/heft-plugins/heft-webpack5-plugin/package.json b/heft-plugins/heft-webpack5-plugin/package.json
index 34cd9859ad7..6f82b428d5b 100644
--- a/heft-plugins/heft-webpack5-plugin/package.json
+++ b/heft-plugins/heft-webpack5-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Heft plugin for Webpack 5",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.34.8"
+    "@rushstack/heft": "^0.35.0"
   },
   "dependencies": {
     "@rushstack/node-core-library": "workspace:*",
diff --git a/libraries/debug-certificate-manager/package.json b/libraries/debug-certificate-manager/package.json
index aa68bfa7677..113ffe68804 100644
--- a/libraries/debug-certificate-manager/package.json
+++ b/libraries/debug-certificate-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/debug-certificate-manager",
-  "version": "1.0.50",
+  "version": "1.0.51",
   "description": "Cross-platform functionality to create debug ssl certificates.",
   "main": "lib/index.js",
   "typings": "dist/debug-certificate-manager.d.ts",
diff --git a/libraries/load-themed-styles/package.json b/libraries/load-themed-styles/package.json
index ae451cac5f4..9b5553143be 100644
--- a/libraries/load-themed-styles/package.json
+++ b/libraries/load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/load-themed-styles",
-  "version": "1.10.196",
+  "version": "1.10.197",
   "description": "Loads themed styles.",
   "license": "MIT",
   "repository": {
diff --git a/libraries/package-deps-hash/package.json b/libraries/package-deps-hash/package.json
index efd96f9973d..5c5c260426c 100644
--- a/libraries/package-deps-hash/package.json
+++ b/libraries/package-deps-hash/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/package-deps-hash",
-  "version": "3.0.54",
+  "version": "3.0.55",
   "description": "",
   "main": "lib/index.js",
   "typings": "dist/package-deps-hash.d.ts",
diff --git a/libraries/stream-collator/package.json b/libraries/stream-collator/package.json
index bafa198bb81..78139215c7c 100644
--- a/libraries/stream-collator/package.json
+++ b/libraries/stream-collator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/stream-collator",
-  "version": "4.0.109",
+  "version": "4.0.110",
   "description": "Display intelligible realtime output from concurrent processes",
   "repository": {
     "type": "git",
diff --git a/libraries/terminal/package.json b/libraries/terminal/package.json
index 981d3d69297..1d0f631c6b9 100644
--- a/libraries/terminal/package.json
+++ b/libraries/terminal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/terminal",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "description": "User interface primitives for console applications",
   "main": "lib/index.js",
   "typings": "dist/terminal.d.ts",
diff --git a/rigs/heft-node-rig/package.json b/rigs/heft-node-rig/package.json
index 25e1a709da3..bd240d03844 100644
--- a/rigs/heft-node-rig/package.json
+++ b/rigs/heft-node-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-node-rig",
-  "version": "1.1.13",
+  "version": "1.1.14",
   "description": "A rig package for Node.js projects that build using Heft",
   "license": "MIT",
   "scripts": {
@@ -11,7 +11,7 @@
     "url": "https://github.com/microsoft/rushstack/tree/master/rigs/heft-node-rig"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.34.8"
+    "@rushstack/heft": "^0.35.0"
   },
   "dependencies": {
     "@microsoft/api-extractor": "workspace:*",
diff --git a/rigs/heft-web-rig/package.json b/rigs/heft-web-rig/package.json
index 48e45531c15..ea5c76673d7 100644
--- a/rigs/heft-web-rig/package.json
+++ b/rigs/heft-web-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-web-rig",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "description": "A rig package for web browser projects that build using Heft",
   "license": "MIT",
   "scripts": {
@@ -11,7 +11,7 @@
     "url": "https://github.com/microsoft/rushstack/tree/master/rigs/heft-web-rig"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.34.8"
+    "@rushstack/heft": "^0.35.0"
   },
   "dependencies": {
     "@microsoft/api-extractor": "workspace:*",
diff --git a/webpack/loader-load-themed-styles/package.json b/webpack/loader-load-themed-styles/package.json
index 4c65043f5bf..566bab4e367 100644
--- a/webpack/loader-load-themed-styles/package.json
+++ b/webpack/loader-load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
-  "version": "1.9.77",
+  "version": "1.9.78",
   "description": "This simple loader wraps the loading of CSS in script equivalent to `require('load-themed-styles').loadStyles( /* css text */ )`. It is designed to be a replacement for style-loader.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/loader-raw-script/package.json b/webpack/loader-raw-script/package.json
index e6c8eedd3c7..6b14ce93938 100644
--- a/webpack/loader-raw-script/package.json
+++ b/webpack/loader-raw-script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/loader-raw-script",
-  "version": "1.3.163",
+  "version": "1.3.164",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/localization-plugin/package.json b/webpack/localization-plugin/package.json
index 85b10dedf49..ad01d69b40d 100644
--- a/webpack/localization-plugin/package.json
+++ b/webpack/localization-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/localization-plugin",
-  "version": "0.6.37",
+  "version": "0.6.38",
   "description": "This plugin facilitates localization with Webpack.",
   "main": "lib/index.js",
   "typings": "dist/localization-plugin.d.ts",
@@ -13,7 +13,7 @@
     "build": "heft build --clean"
   },
   "peerDependencies": {
-    "@rushstack/set-webpack-public-path-plugin": "^3.2.57",
+    "@rushstack/set-webpack-public-path-plugin": "^3.2.58",
     "@types/webpack": "^4.39.0",
     "webpack": "^4.31.0"
   },
diff --git a/webpack/module-minifier-plugin/package.json b/webpack/module-minifier-plugin/package.json
index 514f5b7ac2d..014bf9a951a 100644
--- a/webpack/module-minifier-plugin/package.json
+++ b/webpack/module-minifier-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/module-minifier-plugin",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "This plugin splits minification of webpack compilations into smaller units.",
   "main": "lib/index.js",
   "typings": "dist/module-minifier-plugin.d.ts",
diff --git a/webpack/set-webpack-public-path-plugin/package.json b/webpack/set-webpack-public-path-plugin/package.json
index 806d8736f0c..f9640f38bf7 100644
--- a/webpack/set-webpack-public-path-plugin/package.json
+++ b/webpack/set-webpack-public-path-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/set-webpack-public-path-plugin",
-  "version": "3.2.57",
+  "version": "3.2.58",
   "description": "This plugin sets the webpack public path at runtime.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

From 992627de1453e0190901d32970bdf23383b77008 Mon Sep 17 00:00:00 2001
From: Elliot Nelson <elliot-nelson@users.noreply.github.com>
Date: Tue, 3 Aug 2021 15:31:02 -0400
Subject: [PATCH 071/155] Experimental Terminal Changes

---
 .../src/cli/scriptActions/BulkScriptAction.ts |  3 +
 apps/rush-lib/src/logic/TaskSelector.ts       |  1 +
 .../src/logic/taskRunner/BaseBuilder.ts       |  1 +
 .../src/logic/taskRunner/ProjectBuilder.ts    |  8 +-
 .../src/logic/taskRunner/TaskRunner.ts        |  7 +-
 .../taskRunner/test/TaskCollection.test.ts    |  2 +-
 .../logic/taskRunner/test/TaskRunner.test.ts  |  4 +
 .../src/utilities/CollatedTerminalProvider.ts | 23 +++++-
 common/reviews/api/node-core-library.api.md   | 15 +++-
 .../heft-config-file/src/ConfigurationFile.ts |  8 +-
 .../src/test/ConfigurationFile.test.ts        |  3 +-
 .../ConfigurationFile.test.ts.snap            | 37 +++++++--
 .../src/Terminal/ConsoleTerminalProvider.ts   | 22 ++++-
 .../src/Terminal/ITerminalProvider.ts         | 24 +++++-
 .../Terminal/StringBufferTerminalProvider.ts  | 15 +++-
 .../src/Terminal/Terminal.ts                  | 14 ++++
 .../src/Terminal/test/Terminal.test.ts        |  3 +-
 .../test/__snapshots__/Terminal.test.ts.snap  | 82 +++++++++++++++++++
 18 files changed, 243 insertions(+), 29 deletions(-)

diff --git a/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts b/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
index cff6d6be597..2f6c9ea9156 100644
--- a/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
+++ b/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
@@ -110,6 +110,7 @@ export class BulkScriptAction extends BaseScriptAction {
     const stopwatch: Stopwatch = Stopwatch.start();
 
     const isQuietMode: boolean = !this._verboseParameter.value;
+    const isDebugMode: boolean = !!this.parser.isDebug;
 
     // if this is parallelizable, then use the value from the flag (undefined or a number),
     // if parallelism is not enabled, then restrict to 1 core
@@ -144,6 +145,7 @@ export class BulkScriptAction extends BaseScriptAction {
       commandToRun: this._commandToRun,
       customParameterValues,
       isQuietMode: isQuietMode,
+      isDebugMode: isDebugMode,
       isIncrementalBuildAllowed: this._isIncrementalBuildAllowed,
       ignoreMissingScript: this._ignoreMissingScript,
       ignoreDependencyOrder: this._ignoreDependencyOrder,
@@ -152,6 +154,7 @@ export class BulkScriptAction extends BaseScriptAction {
 
     const taskRunnerOptions: ITaskRunnerOptions = {
       quietMode: isQuietMode,
+      debugMode: this.parser.isDebug,
       parallelism: parallelism,
       changedProjectsOnly: changedProjectsOnly,
       allowWarningsInSuccessfulBuild: this._allowWarningsInSuccessfulBuild,
diff --git a/apps/rush-lib/src/logic/TaskSelector.ts b/apps/rush-lib/src/logic/TaskSelector.ts
index 2899d7daed1..5c8bfffcfb2 100644
--- a/apps/rush-lib/src/logic/TaskSelector.ts
+++ b/apps/rush-lib/src/logic/TaskSelector.ts
@@ -16,6 +16,7 @@ export interface ITaskSelectorConstructor {
   commandToRun: string;
   customParameterValues: string[];
   isQuietMode: boolean;
+  isDebugMode: boolean;
   isIncrementalBuildAllowed: boolean;
   ignoreMissingScript: boolean;
   ignoreDependencyOrder: boolean;
diff --git a/apps/rush-lib/src/logic/taskRunner/BaseBuilder.ts b/apps/rush-lib/src/logic/taskRunner/BaseBuilder.ts
index acb21bb752a..67ec6a2d146 100644
--- a/apps/rush-lib/src/logic/taskRunner/BaseBuilder.ts
+++ b/apps/rush-lib/src/logic/taskRunner/BaseBuilder.ts
@@ -12,6 +12,7 @@ export interface IBuilderContext {
   collatedWriter: CollatedWriter;
   stdioSummarizer: StdioSummarizer;
   quietMode: boolean;
+  debugMode: boolean;
 }
 
 /**
diff --git a/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts b/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts
index 6ba857d53ab..9abe3de483d 100644
--- a/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts
+++ b/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts
@@ -167,12 +167,12 @@ export class ProjectBuilder extends BaseBuilder {
         newlineKind: NewlineKind.Lf // for StdioSummarizer
       });
 
-      const quietModeTransform: DiscardStdoutTransform = new DiscardStdoutTransform({
+      const discardTransform: DiscardStdoutTransform = new DiscardStdoutTransform({
         destination: context.collatedWriter
       });
 
       const splitterTransform1: SplitterTransform = new SplitterTransform({
-        destinations: [context.quietMode ? quietModeTransform : context.collatedWriter, stderrLineTransform]
+        destinations: [context.quietMode ? discardTransform : context.collatedWriter, stderrLineTransform]
       });
 
       const normalizeNewlineTransform: TextRewriterTransform = new TextRewriterTransform({
@@ -182,7 +182,9 @@ export class ProjectBuilder extends BaseBuilder {
       });
 
       const collatedTerminal: CollatedTerminal = new CollatedTerminal(normalizeNewlineTransform);
-      const terminalProvider: CollatedTerminalProvider = new CollatedTerminalProvider(collatedTerminal);
+      const terminalProvider: CollatedTerminalProvider = new CollatedTerminalProvider(collatedTerminal, {
+        debugEnabled: context.debugMode
+      });
       const terminal: Terminal = new Terminal(terminalProvider);
 
       let hasWarningOrError: boolean = false;
diff --git a/apps/rush-lib/src/logic/taskRunner/TaskRunner.ts b/apps/rush-lib/src/logic/taskRunner/TaskRunner.ts
index c5a185e5767..4ac45d37ad8 100644
--- a/apps/rush-lib/src/logic/taskRunner/TaskRunner.ts
+++ b/apps/rush-lib/src/logic/taskRunner/TaskRunner.ts
@@ -21,6 +21,7 @@ import { CommandLineConfiguration } from '../../api/CommandLineConfiguration';
 
 export interface ITaskRunnerOptions {
   quietMode: boolean;
+  debugMode: boolean;
   parallelism: string | undefined;
   changedProjectsOnly: boolean;
   allowWarningsInSuccessfulBuild: boolean;
@@ -43,6 +44,7 @@ export class TaskRunner {
   private readonly _allowWarningsInSuccessfulBuild: boolean;
   private readonly _buildQueue: Task[];
   private readonly _quietMode: boolean;
+  private readonly _debugMode: boolean;
   private readonly _parallelism: number;
   private readonly _repoCommandLineConfiguration: CommandLineConfiguration | undefined;
   private _hasAnyFailures: boolean;
@@ -60,6 +62,7 @@ export class TaskRunner {
   public constructor(orderedTasks: Task[], options: ITaskRunnerOptions) {
     const {
       quietMode,
+      debugMode,
       parallelism,
       changedProjectsOnly,
       allowWarningsInSuccessfulBuild,
@@ -68,6 +71,7 @@ export class TaskRunner {
     this._tasks = orderedTasks;
     this._buildQueue = orderedTasks.slice(0);
     this._quietMode = quietMode;
+    this._debugMode = debugMode;
     this._hasAnyFailures = false;
     this._hasAnyWarnings = false;
     this._changedProjectsOnly = changedProjectsOnly;
@@ -239,7 +243,8 @@ export class TaskRunner {
       repoCommandLineConfiguration: this._repoCommandLineConfiguration,
       stdioSummarizer: task.stdioSummarizer,
       collatedWriter: task.collatedWriter,
-      quietMode: this._quietMode
+      quietMode: this._quietMode,
+      debugMode: this._debugMode
     };
 
     try {
diff --git a/apps/rush-lib/src/logic/taskRunner/test/TaskCollection.test.ts b/apps/rush-lib/src/logic/taskRunner/test/TaskCollection.test.ts
index ccb4bdaa20f..c43cb0f742f 100644
--- a/apps/rush-lib/src/logic/taskRunner/test/TaskCollection.test.ts
+++ b/apps/rush-lib/src/logic/taskRunner/test/TaskCollection.test.ts
@@ -9,7 +9,7 @@ import { TaskStatus } from '../TaskStatus';
 
 function checkConsoleOutput(terminalProvider: StringBufferTerminalProvider): void {
   expect(terminalProvider.getOutput()).toMatchSnapshot();
-  expect(terminalProvider.getVerbose()).toMatchSnapshot();
+  expect(terminalProvider.getVerboseOutput()).toMatchSnapshot();
   expect(terminalProvider.getWarningOutput()).toMatchSnapshot();
   expect(terminalProvider.getErrorOutput()).toMatchSnapshot();
 }
diff --git a/apps/rush-lib/src/logic/taskRunner/test/TaskRunner.test.ts b/apps/rush-lib/src/logic/taskRunner/test/TaskRunner.test.ts
index bea87d35d23..0ecfe95554c 100644
--- a/apps/rush-lib/src/logic/taskRunner/test/TaskRunner.test.ts
+++ b/apps/rush-lib/src/logic/taskRunner/test/TaskRunner.test.ts
@@ -63,6 +63,7 @@ describe('TaskRunner', () => {
         () =>
           new TaskRunner([], {
             quietMode: false,
+            debugMode: false,
             parallelism: 'tequila',
             changedProjectsOnly: false,
             destination: mockWritable,
@@ -77,6 +78,7 @@ describe('TaskRunner', () => {
     beforeEach(() => {
       taskRunnerOptions = {
         quietMode: false,
+        debugMode: false,
         parallelism: '1',
         changedProjectsOnly: false,
         destination: mockWritable,
@@ -134,6 +136,7 @@ describe('TaskRunner', () => {
       beforeEach(() => {
         taskRunnerOptions = {
           quietMode: false,
+          debugMode: false,
           parallelism: '1',
           changedProjectsOnly: false,
           destination: mockWritable,
@@ -169,6 +172,7 @@ describe('TaskRunner', () => {
       beforeEach(() => {
         taskRunnerOptions = {
           quietMode: false,
+          debugMode: false,
           parallelism: '1',
           changedProjectsOnly: false,
           destination: mockWritable,
diff --git a/apps/rush-lib/src/utilities/CollatedTerminalProvider.ts b/apps/rush-lib/src/utilities/CollatedTerminalProvider.ts
index 9b450020562..acf206b25c1 100644
--- a/apps/rush-lib/src/utilities/CollatedTerminalProvider.ts
+++ b/apps/rush-lib/src/utilities/CollatedTerminalProvider.ts
@@ -4,10 +4,15 @@
 import { ITerminalProvider, TerminalProviderSeverity } from '@rushstack/node-core-library';
 import { CollatedTerminal } from '@rushstack/stream-collator';
 
+export interface ICollatedTerminalProviderOptions {
+  debugEnabled: boolean;
+}
+
 export class CollatedTerminalProvider implements ITerminalProvider {
   private readonly _collatedTerminal: CollatedTerminal;
   private _hasErrors: boolean = false;
   private _hasWarnings: boolean = false;
+  private _debugEnabled: boolean = false;
 
   public readonly supportsColor: boolean = true;
   public readonly eolCharacter: string = '\n';
@@ -20,18 +25,34 @@ export class CollatedTerminalProvider implements ITerminalProvider {
     return this._hasWarnings;
   }
 
-  public constructor(collatedTerminal: CollatedTerminal) {
+  public constructor(
+    collatedTerminal: CollatedTerminal,
+    options?: Partial<ICollatedTerminalProviderOptions>
+  ) {
     this._collatedTerminal = collatedTerminal;
+    this._debugEnabled = !!options?.debugEnabled;
   }
 
   public write(data: string, severity: TerminalProviderSeverity): void {
     switch (severity) {
       case TerminalProviderSeverity.log:
       case TerminalProviderSeverity.verbose: {
+        // Unlike the basic ConsoleTerminalProvider, verbose messages are always passed
+        // to stdout -- by convention the user-controlled build script output is sent
+        // to verbose, and will be routed to a variety of other providers in the ProjectBuilder.
         this._collatedTerminal.writeStdoutLine(data);
         break;
       }
 
+      case TerminalProviderSeverity.debug: {
+        // Similar to the basic ConsoleTerminalProvider, debug messages are discarded
+        // unless they are explicitly enabled.
+        if (this._debugEnabled) {
+          this._collatedTerminal.writeStdoutLine(data);
+        }
+        break;
+      }
+
       case TerminalProviderSeverity.error: {
         this._collatedTerminal.writeStderrLine(data);
         this._hasErrors = true;
diff --git a/common/reviews/api/node-core-library.api.md b/common/reviews/api/node-core-library.api.md
index 991a198b489..06bc99a3904 100644
--- a/common/reviews/api/node-core-library.api.md
+++ b/common/reviews/api/node-core-library.api.md
@@ -120,6 +120,7 @@ export enum ColorValue {
 // @beta
 export class ConsoleTerminalProvider implements ITerminalProvider {
     constructor(options?: Partial<IConsoleTerminalProviderOptions>);
+    debugEnabled: boolean;
     get eolCharacter(): string;
     get supportsColor(): boolean;
     verboseEnabled: boolean;
@@ -289,6 +290,7 @@ export interface IColorableSequence {
 
 // @beta
 export interface IConsoleTerminalProviderOptions {
+    debugEnabled: boolean;
     verboseEnabled: boolean;
 }
 
@@ -718,9 +720,10 @@ export class Sort {
 export class StringBufferTerminalProvider implements ITerminalProvider {
     constructor(supportsColor?: boolean);
     get eolCharacter(): string;
+    getDebugOutput(options?: IStringBufferOutputOptions): string;
     getErrorOutput(options?: IStringBufferOutputOptions): string;
     getOutput(options?: IStringBufferOutputOptions): string;
-    getVerbose(options?: IStringBufferOutputOptions): string;
+    getVerboseOutput(options?: IStringBufferOutputOptions): string;
     getWarningOutput(options?: IStringBufferOutputOptions): string;
     get supportsColor(): boolean;
     write(data: string, severity: TerminalProviderSeverity): void;
@@ -739,6 +742,8 @@ export class Terminal {
     registerProvider(provider: ITerminalProvider): void;
     unregisterProvider(provider: ITerminalProvider): void;
     write(...messageParts: (string | IColorableSequence)[]): void;
+    writeDebug(...messageParts: (string | IColorableSequence)[]): void;
+    writeDebugLine(...messageParts: (string | IColorableSequence)[]): void;
     writeError(...messageParts: (string | IColorableSequence)[]): void;
     writeErrorLine(...messageParts: (string | IColorableSequence)[]): void;
     writeLine(...messageParts: (string | IColorableSequence)[]): void;
@@ -748,12 +753,14 @@ export class Terminal {
     writeWarningLine(...messageParts: (string | IColorableSequence)[]): void;
 }
 
-// @beta (undocumented)
+// @beta
 export enum TerminalProviderSeverity {
     // (undocumented)
-    error = 2,
+    debug = 4,
+    // (undocumented)
+    error = 0,
     // (undocumented)
-    log = 0,
+    log = 2,
     // (undocumented)
     verbose = 3,
     // (undocumented)
diff --git a/libraries/heft-config-file/src/ConfigurationFile.ts b/libraries/heft-config-file/src/ConfigurationFile.ts
index 302f7fe1dc2..769ab61afaf 100644
--- a/libraries/heft-config-file/src/ConfigurationFile.ts
+++ b/libraries/heft-config-file/src/ConfigurationFile.ts
@@ -341,7 +341,7 @@ export class ConfigurationFile<TConfigurationFile> {
     } catch (e) {
       if (FileSystem.isNotExistError(e)) {
         if (rigConfig) {
-          terminal.writeVerboseLine(
+          terminal.writeDebugLine(
             `Config file "${resolvedConfigurationFilePathForLogging}" does not exist. Attempting to load via rig.`
           );
           const rigResult: TConfigurationFile | undefined = await this._tryLoadConfigurationFileInRigAsync(
@@ -353,7 +353,7 @@ export class ConfigurationFile<TConfigurationFile> {
             return rigResult;
           }
         } else {
-          terminal.writeVerboseLine(
+          terminal.writeDebugLine(
             `Configuration file "${resolvedConfigurationFilePathForLogging}" not found.`
           );
         }
@@ -570,7 +570,7 @@ export class ConfigurationFile<TConfigurationFile> {
         if (!FileSystem.isNotExistError(e)) {
           throw e;
         } else {
-          terminal.writeVerboseLine(
+          terminal.writeDebugLine(
             `Configuration file "${
               this.projectRelativeFilePath
             }" not found in rig ("${ConfigurationFile._formatPathForLogging(rigProfileFolder)}")`
@@ -578,7 +578,7 @@ export class ConfigurationFile<TConfigurationFile> {
         }
       }
     } else {
-      terminal.writeVerboseLine(
+      terminal.writeDebugLine(
         `No rig found for "${ConfigurationFile._formatPathForLogging(rigConfig.projectFolderPath)}"`
       );
     }
diff --git a/libraries/heft-config-file/src/test/ConfigurationFile.test.ts b/libraries/heft-config-file/src/test/ConfigurationFile.test.ts
index f43b1941bf5..f5f4b31d746 100644
--- a/libraries/heft-config-file/src/test/ConfigurationFile.test.ts
+++ b/libraries/heft-config-file/src/test/ConfigurationFile.test.ts
@@ -34,7 +34,8 @@ describe('ConfigurationFile', () => {
       log: terminalProvider.getOutput(),
       warning: terminalProvider.getWarningOutput(),
       error: terminalProvider.getErrorOutput(),
-      verbose: terminalProvider.getVerbose()
+      verbose: terminalProvider.getVerboseOutput(),
+      debug: terminalProvider.getDebugOutput()
     }).toMatchSnapshot();
   });
 
diff --git a/libraries/heft-config-file/src/test/__snapshots__/ConfigurationFile.test.ts.snap b/libraries/heft-config-file/src/test/__snapshots__/ConfigurationFile.test.ts.snap
index 61e0be9ac01..025b216e391 100644
--- a/libraries/heft-config-file/src/test/__snapshots__/ConfigurationFile.test.ts.snap
+++ b/libraries/heft-config-file/src/test/__snapshots__/ConfigurationFile.test.ts.snap
@@ -2,6 +2,7 @@
 
 exports[`ConfigurationFile A complex config file Correctly loads a complex config file 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -11,6 +12,7 @@ Object {
 
 exports[`ConfigurationFile A simple config file Correctly loads the config file 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -20,6 +22,7 @@ Object {
 
 exports[`ConfigurationFile A simple config file Correctly resolves paths relative to the config file 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -29,6 +32,7 @@ Object {
 
 exports[`ConfigurationFile A simple config file Correctly resolves paths relative to the project root 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -38,6 +42,7 @@ Object {
 
 exports[`ConfigurationFile A simple config file containing an array Correctly loads the config file 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -47,6 +52,7 @@ Object {
 
 exports[`ConfigurationFile A simple config file containing an array Correctly resolves paths relative to the config file 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -56,6 +62,7 @@ Object {
 
 exports[`ConfigurationFile A simple config file containing an array Correctly resolves paths relative to the project root 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -65,6 +72,7 @@ Object {
 
 exports[`ConfigurationFile A simple config file with "extends" Correctly loads the config file with "append" in config meta 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -74,6 +82,7 @@ Object {
 
 exports[`ConfigurationFile A simple config file with "extends" Correctly loads the config file with "custom" in config meta 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -83,6 +92,7 @@ Object {
 
 exports[`ConfigurationFile A simple config file with "extends" Correctly loads the config file with "replace" in config meta 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -92,6 +102,7 @@ Object {
 
 exports[`ConfigurationFile A simple config file with "extends" Correctly loads the config file with default config meta 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -101,6 +112,7 @@ Object {
 
 exports[`ConfigurationFile A simple config file with "extends" Correctly resolves paths relative to the config file 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -118,6 +130,7 @@ Error: #/filePaths
 
 exports[`ConfigurationFile error cases Throws an error for a file that doesn't match its schema 2`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -139,6 +152,7 @@ Error: #/
 
 exports[`ConfigurationFile error cases Throws an error when a combined config file doesn't match the schema 2`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -150,9 +164,10 @@ exports[`ConfigurationFile error cases Throws an error when a requested file doe
 
 exports[`ConfigurationFile error cases Throws an error when a requested file doesn't exist 2`] = `
 Object {
+  "debug": "Configuration file \\"<project root>/src/test/errorCases/folderThatDoesntExist/config.json\\" not found.[n]",
   "error": "",
   "log": "",
-  "verbose": "Configuration file \\"<project root>/src/test/errorCases/folderThatDoesntExist/config.json\\" not found.[n]",
+  "verbose": "",
   "warning": "",
 }
 `;
@@ -161,9 +176,10 @@ exports[`ConfigurationFile error cases Throws an error when an "extends" propert
 
 exports[`ConfigurationFile error cases Throws an error when an "extends" property points to a file that cannot be resolved 2`] = `
 Object {
+  "debug": "Configuration file \\"<project root>/src/test/errorCases/extendsNotExist/config2.json\\" not found.[n]",
   "error": "",
   "log": "",
-  "verbose": "Configuration file \\"<project root>/src/test/errorCases/extendsNotExist/config2.json\\" not found.[n]",
+  "verbose": "",
   "warning": "",
 }
 `;
@@ -176,6 +192,7 @@ exports[`ConfigurationFile error cases Throws an error when the file isn't valid
 
 exports[`ConfigurationFile error cases Throws an error when the file isn't valid JSON 2`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -187,6 +204,7 @@ exports[`ConfigurationFile error cases Throws an error when there is a circular
 
 exports[`ConfigurationFile error cases Throws an error when there is a circular reference in "extends" properties 2`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -196,9 +214,10 @@ Object {
 
 exports[`ConfigurationFile error cases returns undefined when the file doesn't exist for tryLoadConfigurationFileForProjectAsync 1`] = `
 Object {
+  "debug": "Configuration file \\"<project root>/src/test/errorCases/invalidType/notExist.json\\" not found.[n]",
   "error": "",
   "log": "",
-  "verbose": "Configuration file \\"<project root>/src/test/errorCases/invalidType/notExist.json\\" not found.[n]",
+  "verbose": "",
   "warning": "",
 }
 `;
@@ -207,27 +226,30 @@ exports[`ConfigurationFile error cases throws an error when the file doesn't exi
 
 exports[`ConfigurationFile error cases throws an error when the file doesn't exist 2`] = `
 Object {
+  "debug": "Configuration file \\"<project root>/src/test/errorCases/invalidType/notExist.json\\" not found.[n]",
   "error": "",
   "log": "",
-  "verbose": "Configuration file \\"<project root>/src/test/errorCases/invalidType/notExist.json\\" not found.[n]",
+  "verbose": "",
   "warning": "",
 }
 `;
 
 exports[`ConfigurationFile loading a rig correctly loads a config file inside a rig 1`] = `
 Object {
+  "debug": "Config file \\"<project root>/src/test/project-referencing-rig/config/simplestConfigFile.json\\" does not exist. Attempting to load via rig.[n]",
   "error": "",
   "log": "",
-  "verbose": "Config file \\"<project root>/src/test/project-referencing-rig/config/simplestConfigFile.json\\" does not exist. Attempting to load via rig.[n]",
+  "verbose": "",
   "warning": "",
 }
 `;
 
 exports[`ConfigurationFile loading a rig correctly loads a config file inside a rig via tryLoadConfigurationFileForProjectAsync 1`] = `
 Object {
+  "debug": "Config file \\"<project root>/src/test/project-referencing-rig/config/simplestConfigFile.json\\" does not exist. Attempting to load via rig.[n]",
   "error": "",
   "log": "",
-  "verbose": "Config file \\"<project root>/src/test/project-referencing-rig/config/simplestConfigFile.json\\" does not exist. Attempting to load via rig.[n]",
+  "verbose": "",
   "warning": "",
 }
 `;
@@ -236,9 +258,10 @@ exports[`ConfigurationFile loading a rig throws an error when a config file does
 
 exports[`ConfigurationFile loading a rig throws an error when a config file doesn't exist in a project referencing a rig, which also doesn't have the file 2`] = `
 Object {
+  "debug": "Config file \\"<project root>/src/test/project-referencing-rig/config/notExist.json\\" does not exist. Attempting to load via rig.[n]Configuration file \\"<project root>/src/test/project-referencing-rig/node_modules/test-rig/profiles/default/config/notExist.json\\" not found.[n]Configuration file \\"config/notExist.json\\" not found in rig (\\"<project root>/src/test/project-referencing-rig/node_modules/test-rig/profiles/default\\")[n]",
   "error": "",
   "log": "",
-  "verbose": "Config file \\"<project root>/src/test/project-referencing-rig/config/notExist.json\\" does not exist. Attempting to load via rig.[n]Configuration file \\"<project root>/src/test/project-referencing-rig/node_modules/test-rig/profiles/default/config/notExist.json\\" not found.[n]Configuration file \\"config/notExist.json\\" not found in rig (\\"<project root>/src/test/project-referencing-rig/node_modules/test-rig/profiles/default\\")[n]",
+  "verbose": "",
   "warning": "",
 }
 `;
diff --git a/libraries/node-core-library/src/Terminal/ConsoleTerminalProvider.ts b/libraries/node-core-library/src/Terminal/ConsoleTerminalProvider.ts
index dd8b6f9f839..cfe2f84374b 100644
--- a/libraries/node-core-library/src/Terminal/ConsoleTerminalProvider.ts
+++ b/libraries/node-core-library/src/Terminal/ConsoleTerminalProvider.ts
@@ -13,9 +13,16 @@ import { ITerminalProvider, TerminalProviderSeverity } from './ITerminalProvider
  */
 export interface IConsoleTerminalProviderOptions {
   /**
-   * If true, print verbose logging messages
+   * If true, print verbose logging messages.
    */
   verboseEnabled: boolean;
+
+  /**
+   * If true, print debug logging messages. Note that "verbose" and "debug" are considered
+   * separate message filters; if you want debug to imply verbose, it is up to your
+   * application code to enforce that.
+   */
+  debugEnabled: boolean;
 }
 
 /**
@@ -30,8 +37,14 @@ export class ConsoleTerminalProvider implements ITerminalProvider {
    */
   public verboseEnabled: boolean = false;
 
+  /**
+   * If true, debug-level messages should be written to the console.
+   */
+  public debugEnabled: boolean = false;
+
   public constructor(options: Partial<IConsoleTerminalProviderOptions> = {}) {
     this.verboseEnabled = !!options.verboseEnabled;
+    this.debugEnabled = !!options.debugEnabled;
   }
 
   /**
@@ -52,6 +65,13 @@ export class ConsoleTerminalProvider implements ITerminalProvider {
         break;
       }
 
+      case TerminalProviderSeverity.debug: {
+        if (this.debugEnabled) {
+          process.stdout.write(data);
+        }
+        break;
+      }
+
       case TerminalProviderSeverity.log:
       default: {
         process.stdout.write(data);
diff --git a/libraries/node-core-library/src/Terminal/ITerminalProvider.ts b/libraries/node-core-library/src/Terminal/ITerminalProvider.ts
index f49ec8bfc1f..d0c23c67602 100644
--- a/libraries/node-core-library/src/Terminal/ITerminalProvider.ts
+++ b/libraries/node-core-library/src/Terminal/ITerminalProvider.ts
@@ -2,13 +2,29 @@
 // See LICENSE in the project root for license information.
 
 /**
+ * Similar to many popular logging packages, terminal providers support a range of message
+ * severities. These severities have built-in formatting defaults in the Terminal object
+ * (warnings are yellow, errors are red, etc.).
+ *
+ * Terminal providers may choose to suppress certain messages based on their severity,
+ * or to route some messages to other providers or not based on severity.
+ *
+ *   Severity  | Purpose
+ *   --------- | -------
+ *   error     | Build errors and fatal issues in rush
+ *   warning   | Not necessarily fatal, but indicate a problem the user should fix
+ *   log       | Informational messages from the rush system
+ *   verbose   | Additional information that may not always be necessary
+ *   debug     | Highest detail level, best used for troubleshooting information
+ *
  * @beta
  */
 export enum TerminalProviderSeverity {
-  log,
-  warning,
   error,
-  verbose
+  warning,
+  log,
+  verbose,
+  debug
 }
 
 /**
@@ -37,7 +53,7 @@ export interface ITerminalProvider {
    * @param data - The terminal message.
    * @param severity - The message severity. Terminal providers can
    * route different kinds of messages to different streams and may choose
-   * to ignore verbose messages.
+   * to ignore verbose or debug messages.
    */
   write(data: string, severity: TerminalProviderSeverity): void;
 }
diff --git a/libraries/node-core-library/src/Terminal/StringBufferTerminalProvider.ts b/libraries/node-core-library/src/Terminal/StringBufferTerminalProvider.ts
index f7e1ef7d713..ef02cd716d4 100644
--- a/libraries/node-core-library/src/Terminal/StringBufferTerminalProvider.ts
+++ b/libraries/node-core-library/src/Terminal/StringBufferTerminalProvider.ts
@@ -29,6 +29,7 @@ export interface IStringBufferOutputOptions {
 export class StringBufferTerminalProvider implements ITerminalProvider {
   private _standardBuffer: StringBuilder = new StringBuilder();
   private _verboseBuffer: StringBuilder = new StringBuilder();
+  private _debugBuffer: StringBuilder = new StringBuilder();
   private _warningBuffer: StringBuilder = new StringBuilder();
   private _errorBuffer: StringBuilder = new StringBuilder();
 
@@ -58,6 +59,11 @@ export class StringBufferTerminalProvider implements ITerminalProvider {
         break;
       }
 
+      case TerminalProviderSeverity.debug: {
+        this._debugBuffer.append(data);
+        break;
+      }
+
       case TerminalProviderSeverity.log:
       default: {
         this._standardBuffer.append(data);
@@ -90,10 +96,17 @@ export class StringBufferTerminalProvider implements ITerminalProvider {
   /**
    * Get everything that has been written at verbose-level severity.
    */
-  public getVerbose(options?: IStringBufferOutputOptions): string {
+  public getVerboseOutput(options?: IStringBufferOutputOptions): string {
     return this._normalizeOutput(this._verboseBuffer.toString(), options);
   }
 
+  /**
+   * Get everything that has been written at debug-level severity.
+   */
+  public getDebugOutput(options?: IStringBufferOutputOptions): string {
+    return this._normalizeOutput(this._debugBuffer.toString(), options);
+  }
+
   /**
    * Get everything that has been written at error-level severity.
    */
diff --git a/libraries/node-core-library/src/Terminal/Terminal.ts b/libraries/node-core-library/src/Terminal/Terminal.ts
index a2e8ad7427c..2bbeffd9af5 100644
--- a/libraries/node-core-library/src/Terminal/Terminal.ts
+++ b/libraries/node-core-library/src/Terminal/Terminal.ts
@@ -146,6 +146,20 @@ export class Terminal {
     this.writeVerbose(...messageParts, eolSequence);
   }
 
+  /**
+   * Write a debug-level message.
+   */
+  public writeDebug(...messageParts: (string | IColorableSequence)[]): void {
+    this._writeSegmentsToProviders(messageParts, TerminalProviderSeverity.debug);
+  }
+
+  /**
+   * Write a debug-level message followed by a newline.
+   */
+  public writeDebugLine(...messageParts: (string | IColorableSequence)[]): void {
+    this.writeDebug(...messageParts, eolSequence);
+  }
+
   private _writeSegmentsToProviders(
     segments: (string | IColorableSequence)[],
     severity: TerminalProviderSeverity
diff --git a/libraries/node-core-library/src/Terminal/test/Terminal.test.ts b/libraries/node-core-library/src/Terminal/test/Terminal.test.ts
index 5928c03eb23..174b0e993dc 100644
--- a/libraries/node-core-library/src/Terminal/test/Terminal.test.ts
+++ b/libraries/node-core-library/src/Terminal/test/Terminal.test.ts
@@ -13,7 +13,8 @@ function verifyProvider(): void {
     log: provider.getOutput(),
     warning: provider.getWarningOutput(),
     error: provider.getErrorOutput(),
-    verbose: provider.getVerbose()
+    verbose: provider.getVerboseOutput(),
+    debug: provider.getDebugOutput()
   }).toMatchSnapshot();
 }
 
diff --git a/libraries/node-core-library/src/Terminal/test/__snapshots__/Terminal.test.ts.snap b/libraries/node-core-library/src/Terminal/test/__snapshots__/Terminal.test.ts.snap
index d411f209670..4090222bcd0 100644
--- a/libraries/node-core-library/src/Terminal/test/__snapshots__/Terminal.test.ts.snap
+++ b/libraries/node-core-library/src/Terminal/test/__snapshots__/Terminal.test.ts.snap
@@ -2,6 +2,7 @@
 
 exports[`01 color enabled 01 basic terminal functions 01 write 01 writes a single message 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "test message",
   "verbose": "",
@@ -11,6 +12,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 01 write 02 writes multiple messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "message 1message 2",
   "verbose": "",
@@ -20,6 +22,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 01 write 03 writes a message with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "[green]message 1[default]",
   "verbose": "",
@@ -29,6 +32,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 01 write 04 writes a multiple messages with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "[green]message 1[default][red]message 2[default]",
   "verbose": "",
@@ -38,6 +42,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 01 write 05 writes a messages with colors interspersed with non-colored messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "message 1[green]message 2[default]message 3[red]message 4[default]",
   "verbose": "",
@@ -47,6 +52,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 02 writeLine 01 writes a single message 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "test message[n]",
   "verbose": "",
@@ -56,6 +62,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 02 writeLine 02 writes multiple messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "message 1message 2[n]",
   "verbose": "",
@@ -65,6 +72,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 02 writeLine 03 writes a message with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "[green]message 1[default][n]",
   "verbose": "",
@@ -74,6 +82,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 02 writeLine 04 writes a multiple messages with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "[green]message 1[default][red]message 2[default][n]",
   "verbose": "",
@@ -83,6 +92,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 02 writeLine 05 writes a messages with colors interspersed with non-colored messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "message 1[green]message 2[default]message 3[red]message 4[default][n]",
   "verbose": "",
@@ -92,6 +102,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 03 writeWarning 01 writes a single message 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -101,6 +112,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 03 writeWarning 02 writes multiple messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -110,6 +122,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 03 writeWarning 03 writes a message with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -119,6 +132,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 03 writeWarning 04 writes a multiple messages with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -128,6 +142,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 03 writeWarning 05 writes a messages with colors interspersed with non-colored messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -137,6 +152,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 04 writeWarningLine 01 writes a single message 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -146,6 +162,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 04 writeWarningLine 02 writes multiple messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -155,6 +172,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 04 writeWarningLine 03 writes a message with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -164,6 +182,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 04 writeWarningLine 04 writes a multiple messages with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -173,6 +192,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 04 writeWarningLine 05 writes a messages with colors interspersed with non-colored messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -182,6 +202,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 05 writeError 01 writes a single message 1`] = `
 Object {
+  "debug": "",
   "error": "[red]test message[default]",
   "log": "",
   "verbose": "",
@@ -191,6 +212,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 05 writeError 02 writes multiple messages 1`] = `
 Object {
+  "debug": "",
   "error": "[red]message 1[default][red]message 2[default]",
   "log": "",
   "verbose": "",
@@ -200,6 +222,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 05 writeError 03 writes a message with colors 1`] = `
 Object {
+  "debug": "",
   "error": "[red]message 1[default]",
   "log": "",
   "verbose": "",
@@ -209,6 +232,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 05 writeError 04 writes a multiple messages with colors 1`] = `
 Object {
+  "debug": "",
   "error": "[red]message 1[default][red]message 2[default]",
   "log": "",
   "verbose": "",
@@ -218,6 +242,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 05 writeError 05 writes a messages with colors interspersed with non-colored messages 1`] = `
 Object {
+  "debug": "",
   "error": "[red]message 1[default][red]message 2[default][red]message 3[default][red]message 4[default]",
   "log": "",
   "verbose": "",
@@ -227,6 +252,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 06 writeErrorLine 01 writes a single message 1`] = `
 Object {
+  "debug": "",
   "error": "[red]test message[default][n]",
   "log": "",
   "verbose": "",
@@ -236,6 +262,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 06 writeErrorLine 02 writes multiple messages 1`] = `
 Object {
+  "debug": "",
   "error": "[red]message 1[default][red]message 2[default][n]",
   "log": "",
   "verbose": "",
@@ -245,6 +272,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 06 writeErrorLine 03 writes a message with colors 1`] = `
 Object {
+  "debug": "",
   "error": "[red]message 1[default][n]",
   "log": "",
   "verbose": "",
@@ -254,6 +282,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 06 writeErrorLine 04 writes a multiple messages with colors 1`] = `
 Object {
+  "debug": "",
   "error": "[red]message 1[default][red]message 2[default][n]",
   "log": "",
   "verbose": "",
@@ -263,6 +292,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 06 writeErrorLine 05 writes a messages with colors interspersed with non-colored messages 1`] = `
 Object {
+  "debug": "",
   "error": "[red]message 1[default][red]message 2[default][red]message 3[default][red]message 4[default][n]",
   "log": "",
   "verbose": "",
@@ -272,6 +302,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 07 writeVerbose 01 writes a single message 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "test message",
@@ -281,6 +312,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 07 writeVerbose 02 writes multiple messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "message 1message 2",
@@ -290,6 +322,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 07 writeVerbose 03 writes a message with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "[green]message 1[default]",
@@ -299,6 +332,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 07 writeVerbose 04 writes a multiple messages with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "[green]message 1[default][red]message 2[default]",
@@ -308,6 +342,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 07 writeVerbose 05 writes a messages with colors interspersed with non-colored messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "message 1[green]message 2[default]message 3[red]message 4[default]",
@@ -317,6 +352,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 08 writeVerboseLine 01 writes a single message 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "test message[n]",
@@ -326,6 +362,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 08 writeVerboseLine 02 writes multiple messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "message 1message 2[n]",
@@ -335,6 +372,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 08 writeVerboseLine 03 writes a message with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "[green]message 1[default][n]",
@@ -344,6 +382,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 08 writeVerboseLine 04 writes a multiple messages with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "[green]message 1[default][red]message 2[default][n]",
@@ -353,6 +392,7 @@ Object {
 
 exports[`01 color enabled 01 basic terminal functions 08 writeVerboseLine 05 writes a messages with colors interspersed with non-colored messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "message 1[green]message 2[default]message 3[red]message 4[default][n]",
@@ -362,6 +402,7 @@ Object {
 
 exports[`01 color enabled 05 writes to multiple streams 1`] = `
 Object {
+  "debug": "",
   "error": "[red]message 1[default][red]message 2[default][red]message 3[default][red]message 4[default][red]test message[default][n][red]message 1[default][red]message 2[default][red]message 1[default][red]message 2[default][n][red]message 1[default][red]message 1[default][red]message 2[default][red]message 3[default][red]message 4[default][n][red]message 1[default][n][red]test message[default][red]message 1[default][red]message 2[default][n][red]message 1[default][red]message 2[default]",
   "log": "message 1[green]message 2[default]message 3[red]message 4[default][green]message 1[default][n][green]message 1[default][green]message 1[default][red]message 2[default][green]message 1[default][red]message 2[default][n]test messagemessage 1[green]message 2[default]message 3[red]message 4[default][n]message 1message 2test message[n]message 1message 2[n]",
   "verbose": "test message[green]message 1[default]message 1[green]message 2[default]message 3[red]message 4[default][n]test message[n]message 1[green]message 2[default]message 3[red]message 4[default]message 1message 2[green]message 1[default][n][green]message 1[default][red]message 2[default][n]message 1message 2[n][green]message 1[default][red]message 2[default]",
@@ -371,6 +412,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 01 write 01 writes a single message 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "test message",
   "verbose": "",
@@ -380,6 +422,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 01 write 02 writes multiple messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "message 1message 2",
   "verbose": "",
@@ -389,6 +432,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 01 write 03 writes a message with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "message 1",
   "verbose": "",
@@ -398,6 +442,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 01 write 04 writes a multiple messages with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "message 1message 2",
   "verbose": "",
@@ -407,6 +452,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 01 write 05 writes a messages with colors interspersed with non-colored messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "message 1message 2message 3message 4",
   "verbose": "",
@@ -416,6 +462,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 02 writeLine 01 writes a single message 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "test message[n]",
   "verbose": "",
@@ -425,6 +472,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 02 writeLine 02 writes multiple messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "message 1message 2[n]",
   "verbose": "",
@@ -434,6 +482,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 02 writeLine 03 writes a message with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "message 1[n]",
   "verbose": "",
@@ -443,6 +492,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 02 writeLine 04 writes a multiple messages with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "message 1message 2[n]",
   "verbose": "",
@@ -452,6 +502,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 02 writeLine 05 writes a messages with colors interspersed with non-colored messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "message 1message 2message 3message 4[n]",
   "verbose": "",
@@ -461,6 +512,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 03 writeWarning 01 writes a single message 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -470,6 +522,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 03 writeWarning 02 writes multiple messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -479,6 +532,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 03 writeWarning 03 writes a message with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -488,6 +542,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 03 writeWarning 04 writes a multiple messages with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -497,6 +552,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 03 writeWarning 05 writes a messages with colors interspersed with non-colored messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -506,6 +562,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 04 writeWarningLine 01 writes a single message 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -515,6 +572,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 04 writeWarningLine 02 writes multiple messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -524,6 +582,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 04 writeWarningLine 03 writes a message with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -533,6 +592,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 04 writeWarningLine 04 writes a multiple messages with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -542,6 +602,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 04 writeWarningLine 05 writes a messages with colors interspersed with non-colored messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "",
@@ -551,6 +612,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 05 writeError 01 writes a single message 1`] = `
 Object {
+  "debug": "",
   "error": "test message",
   "log": "",
   "verbose": "",
@@ -560,6 +622,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 05 writeError 02 writes multiple messages 1`] = `
 Object {
+  "debug": "",
   "error": "message 1message 2",
   "log": "",
   "verbose": "",
@@ -569,6 +632,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 05 writeError 03 writes a message with colors 1`] = `
 Object {
+  "debug": "",
   "error": "message 1",
   "log": "",
   "verbose": "",
@@ -578,6 +642,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 05 writeError 04 writes a multiple messages with colors 1`] = `
 Object {
+  "debug": "",
   "error": "message 1message 2",
   "log": "",
   "verbose": "",
@@ -587,6 +652,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 05 writeError 05 writes a messages with colors interspersed with non-colored messages 1`] = `
 Object {
+  "debug": "",
   "error": "message 1message 2message 3message 4",
   "log": "",
   "verbose": "",
@@ -596,6 +662,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 06 writeErrorLine 01 writes a single message 1`] = `
 Object {
+  "debug": "",
   "error": "test message[n]",
   "log": "",
   "verbose": "",
@@ -605,6 +672,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 06 writeErrorLine 02 writes multiple messages 1`] = `
 Object {
+  "debug": "",
   "error": "message 1message 2[n]",
   "log": "",
   "verbose": "",
@@ -614,6 +682,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 06 writeErrorLine 03 writes a message with colors 1`] = `
 Object {
+  "debug": "",
   "error": "message 1[n]",
   "log": "",
   "verbose": "",
@@ -623,6 +692,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 06 writeErrorLine 04 writes a multiple messages with colors 1`] = `
 Object {
+  "debug": "",
   "error": "message 1message 2[n]",
   "log": "",
   "verbose": "",
@@ -632,6 +702,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 06 writeErrorLine 05 writes a messages with colors interspersed with non-colored messages 1`] = `
 Object {
+  "debug": "",
   "error": "message 1message 2message 3message 4[n]",
   "log": "",
   "verbose": "",
@@ -641,6 +712,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 07 writeVerbose 01 writes a single message 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "test message",
@@ -650,6 +722,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 07 writeVerbose 02 writes multiple messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "message 1message 2",
@@ -659,6 +732,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 07 writeVerbose 03 writes a message with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "message 1",
@@ -668,6 +742,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 07 writeVerbose 04 writes a multiple messages with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "message 1message 2",
@@ -677,6 +752,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 07 writeVerbose 05 writes a messages with colors interspersed with non-colored messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "message 1message 2message 3message 4",
@@ -686,6 +762,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 08 writeVerboseLine 01 writes a single message 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "test message[n]",
@@ -695,6 +772,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 08 writeVerboseLine 02 writes multiple messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "message 1message 2[n]",
@@ -704,6 +782,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 08 writeVerboseLine 03 writes a message with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "message 1[n]",
@@ -713,6 +792,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 08 writeVerboseLine 04 writes a multiple messages with colors 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "message 1message 2[n]",
@@ -722,6 +802,7 @@ Object {
 
 exports[`02 color disabled 01 basic terminal functions 08 writeVerboseLine 05 writes a messages with colors interspersed with non-colored messages 1`] = `
 Object {
+  "debug": "",
   "error": "",
   "log": "",
   "verbose": "message 1message 2message 3message 4[n]",
@@ -731,6 +812,7 @@ Object {
 
 exports[`02 color disabled 05 writes to multiple streams 1`] = `
 Object {
+  "debug": "",
   "error": "message 1message 2message 3message 4test message[n]message 1message 2message 1message 2[n]message 1message 1message 2message 3message 4[n]message 1[n]test messagemessage 1message 2[n]message 1message 2",
   "log": "message 1message 2message 3message 4message 1[n]message 1message 1message 2message 1message 2[n]test messagemessage 1message 2message 3message 4[n]message 1message 2test message[n]message 1message 2[n]",
   "verbose": "test messagemessage 1message 1message 2message 3message 4[n]test message[n]message 1message 2message 3message 4message 1message 2message 1[n]message 1message 2[n]message 1message 2[n]message 1message 2",

From a286ddcd81cba12f3a0e8c6017c3b35e5d37a730 Mon Sep 17 00:00:00 2001
From: Elliot Nelson <elliot-nelson@users.noreply.github.com>
Date: Tue, 3 Aug 2021 15:33:06 -0400
Subject: [PATCH 072/155] rush change

---
 .../rush/experimental-terminal_2021-08-03-19-33.json  | 11 +++++++++++
 .../experimental-terminal_2021-08-03-19-33.json       | 11 +++++++++++
 .../experimental-terminal_2021-08-03-19-33.json       | 11 +++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 common/changes/@microsoft/rush/experimental-terminal_2021-08-03-19-33.json
 create mode 100644 common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json
 create mode 100644 common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json

diff --git a/common/changes/@microsoft/rush/experimental-terminal_2021-08-03-19-33.json b/common/changes/@microsoft/rush/experimental-terminal_2021-08-03-19-33.json
new file mode 100644
index 00000000000..aedf310cec5
--- /dev/null
+++ b/common/changes/@microsoft/rush/experimental-terminal_2021-08-03-19-33.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "The --debug flag now also shows additional diagnostic information.",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "elliot-nelson@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json b/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json
new file mode 100644
index 00000000000..c940798ff70
--- /dev/null
+++ b/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/heft-config-file",
+      "comment": "Detailed logging moved from verbose to debug severity.",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@rushstack/heft-config-file",
+  "email": "elliot-nelson@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json b/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json
new file mode 100644
index 00000000000..dcaa89d4e5e
--- /dev/null
+++ b/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/node-core-library",
+      "comment": "Added new message severity \"debug\", below verbose.",
+      "type": "major"
+    }
+  ],
+  "packageName": "@rushstack/node-core-library",
+  "email": "elliot-nelson@users.noreply.github.com"
+}
\ No newline at end of file

From 1b32c84e07eca52a1187ad08b719c42740c34915 Mon Sep 17 00:00:00 2001
From: Ben Papp <BPapp-MS@users.noreply.github.com>
Date: Wed, 4 Aug 2021 14:19:08 -0700
Subject: [PATCH 073/155] include flags in the extraData section of the rush
 telemetry drop

---
 .../src/cli/actions/BaseInstallAction.ts      | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/apps/rush-lib/src/cli/actions/BaseInstallAction.ts b/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
index e7136630b34..c2a43c30caf 100644
--- a/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
+++ b/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
@@ -21,6 +21,7 @@ import { Stopwatch } from '../../utilities/Stopwatch';
 import { VersionMismatchFinder } from '../../logic/versionMismatch/VersionMismatchFinder';
 import { Variants } from '../../api/Variants';
 import { RushConstants } from '../../logic/RushConstants';
+import { SelectionParameterSet } from '../SelectionParameterSet';
 
 const installManagerFactoryModule: typeof import('../../logic/InstallManagerFactory') = Import.lazy(
   '../../logic/InstallManagerFactory',
@@ -39,6 +40,7 @@ export abstract class BaseInstallAction extends BaseRushAction {
   protected _debugPackageManagerParameter!: CommandLineFlagParameter;
   protected _maxInstallAttempts!: CommandLineIntegerParameter;
   protected _ignoreHooksParameter!: CommandLineFlagParameter;
+  protected _selectionParameters?: SelectionParameterSet;
 
   protected onDefineParameters(): void {
     this._purgeParameter = this.defineFlagParameter({
@@ -181,15 +183,30 @@ export abstract class BaseInstallAction extends BaseRushAction {
     success: boolean
   ): void {
     if (this.parser.telemetry) {
+      let extraData: { [key: string]: string } = {
+        mode: this.actionName,
+        clean: (!!this._purgeParameter.value).toString(),
+        bypassPolicy: (!!this._bypassPolicyParameter.value).toString(),
+        noLink: (!!this._noLinkParameter.value).toString(),
+        networkConcurrency: this._networkConcurrencyParameter.value
+          ? this._networkConcurrencyParameter.toString()
+          : 'unspecified',
+        debugPackageManager: (!!this._debugPackageManagerParameter).toString(),
+        maxInstallAttempts: this._maxInstallAttempts.value
+          ? this._maxInstallAttempts.value.toString()
+          : 'unspecified',
+        ignoreHooks: (!!this._ignoreHooksParameter.value).toString(),
+        debug: installManagerOptions.debug.toString(),
+        full: installManagerOptions.fullUpgrade.toString()
+      };
+      if (this._selectionParameters) {
+        extraData = { ...extraData, ...this._selectionParameters.getTelemetry() };
+      }
       this.parser.telemetry.log({
         name: 'install',
         duration: stopwatch.duration,
         result: success ? 'Succeeded' : 'Failed',
-        extraData: {
-          mode: this.actionName,
-          clean: (!!this._purgeParameter.value).toString(),
-          full: installManagerOptions.fullUpgrade.toString()
-        }
+        extraData
       });
     }
   }

From 158b3457400a55fd01d5c37475f93603b4a65eba Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Wed, 4 Aug 2021 19:12:42 -0700
Subject: [PATCH 074/155] Fix an issue where a misleading error is thrown when
 a subprocess requesting a ScopedLogger throws.

---
 apps/heft/src/utilities/subprocess/SubprocessLoggerManager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/heft/src/utilities/subprocess/SubprocessLoggerManager.ts b/apps/heft/src/utilities/subprocess/SubprocessLoggerManager.ts
index 1aa684bbc4a..3b130714e7b 100644
--- a/apps/heft/src/utilities/subprocess/SubprocessLoggerManager.ts
+++ b/apps/heft/src/utilities/subprocess/SubprocessLoggerManager.ts
@@ -122,7 +122,7 @@ export class SubprocessLoggerManager extends SubprocessCommunicationManagerBase
           };
         } catch (error) {
           responseMessage = {
-            type: SUBPROCESS_LOGGER_MANAGER_REQUEST_LOGGER_MESSAGE_TYPE,
+            type: SUBPROCESS_LOGGER_MANAGER_PROVIDE_LOGGER_MESSAGE_TYPE,
             loggerName: typedMessage.loggerName,
             error: SubprocessRunnerBase.serializeForIpcMessage(
               error

From 5874b65795568a05b3cf0c142fc33e326c242593 Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Wed, 4 Aug 2021 19:16:10 -0700
Subject: [PATCH 075/155] Rush change

---
 .../heft/ianc-fix-error-case_2021-08-05-02-15.json    | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@rushstack/heft/ianc-fix-error-case_2021-08-05-02-15.json

diff --git a/common/changes/@rushstack/heft/ianc-fix-error-case_2021-08-05-02-15.json b/common/changes/@rushstack/heft/ianc-fix-error-case_2021-08-05-02-15.json
new file mode 100644
index 00000000000..ef525830e37
--- /dev/null
+++ b/common/changes/@rushstack/heft/ianc-fix-error-case_2021-08-05-02-15.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "",
+      "type": "none",
+      "packageName": "@rushstack/heft"
+    }
+  ],
+  "packageName": "@rushstack/heft",
+  "email": "iclanton@users.noreply.github.com"
+}
\ No newline at end of file

From 9bf8b62b5b3407414c79c9916e473b892e5aaf6e Mon Sep 17 00:00:00 2001
From: Elliot Nelson <Elliot.Nelson@hbo.com>
Date: Thu, 5 Aug 2021 07:07:32 -0400
Subject: [PATCH 076/155] Apply suggested verbiage changes

Tweak log severity comments and rush change entries.

Co-authored-by: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
---
 .../experimental-terminal_2021-08-03-19-33.json               | 4 ++--
 .../experimental-terminal_2021-08-03-19-33.json               | 4 ++--
 libraries/node-core-library/src/Terminal/ITerminalProvider.ts | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json b/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json
index c940798ff70..a307e0e5bc2 100644
--- a/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json
+++ b/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json
@@ -2,10 +2,10 @@
   "changes": [
     {
       "packageName": "@rushstack/heft-config-file",
-      "comment": "Detailed logging moved from verbose to debug severity.",
+      "comment": "Moved detailed logging from verbose to debug severity.",
       "type": "patch"
     }
   ],
   "packageName": "@rushstack/heft-config-file",
   "email": "elliot-nelson@users.noreply.github.com"
-}
\ No newline at end of file
+}
diff --git a/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json b/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json
index dcaa89d4e5e..c78aa8ccf65 100644
--- a/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json
+++ b/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json
@@ -2,10 +2,10 @@
   "changes": [
     {
       "packageName": "@rushstack/node-core-library",
-      "comment": "Added new message severity \"debug\", below verbose.",
+      "comment": "Added new Terminal message severity \"debug\", below verbose.",
       "type": "major"
     }
   ],
   "packageName": "@rushstack/node-core-library",
   "email": "elliot-nelson@users.noreply.github.com"
-}
\ No newline at end of file
+}
diff --git a/libraries/node-core-library/src/Terminal/ITerminalProvider.ts b/libraries/node-core-library/src/Terminal/ITerminalProvider.ts
index d0c23c67602..df2c83794b3 100644
--- a/libraries/node-core-library/src/Terminal/ITerminalProvider.ts
+++ b/libraries/node-core-library/src/Terminal/ITerminalProvider.ts
@@ -11,9 +11,9 @@
  *
  *   Severity  | Purpose
  *   --------- | -------
- *   error     | Build errors and fatal issues in rush
+ *   error     | Build errors and fatal issues
  *   warning   | Not necessarily fatal, but indicate a problem the user should fix
- *   log       | Informational messages from the rush system
+ *   log       | Informational messages
  *   verbose   | Additional information that may not always be necessary
  *   debug     | Highest detail level, best used for troubleshooting information
  *

From 92a37defc4f709684f03e3a1e178108facbd33b9 Mon Sep 17 00:00:00 2001
From: Ben Papp <BPapp-MS@users.noreply.github.com>
Date: Thu, 5 Aug 2021 13:51:27 -0700
Subject: [PATCH 077/155] add a couple clarifying comments

---
 apps/rush-lib/src/cli/actions/BaseInstallAction.ts | 8 ++++++--
 apps/rush-lib/src/cli/actions/InstallAction.ts     | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/rush-lib/src/cli/actions/BaseInstallAction.ts b/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
index c2a43c30caf..558ebdf475c 100644
--- a/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
+++ b/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
@@ -40,6 +40,10 @@ export abstract class BaseInstallAction extends BaseRushAction {
   protected _debugPackageManagerParameter!: CommandLineFlagParameter;
   protected _maxInstallAttempts!: CommandLineIntegerParameter;
   protected _ignoreHooksParameter!: CommandLineFlagParameter;
+  /*
+   * Subclasses can initialize the _selectionParameters property in order for
+   * the parameters to be written to the telemetry file
+   */
   protected _selectionParameters?: SelectionParameterSet;
 
   protected onDefineParameters(): void {
@@ -189,9 +193,9 @@ export abstract class BaseInstallAction extends BaseRushAction {
         bypassPolicy: (!!this._bypassPolicyParameter.value).toString(),
         noLink: (!!this._noLinkParameter.value).toString(),
         networkConcurrency: this._networkConcurrencyParameter.value
-          ? this._networkConcurrencyParameter.toString()
+          ? this._networkConcurrencyParameter.value.toString()
           : 'unspecified',
-        debugPackageManager: (!!this._debugPackageManagerParameter).toString(),
+        debugPackageManager: (!!this._debugPackageManagerParameter.value).toString(),
         maxInstallAttempts: this._maxInstallAttempts.value
           ? this._maxInstallAttempts.value.toString()
           : 'unspecified',
diff --git a/apps/rush-lib/src/cli/actions/InstallAction.ts b/apps/rush-lib/src/cli/actions/InstallAction.ts
index beee4ba4f9c..db4df689136 100644
--- a/apps/rush-lib/src/cli/actions/InstallAction.ts
+++ b/apps/rush-lib/src/cli/actions/InstallAction.ts
@@ -7,6 +7,8 @@ import { RushCommandLineParser } from '../RushCommandLineParser';
 import { SelectionParameterSet } from '../SelectionParameterSet';
 
 export class InstallAction extends BaseInstallAction {
+  // must match name of _selectionParameters in BaseInstallAction for telemetry to work
+  // worthy of the override parameter in TypeScript > 4.3
   protected _selectionParameters!: SelectionParameterSet;
 
   public constructor(parser: RushCommandLineParser) {

From 1091e962b7a9a9a7fe5d95a452d0b1e3f5d26fbc Mon Sep 17 00:00:00 2001
From: Ben Papp <BPapp-MS@users.noreply.github.com>
Date: Thu, 5 Aug 2021 13:53:29 -0700
Subject: [PATCH 078/155] changefile

---
 ...papp-AddFlagsToRushTelemetry_2021-08-05-20-52.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@microsoft/rush/benpapp-AddFlagsToRushTelemetry_2021-08-05-20-52.json

diff --git a/common/changes/@microsoft/rush/benpapp-AddFlagsToRushTelemetry_2021-08-05-20-52.json b/common/changes/@microsoft/rush/benpapp-AddFlagsToRushTelemetry_2021-08-05-20-52.json
new file mode 100644
index 00000000000..b02aef1c96e
--- /dev/null
+++ b/common/changes/@microsoft/rush/benpapp-AddFlagsToRushTelemetry_2021-08-05-20-52.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Adds properties to the extraData section of the telemetry file for parameter usage in the install commands",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "BPapp-MS@users.noreply.github.com"
+}
\ No newline at end of file

From 1d85fc6be5f10365c4f71c236b9c875a29381ec9 Mon Sep 17 00:00:00 2001
From: Elliot Nelson <elliot-nelson@users.noreply.github.com>
Date: Mon, 9 Aug 2021 13:43:19 -0400
Subject: [PATCH 079/155] Revert the breaking/major changes from PR

---
 .../rush-lib/src/logic/taskRunner/test/TaskCollection.test.ts | 2 +-
 .../experimental-terminal_2021-08-03-19-33.json               | 2 +-
 .../experimental-terminal_2021-08-03-19-33.json               | 4 ++--
 common/reviews/api/node-core-library.api.md                   | 2 +-
 libraries/heft-config-file/src/test/ConfigurationFile.test.ts | 2 +-
 libraries/node-core-library/src/Terminal/ITerminalProvider.ts | 4 ++--
 .../src/Terminal/StringBufferTerminalProvider.ts              | 2 +-
 .../node-core-library/src/Terminal/test/Terminal.test.ts      | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/rush-lib/src/logic/taskRunner/test/TaskCollection.test.ts b/apps/rush-lib/src/logic/taskRunner/test/TaskCollection.test.ts
index c43cb0f742f..ccb4bdaa20f 100644
--- a/apps/rush-lib/src/logic/taskRunner/test/TaskCollection.test.ts
+++ b/apps/rush-lib/src/logic/taskRunner/test/TaskCollection.test.ts
@@ -9,7 +9,7 @@ import { TaskStatus } from '../TaskStatus';
 
 function checkConsoleOutput(terminalProvider: StringBufferTerminalProvider): void {
   expect(terminalProvider.getOutput()).toMatchSnapshot();
-  expect(terminalProvider.getVerboseOutput()).toMatchSnapshot();
+  expect(terminalProvider.getVerbose()).toMatchSnapshot();
   expect(terminalProvider.getWarningOutput()).toMatchSnapshot();
   expect(terminalProvider.getErrorOutput()).toMatchSnapshot();
 }
diff --git a/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json b/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json
index c940798ff70..5c95392e096 100644
--- a/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json
+++ b/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json
@@ -8,4 +8,4 @@
   ],
   "packageName": "@rushstack/heft-config-file",
   "email": "elliot-nelson@users.noreply.github.com"
-}
\ No newline at end of file
+}
diff --git a/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json b/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json
index dcaa89d4e5e..48fefaad3ff 100644
--- a/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json
+++ b/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json
@@ -3,9 +3,9 @@
     {
       "packageName": "@rushstack/node-core-library",
       "comment": "Added new message severity \"debug\", below verbose.",
-      "type": "major"
+      "type": "minor"
     }
   ],
   "packageName": "@rushstack/node-core-library",
   "email": "elliot-nelson@users.noreply.github.com"
-}
\ No newline at end of file
+}
diff --git a/common/reviews/api/node-core-library.api.md b/common/reviews/api/node-core-library.api.md
index 06bc99a3904..2067e1f336d 100644
--- a/common/reviews/api/node-core-library.api.md
+++ b/common/reviews/api/node-core-library.api.md
@@ -723,7 +723,7 @@ export class StringBufferTerminalProvider implements ITerminalProvider {
     getDebugOutput(options?: IStringBufferOutputOptions): string;
     getErrorOutput(options?: IStringBufferOutputOptions): string;
     getOutput(options?: IStringBufferOutputOptions): string;
-    getVerboseOutput(options?: IStringBufferOutputOptions): string;
+    getVerbose(options?: IStringBufferOutputOptions): string;
     getWarningOutput(options?: IStringBufferOutputOptions): string;
     get supportsColor(): boolean;
     write(data: string, severity: TerminalProviderSeverity): void;
diff --git a/libraries/heft-config-file/src/test/ConfigurationFile.test.ts b/libraries/heft-config-file/src/test/ConfigurationFile.test.ts
index f5f4b31d746..1fe0954badb 100644
--- a/libraries/heft-config-file/src/test/ConfigurationFile.test.ts
+++ b/libraries/heft-config-file/src/test/ConfigurationFile.test.ts
@@ -34,7 +34,7 @@ describe('ConfigurationFile', () => {
       log: terminalProvider.getOutput(),
       warning: terminalProvider.getWarningOutput(),
       error: terminalProvider.getErrorOutput(),
-      verbose: terminalProvider.getVerboseOutput(),
+      verbose: terminalProvider.getVerbose(),
       debug: terminalProvider.getDebugOutput()
     }).toMatchSnapshot();
   });
diff --git a/libraries/node-core-library/src/Terminal/ITerminalProvider.ts b/libraries/node-core-library/src/Terminal/ITerminalProvider.ts
index d0c23c67602..3fa3b138ba6 100644
--- a/libraries/node-core-library/src/Terminal/ITerminalProvider.ts
+++ b/libraries/node-core-library/src/Terminal/ITerminalProvider.ts
@@ -20,9 +20,9 @@
  * @beta
  */
 export enum TerminalProviderSeverity {
-  error,
-  warning,
   log,
+  warning,
+  error,
   verbose,
   debug
 }
diff --git a/libraries/node-core-library/src/Terminal/StringBufferTerminalProvider.ts b/libraries/node-core-library/src/Terminal/StringBufferTerminalProvider.ts
index ef02cd716d4..ff2359c5a96 100644
--- a/libraries/node-core-library/src/Terminal/StringBufferTerminalProvider.ts
+++ b/libraries/node-core-library/src/Terminal/StringBufferTerminalProvider.ts
@@ -96,7 +96,7 @@ export class StringBufferTerminalProvider implements ITerminalProvider {
   /**
    * Get everything that has been written at verbose-level severity.
    */
-  public getVerboseOutput(options?: IStringBufferOutputOptions): string {
+  public getVerbose(options?: IStringBufferOutputOptions): string {
     return this._normalizeOutput(this._verboseBuffer.toString(), options);
   }
 
diff --git a/libraries/node-core-library/src/Terminal/test/Terminal.test.ts b/libraries/node-core-library/src/Terminal/test/Terminal.test.ts
index 174b0e993dc..30af7b89607 100644
--- a/libraries/node-core-library/src/Terminal/test/Terminal.test.ts
+++ b/libraries/node-core-library/src/Terminal/test/Terminal.test.ts
@@ -13,7 +13,7 @@ function verifyProvider(): void {
     log: provider.getOutput(),
     warning: provider.getWarningOutput(),
     error: provider.getErrorOutput(),
-    verbose: provider.getVerboseOutput(),
+    verbose: provider.getVerbose(),
     debug: provider.getDebugOutput()
   }).toMatchSnapshot();
 }

From e8df56c42713838cfadf8dd6a0eec3c1c53054ab Mon Sep 17 00:00:00 2001
From: Elliot Nelson <elliot-nelson@users.noreply.github.com>
Date: Mon, 9 Aug 2021 16:28:16 -0400
Subject: [PATCH 080/155] update library

---
 common/reviews/api/node-core-library.api.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/reviews/api/node-core-library.api.md b/common/reviews/api/node-core-library.api.md
index 2067e1f336d..f9946a1dab6 100644
--- a/common/reviews/api/node-core-library.api.md
+++ b/common/reviews/api/node-core-library.api.md
@@ -758,9 +758,9 @@ export enum TerminalProviderSeverity {
     // (undocumented)
     debug = 4,
     // (undocumented)
-    error = 0,
+    error = 2,
     // (undocumented)
-    log = 2,
+    log = 0,
     // (undocumented)
     verbose = 3,
     // (undocumented)

From 250d79645411e736a9e771cda175403934568102 Mon Sep 17 00:00:00 2001
From: Elliot Nelson <elliot-nelson@users.noreply.github.com>
Date: Mon, 9 Aug 2021 16:37:56 -0400
Subject: [PATCH 081/155] Add snapshots for writeDebug and writeDebugLine in
 Terminal

---
 .../src/Terminal/test/Terminal.test.ts        |  54 ++++++++++
 .../test/__snapshots__/Terminal.test.ts.snap  | 100 ++++++++++++++++++
 2 files changed, 154 insertions(+)

diff --git a/libraries/node-core-library/src/Terminal/test/Terminal.test.ts b/libraries/node-core-library/src/Terminal/test/Terminal.test.ts
index 30af7b89607..e59e52f4d77 100644
--- a/libraries/node-core-library/src/Terminal/test/Terminal.test.ts
+++ b/libraries/node-core-library/src/Terminal/test/Terminal.test.ts
@@ -528,6 +528,60 @@ describe('02 color disabled', () => {
         verifyProvider();
       });
     });
+
+    describe('09 writeDebug', () => {
+      test('01 writes a single message', () => {
+        terminal.writeDebug('test message');
+        verifyProvider();
+      });
+
+      test('02 writes multiple messages', () => {
+        terminal.writeDebug('message 1', 'message 2');
+        verifyProvider();
+      });
+
+      test('03 writes a message with colors', () => {
+        terminal.writeDebug(Colors.green('message 1'));
+        verifyProvider();
+      });
+
+      test('04 writes a multiple messages with colors', () => {
+        terminal.writeDebug(Colors.green('message 1'), Colors.red('message 2'));
+        verifyProvider();
+      });
+
+      test('05 writes a messages with colors interspersed with non-colored messages', () => {
+        terminal.writeDebug('message 1', Colors.green('message 2'), 'message 3', Colors.red('message 4'));
+        verifyProvider();
+      });
+    });
+
+    describe('10 writeDebugLine', () => {
+      test('01 writes a single message', () => {
+        terminal.writeDebugLine('test message');
+        verifyProvider();
+      });
+
+      test('02 writes multiple messages', () => {
+        terminal.writeDebugLine('message 1', 'message 2');
+        verifyProvider();
+      });
+
+      test('03 writes a message with colors', () => {
+        terminal.writeDebugLine(Colors.green('message 1'));
+        verifyProvider();
+      });
+
+      test('04 writes a multiple messages with colors', () => {
+        terminal.writeDebugLine(Colors.green('message 1'), Colors.red('message 2'));
+        verifyProvider();
+      });
+
+      test('05 writes a messages with colors interspersed with non-colored messages', () => {
+        terminal.writeDebugLine('message 1', Colors.green('message 2'), 'message 3', Colors.red('message 4'));
+        verifyProvider();
+      });
+    });
   });
 
   test('05 writes to multiple streams', () => {
diff --git a/libraries/node-core-library/src/Terminal/test/__snapshots__/Terminal.test.ts.snap b/libraries/node-core-library/src/Terminal/test/__snapshots__/Terminal.test.ts.snap
index 4090222bcd0..f22a28ef5ff 100644
--- a/libraries/node-core-library/src/Terminal/test/__snapshots__/Terminal.test.ts.snap
+++ b/libraries/node-core-library/src/Terminal/test/__snapshots__/Terminal.test.ts.snap
@@ -810,6 +810,106 @@ Object {
 }
 `;
 
+exports[`02 color disabled 01 basic terminal functions 09 writeDebug 01 writes a single message 1`] = `
+Object {
+  "debug": "test message",
+  "error": "",
+  "log": "",
+  "verbose": "",
+  "warning": "",
+}
+`;
+
+exports[`02 color disabled 01 basic terminal functions 09 writeDebug 02 writes multiple messages 1`] = `
+Object {
+  "debug": "message 1message 2",
+  "error": "",
+  "log": "",
+  "verbose": "",
+  "warning": "",
+}
+`;
+
+exports[`02 color disabled 01 basic terminal functions 09 writeDebug 03 writes a message with colors 1`] = `
+Object {
+  "debug": "message 1",
+  "error": "",
+  "log": "",
+  "verbose": "",
+  "warning": "",
+}
+`;
+
+exports[`02 color disabled 01 basic terminal functions 09 writeDebug 04 writes a multiple messages with colors 1`] = `
+Object {
+  "debug": "message 1message 2",
+  "error": "",
+  "log": "",
+  "verbose": "",
+  "warning": "",
+}
+`;
+
+exports[`02 color disabled 01 basic terminal functions 09 writeDebug 05 writes a messages with colors interspersed with non-colored messages 1`] = `
+Object {
+  "debug": "message 1message 2message 3message 4",
+  "error": "",
+  "log": "",
+  "verbose": "",
+  "warning": "",
+}
+`;
+
+exports[`02 color disabled 01 basic terminal functions 10 writeDebugLine 01 writes a single message 1`] = `
+Object {
+  "debug": "test message[n]",
+  "error": "",
+  "log": "",
+  "verbose": "",
+  "warning": "",
+}
+`;
+
+exports[`02 color disabled 01 basic terminal functions 10 writeDebugLine 02 writes multiple messages 1`] = `
+Object {
+  "debug": "message 1message 2[n]",
+  "error": "",
+  "log": "",
+  "verbose": "",
+  "warning": "",
+}
+`;
+
+exports[`02 color disabled 01 basic terminal functions 10 writeDebugLine 03 writes a message with colors 1`] = `
+Object {
+  "debug": "message 1[n]",
+  "error": "",
+  "log": "",
+  "verbose": "",
+  "warning": "",
+}
+`;
+
+exports[`02 color disabled 01 basic terminal functions 10 writeDebugLine 04 writes a multiple messages with colors 1`] = `
+Object {
+  "debug": "message 1message 2[n]",
+  "error": "",
+  "log": "",
+  "verbose": "",
+  "warning": "",
+}
+`;
+
+exports[`02 color disabled 01 basic terminal functions 10 writeDebugLine 05 writes a messages with colors interspersed with non-colored messages 1`] = `
+Object {
+  "debug": "message 1message 2message 3message 4[n]",
+  "error": "",
+  "log": "",
+  "verbose": "",
+  "warning": "",
+}
+`;
+
 exports[`02 color disabled 05 writes to multiple streams 1`] = `
 Object {
   "debug": "",

From fbc181e2a22f3626e6bc53ccb8658c30b3f380d2 Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Tue, 10 Aug 2021 14:43:53 -0700
Subject: [PATCH 082/155] Update changelogs.

---
 .../experimental-terminal_2021-08-03-19-33.json                 | 2 +-
 .../experimental-terminal_2021-08-03-19-33.json                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json b/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json
index a307e0e5bc2..454fdac5375 100644
--- a/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json
+++ b/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json
@@ -2,7 +2,7 @@
   "changes": [
     {
       "packageName": "@rushstack/heft-config-file",
-      "comment": "Moved detailed logging from verbose to debug severity.",
+      "comment": "Move detailed logging from verbose to debug severity.",
       "type": "patch"
     }
   ],
diff --git a/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json b/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json
index 5b189e8c192..ae4972d666e 100644
--- a/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json
+++ b/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json
@@ -2,7 +2,7 @@
   "changes": [
     {
       "packageName": "@rushstack/node-core-library",
-      "comment": "Added new Terminal message severity \"debug\", below verbose.",
+      "comment": "Add new Terminal message severity \"debug\", below verbose.",
       "type": "minor"
     }
   ],

From fde93977c21da655459d934230d800d4c7c86698 Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Tue, 10 Aug 2021 15:07:19 -0700
Subject: [PATCH 083/155] Update JSZip

---
 apps/rush-lib/package.json         | 2 +-
 common/config/rush/pnpm-lock.yaml  | 8 ++++----
 common/config/rush/repo-state.json | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/rush-lib/package.json b/apps/rush-lib/package.json
index 58675051a9e..3138116c0ae 100644
--- a/apps/rush-lib/package.json
+++ b/apps/rush-lib/package.json
@@ -39,7 +39,7 @@
     "ignore": "~5.1.6",
     "inquirer": "~7.3.3",
     "js-yaml": "~3.13.1",
-    "jszip": "~3.5.0",
+    "jszip": "~3.7.1",
     "lodash": "~4.17.15",
     "minimatch": "~3.0.2",
     "node-fetch": "~2.6.1",
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 2468e455198..1eba1e13496 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -258,7 +258,7 @@ importers:
       inquirer: ~7.3.3
       jest: ~25.4.0
       js-yaml: ~3.13.1
-      jszip: ~3.5.0
+      jszip: ~3.7.1
       lodash: ~4.17.15
       minimatch: ~3.0.2
       node-fetch: ~2.6.1
@@ -295,7 +295,7 @@ importers:
       ignore: 5.1.8
       inquirer: 7.3.3
       js-yaml: 3.13.1
-      jszip: 3.5.0
+      jszip: 3.7.1
       lodash: 4.17.21
       minimatch: 3.0.4
       node-fetch: 2.6.1
@@ -7969,8 +7969,8 @@ packages:
       array-includes: 3.1.3
       object.assign: 4.1.2
 
-  /jszip/3.5.0:
-    resolution: {integrity: sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==}
+  /jszip/3.7.1:
+    resolution: {integrity: sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==}
     dependencies:
       lie: 3.3.0
       pako: 1.0.11
diff --git a/common/config/rush/repo-state.json b/common/config/rush/repo-state.json
index 2054c7ba98c..59f083e61ef 100644
--- a/common/config/rush/repo-state.json
+++ b/common/config/rush/repo-state.json
@@ -1,5 +1,5 @@
 // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
 {
-  "pnpmShrinkwrapHash": "a87ca42757369632b3dcacc39399f26fa591a4ea",
+  "pnpmShrinkwrapHash": "30dd6f0cf630dc4fa0c66b73735436b4e05b43c6",
   "preferredVersionsHash": "1fbc26d2c5b3248616b9edccd6bef064075243bc"
 }

From 0f609d99d1a95d85406d7996f08e2be1244a991e Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Tue, 10 Aug 2021 15:48:42 -0700
Subject: [PATCH 084/155] Rush change

---
 .../rush/ianc-update-jszip_2021-08-10-22-48.json      | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@microsoft/rush/ianc-update-jszip_2021-08-10-22-48.json

diff --git a/common/changes/@microsoft/rush/ianc-update-jszip_2021-08-10-22-48.json b/common/changes/@microsoft/rush/ianc-update-jszip_2021-08-10-22-48.json
new file mode 100644
index 00000000000..640b3a9606e
--- /dev/null
+++ b/common/changes/@microsoft/rush/ianc-update-jszip_2021-08-10-22-48.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Update JSZip dependency.",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "iclanton@users.noreply.github.com"
+}
\ No newline at end of file

From c7ad7f949d54b8b51f891366ddbc5d919d001300 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Wed, 11 Aug 2021 00:07:21 +0000
Subject: [PATCH 085/155] Deleting change files and updating change logs for
 package updates.

---
 apps/api-documenter/CHANGELOG.json            | 21 +++++++++++++
 apps/api-documenter/CHANGELOG.md              |  7 ++++-
 apps/api-extractor-model/CHANGELOG.json       | 12 ++++++++
 apps/api-extractor-model/CHANGELOG.md         |  7 ++++-
 apps/api-extractor/CHANGELOG.json             | 15 ++++++++++
 apps/api-extractor/CHANGELOG.md               |  7 ++++-
 apps/heft/CHANGELOG.json                      | 21 +++++++++++++
 apps/heft/CHANGELOG.md                        |  7 ++++-
 apps/rundown/CHANGELOG.json                   | 18 +++++++++++
 apps/rundown/CHANGELOG.md                     |  7 ++++-
 ...ctogonz-upgrade-deps_2021-07-13-21-50.json | 11 -------
 ...xperimental-terminal_2021-08-03-19-33.json | 11 -------
 ...ctogonz-upgrade-deps_2021-07-13-21-50.json | 11 -------
 .../ianc-fix-error-case_2021-08-05-02-15.json | 11 -------
 ...xperimental-terminal_2021-08-03-19-33.json | 11 -------
 ...ctogonz-upgrade-deps_2021-07-13-21-50.json | 11 -------
 ...ctogonz-upgrade-deps_2021-07-13-21-50.json | 11 -------
 heft-plugins/heft-jest-plugin/CHANGELOG.json  | 24 +++++++++++++++
 heft-plugins/heft-jest-plugin/CHANGELOG.md    |  7 ++++-
 heft-plugins/heft-sass-plugin/CHANGELOG.json  | 30 +++++++++++++++++++
 heft-plugins/heft-sass-plugin/CHANGELOG.md    |  7 ++++-
 .../heft-webpack4-plugin/CHANGELOG.json       | 21 +++++++++++++
 .../heft-webpack4-plugin/CHANGELOG.md         |  7 ++++-
 .../heft-webpack5-plugin/CHANGELOG.json       | 21 +++++++++++++
 .../heft-webpack5-plugin/CHANGELOG.md         |  7 ++++-
 .../debug-certificate-manager/CHANGELOG.json  | 18 +++++++++++
 .../debug-certificate-manager/CHANGELOG.md    |  7 ++++-
 libraries/heft-config-file/CHANGELOG.json     | 17 +++++++++++
 libraries/heft-config-file/CHANGELOG.md       |  9 +++++-
 libraries/load-themed-styles/CHANGELOG.json   | 15 ++++++++++
 libraries/load-themed-styles/CHANGELOG.md     |  7 ++++-
 libraries/node-core-library/CHANGELOG.json    | 12 ++++++++
 libraries/node-core-library/CHANGELOG.md      |  9 +++++-
 libraries/package-deps-hash/CHANGELOG.json    | 21 +++++++++++++
 libraries/package-deps-hash/CHANGELOG.md      |  7 ++++-
 libraries/stream-collator/CHANGELOG.json      | 21 +++++++++++++
 libraries/stream-collator/CHANGELOG.md        |  7 ++++-
 libraries/terminal/CHANGELOG.json             | 18 +++++++++++
 libraries/terminal/CHANGELOG.md               |  7 ++++-
 libraries/typings-generator/CHANGELOG.json    | 12 ++++++++
 libraries/typings-generator/CHANGELOG.md      |  7 ++++-
 rigs/heft-node-rig/CHANGELOG.json             | 21 +++++++++++++
 rigs/heft-node-rig/CHANGELOG.md               |  7 ++++-
 rigs/heft-web-rig/CHANGELOG.json              | 27 +++++++++++++++++
 rigs/heft-web-rig/CHANGELOG.md                |  7 ++++-
 .../loader-load-themed-styles/CHANGELOG.json  | 18 +++++++++++
 .../loader-load-themed-styles/CHANGELOG.md    |  7 ++++-
 webpack/loader-raw-script/CHANGELOG.json      | 15 ++++++++++
 webpack/loader-raw-script/CHANGELOG.md        |  7 ++++-
 webpack/localization-plugin/CHANGELOG.json    | 27 +++++++++++++++++
 webpack/localization-plugin/CHANGELOG.md      |  7 ++++-
 webpack/module-minifier-plugin/CHANGELOG.json | 15 ++++++++++
 webpack/module-minifier-plugin/CHANGELOG.md   |  7 ++++-
 .../CHANGELOG.json                            | 15 ++++++++++
 .../CHANGELOG.md                              |  7 ++++-
 55 files changed, 603 insertions(+), 101 deletions(-)
 delete mode 100644 common/changes/@microsoft/api-extractor-model/octogonz-upgrade-deps_2021-07-13-21-50.json
 delete mode 100644 common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json
 delete mode 100644 common/changes/@rushstack/heft-config-file/octogonz-upgrade-deps_2021-07-13-21-50.json
 delete mode 100644 common/changes/@rushstack/heft/ianc-fix-error-case_2021-08-05-02-15.json
 delete mode 100644 common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json
 delete mode 100644 common/changes/@rushstack/node-core-library/octogonz-upgrade-deps_2021-07-13-21-50.json
 delete mode 100644 common/changes/@rushstack/typings-generator/octogonz-upgrade-deps_2021-07-13-21-50.json

diff --git a/apps/api-documenter/CHANGELOG.json b/apps/api-documenter/CHANGELOG.json
index 3ec53822fef..183ed0e7ecc 100644
--- a/apps/api-documenter/CHANGELOG.json
+++ b/apps/api-documenter/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@microsoft/api-documenter",
   "entries": [
+    {
+      "version": "7.13.35",
+      "tag": "@microsoft/api-documenter_v7.13.35",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor-model\" to `7.13.5`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.15`"
+          }
+        ]
+      }
+    },
     {
       "version": "7.13.34",
       "tag": "@microsoft/api-documenter_v7.13.34",
diff --git a/apps/api-documenter/CHANGELOG.md b/apps/api-documenter/CHANGELOG.md
index 10261d5f2c2..be4519a3339 100644
--- a/apps/api-documenter/CHANGELOG.md
+++ b/apps/api-documenter/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/api-documenter
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 7.13.35
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 7.13.34
 Sat, 31 Jul 2021 00:52:11 GMT
diff --git a/apps/api-extractor-model/CHANGELOG.json b/apps/api-extractor-model/CHANGELOG.json
index 55d1c3206a0..daba8496210 100644
--- a/apps/api-extractor-model/CHANGELOG.json
+++ b/apps/api-extractor-model/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@microsoft/api-extractor-model",
   "entries": [
+    {
+      "version": "7.13.5",
+      "tag": "@microsoft/api-extractor-model_v7.13.5",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "7.13.4",
       "tag": "@microsoft/api-extractor-model_v7.13.4",
diff --git a/apps/api-extractor-model/CHANGELOG.md b/apps/api-extractor-model/CHANGELOG.md
index e5a61442c30..fc3ddad6ed5 100644
--- a/apps/api-extractor-model/CHANGELOG.md
+++ b/apps/api-extractor-model/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/api-extractor-model
 
-This log was last generated on Mon, 12 Jul 2021 23:08:26 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 7.13.5
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 7.13.4
 Mon, 12 Jul 2021 23:08:26 GMT
diff --git a/apps/api-extractor/CHANGELOG.json b/apps/api-extractor/CHANGELOG.json
index bad24d4edad..d3ef72c1bd1 100644
--- a/apps/api-extractor/CHANGELOG.json
+++ b/apps/api-extractor/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@microsoft/api-extractor",
   "entries": [
+    {
+      "version": "7.18.5",
+      "tag": "@microsoft/api-extractor_v7.18.5",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor-model\" to `7.13.5`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "7.18.4",
       "tag": "@microsoft/api-extractor_v7.18.4",
diff --git a/apps/api-extractor/CHANGELOG.md b/apps/api-extractor/CHANGELOG.md
index 0780a450d91..d00666e3b52 100644
--- a/apps/api-extractor/CHANGELOG.md
+++ b/apps/api-extractor/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/api-extractor
 
-This log was last generated on Wed, 14 Jul 2021 15:06:29 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 7.18.5
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 7.18.4
 Wed, 14 Jul 2021 15:06:29 GMT
diff --git a/apps/heft/CHANGELOG.json b/apps/heft/CHANGELOG.json
index 7fb72d9055d..422828b53f2 100644
--- a/apps/heft/CHANGELOG.json
+++ b/apps/heft/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@rushstack/heft",
   "entries": [
+    {
+      "version": "0.35.1",
+      "tag": "@rushstack/heft_v0.35.1",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-config-file\" to `0.6.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/typings-generator\" to `0.3.9`"
+          },
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor\" to `7.18.5`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.35.0",
       "tag": "@rushstack/heft_v0.35.0",
diff --git a/apps/heft/CHANGELOG.md b/apps/heft/CHANGELOG.md
index 27648ba529b..341af6bf836 100644
--- a/apps/heft/CHANGELOG.md
+++ b/apps/heft/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 0.35.1
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 0.35.0
 Sat, 31 Jul 2021 00:52:11 GMT
diff --git a/apps/rundown/CHANGELOG.json b/apps/rundown/CHANGELOG.json
index 2af45e219a0..2867b5c9565 100644
--- a/apps/rundown/CHANGELOG.json
+++ b/apps/rundown/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/rundown",
   "entries": [
+    {
+      "version": "1.0.127",
+      "tag": "@rushstack/rundown_v1.0.127",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.15`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.126",
       "tag": "@rushstack/rundown_v1.0.126",
diff --git a/apps/rundown/CHANGELOG.md b/apps/rundown/CHANGELOG.md
index 846a63f5a09..8c7f0e679f6 100644
--- a/apps/rundown/CHANGELOG.md
+++ b/apps/rundown/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/rundown
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 1.0.127
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 1.0.126
 Sat, 31 Jul 2021 00:52:11 GMT
diff --git a/common/changes/@microsoft/api-extractor-model/octogonz-upgrade-deps_2021-07-13-21-50.json b/common/changes/@microsoft/api-extractor-model/octogonz-upgrade-deps_2021-07-13-21-50.json
deleted file mode 100644
index 86912ff5b90..00000000000
--- a/common/changes/@microsoft/api-extractor-model/octogonz-upgrade-deps_2021-07-13-21-50.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@microsoft/api-extractor-model",
-      "comment": "",
-      "type": "none"
-    }
-  ],
-  "packageName": "@microsoft/api-extractor-model",
-  "email": "4673363+octogonz@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json b/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json
deleted file mode 100644
index 454fdac5375..00000000000
--- a/common/changes/@rushstack/heft-config-file/experimental-terminal_2021-08-03-19-33.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/heft-config-file",
-      "comment": "Move detailed logging from verbose to debug severity.",
-      "type": "patch"
-    }
-  ],
-  "packageName": "@rushstack/heft-config-file",
-  "email": "elliot-nelson@users.noreply.github.com"
-}
diff --git a/common/changes/@rushstack/heft-config-file/octogonz-upgrade-deps_2021-07-13-21-50.json b/common/changes/@rushstack/heft-config-file/octogonz-upgrade-deps_2021-07-13-21-50.json
deleted file mode 100644
index b97158973bd..00000000000
--- a/common/changes/@rushstack/heft-config-file/octogonz-upgrade-deps_2021-07-13-21-50.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/heft-config-file",
-      "comment": "",
-      "type": "none"
-    }
-  ],
-  "packageName": "@rushstack/heft-config-file",
-  "email": "4673363+octogonz@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft/ianc-fix-error-case_2021-08-05-02-15.json b/common/changes/@rushstack/heft/ianc-fix-error-case_2021-08-05-02-15.json
deleted file mode 100644
index ef525830e37..00000000000
--- a/common/changes/@rushstack/heft/ianc-fix-error-case_2021-08-05-02-15.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "comment": "",
-      "type": "none",
-      "packageName": "@rushstack/heft"
-    }
-  ],
-  "packageName": "@rushstack/heft",
-  "email": "iclanton@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json b/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json
deleted file mode 100644
index ae4972d666e..00000000000
--- a/common/changes/@rushstack/node-core-library/experimental-terminal_2021-08-03-19-33.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/node-core-library",
-      "comment": "Add new Terminal message severity \"debug\", below verbose.",
-      "type": "minor"
-    }
-  ],
-  "packageName": "@rushstack/node-core-library",
-  "email": "elliot-nelson@users.noreply.github.com"
-}
diff --git a/common/changes/@rushstack/node-core-library/octogonz-upgrade-deps_2021-07-13-21-50.json b/common/changes/@rushstack/node-core-library/octogonz-upgrade-deps_2021-07-13-21-50.json
deleted file mode 100644
index a18f56bf958..00000000000
--- a/common/changes/@rushstack/node-core-library/octogonz-upgrade-deps_2021-07-13-21-50.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/node-core-library",
-      "comment": "",
-      "type": "none"
-    }
-  ],
-  "packageName": "@rushstack/node-core-library",
-  "email": "4673363+octogonz@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/typings-generator/octogonz-upgrade-deps_2021-07-13-21-50.json b/common/changes/@rushstack/typings-generator/octogonz-upgrade-deps_2021-07-13-21-50.json
deleted file mode 100644
index 320ce60e5a4..00000000000
--- a/common/changes/@rushstack/typings-generator/octogonz-upgrade-deps_2021-07-13-21-50.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/typings-generator",
-      "comment": "",
-      "type": "none"
-    }
-  ],
-  "packageName": "@rushstack/typings-generator",
-  "email": "4673363+octogonz@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.json b/heft-plugins/heft-jest-plugin/CHANGELOG.json
index dd54a8bb4e5..31f7de9efe7 100644
--- a/heft-plugins/heft-jest-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-jest-plugin/CHANGELOG.json
@@ -1,6 +1,30 @@
 {
   "name": "@rushstack/heft-jest-plugin",
   "entries": [
+    {
+      "version": "0.1.16",
+      "tag": "@rushstack/heft-jest-plugin_v0.1.16",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-config-file\" to `0.6.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          },
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor\" to `7.18.5`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.35.0` to `^0.35.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.15",
       "tag": "@rushstack/heft-jest-plugin_v0.1.15",
diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.md b/heft-plugins/heft-jest-plugin/CHANGELOG.md
index c2e14f87f45..c06335a9a81 100644
--- a/heft-plugins/heft-jest-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-jest-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-jest-plugin
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 0.1.16
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 0.1.15
 Sat, 31 Jul 2021 00:52:11 GMT
diff --git a/heft-plugins/heft-sass-plugin/CHANGELOG.json b/heft-plugins/heft-sass-plugin/CHANGELOG.json
index 0ca7bdc2c57..1cd696e9cb2 100644
--- a/heft-plugins/heft-sass-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-sass-plugin/CHANGELOG.json
@@ -1,6 +1,36 @@
 {
   "name": "@rushstack/heft-sass-plugin",
   "entries": [
+    {
+      "version": "0.1.1",
+      "tag": "@rushstack/heft-sass-plugin_v0.1.1",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-config-file\" to `0.6.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/typings-generator\" to `0.3.9`"
+          },
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor\" to `7.18.5`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.15`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.35.0` to `^0.35.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.0",
       "tag": "@rushstack/heft-sass-plugin_v0.1.0",
diff --git a/heft-plugins/heft-sass-plugin/CHANGELOG.md b/heft-plugins/heft-sass-plugin/CHANGELOG.md
index 69400dc4f21..440c3f4d45b 100644
--- a/heft-plugins/heft-sass-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-sass-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-sass-plugin
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 0.1.1
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 0.1.0
 Sat, 31 Jul 2021 00:52:11 GMT
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
index 06136181240..40379cf16eb 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
   "entries": [
+    {
+      "version": "0.2.2",
+      "tag": "@rushstack/heft-webpack4-plugin_v0.2.2",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.15`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.35.0` to `^0.35.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.1",
       "tag": "@rushstack/heft-webpack4-plugin_v0.2.1",
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
index f2adbe11087..ce24ee531b4 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-webpack4-plugin
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 0.2.2
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 0.2.1
 Sat, 31 Jul 2021 00:52:11 GMT
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
index 517a26147ab..364636e9931 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
   "entries": [
+    {
+      "version": "0.2.2",
+      "tag": "@rushstack/heft-webpack5-plugin_v0.2.2",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.15`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.35.0` to `^0.35.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.1",
       "tag": "@rushstack/heft-webpack5-plugin_v0.2.1",
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
index 69ea06bd90c..be5cbc12b7d 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-webpack5-plugin
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 0.2.2
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 0.2.1
 Sat, 31 Jul 2021 00:52:11 GMT
diff --git a/libraries/debug-certificate-manager/CHANGELOG.json b/libraries/debug-certificate-manager/CHANGELOG.json
index e083d6872f8..1bee4d41677 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.json
+++ b/libraries/debug-certificate-manager/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/debug-certificate-manager",
   "entries": [
+    {
+      "version": "1.0.52",
+      "tag": "@rushstack/debug-certificate-manager_v1.0.52",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.15`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.51",
       "tag": "@rushstack/debug-certificate-manager_v1.0.51",
diff --git a/libraries/debug-certificate-manager/CHANGELOG.md b/libraries/debug-certificate-manager/CHANGELOG.md
index cb7f6638314..2c13695b783 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.md
+++ b/libraries/debug-certificate-manager/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/debug-certificate-manager
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 1.0.52
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 1.0.51
 Sat, 31 Jul 2021 00:52:11 GMT
diff --git a/libraries/heft-config-file/CHANGELOG.json b/libraries/heft-config-file/CHANGELOG.json
index 4dcc6866e18..99d96f77416 100644
--- a/libraries/heft-config-file/CHANGELOG.json
+++ b/libraries/heft-config-file/CHANGELOG.json
@@ -1,6 +1,23 @@
 {
   "name": "@rushstack/heft-config-file",
   "entries": [
+    {
+      "version": "0.6.2",
+      "tag": "@rushstack/heft-config-file_v0.6.2",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Move detailed logging from verbose to debug severity."
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.6.1",
       "tag": "@rushstack/heft-config-file_v0.6.1",
diff --git a/libraries/heft-config-file/CHANGELOG.md b/libraries/heft-config-file/CHANGELOG.md
index 183b678c123..55ba06ab9b0 100644
--- a/libraries/heft-config-file/CHANGELOG.md
+++ b/libraries/heft-config-file/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/heft-config-file
 
-This log was last generated on Mon, 12 Jul 2021 23:08:26 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 0.6.2
+Wed, 11 Aug 2021 00:07:21 GMT
+
+### Patches
+
+- Move detailed logging from verbose to debug severity.
 
 ## 0.6.1
 Mon, 12 Jul 2021 23:08:26 GMT
diff --git a/libraries/load-themed-styles/CHANGELOG.json b/libraries/load-themed-styles/CHANGELOG.json
index c88ee593581..81323eafea5 100644
--- a/libraries/load-themed-styles/CHANGELOG.json
+++ b/libraries/load-themed-styles/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@microsoft/load-themed-styles",
   "entries": [
+    {
+      "version": "1.10.198",
+      "tag": "@microsoft/load-themed-styles_v1.10.198",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-web-rig\" to `0.3.16`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.10.197",
       "tag": "@microsoft/load-themed-styles_v1.10.197",
diff --git a/libraries/load-themed-styles/CHANGELOG.md b/libraries/load-themed-styles/CHANGELOG.md
index f8c4508073a..ffe1ab3f7e3 100644
--- a/libraries/load-themed-styles/CHANGELOG.md
+++ b/libraries/load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/load-themed-styles
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 1.10.198
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 1.10.197
 Sat, 31 Jul 2021 00:52:11 GMT
diff --git a/libraries/node-core-library/CHANGELOG.json b/libraries/node-core-library/CHANGELOG.json
index 632fd403f01..3888f320a5c 100644
--- a/libraries/node-core-library/CHANGELOG.json
+++ b/libraries/node-core-library/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/node-core-library",
   "entries": [
+    {
+      "version": "3.40.0",
+      "tag": "@rushstack/node-core-library_v3.40.0",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Add new Terminal message severity \"debug\", below verbose."
+          }
+        ]
+      }
+    },
     {
       "version": "3.39.1",
       "tag": "@rushstack/node-core-library_v3.39.1",
diff --git a/libraries/node-core-library/CHANGELOG.md b/libraries/node-core-library/CHANGELOG.md
index b7d42654eeb..73ecdbb50d4 100644
--- a/libraries/node-core-library/CHANGELOG.md
+++ b/libraries/node-core-library/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/node-core-library
 
-This log was last generated on Mon, 12 Jul 2021 23:08:26 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 3.40.0
+Wed, 11 Aug 2021 00:07:21 GMT
+
+### Minor changes
+
+- Add new Terminal message severity "debug", below verbose.
 
 ## 3.39.1
 Mon, 12 Jul 2021 23:08:26 GMT
diff --git a/libraries/package-deps-hash/CHANGELOG.json b/libraries/package-deps-hash/CHANGELOG.json
index dbb76b02dc3..607b1528cde 100644
--- a/libraries/package-deps-hash/CHANGELOG.json
+++ b/libraries/package-deps-hash/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@rushstack/package-deps-hash",
   "entries": [
+    {
+      "version": "3.0.56",
+      "tag": "@rushstack/package-deps-hash_v3.0.56",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.15`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "3.0.55",
       "tag": "@rushstack/package-deps-hash_v3.0.55",
diff --git a/libraries/package-deps-hash/CHANGELOG.md b/libraries/package-deps-hash/CHANGELOG.md
index a3294b55fab..a1988abdabe 100644
--- a/libraries/package-deps-hash/CHANGELOG.md
+++ b/libraries/package-deps-hash/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/package-deps-hash
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 3.0.56
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 3.0.55
 Sat, 31 Jul 2021 00:52:11 GMT
diff --git a/libraries/stream-collator/CHANGELOG.json b/libraries/stream-collator/CHANGELOG.json
index f4b7672cbee..f16d0bd0930 100644
--- a/libraries/stream-collator/CHANGELOG.json
+++ b/libraries/stream-collator/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@rushstack/stream-collator",
   "entries": [
+    {
+      "version": "4.0.111",
+      "tag": "@rushstack/stream-collator_v4.0.111",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/terminal\" to `0.2.13`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.15`"
+          }
+        ]
+      }
+    },
     {
       "version": "4.0.110",
       "tag": "@rushstack/stream-collator_v4.0.110",
diff --git a/libraries/stream-collator/CHANGELOG.md b/libraries/stream-collator/CHANGELOG.md
index 8ab8fc317b9..8acb6c4764c 100644
--- a/libraries/stream-collator/CHANGELOG.md
+++ b/libraries/stream-collator/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/stream-collator
 
-This log was last generated on Sat, 31 Jul 2021 00:52:12 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 4.0.111
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 4.0.110
 Sat, 31 Jul 2021 00:52:12 GMT
diff --git a/libraries/terminal/CHANGELOG.json b/libraries/terminal/CHANGELOG.json
index 4ff01e87d7e..1941728edd8 100644
--- a/libraries/terminal/CHANGELOG.json
+++ b/libraries/terminal/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/terminal",
   "entries": [
+    {
+      "version": "0.2.13",
+      "tag": "@rushstack/terminal_v0.2.13",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.15`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.12",
       "tag": "@rushstack/terminal_v0.2.12",
diff --git a/libraries/terminal/CHANGELOG.md b/libraries/terminal/CHANGELOG.md
index 507dc5da679..bf66c4b00c1 100644
--- a/libraries/terminal/CHANGELOG.md
+++ b/libraries/terminal/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/terminal
 
-This log was last generated on Sat, 31 Jul 2021 00:52:12 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 0.2.13
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 0.2.12
 Sat, 31 Jul 2021 00:52:12 GMT
diff --git a/libraries/typings-generator/CHANGELOG.json b/libraries/typings-generator/CHANGELOG.json
index de8907f1b11..577402228f6 100644
--- a/libraries/typings-generator/CHANGELOG.json
+++ b/libraries/typings-generator/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/typings-generator",
   "entries": [
+    {
+      "version": "0.3.9",
+      "tag": "@rushstack/typings-generator_v0.3.9",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.3.8",
       "tag": "@rushstack/typings-generator_v0.3.8",
diff --git a/libraries/typings-generator/CHANGELOG.md b/libraries/typings-generator/CHANGELOG.md
index a23cc682204..97c138e929e 100644
--- a/libraries/typings-generator/CHANGELOG.md
+++ b/libraries/typings-generator/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/typings-generator
 
-This log was last generated on Mon, 12 Jul 2021 23:08:26 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 0.3.9
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 0.3.8
 Mon, 12 Jul 2021 23:08:26 GMT
diff --git a/rigs/heft-node-rig/CHANGELOG.json b/rigs/heft-node-rig/CHANGELOG.json
index 5b4ff57f1cc..2ab41d3ed93 100644
--- a/rigs/heft-node-rig/CHANGELOG.json
+++ b/rigs/heft-node-rig/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@rushstack/heft-node-rig",
   "entries": [
+    {
+      "version": "1.1.15",
+      "tag": "@rushstack/heft-node-rig_v1.1.15",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor\" to `7.18.5`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-jest-plugin\" to `0.1.16`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.35.0` to `^0.35.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.1.14",
       "tag": "@rushstack/heft-node-rig_v1.1.14",
diff --git a/rigs/heft-node-rig/CHANGELOG.md b/rigs/heft-node-rig/CHANGELOG.md
index c840d2aeeda..1d64352e84a 100644
--- a/rigs/heft-node-rig/CHANGELOG.md
+++ b/rigs/heft-node-rig/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-node-rig
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 1.1.15
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 1.1.14
 Sat, 31 Jul 2021 00:52:11 GMT
diff --git a/rigs/heft-web-rig/CHANGELOG.json b/rigs/heft-web-rig/CHANGELOG.json
index 1e7f718ea6b..5f2c6838724 100644
--- a/rigs/heft-web-rig/CHANGELOG.json
+++ b/rigs/heft-web-rig/CHANGELOG.json
@@ -1,6 +1,33 @@
 {
   "name": "@rushstack/heft-web-rig",
   "entries": [
+    {
+      "version": "0.3.16",
+      "tag": "@rushstack/heft-web-rig_v0.3.16",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor\" to `7.18.5`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-jest-plugin\" to `0.1.16`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-sass-plugin\" to `0.1.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-webpack4-plugin\" to `0.2.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.35.0` to `^0.35.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.3.15",
       "tag": "@rushstack/heft-web-rig_v0.3.15",
diff --git a/rigs/heft-web-rig/CHANGELOG.md b/rigs/heft-web-rig/CHANGELOG.md
index 871a37f047f..98a5725ba40 100644
--- a/rigs/heft-web-rig/CHANGELOG.md
+++ b/rigs/heft-web-rig/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-web-rig
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 0.3.16
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 0.3.15
 Sat, 31 Jul 2021 00:52:11 GMT
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.json b/webpack/loader-load-themed-styles/CHANGELOG.json
index c6e0bbc312d..ffcba6701df 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.json
+++ b/webpack/loader-load-themed-styles/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
   "entries": [
+    {
+      "version": "1.9.79",
+      "tag": "@microsoft/loader-load-themed-styles_v1.9.79",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/load-themed-styles\" to `1.10.198`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.15`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.9.78",
       "tag": "@microsoft/loader-load-themed-styles_v1.9.78",
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.md b/webpack/loader-load-themed-styles/CHANGELOG.md
index f34c5fceace..ebc418a232c 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.md
+++ b/webpack/loader-load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/loader-load-themed-styles
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 1.9.79
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 1.9.78
 Sat, 31 Jul 2021 00:52:11 GMT
diff --git a/webpack/loader-raw-script/CHANGELOG.json b/webpack/loader-raw-script/CHANGELOG.json
index a91ed5850ae..4e67c31c2cc 100644
--- a/webpack/loader-raw-script/CHANGELOG.json
+++ b/webpack/loader-raw-script/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/loader-raw-script",
   "entries": [
+    {
+      "version": "1.3.165",
+      "tag": "@rushstack/loader-raw-script_v1.3.165",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.15`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.3.164",
       "tag": "@rushstack/loader-raw-script_v1.3.164",
diff --git a/webpack/loader-raw-script/CHANGELOG.md b/webpack/loader-raw-script/CHANGELOG.md
index a63c72da41c..4290a316351 100644
--- a/webpack/loader-raw-script/CHANGELOG.md
+++ b/webpack/loader-raw-script/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/loader-raw-script
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 1.3.165
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 1.3.164
 Sat, 31 Jul 2021 00:52:11 GMT
diff --git a/webpack/localization-plugin/CHANGELOG.json b/webpack/localization-plugin/CHANGELOG.json
index ec4f530a624..541b7f468c2 100644
--- a/webpack/localization-plugin/CHANGELOG.json
+++ b/webpack/localization-plugin/CHANGELOG.json
@@ -1,6 +1,33 @@
 {
   "name": "@rushstack/localization-plugin",
   "entries": [
+    {
+      "version": "0.6.39",
+      "tag": "@rushstack/localization-plugin_v0.6.39",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `3.40.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/typings-generator\" to `0.3.9`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.15`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/set-webpack-public-path-plugin\" to `3.2.59`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/set-webpack-public-path-plugin\" from `^3.2.58` to `^3.2.59`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.6.38",
       "tag": "@rushstack/localization-plugin_v0.6.38",
diff --git a/webpack/localization-plugin/CHANGELOG.md b/webpack/localization-plugin/CHANGELOG.md
index 847bc704504..4416bcc4756 100644
--- a/webpack/localization-plugin/CHANGELOG.md
+++ b/webpack/localization-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/localization-plugin
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 0.6.39
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 0.6.38
 Sat, 31 Jul 2021 00:52:11 GMT
diff --git a/webpack/module-minifier-plugin/CHANGELOG.json b/webpack/module-minifier-plugin/CHANGELOG.json
index de3b7b1fde7..3ee9dda3ba8 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.json
+++ b/webpack/module-minifier-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/module-minifier-plugin",
   "entries": [
+    {
+      "version": "0.4.3",
+      "tag": "@rushstack/module-minifier-plugin_v0.4.3",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.15`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.2",
       "tag": "@rushstack/module-minifier-plugin_v0.4.2",
diff --git a/webpack/module-minifier-plugin/CHANGELOG.md b/webpack/module-minifier-plugin/CHANGELOG.md
index 61390ebf271..5bc2c35af90 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.md
+++ b/webpack/module-minifier-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/module-minifier-plugin
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 0.4.3
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 0.4.2
 Sat, 31 Jul 2021 00:52:11 GMT
diff --git a/webpack/set-webpack-public-path-plugin/CHANGELOG.json b/webpack/set-webpack-public-path-plugin/CHANGELOG.json
index 4b8609937d4..1a3eec8dece 100644
--- a/webpack/set-webpack-public-path-plugin/CHANGELOG.json
+++ b/webpack/set-webpack-public-path-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/set-webpack-public-path-plugin",
   "entries": [
+    {
+      "version": "3.2.59",
+      "tag": "@rushstack/set-webpack-public-path-plugin_v3.2.59",
+      "date": "Wed, 11 Aug 2021 00:07:21 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.35.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.15`"
+          }
+        ]
+      }
+    },
     {
       "version": "3.2.58",
       "tag": "@rushstack/set-webpack-public-path-plugin_v3.2.58",
diff --git a/webpack/set-webpack-public-path-plugin/CHANGELOG.md b/webpack/set-webpack-public-path-plugin/CHANGELOG.md
index 8f40fa9e0dc..47020b0a008 100644
--- a/webpack/set-webpack-public-path-plugin/CHANGELOG.md
+++ b/webpack/set-webpack-public-path-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/set-webpack-public-path-plugin
 
-This log was last generated on Sat, 31 Jul 2021 00:52:11 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+
+## 3.2.59
+Wed, 11 Aug 2021 00:07:21 GMT
+
+_Version update only_
 
 ## 3.2.58
 Sat, 31 Jul 2021 00:52:11 GMT

From c4c99ee590c6295fa3dba8b3854f485aa9e9153f Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Wed, 11 Aug 2021 00:07:23 +0000
Subject: [PATCH 086/155] Applying package updates.

---
 apps/api-documenter/package.json                    | 2 +-
 apps/api-extractor-model/package.json               | 2 +-
 apps/api-extractor/package.json                     | 2 +-
 apps/heft/package.json                              | 2 +-
 apps/rundown/package.json                           | 2 +-
 heft-plugins/heft-jest-plugin/package.json          | 4 ++--
 heft-plugins/heft-sass-plugin/package.json          | 4 ++--
 heft-plugins/heft-webpack4-plugin/package.json      | 4 ++--
 heft-plugins/heft-webpack5-plugin/package.json      | 4 ++--
 libraries/debug-certificate-manager/package.json    | 2 +-
 libraries/heft-config-file/package.json             | 2 +-
 libraries/load-themed-styles/package.json           | 2 +-
 libraries/node-core-library/package.json            | 2 +-
 libraries/package-deps-hash/package.json            | 2 +-
 libraries/stream-collator/package.json              | 2 +-
 libraries/terminal/package.json                     | 2 +-
 libraries/typings-generator/package.json            | 2 +-
 rigs/heft-node-rig/package.json                     | 4 ++--
 rigs/heft-web-rig/package.json                      | 4 ++--
 webpack/loader-load-themed-styles/package.json      | 2 +-
 webpack/loader-raw-script/package.json              | 2 +-
 webpack/localization-plugin/package.json            | 4 ++--
 webpack/module-minifier-plugin/package.json         | 2 +-
 webpack/set-webpack-public-path-plugin/package.json | 2 +-
 24 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/apps/api-documenter/package.json b/apps/api-documenter/package.json
index 89ac22bfd1e..b911d89d393 100644
--- a/apps/api-documenter/package.json
+++ b/apps/api-documenter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/api-documenter",
-  "version": "7.13.34",
+  "version": "7.13.35",
   "description": "Read JSON files from api-extractor, generate documentation pages",
   "repository": {
     "type": "git",
diff --git a/apps/api-extractor-model/package.json b/apps/api-extractor-model/package.json
index 4bd423d93be..a28837c786e 100644
--- a/apps/api-extractor-model/package.json
+++ b/apps/api-extractor-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/api-extractor-model",
-  "version": "7.13.4",
+  "version": "7.13.5",
   "description": "A helper library for loading and saving the .api.json files created by API Extractor",
   "repository": {
     "type": "git",
diff --git a/apps/api-extractor/package.json b/apps/api-extractor/package.json
index a4f368ef9bd..4d7e923c390 100644
--- a/apps/api-extractor/package.json
+++ b/apps/api-extractor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/api-extractor",
-  "version": "7.18.4",
+  "version": "7.18.5",
   "description": "Analyze the exported API for a TypeScript library and generate reviews, documentation, and .d.ts rollups",
   "keywords": [
     "typescript",
diff --git a/apps/heft/package.json b/apps/heft/package.json
index da42d9e4ced..8c3e3c00714 100644
--- a/apps/heft/package.json
+++ b/apps/heft/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft",
-  "version": "0.35.0",
+  "version": "0.35.1",
   "description": "Build all your JavaScript projects the same way: A way that works.",
   "keywords": [
     "toolchain",
diff --git a/apps/rundown/package.json b/apps/rundown/package.json
index 461251690e8..457d383f054 100644
--- a/apps/rundown/package.json
+++ b/apps/rundown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/rundown",
-  "version": "1.0.126",
+  "version": "1.0.127",
   "description": "Detect load time regressions by running an app, tracing require() calls, and generating a deterministic report",
   "repository": {
     "type": "git",
diff --git a/heft-plugins/heft-jest-plugin/package.json b/heft-plugins/heft-jest-plugin/package.json
index 6a0e5020488..ae8d6a5e2f1 100644
--- a/heft-plugins/heft-jest-plugin/package.json
+++ b/heft-plugins/heft-jest-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-jest-plugin",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "Heft plugin for Jest",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.35.0"
+    "@rushstack/heft": "^0.35.1"
   },
   "dependencies": {
     "@jest/core": "~25.4.0",
diff --git a/heft-plugins/heft-sass-plugin/package.json b/heft-plugins/heft-sass-plugin/package.json
index a5b5550c861..6702729cfe6 100644
--- a/heft-plugins/heft-sass-plugin/package.json
+++ b/heft-plugins/heft-sass-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-sass-plugin",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Heft plugin for SASS",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.35.0"
+    "@rushstack/heft": "^0.35.1"
   },
   "dependencies": {
     "@rushstack/heft-config-file": "workspace:*",
diff --git a/heft-plugins/heft-webpack4-plugin/package.json b/heft-plugins/heft-webpack4-plugin/package.json
index 8ce4470e192..b70ea995240 100644
--- a/heft-plugins/heft-webpack4-plugin/package.json
+++ b/heft-plugins/heft-webpack4-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Heft plugin for Webpack 4",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.35.0"
+    "@rushstack/heft": "^0.35.1"
   },
   "dependencies": {
     "@rushstack/node-core-library": "workspace:*",
diff --git a/heft-plugins/heft-webpack5-plugin/package.json b/heft-plugins/heft-webpack5-plugin/package.json
index 6f82b428d5b..0a6b37c44a9 100644
--- a/heft-plugins/heft-webpack5-plugin/package.json
+++ b/heft-plugins/heft-webpack5-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Heft plugin for Webpack 5",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.35.0"
+    "@rushstack/heft": "^0.35.1"
   },
   "dependencies": {
     "@rushstack/node-core-library": "workspace:*",
diff --git a/libraries/debug-certificate-manager/package.json b/libraries/debug-certificate-manager/package.json
index 113ffe68804..9531e433421 100644
--- a/libraries/debug-certificate-manager/package.json
+++ b/libraries/debug-certificate-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/debug-certificate-manager",
-  "version": "1.0.51",
+  "version": "1.0.52",
   "description": "Cross-platform functionality to create debug ssl certificates.",
   "main": "lib/index.js",
   "typings": "dist/debug-certificate-manager.d.ts",
diff --git a/libraries/heft-config-file/package.json b/libraries/heft-config-file/package.json
index 7877e673fa1..d211b8c4445 100644
--- a/libraries/heft-config-file/package.json
+++ b/libraries/heft-config-file/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-config-file",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Configuration file loader for @rushstack/heft",
   "repository": {
     "type": "git",
diff --git a/libraries/load-themed-styles/package.json b/libraries/load-themed-styles/package.json
index 9b5553143be..8274341a95f 100644
--- a/libraries/load-themed-styles/package.json
+++ b/libraries/load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/load-themed-styles",
-  "version": "1.10.197",
+  "version": "1.10.198",
   "description": "Loads themed styles.",
   "license": "MIT",
   "repository": {
diff --git a/libraries/node-core-library/package.json b/libraries/node-core-library/package.json
index d85b9d1d938..44f731c853e 100644
--- a/libraries/node-core-library/package.json
+++ b/libraries/node-core-library/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/node-core-library",
-  "version": "3.39.1",
+  "version": "3.40.0",
   "description": "Core libraries that every NodeJS toolchain project should use",
   "main": "lib/index.js",
   "typings": "dist/node-core-library.d.ts",
diff --git a/libraries/package-deps-hash/package.json b/libraries/package-deps-hash/package.json
index 5c5c260426c..e0e84e26326 100644
--- a/libraries/package-deps-hash/package.json
+++ b/libraries/package-deps-hash/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/package-deps-hash",
-  "version": "3.0.55",
+  "version": "3.0.56",
   "description": "",
   "main": "lib/index.js",
   "typings": "dist/package-deps-hash.d.ts",
diff --git a/libraries/stream-collator/package.json b/libraries/stream-collator/package.json
index 78139215c7c..2934ab72642 100644
--- a/libraries/stream-collator/package.json
+++ b/libraries/stream-collator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/stream-collator",
-  "version": "4.0.110",
+  "version": "4.0.111",
   "description": "Display intelligible realtime output from concurrent processes",
   "repository": {
     "type": "git",
diff --git a/libraries/terminal/package.json b/libraries/terminal/package.json
index 1d0f631c6b9..21468425aa0 100644
--- a/libraries/terminal/package.json
+++ b/libraries/terminal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/terminal",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "description": "User interface primitives for console applications",
   "main": "lib/index.js",
   "typings": "dist/terminal.d.ts",
diff --git a/libraries/typings-generator/package.json b/libraries/typings-generator/package.json
index bdc36ed90f8..64c8a95ade8 100644
--- a/libraries/typings-generator/package.json
+++ b/libraries/typings-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/typings-generator",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "description": "This library provides functionality for automatically generating typings for non-TS files.",
   "keywords": [
     "dts",
diff --git a/rigs/heft-node-rig/package.json b/rigs/heft-node-rig/package.json
index bd240d03844..38ef34a3c6f 100644
--- a/rigs/heft-node-rig/package.json
+++ b/rigs/heft-node-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-node-rig",
-  "version": "1.1.14",
+  "version": "1.1.15",
   "description": "A rig package for Node.js projects that build using Heft",
   "license": "MIT",
   "scripts": {
@@ -11,7 +11,7 @@
     "url": "https://github.com/microsoft/rushstack/tree/master/rigs/heft-node-rig"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.35.0"
+    "@rushstack/heft": "^0.35.1"
   },
   "dependencies": {
     "@microsoft/api-extractor": "workspace:*",
diff --git a/rigs/heft-web-rig/package.json b/rigs/heft-web-rig/package.json
index ea5c76673d7..6ccb1ce24d0 100644
--- a/rigs/heft-web-rig/package.json
+++ b/rigs/heft-web-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-web-rig",
-  "version": "0.3.15",
+  "version": "0.3.16",
   "description": "A rig package for web browser projects that build using Heft",
   "license": "MIT",
   "scripts": {
@@ -11,7 +11,7 @@
     "url": "https://github.com/microsoft/rushstack/tree/master/rigs/heft-web-rig"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.35.0"
+    "@rushstack/heft": "^0.35.1"
   },
   "dependencies": {
     "@microsoft/api-extractor": "workspace:*",
diff --git a/webpack/loader-load-themed-styles/package.json b/webpack/loader-load-themed-styles/package.json
index 566bab4e367..29e756e6cf0 100644
--- a/webpack/loader-load-themed-styles/package.json
+++ b/webpack/loader-load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
-  "version": "1.9.78",
+  "version": "1.9.79",
   "description": "This simple loader wraps the loading of CSS in script equivalent to `require('load-themed-styles').loadStyles( /* css text */ )`. It is designed to be a replacement for style-loader.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/loader-raw-script/package.json b/webpack/loader-raw-script/package.json
index 6b14ce93938..b42fa24f2f7 100644
--- a/webpack/loader-raw-script/package.json
+++ b/webpack/loader-raw-script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/loader-raw-script",
-  "version": "1.3.164",
+  "version": "1.3.165",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/localization-plugin/package.json b/webpack/localization-plugin/package.json
index ad01d69b40d..10dd8c3c6f9 100644
--- a/webpack/localization-plugin/package.json
+++ b/webpack/localization-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/localization-plugin",
-  "version": "0.6.38",
+  "version": "0.6.39",
   "description": "This plugin facilitates localization with Webpack.",
   "main": "lib/index.js",
   "typings": "dist/localization-plugin.d.ts",
@@ -13,7 +13,7 @@
     "build": "heft build --clean"
   },
   "peerDependencies": {
-    "@rushstack/set-webpack-public-path-plugin": "^3.2.58",
+    "@rushstack/set-webpack-public-path-plugin": "^3.2.59",
     "@types/webpack": "^4.39.0",
     "webpack": "^4.31.0"
   },
diff --git a/webpack/module-minifier-plugin/package.json b/webpack/module-minifier-plugin/package.json
index 014bf9a951a..1bcb1dcf0db 100644
--- a/webpack/module-minifier-plugin/package.json
+++ b/webpack/module-minifier-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/module-minifier-plugin",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "This plugin splits minification of webpack compilations into smaller units.",
   "main": "lib/index.js",
   "typings": "dist/module-minifier-plugin.d.ts",
diff --git a/webpack/set-webpack-public-path-plugin/package.json b/webpack/set-webpack-public-path-plugin/package.json
index f9640f38bf7..82c2b8aefde 100644
--- a/webpack/set-webpack-public-path-plugin/package.json
+++ b/webpack/set-webpack-public-path-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/set-webpack-public-path-plugin",
-  "version": "3.2.58",
+  "version": "3.2.59",
   "description": "This plugin sets the webpack public path at runtime.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

From 0c015d15906e1a191fc9a269f8afb260fb61132f Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 14:30:03 -0700
Subject: [PATCH 087/155] Add RUSH_TAR_BINARY_PATH environment variable

---
 .../src/api/EnvironmentConfiguration.ts       | 21 +++++++++++++++++++
 .../api/test/EnvironmentConfiguration.test.ts | 20 ++++++++++++++++++
 apps/rush-lib/src/utilities/TarExecutable.ts  |  4 +++-
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/apps/rush-lib/src/api/EnvironmentConfiguration.ts b/apps/rush-lib/src/api/EnvironmentConfiguration.ts
index ba060e96d32..aa70e18d79e 100644
--- a/apps/rush-lib/src/api/EnvironmentConfiguration.ts
+++ b/apps/rush-lib/src/api/EnvironmentConfiguration.ts
@@ -134,6 +134,11 @@ export const enum EnvironmentVariableNames {
    */
   RUSH_GIT_BINARY_PATH = 'RUSH_GIT_BINARY_PATH',
 
+  /**
+   * Allows the tar binary path to be explicitly specified.
+   */
+  RUSH_TAR_BINARY_PATH = 'RUSH_TAR_BINARY_PATH',
+
   /**
    * When Rush executes shell scripts, it sometimes changes the working directory to be a project folder or
    * the repository root folder.  The original working directory (where the Rush command was invoked) is assigned
@@ -176,6 +181,8 @@ export class EnvironmentConfiguration {
 
   private static _gitBinaryPath: string | undefined;
 
+  private static _tarBinaryPath: string | undefined;
+
   /**
    * An override for the common/temp folder path.
    */
@@ -269,6 +276,15 @@ export class EnvironmentConfiguration {
     return EnvironmentConfiguration._gitBinaryPath;
   }
 
+  /**
+   * Allows the tar binary path to be explicitly provided.
+   * See {@link EnvironmentVariableNames.RUSH_TAR_BINARY_PATH}
+   */
+  public static get tarBinaryPath(): string | undefined {
+    EnvironmentConfiguration._ensureValidated();
+    return EnvironmentConfiguration._tarBinaryPath;
+  }
+
   /**
    * The front-end RushVersionSelector relies on `RUSH_GLOBAL_FOLDER`, so its value must be read before
    * `EnvironmentConfiguration` is initialized (and actually before the correct version of `EnvironmentConfiguration`
@@ -380,6 +396,11 @@ export class EnvironmentConfiguration {
             break;
           }
 
+          case EnvironmentVariableNames.RUSH_TAR_BINARY_PATH: {
+            EnvironmentConfiguration._tarBinaryPath = value;
+            break;
+          }
+
           case EnvironmentVariableNames.RUSH_PARALLELISM:
           case EnvironmentVariableNames.RUSH_PREVIEW_VERSION:
           case EnvironmentVariableNames.RUSH_VARIANT:
diff --git a/apps/rush-lib/src/api/test/EnvironmentConfiguration.test.ts b/apps/rush-lib/src/api/test/EnvironmentConfiguration.test.ts
index 5038fcada8a..3bfec323def 100644
--- a/apps/rush-lib/src/api/test/EnvironmentConfiguration.test.ts
+++ b/apps/rush-lib/src/api/test/EnvironmentConfiguration.test.ts
@@ -61,6 +61,26 @@ describe('EnvironmentConfiguration', () => {
     });
   });
 
+  describe('binaryOverride', () => {
+    it('returns undefined for unset environment variables', () => {
+      EnvironmentConfiguration.validate();
+
+      expect(EnvironmentConfiguration.gitBinaryPath).not.toBeDefined();
+      expect(EnvironmentConfiguration.tarBinaryPath).not.toBeDefined();
+    });
+
+    it('returns the value for a set environment variable', () => {
+      const gitPath: string = '/usr/bin/git';
+      const tarPath: string = '/usr/bin/tar';
+      process.env.RUSH_GIT_BINARY_PATH = gitPath;
+      process.env.RUSH_TAR_BINARY_PATH = tarPath;
+      EnvironmentConfiguration.validate({ doNotNormalizePaths: true });
+
+      expect(EnvironmentConfiguration.gitBinaryPath).toEqual(gitPath);
+      expect(EnvironmentConfiguration.tarBinaryPath).toEqual(tarPath);
+    });
+  });
+
   describe('pnpmStorePathOverride', () => {
     const ENV_VAR: string = 'RUSH_PNPM_STORE_PATH';
 
diff --git a/apps/rush-lib/src/utilities/TarExecutable.ts b/apps/rush-lib/src/utilities/TarExecutable.ts
index c794c8af95c..647740dbf18 100644
--- a/apps/rush-lib/src/utilities/TarExecutable.ts
+++ b/apps/rush-lib/src/utilities/TarExecutable.ts
@@ -7,6 +7,7 @@ import { ChildProcess } from 'child_process';
 import * as events from 'events';
 
 import { RushConfigurationProject } from '../api/RushConfigurationProject';
+import { EnvironmentConfiguration } from '../api/EnvironmentConfiguration';
 
 export interface ITarOptionsBase {
   logFilePath: string;
@@ -32,7 +33,8 @@ export class TarExecutable {
 
   public static tryInitialize(terminal: Terminal): TarExecutable | undefined {
     terminal.writeVerboseLine('Trying to find "tar" binary');
-    const tarExecutablePath: string | undefined = Executable.tryResolve('tar');
+    const tarExecutablePath: string | undefined =
+      EnvironmentConfiguration.tarBinaryPath || Executable.tryResolve('tar');
     if (!tarExecutablePath) {
       terminal.writeVerboseLine('"tar" was not found on the PATH');
       return undefined;

From 6a4e1788ae7ffeb7e208b609dd27f5918ac7bcd3 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 14:30:59 -0700
Subject: [PATCH 088/155] Add change file

---
 .../tar-environment-variable_2021-08-11-21-30.json    | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@microsoft/rush/tar-environment-variable_2021-08-11-21-30.json

diff --git a/common/changes/@microsoft/rush/tar-environment-variable_2021-08-11-21-30.json b/common/changes/@microsoft/rush/tar-environment-variable_2021-08-11-21-30.json
new file mode 100644
index 00000000000..972043f9d43
--- /dev/null
+++ b/common/changes/@microsoft/rush/tar-environment-variable_2021-08-11-21-30.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Allow the tar binary path to be overridden via the RUSH_TAR_BINARY_PATH environment variable.",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file

From 4cf957516f9d03ee32855d94e6152953db2fb9de Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Mon, 9 Aug 2021 15:12:25 -0700
Subject: [PATCH 089/155] TypeScript Solution Builder support

---
 .../TypeScriptPlugin/EmitFilesPatch.ts        |  49 +-
 .../plugins/TypeScriptPlugin/LinterBase.ts    |  12 +-
 .../TypeScriptPlugin/TypeScriptBuilder.ts     | 623 +++++++++++-------
 .../TypeScriptPlugin/TypeScriptPlugin.ts      |  21 +-
 apps/heft/src/schemas/typescript.schema.json  |  10 +
 .../.eslintrc.js                              |   7 +
 .../config/heft.json                          |  46 ++
 .../config/jest.config.json                   |   3 +
 .../config/rush-project.json                  |   3 +
 .../config/typescript.json                    |  54 ++
 .../package.json                              |  22 +
 .../src/chunks/ChunkClass.ts                  |   9 +
 .../src/chunks/image.png                      | Bin 0 -> 726 bytes
 .../src/copiedAsset.css                       |   1 +
 .../src/indexA.ts                             |  10 +
 .../src/indexB.ts                             |   1 +
 .../src/test/ExampleTest.test.ts              |  16 +
 .../src/test/tsconfig.json                    |  12 +
 .../src/tsconfig.json                         |   8 +
 .../tsconfig-base.json                        |  24 +
 .../tsconfig-eslint.json                      |   4 +
 .../tsconfig.json                             |  13 +
 .../tslint.json                               | 103 +++
 rush.json                                     |   6 +
 24 files changed, 763 insertions(+), 294 deletions(-)
 create mode 100644 build-tests/heft-typescript-composite-test/.eslintrc.js
 create mode 100644 build-tests/heft-typescript-composite-test/config/heft.json
 create mode 100644 build-tests/heft-typescript-composite-test/config/jest.config.json
 create mode 100644 build-tests/heft-typescript-composite-test/config/rush-project.json
 create mode 100644 build-tests/heft-typescript-composite-test/config/typescript.json
 create mode 100644 build-tests/heft-typescript-composite-test/package.json
 create mode 100644 build-tests/heft-typescript-composite-test/src/chunks/ChunkClass.ts
 create mode 100644 build-tests/heft-typescript-composite-test/src/chunks/image.png
 create mode 100644 build-tests/heft-typescript-composite-test/src/copiedAsset.css
 create mode 100644 build-tests/heft-typescript-composite-test/src/indexA.ts
 create mode 100644 build-tests/heft-typescript-composite-test/src/indexB.ts
 create mode 100644 build-tests/heft-typescript-composite-test/src/test/ExampleTest.test.ts
 create mode 100644 build-tests/heft-typescript-composite-test/src/test/tsconfig.json
 create mode 100644 build-tests/heft-typescript-composite-test/src/tsconfig.json
 create mode 100644 build-tests/heft-typescript-composite-test/tsconfig-base.json
 create mode 100644 build-tests/heft-typescript-composite-test/tsconfig-eslint.json
 create mode 100644 build-tests/heft-typescript-composite-test/tsconfig.json
 create mode 100644 build-tests/heft-typescript-composite-test/tslint.json

diff --git a/apps/heft/src/plugins/TypeScriptPlugin/EmitFilesPatch.ts b/apps/heft/src/plugins/TypeScriptPlugin/EmitFilesPatch.ts
index a92f19efd01..1308c2b156a 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/EmitFilesPatch.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/EmitFilesPatch.ts
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import * as path from 'path';
 import { InternalError } from '@rushstack/node-core-library';
 import type * as TTypescript from 'typescript';
 import {
@@ -17,13 +16,6 @@ export interface ICachedEmitModuleKind {
 
   outFolderPath: string;
 
-  /**
-   * TypeScript's output is placed in the \<project root\>/.heft/build-cache folder.
-   * This is the the path to the subfolder in the build-cache folder that this emit kind
-   * written to.
-   */
-  cacheOutFolderPath: string;
-
   /**
    * File extension to use instead of '.js' for emitted ECMAScript files.
    * For example, '.cjs' to indicate commonjs content, or '.mjs' to indicate ECMAScript modules.
@@ -41,14 +33,11 @@ export class EmitFilesPatch {
   private static _patchedTs: ExtendedTypeScript | undefined = undefined;
 
   private static _baseEmitFiles: any | undefined = undefined; // eslint-disable-line
-  private static _originalOutDir: string | undefined = undefined;
-  private static _redirectedOutDir: string | undefined = undefined;
 
   public static install(
     ts: ExtendedTypeScript,
     tsconfig: TTypescript.ParsedCommandLine,
     moduleKindsToEmit: ICachedEmitModuleKind[],
-    useBuildCache: boolean,
     changedFiles?: Set<IExtendedSourceFile>
   ): void {
     if (EmitFilesPatch._patchedTs === ts) {
@@ -117,6 +106,7 @@ export class EmitFilesPatch {
             : {
                 ...tsconfig.options,
                 module: moduleKindToEmit.moduleKind,
+                outDir: moduleKindToEmit.outFolderPath,
 
                 // Don't emit declarations for secondary module kinds
                 declaration: false,
@@ -127,13 +117,6 @@ export class EmitFilesPatch {
             throw new InternalError('Expected compilerOptions.outDir to be assigned');
           }
 
-          // Redirect from "path/to/lib" --> "path/to/.heft/build-cache/lib"
-          EmitFilesPatch._originalOutDir =
-            compilerOptions.outDir.replace(/([\\\/]+)$/, '') + '/'; /* Ensure trailing slash */
-          EmitFilesPatch._redirectedOutDir = useBuildCache
-            ? moduleKindToEmit.cacheOutFolderPath
-            : moduleKindToEmit.outFolderPath;
-
           const flavorResult: TTypescript.EmitResult = EmitFilesPatch._baseEmitFiles(
             resolver,
             {
@@ -152,9 +135,6 @@ export class EmitFilesPatch {
           if (moduleKindToEmit.moduleKind === defaultModuleKind) {
             defaultModuleKindResult = flavorResult;
           }
-
-          EmitFilesPatch._originalOutDir = undefined;
-          EmitFilesPatch._redirectedOutDir = undefined;
           // Should results be aggregated, in case for whatever reason the diagnostics are not the same?
         }
         return {
@@ -198,33 +178,6 @@ export class EmitFilesPatch {
     };
   }
 
-  public static getRedirectedFilePath(filePath: string): string {
-    if (!EmitFilesPatch.isInstalled) {
-      throw new InternalError(
-        'EmitFilesPatch.getRedirectedFilePath() cannot be used unless the patch is installed'
-      );
-    }
-
-    // Redirect from "path/to/lib" --> "path/to/.heft/build-cache/lib"
-    let redirectedFilePath: string = filePath;
-    if (EmitFilesPatch._redirectedOutDir !== undefined) {
-      if (
-        /* This is significantly faster than Path.isUnderOrEqual */
-        filePath.startsWith(EmitFilesPatch._originalOutDir!)
-      ) {
-        redirectedFilePath = path.resolve(
-          EmitFilesPatch._redirectedOutDir,
-          path.relative(EmitFilesPatch._originalOutDir!, filePath)
-        );
-      } else {
-        // The compiler is writing some other output, for example:
-        // ./.heft/build-cache/ts_a7cd263b9f06b2440c0f2b2264746621c192f2e2.json
-      }
-    }
-
-    return redirectedFilePath;
-  }
-
   public static uninstall(ts: ExtendedTypeScript): void {
     if (EmitFilesPatch._patchedTs === undefined) {
       throw new InternalError('EmitFilesPatch.uninstall() cannot be called if no patch was installed');
diff --git a/apps/heft/src/plugins/TypeScriptPlugin/LinterBase.ts b/apps/heft/src/plugins/TypeScriptPlugin/LinterBase.ts
index bd6d08578cd..fb85aa72599 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/LinterBase.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/LinterBase.ts
@@ -11,6 +11,7 @@ import {
 } from './internalTypings/TypeScriptInternals';
 import { PerformanceMeasurer } from '../../utilities/Performance';
 import { IScopedLogger } from '../../pluginFramework/logging/ScopedLogger';
+import { createHash, Hash } from 'crypto';
 
 export interface ILinterBaseOptions {
   ts: IExtendedTypeScript;
@@ -87,8 +88,17 @@ export abstract class LinterBase<TLintResult> {
   public async performLintingAsync(options: IRunLinterOptions): Promise<void> {
     await this.initializeAsync(options.tsProgram);
 
+    const fileHash: Hash = createHash('md5');
+    for (const file of options.typeScriptFilenames) {
+      fileHash.update(file);
+    }
+    const hashSuffix: string = fileHash.digest('base64').replace(/\+/g, '-').replace(/\//g, '_').slice(0, 8);
+
     const tslintConfigVersion: string = this.cacheVersion;
-    const cacheFilePath: string = path.join(this._buildCacheFolderPath, `${this._linterName}.json`);
+    const cacheFilePath: string = path.join(
+      this._buildCacheFolderPath,
+      `${this._linterName}-${hashSuffix}.json`
+    );
 
     let tslintCacheData: ITsLintCacheData | undefined;
     try {
diff --git a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
index 4ba18482f66..b2435230b49 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
@@ -5,23 +5,19 @@ import * as path from 'path';
 import * as semver from 'semver';
 import {
   FileSystemStats,
-  IFileSystemCreateLinkOptions,
   Terminal,
   JsonFile,
   IPackageJson,
-  InternalError,
   ITerminalProvider,
   FileSystem,
-  Path,
-  AlreadyExistsBehavior
+  Path
 } from '@rushstack/node-core-library';
 import * as crypto from 'crypto';
 import type * as TTypescript from 'typescript';
 import {
   ExtendedTypeScript,
   IExtendedProgram,
-  IExtendedSourceFile,
-  IResolveModuleNameResolutionHost
+  IExtendedSourceFile
 } from './internalTypings/TypeScriptInternals';
 
 import { SubprocessRunnerBase } from '../../utilities/subprocess/SubprocessRunnerBase';
@@ -37,6 +33,7 @@ import { HeftSession } from '../../pluginFramework/HeftSession';
 import { EmitCompletedCallbackManager } from './EmitCompletedCallbackManager';
 import { ISharedTypeScriptConfiguration } from './TypeScriptPlugin';
 import { TypeScriptCachedFileSystem } from '../../utilities/fileSystem/TypeScriptCachedFileSystem';
+import { LinterBase } from './LinterBase';
 
 export interface ITypeScriptBuilderConfiguration extends ISharedTypeScriptConfiguration {
   buildFolder: string;
@@ -67,6 +64,9 @@ export interface ITypeScriptBuilderConfiguration extends ISharedTypeScriptConfig
 
 type TWatchCompilerHost =
   TTypescript.WatchCompilerHostOfFilesAndCompilerOptions<TTypescript.EmitAndSemanticDiagnosticsBuilderProgram>;
+type TSolutionHost = TTypescript.SolutionBuilderHost<TTypescript.EmitAndSemanticDiagnosticsBuilderProgram>;
+type TWatchSolutionHost =
+  TTypescript.SolutionBuilderWithWatchHost<TTypescript.EmitAndSemanticDiagnosticsBuilderProgram>;
 
 const EMPTY_JSON: object = {};
 
@@ -76,6 +76,12 @@ interface ICompilerCapabilities {
    * Introduced with TypeScript 3.6.
    */
   incrementalProgram: boolean;
+
+  /**
+   * Support for composite projects via `ts.createSolutionBuilder()`.
+   * Introduced with TypeScript 3.0.
+   */
+  solutionBuilder: boolean;
 }
 
 interface IFileToWrite {
@@ -101,6 +107,7 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
 
   private _capabilities!: ICompilerCapabilities;
   private _useIncrementalProgram!: boolean;
+  private _useSolutionBuilder!: boolean;
 
   private _eslintEnabled!: boolean;
   private _tslintEnabled!: boolean;
@@ -173,8 +180,10 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     // Detect what features this compiler supports.  Note that manually comparing major/minor numbers
     // loosens the matching to accept prereleases such as "3.6.0-dev.20190530"
     this._capabilities = {
-      incrementalProgram: false
+      incrementalProgram: false,
+      solutionBuilder: this._typescriptParsedVersion.major >= 3
     };
+
     if (
       this._typescriptParsedVersion.major > 3 ||
       (this._typescriptParsedVersion.major === 3 && this._typescriptParsedVersion.minor >= 6)
@@ -187,6 +196,13 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     // to delete the cache when switching modes, or else maintain two separate cache folders.
     this._useIncrementalProgram = this._capabilities.incrementalProgram && !this._configuration.watchMode;
 
+    this._useSolutionBuilder = !!this._configuration.buildProjectReferences;
+    if (this._useSolutionBuilder && !this._capabilities.solutionBuilder) {
+      throw new Error(
+        `Building project references requires TypeScript@>=3.0, but the current version is ${this._typescriptVersion}`
+      );
+    }
+
     this._configuration.buildCacheFolder = Path.convertToSlashes(this._configuration.buildCacheFolder);
     this._tslintConfigFilePath = path.resolve(this._configuration.buildFolder, 'tslint.json');
     this._eslintConfigFilePath = path.resolve(this._configuration.buildFolder, '.eslintrc.js');
@@ -259,6 +275,55 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
       };
     };
 
+    this._typescriptTerminal.writeLine(`Using TypeScript version ${ts.version}`);
+
+    if (this._configuration.watchMode) {
+      await this._runWatch(ts, measureTsPerformance);
+    } else if (this._useSolutionBuilder) {
+      await this._runSolutionBuild(ts, measureTsPerformance);
+    } else {
+      await this._runBuild(ts, measureTsPerformance, measureTsPerformanceAsync);
+    }
+  }
+
+  public async _runWatch(ts: ExtendedTypeScript, measureTsPerformance: PerformanceMeasurer): Promise<void> {
+    //#region CONFIGURE
+    const { duration: configureDurationMs, tsconfig } = measureTsPerformance('Configure', () => {
+      const _tsconfig: TTypescript.ParsedCommandLine = this._loadTsconfig(ts);
+      this._validateTsconfig(ts, _tsconfig);
+      EmitFilesPatch.install(ts, _tsconfig, this._moduleKindsToEmit);
+
+      return {
+        tsconfig: _tsconfig
+      };
+    });
+    this._typescriptTerminal.writeVerboseLine(`Configure: ${configureDurationMs}ms`);
+    //#endregion
+
+    if (this._useSolutionBuilder) {
+      const solutionHost: TWatchSolutionHost = this._buildWatchSolutionBuilderHost(ts);
+      const watchBuilder: TTypescript.SolutionBuilder<TTypescript.EmitAndSemanticDiagnosticsBuilderProgram> =
+        ts.createSolutionBuilderWithWatch(solutionHost, [this._configuration.tsconfigPath], {});
+
+      watchBuilder.build();
+    } else {
+      const compilerHost: TWatchCompilerHost = this._buildWatchCompilerHost(ts, tsconfig);
+      ts.createWatchProgram(compilerHost);
+    }
+
+    return new Promise(() => {
+      /* never terminate */
+    });
+  }
+
+  public async _runBuild(
+    ts: ExtendedTypeScript,
+    measureTsPerformance: PerformanceMeasurer,
+    measureTsPerformanceAsync: PerformanceMeasurerAsync
+  ): Promise<void> {
+    // Ensure the cache folder exists
+    this._cachedFileSystem.ensureFolder(this._configuration.buildCacheFolder);
+
     let tslint: Tslint | undefined = undefined;
     if (this._tslintEnabled) {
       if (!this._configuration.tslintToolPath) {
@@ -296,8 +361,6 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
       });
     }
 
-    this._typescriptTerminal.writeLine(`Using TypeScript version ${ts.version}`);
-
     if (eslint) {
       eslint.printVersionHeader();
     }
@@ -306,51 +369,6 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
       tslint.printVersionHeader();
     }
 
-    if (this._configuration.watchMode) {
-      await this._runWatch(ts, measureTsPerformance);
-    } else {
-      await this._runBuild(ts, eslint, tslint, measureTsPerformance, measureTsPerformanceAsync);
-    }
-  }
-
-  public async _runWatch(ts: ExtendedTypeScript, measureTsPerformance: PerformanceMeasurer): Promise<void> {
-    //#region CONFIGURE
-    const {
-      duration: configureDurationMs,
-      tsconfig,
-      compilerHost
-    } = measureTsPerformance('Configure', () => {
-      const _tsconfig: TTypescript.ParsedCommandLine = this._loadTsconfig(ts);
-      const _compilerHost: TWatchCompilerHost = this._buildWatchCompilerHost(ts, _tsconfig);
-      return {
-        tsconfig: _tsconfig,
-        compilerHost: _compilerHost
-      };
-    });
-    this._typescriptTerminal.writeVerboseLine(`Configure: ${configureDurationMs}ms`);
-    //#endregion
-
-    this._validateTsconfig(ts, tsconfig);
-
-    EmitFilesPatch.install(ts, tsconfig, this._moduleKindsToEmit, /* useBuildCache */ false);
-
-    ts.createWatchProgram(compilerHost);
-
-    return new Promise(() => {
-      /* never terminate */
-    });
-  }
-
-  public async _runBuild(
-    ts: ExtendedTypeScript,
-    eslint: Eslint | undefined,
-    tslint: Tslint | undefined,
-    measureTsPerformance: PerformanceMeasurer,
-    measureTsPerformanceAsync: PerformanceMeasurerAsync
-  ): Promise<void> {
-    // Ensure the cache folder exists
-    this._cachedFileSystem.ensureFolder(this._configuration.buildCacheFolder);
-
     //#region CONFIGURE
     const {
       duration: configureDurationMs,
@@ -494,120 +512,133 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
       `I/O Write: ${writeDuration}ms (${emitResult.filesToWrite.length} files)`
     );
 
-    //#region HARDLINK/COPY
-    const shouldHardlink: boolean = this._configuration.copyFromCacheMode !== 'copy';
-    const { duration: hardlinkDuration, linkCount: hardlinkCount } = await measureTsPerformanceAsync(
-      shouldHardlink ? 'Hardlink' : 'CopyFromCache',
-      async () => {
-        const commonSourceDirectory: string = extendedProgram.getCommonSourceDirectory();
-        const linkPromises: Promise<void>[] = [];
-        let linkCount: number = 0;
-
-        const resolverHost: IResolveModuleNameResolutionHost = {
-          getCurrentDirectory: () => compilerHost.getCurrentDirectory(),
-          getCommonSourceDirectory: () => commonSourceDirectory,
-          getCanonicalFileName: (filename: string) => compilerHost.getCanonicalFileName(filename)
-        };
+    // In non-watch mode, notify EmitCompletedCallbackManager once after we complete the compile step
+    this._emitCompletedCallbackManager.callback();
 
-        let queueLinkOrCopy: (options: IFileSystemCreateLinkOptions) => void;
-        if (shouldHardlink) {
-          queueLinkOrCopy = (options: IFileSystemCreateLinkOptions) => {
-            linkPromises.push(
-              this._cachedFileSystem
-                .createHardLinkAsync({ ...options, alreadyExistsBehavior: AlreadyExistsBehavior.Ignore })
-                .then(() => {
-                  linkCount++;
-                })
-                .catch((error) => {
-                  if (!FileSystem.isNotExistError(error)) {
-                    // Only re-throw errors that aren't not-exist errors
-                    throw error;
-                  }
-                })
-            );
-          };
-        } else {
-          queueLinkOrCopy = (options: IFileSystemCreateLinkOptions) => {
-            linkPromises.push(
-              this._cachedFileSystem
-                .copyFileAsync({
-                  sourcePath: options.linkTargetPath,
-                  destinationPath: options.newLinkPath
-                })
-                .then(() => {
-                  linkCount++;
-                })
-                .catch((error) => {
-                  if (!FileSystem.isNotExistError(error)) {
-                    // Only re-throw errors that aren't not-exist errors
-                    throw error;
-                  }
-                })
-            );
-          };
+    let typeScriptErrorCount: number = 0;
+    if (diagnostics.length > 0) {
+      this._typescriptTerminal.writeLine(
+        `Encountered ${diagnostics.length} TypeScript issue${diagnostics.length > 1 ? 's' : ''}:`
+      );
+      for (const diagnostic of diagnostics) {
+        const diagnosticCategory: TTypescript.DiagnosticCategory = this._getAdjustedDiagnosticCategory(
+          diagnostic,
+          ts
+        );
+
+        if (diagnosticCategory === ts.DiagnosticCategory.Error) {
+          typeScriptErrorCount++;
         }
 
-        for (const sourceFile of genericProgram.getSourceFiles()) {
-          const filename: string = sourceFile.fileName;
-          if (typeScriptFilenames.has(filename)) {
-            const relativeFilenameWithoutExtension: string = ts.removeFileExtension(
-              ts.getExternalModuleNameFromPath(resolverHost, filename)
-            );
+        this._printDiagnosticMessage(ts, diagnostic, diagnosticCategory);
+      }
+    }
 
-            for (const { cacheOutFolderPath, outFolderPath, jsExtensionOverride = '.js', isPrimary } of this
-              ._moduleKindsToEmit) {
-              // Only primary module kinds emit declarations
-              if (isPrimary) {
-                if (tsconfig.options.declarationMap) {
-                  const dtsMapFilename: string = `${relativeFilenameWithoutExtension}.d.ts.map`;
-                  queueLinkOrCopy({
-                    linkTargetPath: path.join(cacheOutFolderPath, dtsMapFilename),
-                    newLinkPath: path.join(outFolderPath, dtsMapFilename)
-                  });
-                }
-
-                if (tsconfig.options.declaration) {
-                  const dtsFilename: string = `${relativeFilenameWithoutExtension}.d.ts`;
-                  queueLinkOrCopy({
-                    linkTargetPath: path.join(cacheOutFolderPath, dtsFilename),
-                    newLinkPath: path.join(outFolderPath, dtsFilename)
-                  });
-                }
-              }
-
-              if (tsconfig.options.sourceMap && !sourceFile.isDeclarationFile) {
-                const jsMapFilename: string = `${relativeFilenameWithoutExtension}${jsExtensionOverride}.map`;
-                queueLinkOrCopy({
-                  linkTargetPath: path.join(cacheOutFolderPath, jsMapFilename),
-                  newLinkPath: path.join(outFolderPath, jsMapFilename)
-                });
-              }
-
-              // Write the .js file last in case something is watching its timestamp
-              if (!sourceFile.isDeclarationFile) {
-                const jsFilename: string = `${relativeFilenameWithoutExtension}${jsExtensionOverride}`;
-                queueLinkOrCopy({
-                  linkTargetPath: path.join(cacheOutFolderPath, jsFilename),
-                  newLinkPath: path.join(outFolderPath, jsFilename)
-                });
-              }
-            }
-          }
-        }
+    if (eslint) {
+      eslint.reportFailures();
+    }
+
+    if (tslint) {
+      tslint.reportFailures();
+    }
+
+    if (typeScriptErrorCount > 0) {
+      throw new Error(`Encountered TypeScript error${typeScriptErrorCount > 1 ? 's' : ''}`);
+    }
+  }
+
+  public async _runSolutionBuild(
+    ts: ExtendedTypeScript,
+    measureTsPerformance: PerformanceMeasurer
+  ): Promise<void> {
+    // Ensure the cache folder exists
+    this._cachedFileSystem.ensureFolder(this._configuration.buildCacheFolder);
+
+    this._typescriptTerminal.writeVerboseLine(`Using solution mode`);
+
+    //#region CONFIGURE
+    const { duration: configureDurationMs } = measureTsPerformance('Configure', () => {
+      this._overrideTypeScriptReadJson(ts);
+      const _tsconfig: TTypescript.ParsedCommandLine = this._loadTsconfig(ts);
 
-        await Promise.all(linkPromises);
+      this._validateTsconfig(ts, _tsconfig);
 
-        return { linkCount };
+      EmitFilesPatch.install(ts, _tsconfig, this._moduleKindsToEmit);
+
+      return {};
+    });
+    this._typescriptTerminal.writeVerboseLine(`Configure: ${configureDurationMs}ms`);
+    //#endregion
+
+    const rawDiagnostics: TTypescript.Diagnostic[] = [];
+    const reportDiagnostic: TTypescript.DiagnosticReporter = (diagnostic: TTypescript.Diagnostic) => {
+      rawDiagnostics.push(diagnostic);
+    };
+
+    const solutionBuilderHost: TSolutionHost = this._buildSolutionBuilderHost(ts, reportDiagnostic);
+
+    const solutionBuilder: TTypescript.SolutionBuilder<TTypescript.EmitAndSemanticDiagnosticsBuilderProgram> =
+      ts.createSolutionBuilder(solutionBuilderHost, [this._configuration.tsconfigPath], {});
+
+    const lintPromises: Promise<LinterBase<unknown>>[] = [];
+
+    const [eslintLogger, tslintLogger] = await Promise.all([
+      this._initESlintLogger(),
+      this._initTSlintLogger()
+    ]);
+
+    solutionBuilderHost.afterProgramEmitAndDiagnostics = (
+      program: TTypescript.EmitAndSemanticDiagnosticsBuilderProgram
+    ) => {
+      const tsProgram: TTypescript.Program | undefined = program.getProgram();
+
+      if (tsProgram) {
+        const extendedProgram: IExtendedProgram = tsProgram as IExtendedProgram;
+        if (eslintLogger) {
+          lintPromises.push(this._runESlintAsync(ts, eslintLogger, measureTsPerformance, extendedProgram));
+        }
+
+        if (tslintLogger) {
+          lintPromises.push(this._runTSlintAsync(ts, tslintLogger, measureTsPerformance, extendedProgram));
+        }
       }
+    };
+
+    const exitStatus: TTypescript.ExitStatus = solutionBuilder.build();
+
+    const diagnostics: readonly TTypescript.Diagnostic[] = ts.sortAndDeduplicateDiagnostics(rawDiagnostics);
+
+    this._typescriptTerminal.writeVerboseLine(
+      `I/O Read: ${ts.performance.getDuration('I/O Read')}ms (${ts.performance.getCount(
+        'beforeIORead'
+      )} files)`
+    );
+    this._typescriptTerminal.writeVerboseLine(
+      `Parse: ${ts.performance.getDuration('Parse')}ms (${ts.performance.getCount('beforeParse')} files)`
+    );
+    this._typescriptTerminal.writeVerboseLine(
+      `Program (includes Read + Parse): ${ts.performance.getDuration('Program')}ms`
     );
+    //#endregion
 
+    this._typescriptTerminal.writeVerboseLine(`Bind: ${ts.performance.getDuration('Bind')}ms`);
+    this._typescriptTerminal.writeVerboseLine(`Check: ${ts.performance.getDuration('Check')}ms`);
     this._typescriptTerminal.writeVerboseLine(
-      `${shouldHardlink ? 'Hardlink' : 'Copy from cache'}: ${hardlinkDuration}ms (${hardlinkCount} files)`
+      `Transform: ${ts.performance.getDuration('transformTime')}ms ` +
+        `(${ts.performance.getCount('beforeTransform')} files)`
+    );
+    this._typescriptTerminal.writeVerboseLine(
+      `Print: ${ts.performance.getDuration('printTime')}ms ` +
+        `(${ts.performance.getCount('beforePrint')} files) (Includes Transform)`
+    );
+    this._typescriptTerminal.writeVerboseLine(
+      `Emit: ${ts.performance.getDuration('Emit')}ms (Includes Print)`
     );
 
     // In non-watch mode, notify EmitCompletedCallbackManager once after we complete the compile step
     this._emitCompletedCallbackManager.callback();
-    //#endregion
+
+    const linters: LinterBase<unknown>[] = await Promise.all(lintPromises);
 
     let typeScriptErrorCount: number = 0;
     if (diagnostics.length > 0) {
@@ -628,12 +659,10 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
       }
     }
 
-    if (eslint) {
-      eslint.reportFailures();
-    }
+    this._typescriptTerminal.writeVerboseLine(`TypeScript exit status: ${exitStatus}`);
 
-    if (tslint) {
-      tslint.reportFailures();
+    for (const linter of linters) {
+      linter.reportFailures();
     }
 
     if (typeScriptErrorCount > 0) {
@@ -641,6 +670,91 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     }
   }
 
+  private async _initTSlintLogger(): Promise<IScopedLogger | undefined> {
+    if (this._tslintEnabled) {
+      if (!this._configuration.tslintToolPath) {
+        throw new Error('Unable to resolve "tslint" package');
+      }
+
+      return await this.requestScopedLoggerAsync('tslint');
+    }
+  }
+
+  private async _initESlintLogger(): Promise<IScopedLogger | undefined> {
+    if (this._eslintEnabled) {
+      if (!this._configuration.eslintToolPath) {
+        throw new Error('Unable to resolve "eslint" package');
+      }
+
+      return await this.requestScopedLoggerAsync('eslint');
+    }
+  }
+
+  private async _runESlintAsync(
+    ts: ExtendedTypeScript,
+    scopedLogger: IScopedLogger,
+    measureTsPerformance: PerformanceMeasurer,
+    tsProgram: IExtendedProgram
+  ): Promise<Eslint> {
+    const eslint: Eslint = new Eslint({
+      ts: ts,
+      eslintPackagePath: this._configuration.eslintToolPath!,
+      scopedLogger,
+      buildFolderPath: this._configuration.buildFolder,
+      buildCacheFolderPath: this._configuration.buildCacheFolder,
+      linterConfigFilePath: this._eslintConfigFilePath,
+      measurePerformance: measureTsPerformance
+    });
+
+    eslint.printVersionHeader();
+
+    const typeScriptFilenames: Set<string> = new Set(tsProgram.getRootFileNames());
+    for (const file of typeScriptFilenames) {
+      scopedLogger.terminal.writeVerboseLine(`Linting ${file}`);
+    }
+
+    await eslint.performLintingAsync({
+      tsProgram,
+      typeScriptFilenames,
+      changedFiles: new Set(tsProgram.getSourceFiles())
+    });
+
+    return eslint;
+  }
+
+  private async _runTSlintAsync(
+    ts: ExtendedTypeScript,
+    scopedLogger: IScopedLogger,
+    measureTsPerformance: PerformanceMeasurer,
+    tsProgram: IExtendedProgram
+  ): Promise<Tslint> {
+    const tslint: Tslint = new Tslint({
+      ts: ts,
+      tslintPackagePath: this._configuration.tslintToolPath!,
+      scopedLogger,
+      buildFolderPath: this._configuration.buildFolder,
+      buildCacheFolderPath: this._configuration.buildCacheFolder,
+      linterConfigFilePath: this._tslintConfigFilePath,
+      cachedFileSystem: this._cachedFileSystem,
+      measurePerformance: measureTsPerformance
+    });
+
+    tslint.printVersionHeader();
+
+    const typeScriptFilenames: Set<string> = new Set(tsProgram.getRootFileNames());
+    for (const file of typeScriptFilenames) {
+      scopedLogger.terminal.writeVerboseLine(`Linting ${file}`);
+    }
+
+    await tslint.performLintingAsync({
+      tsProgram,
+      typeScriptFilenames,
+      changedFiles: new Set(tsProgram.getSourceFiles())
+    });
+
+    return tslint;
+  }
+
   private _printDiagnosticMessage(
     ts: ExtendedTypeScript,
     diagnostic: TTypescript.Diagnostic,
@@ -717,11 +831,10 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     const filesToWrite: IFileToWrite[] = [];
 
     const changedFiles: Set<IExtendedSourceFile> = new Set<IExtendedSourceFile>();
-    EmitFilesPatch.install(ts, tsconfig, this._moduleKindsToEmit, /* useBuildCache */ true, changedFiles);
+    EmitFilesPatch.install(ts, tsconfig, this._moduleKindsToEmit, changedFiles);
 
     const writeFileCallback: TTypescript.WriteFileCallback = (filePath: string, data: string) => {
-      const redirectedFilePath: string = EmitFilesPatch.getRedirectedFilePath(filePath);
-      filesToWrite.push({ filePath: redirectedFilePath, data });
+      filesToWrite.push({ filePath, data });
     };
 
     const result: TTypescript.EmitResult = genericProgram.emit(
@@ -913,9 +1026,6 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     this._moduleKindsToEmit.push({
       outFolderPath,
       moduleKind,
-      cacheOutFolderPath: Path.convertToSlashes(
-        path.resolve(this._configuration.buildCacheFolder, outFolderName)
-      ),
       jsExtensionOverride,
 
       isPrimary
@@ -929,6 +1039,7 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
       this._configuration.tsconfigPath,
       this._cachedFileSystem.readFile
     );
+
     const currentFolder: string = path.dirname(this._configuration.tsconfigPath);
     const tsconfig: TTypescript.ParsedCommandLine = ts.parseJsonConfigFileContent(
       parsedConfigFile.config,
@@ -966,108 +1077,132 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     return tsconfig;
   }
 
+  private _buildSolutionBuilderHost(
+    ts: ExtendedTypeScript,
+    reportDiagnostic: TTypescript.DiagnosticReporter
+  ): TSolutionHost {
+    const reportSolutionBuilderStatus: TTypescript.DiagnosticReporter = reportDiagnostic;
+    const reportEmitErrorSummary: TTypescript.ReportEmitErrorSummary = (errorCount: number): void => {
+      // Do nothing
+    };
+
+    const compilerHost: TTypescript.SolutionBuilderHost<TTypescript.EmitAndSemanticDiagnosticsBuilderProgram> =
+      ts.createSolutionBuilderHost(
+        this._getCachingSystem(ts),
+        ts.createEmitAndSemanticDiagnosticsBuilderProgram,
+        reportDiagnostic,
+        reportSolutionBuilderStatus,
+        reportEmitErrorSummary
+      );
+
+    return compilerHost;
+  }
+
   private _buildIncrementalCompilerHost(
     ts: ExtendedTypeScript,
     tsconfig: TTypescript.ParsedCommandLine
   ): TTypescript.CompilerHost {
-    let compilerHost: TTypescript.CompilerHost;
-
     if (this._useIncrementalProgram) {
-      compilerHost = ts.createIncrementalCompilerHost(tsconfig.options);
+      return ts.createIncrementalCompilerHost(tsconfig.options, this._getCachingSystem(ts));
     } else {
-      compilerHost = ts.createCompilerHost(tsconfig.options);
+      return ts.createCompilerHost(tsconfig.options);
     }
+  }
 
-    compilerHost.realpath = this._cachedFileSystem.getRealPath.bind(this._cachedFileSystem);
-    compilerHost.readFile = (filePath: string) => {
-      try {
-        return this._cachedFileSystem.readFile(filePath, {});
-      } catch (error) {
-        if (FileSystem.isNotExistError(error)) {
-          return undefined;
-        } else {
-          throw error;
+  private _getCachingSystem(ts: ExtendedTypeScript): TTypescript.System {
+    const sys: TTypescript.System = {
+      ...ts.sys,
+      deleteFile: this._cachedFileSystem.deleteFile.bind(this._cachedFileSystem),
+      /** Check if the path exists and is a directory */
+      directoryExists: (directoryPath: string) => {
+        try {
+          const stats: FileSystemStats = this._cachedFileSystem.getStatistics(directoryPath);
+          return stats.isDirectory() || stats.isSymbolicLink();
+        } catch (error) {
+          if (FileSystem.isNotExistError(error)) {
+            return false;
+          } else {
+            throw error;
+          }
         }
-      }
-    };
-    compilerHost.fileExists = this._cachedFileSystem.exists.bind(this._cachedFileSystem);
-    compilerHost.directoryExists = (directoryPath: string) => {
-      try {
-        const stats: FileSystemStats = this._cachedFileSystem.getStatistics(directoryPath);
-        return stats.isDirectory() || stats.isSymbolicLink();
-      } catch (error) {
-        if (FileSystem.isNotExistError(error)) {
-          return false;
-        } else {
-          throw error;
+      },
+      /** Check if the path exists and is a file */
+      fileExists: (filePath: string) => {
+        try {
+          const stats: FileSystemStats = this._cachedFileSystem.getStatistics(filePath);
+          return stats.isFile();
+        } catch (error) {
+          if (FileSystem.isNotExistError(error)) {
+            return false;
+          } else {
+            throw error;
+          }
         }
-      }
+      },
+      /* Use the Heft config's build folder because it has corrected casing */
+      getCurrentDirectory: () => this._configuration.buildFolder,
+      getDirectories: (folderPath: string) => {
+        return this._cachedFileSystem.readFolderFilesAndDirectories(folderPath).directories;
+      },
+      realpath: this._cachedFileSystem.getRealPath.bind(this._cachedFileSystem)
     };
-    compilerHost.getDirectories = (folderPath: string) =>
-      this._cachedFileSystem.readFolderFilesAndDirectories(folderPath).directories;
 
-    /* Use the Heft config's build folder because it has corrected casing */
-    compilerHost.getCurrentDirectory = () => this._configuration.buildFolder;
-    return compilerHost;
+    return sys;
   }
 
   private _buildWatchCompilerHost(
     ts: ExtendedTypeScript,
     tsconfig: TTypescript.ParsedCommandLine
   ): TWatchCompilerHost {
+    const reportDiagnostic: TTypescript.DiagnosticReporter = (diagnostic: TTypescript.Diagnostic): void => {
+      this._printDiagnosticMessage(ts, diagnostic);
+    };
+    const reportWatchStatus: TTypescript.DiagnosticReporter = (diagnostic: TTypescript.Diagnostic) => {
+      this._printDiagnosticMessage(ts, diagnostic);
+
+      // In watch mode, notify EmitCompletedCallbackManager every time we finish recompiling.
+      if (
+        diagnostic.code === ts.Diagnostics.Found_0_errors_Watching_for_file_changes.code ||
+        diagnostic.code === ts.Diagnostics.Found_1_error_Watching_for_file_changes.code
+      ) {
+        this._emitCompletedCallbackManager.callback();
+      }
+    };
+
     return ts.createWatchCompilerHost(
       tsconfig.fileNames,
       tsconfig.options,
-      ts.sys,
-      (
-        rootNames: ReadonlyArray<string> | undefined,
-        options: TTypescript.CompilerOptions | undefined,
-        compilerHost?: TTypescript.CompilerHost,
-        oldProgram?: TTypescript.EmitAndSemanticDiagnosticsBuilderProgram,
-        configFileParsingDiagnostics?: ReadonlyArray<TTypescript.Diagnostic>,
-        projectReferences?: ReadonlyArray<TTypescript.ProjectReference> | undefined
-      ) => {
-        if (compilerHost === undefined) {
-          throw new InternalError('_buildWatchCompilerHost() expects a compilerHost to be configured');
-        }
+      this._getCachingSystem(ts),
+      ts.createEmitAndSemanticDiagnosticsBuilderProgram,
+      reportDiagnostic,
+      reportWatchStatus,
+      tsconfig.projectReferences
+    );
+  }
 
-        const originalWriteFile: TTypescript.WriteFileCallback = compilerHost.writeFile;
-        compilerHost.writeFile = (
-          filePath: string,
-          // Do this with a "rest" argument in case the TS API changes
-          ...rest: [
-            string,
-            boolean,
-            ((message: string) => void) | undefined,
-            readonly TTypescript.SourceFile[] | undefined
-          ]
-        ) => {
-          const redirectedFilePath: string = EmitFilesPatch.getRedirectedFilePath(filePath);
-          originalWriteFile.call(this, redirectedFilePath, ...rest);
-        };
+  private _buildWatchSolutionBuilderHost(ts: ExtendedTypeScript): TWatchSolutionHost {
+    const reportDiagnostic: TTypescript.DiagnosticReporter = (diagnostic: TTypescript.Diagnostic): void => {
+      this._printDiagnosticMessage(ts, diagnostic);
+    };
+    const reportSolutionBuilderStatus: TTypescript.DiagnosticReporter = reportDiagnostic;
+    const reportWatchStatus: TTypescript.DiagnosticReporter = (diagnostic: TTypescript.Diagnostic) => {
+      this._printDiagnosticMessage(ts, diagnostic);
+
+      // In watch mode, notify EmitCompletedCallbackManager every time we finish recompiling.
+      if (
+        diagnostic.code === ts.Diagnostics.Found_0_errors_Watching_for_file_changes.code ||
+        diagnostic.code === ts.Diagnostics.Found_1_error_Watching_for_file_changes.code
+      ) {
+        this._emitCompletedCallbackManager.callback();
+      }
+    };
 
-        return ts.createEmitAndSemanticDiagnosticsBuilderProgram(
-          rootNames,
-          options,
-          compilerHost,
-          oldProgram,
-          configFileParsingDiagnostics,
-          projectReferences
-        );
-      },
-      (diagnostic: TTypescript.Diagnostic) => this._printDiagnosticMessage(ts, diagnostic),
-      (diagnostic: TTypescript.Diagnostic) => {
-        this._printDiagnosticMessage(ts, diagnostic);
-
-        // In watch mode, notify EmitCompletedCallbackManager every time we finish recompiling.
-        if (
-          diagnostic.code === ts.Diagnostics.Found_0_errors_Watching_for_file_changes.code ||
-          diagnostic.code === ts.Diagnostics.Found_1_error_Watching_for_file_changes.code
-        ) {
-          this._emitCompletedCallbackManager.callback();
-        }
-      },
-      tsconfig.projectReferences
+    return ts.createSolutionBuilderWithWatchHost(
+      this._getCachingSystem(ts),
+      ts.createEmitAndSemanticDiagnosticsBuilderProgram,
+      reportDiagnostic,
+      reportSolutionBuilderStatus,
+      reportWatchStatus
     );
   }
 
diff --git a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
index e7c3758f495..f6e5036db62 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
@@ -63,6 +63,19 @@ export interface ISharedTypeScriptConfiguration {
    */
   emitMjsExtensionForESModule?: boolean | undefined;
 
+  /**
+   * If true, enable behavior analogous to the "tsc --build" command. Will build projects referenced by the main project in dependency order.
+   * Note that this will effectively enable \"noEmitOnError\".
+   */
+  buildProjectReferences?: string;
+
+  /*
+   * Specifies the tsconfig.json file that will be used for compilation. Equivalent to the same property in the 'tsc' command line.
+   *
+   * The default value is "./tsconfig.json"
+   */
+  project?: string;
+
   /**
    * Specifies the intermediary folder that tests will use.  Because Jest uses the
    * Node.js runtime to execute tests, the module format must be CommonJS.
@@ -202,7 +215,10 @@ export class TypeScriptPlugin implements IHeftPlugin {
     const typescriptConfigurationJson: ITypeScriptConfigurationJson | undefined =
       await this._ensureConfigFileLoadedAsync(logger.terminal, heftConfiguration);
 
-    const tsconfigFilePath: string = `${heftConfiguration.buildFolder}/tsconfig.json`;
+    const { project = './tsconfig.json' } = typescriptConfigurationJson || {};
+
+    const tsconfigFilePath: string = path.resolve(heftConfiguration.buildFolder, project);
+    logger.terminal.writeVerboseLine(`Looking for tsconfig at ${tsconfigFilePath}`);
     buildProperties.isTypeScriptProject = await FileSystem.existsAsync(tsconfigFilePath);
     if (!buildProperties.isTypeScriptProject) {
       // If there are no TSConfig, we have nothing to do
@@ -212,6 +228,7 @@ export class TypeScriptPlugin implements IHeftPlugin {
     const typeScriptConfiguration: ITypeScriptConfiguration = {
       copyFromCacheMode: typescriptConfigurationJson?.copyFromCacheMode,
       additionalModuleKindsToEmit: typescriptConfigurationJson?.additionalModuleKindsToEmit,
+      buildProjectReferences: typescriptConfigurationJson?.buildProjectReferences,
       emitCjsExtensionForCommonJS: typescriptConfigurationJson?.emitCjsExtensionForCommonJS,
       emitMjsExtensionForESModule: typescriptConfigurationJson?.emitMjsExtensionForESModule,
       emitFolderNameForTests: typescriptConfigurationJson?.emitFolderNameForTests,
@@ -257,6 +274,8 @@ export class TypeScriptPlugin implements IHeftPlugin {
       tslintToolPath: toolPackageResolution.tslintPackagePath,
       eslintToolPath: toolPackageResolution.eslintPackagePath,
 
+      buildProjectReferences: typescriptConfigurationJson?.buildProjectReferences,
+
       tsconfigPath: tsconfigFilePath,
       lintingEnabled: !!typeScriptConfiguration.isLintingEnabled,
       buildCacheFolder: heftConfiguration.buildCacheFolder,
diff --git a/apps/heft/src/schemas/typescript.schema.json b/apps/heft/src/schemas/typescript.schema.json
index dea52a06655..31e5e266ff5 100644
--- a/apps/heft/src/schemas/typescript.schema.json
+++ b/apps/heft/src/schemas/typescript.schema.json
@@ -58,6 +58,16 @@
       "type": "string"
     },
 
+    "buildProjectReferences": {
+      "description": "If true, enable behavior analogous to the \"tsc --build\" command. Will build projects referenced by the main project. Note that this will effectively enable \"noEmitOnError\".",
+      "type": "boolean"
+    },
+
+    "project": {
+      "description": "Specifies the tsconfig.json file that will be used for compilation. Equivalent to the same property in the \"tsc\" command line.",
+      "type": "string"
+    },
+
     "disableTslint": {
       "description": "If set to \"true\", disable TSlint.",
       "type": "boolean"
diff --git a/build-tests/heft-typescript-composite-test/.eslintrc.js b/build-tests/heft-typescript-composite-test/.eslintrc.js
new file mode 100644
index 00000000000..2144bff3da6
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/.eslintrc.js
@@ -0,0 +1,7 @@
+// This is a workaround for https://github.com/eslint/eslint/issues/3458
+require('@rushstack/eslint-config/patch/modern-module-resolution');
+
+module.exports = {
+  extends: ['@rushstack/eslint-config/profile/web-app'],
+  parserOptions: { tsconfigRootDir: __dirname, project: './tsconfig-eslint.json' }
+};
diff --git a/build-tests/heft-typescript-composite-test/config/heft.json b/build-tests/heft-typescript-composite-test/config/heft.json
new file mode 100644
index 00000000000..1755650dbf3
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/config/heft.json
@@ -0,0 +1,46 @@
+/**
+ * Defines configuration used by core Heft.
+ */
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json",
+
+  "eventActions": [
+    {
+      /**
+       * The kind of built-in operation that should be performed.
+       * The "deleteGlobs" action deletes files or folders that match the
+       * specified glob patterns.
+       */
+      "actionKind": "deleteGlobs",
+
+      /**
+       * The stage of the Heft run during which this action should occur. Note that actions specified in heft.json
+       * occur at the end of the stage of the Heft run.
+       */
+      "heftEvent": "clean",
+
+      /**
+       * A user-defined tag whose purpose is to allow configs to replace/delete handlers that were added by other
+       * configs.
+       */
+      "actionId": "defaultClean",
+
+      /**
+       * Glob patterns to be deleted. The paths are resolved relative to the project folder.
+       */
+      "globsToDelete": ["lib", "lib-commonjs", "temp"]
+    }
+  ],
+
+  /**
+   * The list of Heft plugins to be loaded.
+   */
+  "heftPlugins": [
+    {
+      /**
+       * The path to the plugin package.
+       */
+      "plugin": "@rushstack/heft-jest-plugin"
+    }
+  ]
+}
diff --git a/build-tests/heft-typescript-composite-test/config/jest.config.json b/build-tests/heft-typescript-composite-test/config/jest.config.json
new file mode 100644
index 00000000000..b6f305ec886
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/config/jest.config.json
@@ -0,0 +1,3 @@
+{
+  "extends": "@rushstack/heft-jest-plugin/includes/jest-shared.config.json"
+}
diff --git a/build-tests/heft-typescript-composite-test/config/rush-project.json b/build-tests/heft-typescript-composite-test/config/rush-project.json
new file mode 100644
index 00000000000..fba291db2b2
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/config/rush-project.json
@@ -0,0 +1,3 @@
+{
+  "projectOutputFolderNames": ["lib"]
+}
diff --git a/build-tests/heft-typescript-composite-test/config/typescript.json b/build-tests/heft-typescript-composite-test/config/typescript.json
new file mode 100644
index 00000000000..50ba201657a
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/config/typescript.json
@@ -0,0 +1,54 @@
+/**
+ * Configures the TypeScript plugin for Heft.  This plugin also manages linting.
+ */
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/heft/typescript.schema.json",
+
+  /**
+   * If provided, emit these module kinds in addition to the modules specified in the tsconfig.
+   * Note that this option only applies to the main tsconfig.json configuration.
+   */
+  "additionalModuleKindsToEmit": [],
+
+  "emitCjsExtensionForCommonJS": true,
+
+  "buildProjectReferences": true,
+
+  "project": "./tsconfig.json",
+
+  /**
+   * If set to "true", the TSlint task will not be invoked.
+   */
+  // "disableTslint": true,
+
+  /**
+   * Set this to change the maximum number of file handles that will be opened concurrently for writing.
+   * The default is 50.
+   */
+  // "maxWriteParallelism": 50,
+
+  /**
+   * Describes the way files should be statically coped from src to TS output folders
+   */
+  "staticAssetsToCopy": {
+    /**
+     * File extensions that should be copied from the src folder to the destination folder(s).
+     */
+    "fileExtensions": [".css", ".png"]
+
+    /**
+     * Glob patterns that should be explicitly included.
+     */
+    // "includeGlobs": [
+    //   "some/path/*.js"
+    // ],
+
+    /**
+     * Glob patterns that should be explicitly excluded. This takes precedence over globs listed
+     * in "includeGlobs" and files that match the file extensions provided in "fileExtensions".
+     */
+    // "excludeGlobs": [
+    //   "some/path/*.css"
+    // ]
+  }
+}
diff --git a/build-tests/heft-typescript-composite-test/package.json b/build-tests/heft-typescript-composite-test/package.json
new file mode 100644
index 00000000000..ae8e4508fbd
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "heft-typescript-composite-test",
+  "description": "Building this project tests behavior of Heft when the tsconfig.json file uses project references.",
+  "version": "1.0.0",
+  "private": true,
+  "scripts": {
+    "build": "heft test --clean",
+    "start": "heft start"
+  },
+  "devDependencies": {
+    "@rushstack/eslint-config": "workspace:*",
+    "@rushstack/heft": "workspace:*",
+    "@rushstack/heft-jest-plugin": "workspace:*",
+    "@rushstack/heft-webpack5-plugin": "workspace:*",
+    "@types/heft-jest": "1.0.1",
+    "@types/webpack-env": "1.13.0",
+    "eslint": "~7.30.0",
+    "tslint": "~5.20.1",
+    "tslint-microsoft-contrib": "~6.2.0",
+    "typescript": "~3.9.7"
+  }
+}
diff --git a/build-tests/heft-typescript-composite-test/src/chunks/ChunkClass.ts b/build-tests/heft-typescript-composite-test/src/chunks/ChunkClass.ts
new file mode 100644
index 00000000000..79a43a9d249
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/src/chunks/ChunkClass.ts
@@ -0,0 +1,9 @@
+export class ChunkClass {
+  public doStuff(): void {
+    console.log('CHUNK');
+  }
+
+  public getImageUrl(): string {
+    return require('./image.png');
+  }
+}
diff --git a/build-tests/heft-typescript-composite-test/src/chunks/image.png b/build-tests/heft-typescript-composite-test/src/chunks/image.png
new file mode 100644
index 0000000000000000000000000000000000000000..a028cfeb69f228b4a78c2c22e26d98a6e9b53cf8
GIT binary patch
literal 726
zcmeAS@N?(olHy`uVBq!ia0vp^kAe6d2NRHVDN;WQq!^2X+?^QKos)S9<glbW`Z_W&
zZ0zU$lgJ9>a~60+7BevL9R^{><M}I67#NtcJzX3_D&pQ=V&r9D;5oeDxB1@J8B9_;
q92-}f%<yU+B}T)5I_W?phri7C<k`NyIvZeGWbkzLb6Mw<&;$UV$1u?V

literal 0
HcmV?d00001

diff --git a/build-tests/heft-typescript-composite-test/src/copiedAsset.css b/build-tests/heft-typescript-composite-test/src/copiedAsset.css
new file mode 100644
index 00000000000..e9747e441d3
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/src/copiedAsset.css
@@ -0,0 +1 @@
+/* THIS FILE SHOULD GET COPIED TO THE "lib" FOLDER BECAUSE IT IS REFERENCED IN copy-static-assets.json */
diff --git a/build-tests/heft-typescript-composite-test/src/indexA.ts b/build-tests/heft-typescript-composite-test/src/indexA.ts
new file mode 100644
index 00000000000..6b4db719843
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/src/indexA.ts
@@ -0,0 +1,10 @@
+/* eslint-disable */
+/* tslint:disable */
+import(/* webpackChunkName: 'chunk' */ './chunks/ChunkClass')
+  .then(({ ChunkClass }) => {
+    const chunk: any = new ChunkClass();
+    chunk.doStuff();
+  })
+  .catch((e) => {
+    console.log('Error: ' + e.message);
+  });
diff --git a/build-tests/heft-typescript-composite-test/src/indexB.ts b/build-tests/heft-typescript-composite-test/src/indexB.ts
new file mode 100644
index 00000000000..16401835981
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/src/indexB.ts
@@ -0,0 +1 @@
+console.log('dostuff');
diff --git a/build-tests/heft-typescript-composite-test/src/test/ExampleTest.test.ts b/build-tests/heft-typescript-composite-test/src/test/ExampleTest.test.ts
new file mode 100644
index 00000000000..565432eacf5
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/src/test/ExampleTest.test.ts
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
+
+import { ChunkClass } from '../chunks/ChunkClass';
+
+describe('Example Test', () => {
+  it('Correctly tests stuff', () => {
+    expect(true).toBeTruthy();
+  });
+
+  it('Correctly handles images', () => {
+    const chunkClass: ChunkClass = new ChunkClass();
+    expect(() => chunkClass.getImageUrl()).not.toThrow();
+    expect(typeof chunkClass.getImageUrl()).toBe('string');
+  });
+});
diff --git a/build-tests/heft-typescript-composite-test/src/test/tsconfig.json b/build-tests/heft-typescript-composite-test/src/test/tsconfig.json
new file mode 100644
index 00000000000..74fc6381ca0
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/src/test/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "extends": "../../tsconfig-base.json",
+  "compilerOptions": {
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "../tsconfig.json"
+    }
+  ],
+  "include": ["./**/*.ts"]
+}
diff --git a/build-tests/heft-typescript-composite-test/src/tsconfig.json b/build-tests/heft-typescript-composite-test/src/tsconfig.json
new file mode 100644
index 00000000000..0781a949a08
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/src/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "extends": "../tsconfig-base.json",
+  "compilerOptions": {
+    "composite": true
+  },
+  "include": ["./**/*.ts"],
+  "exclude": ["./test/**/*.ts"]
+}
diff --git a/build-tests/heft-typescript-composite-test/tsconfig-base.json b/build-tests/heft-typescript-composite-test/tsconfig-base.json
new file mode 100644
index 00000000000..2c750bee0ce
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/tsconfig-base.json
@@ -0,0 +1,24 @@
+{
+  "$schema": "http://json.schemastore.org/tsconfig",
+
+  "compilerOptions": {
+    "outDir": "lib",
+    "rootDir": "src",
+
+    "forceConsistentCasingInFileNames": true,
+    "jsx": "react",
+    "declaration": true,
+    "sourceMap": true,
+    "declarationMap": true,
+    "inlineSources": true,
+    "experimentalDecorators": true,
+    "strictNullChecks": true,
+    "noUnusedLocals": true,
+    "types": ["heft-jest", "webpack-env"],
+
+    "module": "esnext",
+    "moduleResolution": "node",
+    "target": "es5",
+    "lib": ["es5", "scripthost", "es2015.collection", "es2015.promise", "es2015.iterable", "dom"]
+  }
+}
diff --git a/build-tests/heft-typescript-composite-test/tsconfig-eslint.json b/build-tests/heft-typescript-composite-test/tsconfig-eslint.json
new file mode 100644
index 00000000000..a96b85d9be4
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/tsconfig-eslint.json
@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig-base.json",
+  "include": ["src/**/*.ts", "src/**/*.tsx"]
+}
diff --git a/build-tests/heft-typescript-composite-test/tsconfig.json b/build-tests/heft-typescript-composite-test/tsconfig.json
new file mode 100644
index 00000000000..f54c89e7d8b
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "./tsconfig-base.json",
+  "references": [
+    {
+      "path": "./src"
+    },
+    {
+      "path": "./src/test"
+    }
+  ],
+  "files": [],
+  "include": []
+}
diff --git a/build-tests/heft-typescript-composite-test/tslint.json b/build-tests/heft-typescript-composite-test/tslint.json
new file mode 100644
index 00000000000..f55613b66cc
--- /dev/null
+++ b/build-tests/heft-typescript-composite-test/tslint.json
@@ -0,0 +1,103 @@
+{
+  "$schema": "http://json.schemastore.org/tslint",
+
+  "rulesDirectory": ["tslint-microsoft-contrib"],
+  "rules": {
+    "class-name": true,
+    "comment-format": [true, "check-space"],
+    "curly": true,
+    "eofline": false,
+    "export-name": true,
+    "forin": true,
+    "indent": [true, "spaces", 2],
+    "interface-name": true,
+    "label-position": true,
+    "max-line-length": [true, 120],
+    "member-access": true,
+    "member-ordering": [
+      true,
+      {
+        "order": [
+          "public-static-field",
+          "protected-static-field",
+          "private-static-field",
+          "public-instance-field",
+          "protected-instance-field",
+          "private-instance-field",
+          "public-static-method",
+          "protected-static-method",
+          "private-static-method",
+          "public-constructor",
+          "public-instance-method",
+          "protected-constructor",
+          "protected-instance-method",
+          "private-constructor",
+          "private-instance-method"
+        ]
+      }
+    ],
+    "missing-optional-annotation": true,
+    "no-arg": true,
+    "no-any": true,
+    "no-bitwise": true,
+    "no-consecutive-blank-lines": true,
+    "no-console": [true, "debug", "info", "time", "timeEnd", "trace"],
+    "no-constant-condition": true,
+    "no-construct": true,
+    "no-debugger": true,
+    "no-duplicate-switch-case": true,
+    "no-duplicate-parameter-names": true,
+    "no-duplicate-variable": true,
+    "no-empty": true,
+    "no-eval": true,
+    "no-floating-promises": true,
+    "no-function-expression": true,
+    "no-inferrable-types": false,
+    "no-internal-module": true,
+    "no-null-keyword": true,
+    "no-shadowed-variable": true,
+    "no-string-literal": true,
+    "no-switch-case-fall-through": true,
+    "no-trailing-whitespace": true,
+    "no-unnecessary-semicolons": true,
+    "no-unused-expression": true,
+    "no-with-statement": true,
+    "no-var-keyword": true,
+    "object-literal-sort-keys": false,
+    "one-line": [true, "check-open-brace", "check-catch", "check-else", "check-whitespace"],
+    "quotemark": [true, "single", "avoid-escape"],
+    "prefer-const": true,
+    "radix": true,
+    "semicolon": true,
+    "trailing-comma": [
+      true,
+      {
+        "multiline": "never",
+        "singleline": "never"
+      }
+    ],
+    "triple-equals": [true, "allow-null-check"],
+    "typedef": [
+      true,
+      "call-signature",
+      "parameter",
+      "property-declaration",
+      "variable-declaration",
+      "member-variable-declaration"
+    ],
+    "typedef-whitespace": [
+      true,
+      {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      }
+    ],
+    "use-isnan": true,
+    "use-named-parameter": true,
+    "variable-name": [true, "check-format", "allow-leading-underscore", "ban-keywords"],
+    "whitespace": [true, "check-branch", "check-decl", "check-operator", "check-separator", "check-type"]
+  }
+}
diff --git a/rush.json b/rush.json
index 52fa9c0bcdf..7c767945d91 100644
--- a/rush.json
+++ b/rush.json
@@ -630,6 +630,12 @@
       "reviewCategory": "tests",
       "shouldPublish": false
     },
+    {
+      "packageName": "heft-typescript-composite-test",
+      "projectFolder": "build-tests/heft-typescript-composite-test",
+      "reviewCategory": "tests",
+      "shouldPublish": false
+    },
     {
       "packageName": "heft-web-rig-library-test",
       "projectFolder": "build-tests/heft-web-rig-library-test",

From 47b7d84e611ce4d52522a4132ce49249a65e7c45 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Mon, 9 Aug 2021 15:12:37 -0700
Subject: [PATCH 090/155] Add change file

---
 .../heft/typescript-solution_2021-08-09-21-26.json    | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@rushstack/heft/typescript-solution_2021-08-09-21-26.json

diff --git a/common/changes/@rushstack/heft/typescript-solution_2021-08-09-21-26.json b/common/changes/@rushstack/heft/typescript-solution_2021-08-09-21-26.json
new file mode 100644
index 00000000000..bd5f65c845e
--- /dev/null
+++ b/common/changes/@rushstack/heft/typescript-solution_2021-08-09-21-26.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/heft",
+      "comment": "Add support to TypeScriptPlugin for composite TypeScript projects, with behavior analogous to \"tsc --build\".",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@rushstack/heft",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file

From 83266d6ab7eb1be4400bee2b03e55849c9c67d61 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Tue, 10 Aug 2021 16:14:23 -0700
Subject: [PATCH 091/155] Ensure all diagnostics are included

---
 .../src/plugins/TypeScriptPlugin/EmitFilesPatch.ts     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/apps/heft/src/plugins/TypeScriptPlugin/EmitFilesPatch.ts b/apps/heft/src/plugins/TypeScriptPlugin/EmitFilesPatch.ts
index 1308c2b156a..ffbf8bf9d07 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/EmitFilesPatch.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/EmitFilesPatch.ts
@@ -97,6 +97,7 @@ export class EmitFilesPatch {
         }
 
         let defaultModuleKindResult: TTypescript.EmitResult;
+        const diagnostics: TTypescript.Diagnostic[] = [];
         let emitSkipped: boolean = false;
         for (const moduleKindToEmit of moduleKindsToEmit) {
           const compilerOptions: TTypescript.CompilerOptions = moduleKindToEmit.isPrimary
@@ -132,13 +133,22 @@ export class EmitFilesPatch {
           );
 
           emitSkipped = emitSkipped || flavorResult.emitSkipped;
+          for (const diagnostic of flavorResult.diagnostics) {
+            diagnostics.push(diagnostic);
+          }
+
           if (moduleKindToEmit.moduleKind === defaultModuleKind) {
             defaultModuleKindResult = flavorResult;
           }
           // Should results be aggregated, in case for whatever reason the diagnostics are not the same?
         }
+
+        const mergedDiagnostics: readonly TTypescript.Diagnostic[] =
+          ts.sortAndDeduplicateDiagnostics(diagnostics);
+
         return {
           ...defaultModuleKindResult!,
+          diagnostics: mergedDiagnostics,
           emitSkipped
         };
       }

From c3705841e9af6f21573db42793bbc3f88f4f865b Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 13:54:06 -0700
Subject: [PATCH 092/155] Stop using .heft/build-cache folder

---
 .../plugins/TypeScriptPlugin/LinterBase.ts    |  31 +-
 .../TypeScriptPlugin/TypeScriptBuilder.ts     | 406 +++++++-----------
 .../TypeScriptPlugin/TypeScriptPlugin.ts      |   1 -
 3 files changed, 178 insertions(+), 260 deletions(-)

diff --git a/apps/heft/src/plugins/TypeScriptPlugin/LinterBase.ts b/apps/heft/src/plugins/TypeScriptPlugin/LinterBase.ts
index fb85aa72599..e0cd0cadc1e 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/LinterBase.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/LinterBase.ts
@@ -2,7 +2,7 @@
 // See LICENSE in the project root for license information.
 
 import * as path from 'path';
-import { Terminal, FileSystem, JsonFile } from '@rushstack/node-core-library';
+import { Terminal, FileSystem, JsonFile, Path } from '@rushstack/node-core-library';
 
 import {
   IExtendedSourceFile,
@@ -17,7 +17,6 @@ export interface ILinterBaseOptions {
   ts: IExtendedTypeScript;
   scopedLogger: IScopedLogger;
   buildFolderPath: string;
-  buildCacheFolderPath: string;
   linterConfigFilePath: string;
 
   /**
@@ -63,7 +62,6 @@ export abstract class LinterBase<TLintResult> {
   protected readonly _scopedLogger: IScopedLogger;
   protected readonly _terminal: Terminal;
   protected readonly _buildFolderPath: string;
-  protected readonly _buildCacheFolderPath: string;
   protected readonly _linterConfigFilePath: string;
   protected readonly _measurePerformance: PerformanceMeasurer;
 
@@ -75,7 +73,6 @@ export abstract class LinterBase<TLintResult> {
     this._terminal = this._scopedLogger.terminal;
     this._ts = options.ts;
     this._buildFolderPath = options.buildFolderPath;
-    this._buildCacheFolderPath = options.buildCacheFolderPath;
     this._linterConfigFilePath = options.linterConfigFilePath;
     this._linterName = linterName;
     this._measurePerformance = options.measurePerformance;
@@ -88,16 +85,24 @@ export abstract class LinterBase<TLintResult> {
   public async performLintingAsync(options: IRunLinterOptions): Promise<void> {
     await this.initializeAsync(options.tsProgram);
 
+    const commonDirectory: string = options.tsProgram.getCommonSourceDirectory();
+
+    const relativePaths: Map<string, string> = new Map();
+
     const fileHash: Hash = createHash('md5');
     for (const file of options.typeScriptFilenames) {
-      fileHash.update(file);
+      // Need to use relative paths to ensure portability.
+      const relative: string = Path.convertToSlashes(path.relative(commonDirectory, file));
+      relativePaths.set(file, relative);
+      fileHash.update(relative);
     }
     const hashSuffix: string = fileHash.digest('base64').replace(/\+/g, '-').replace(/\//g, '_').slice(0, 8);
 
     const tslintConfigVersion: string = this.cacheVersion;
-    const cacheFilePath: string = path.join(
-      this._buildCacheFolderPath,
-      `${this._linterName}-${hashSuffix}.json`
+    const cacheFilePath: string = path.resolve(
+      this._buildFolderPath,
+      options.tsProgram.getCompilerOptions().outDir || '',
+      `_${this._linterName}-${hashSuffix}.json`
     );
 
     let tslintCacheData: ITsLintCacheData | undefined;
@@ -126,13 +131,15 @@ export abstract class LinterBase<TLintResult> {
     for (const sourceFile of options.tsProgram.getSourceFiles()) {
       const filePath: string = sourceFile.fileName;
 
-      if (!options.typeScriptFilenames.has(filePath) || (await this.isFileExcludedAsync(filePath))) {
+      const relative: string | undefined = relativePaths.get(filePath);
+
+      if (relative === undefined || (await this.isFileExcludedAsync(filePath))) {
         continue;
       }
 
       // Older compilers don't compute the ts.SourceFile.version.  If it is missing, then we can't skip processing
       const version: string = sourceFile.version || '';
-      const cachedVersion: string = cachedNoFailureFileVersions.get(filePath) || '';
+      const cachedVersion: string = cachedNoFailureFileVersions.get(relative) || '';
       if (
         cachedVersion === '' ||
         version === '' ||
@@ -142,13 +149,13 @@ export abstract class LinterBase<TLintResult> {
         this._measurePerformance(this._linterName, () => {
           const failures: TLintResult[] = this.lintFile(sourceFile);
           if (failures.length === 0) {
-            newNoFailureFileVersions.set(filePath, version);
+            newNoFailureFileVersions.set(relative, version);
           } else {
             lintFailures.push(...failures);
           }
         });
       } else {
-        newNoFailureFileVersions.set(filePath, version);
+        newNoFailureFileVersions.set(relative, version);
       }
     }
     //#endregion
diff --git a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
index b2435230b49..4d24b94e2ab 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
@@ -12,7 +12,6 @@ import {
   FileSystem,
   Path
 } from '@rushstack/node-core-library';
-import * as crypto from 'crypto';
 import type * as TTypescript from 'typescript';
 import {
   ExtendedTypeScript,
@@ -35,6 +34,12 @@ import { ISharedTypeScriptConfiguration } from './TypeScriptPlugin';
 import { TypeScriptCachedFileSystem } from '../../utilities/fileSystem/TypeScriptCachedFileSystem';
 import { LinterBase } from './LinterBase';
 
+interface ILinterWrapper {
+  ts: ExtendedTypeScript;
+  logger: IScopedLogger;
+  measureTsPerformance: PerformanceMeasurer;
+}
+
 export interface ITypeScriptBuilderConfiguration extends ISharedTypeScriptConfiguration {
   buildFolder: string;
   typeScriptToolPath: string;
@@ -50,11 +55,6 @@ export interface ITypeScriptBuilderConfiguration extends ISharedTypeScriptConfig
    */
   tsconfigPath: string;
 
-  /**
-   * The path of project's build cache folder
-   */
-  buildCacheFolder: string;
-
   /**
    * Set this to change the maximum number of file handles that will be opened concurrently for writing.
    * The default is 50.
@@ -118,7 +118,6 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
   private _typescriptTerminal!: Terminal;
   private _emitCompletedCallbackManager: EmitCompletedCallbackManager;
 
-  private __tsCacheFilePath!: string;
   private _tsReadJsonCache: Map<string, object> = new Map<string, object>();
   private _cachedFileSystem: TypeScriptCachedFileSystem = new TypeScriptCachedFileSystem();
 
@@ -126,25 +125,6 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     return __filename;
   }
 
-  private get _tsCacheFilePath(): string {
-    if (!this.__tsCacheFilePath) {
-      const configHash: crypto.Hash = Tslint.getConfigHash(
-        this._configuration.tsconfigPath,
-        this._typescriptTerminal,
-        this._cachedFileSystem
-      );
-      configHash.update(JSON.stringify(this._configuration.additionalModuleKindsToEmit || {}));
-      const serializedConfigHash: string = configHash.digest('hex');
-
-      this.__tsCacheFilePath = path.posix.join(
-        this._configuration.buildCacheFolder,
-        `ts_${serializedConfigHash}.json`
-      );
-    }
-
-    return this.__tsCacheFilePath;
-  }
-
   public constructor(
     parentGlobalTerminalProvider: ITerminalProvider,
     configuration: ITypeScriptBuilderConfiguration,
@@ -203,7 +183,6 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
       );
     }
 
-    this._configuration.buildCacheFolder = Path.convertToSlashes(this._configuration.buildCacheFolder);
     this._tslintConfigFilePath = path.resolve(this._configuration.buildFolder, 'tslint.json');
     this._eslintConfigFilePath = path.resolve(this._configuration.buildFolder, '.eslintrc.js');
     this._eslintEnabled = this._tslintEnabled =
@@ -280,9 +259,9 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     if (this._configuration.watchMode) {
       await this._runWatch(ts, measureTsPerformance);
     } else if (this._useSolutionBuilder) {
-      await this._runSolutionBuild(ts, measureTsPerformance);
+      await this._runSolutionBuildAsync(ts, measureTsPerformance, measureTsPerformanceAsync);
     } else {
-      await this._runBuild(ts, measureTsPerformance, measureTsPerformanceAsync);
+      await this._runBuildAsync(ts, measureTsPerformance, measureTsPerformanceAsync);
     }
   }
 
@@ -316,59 +295,11 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     });
   }
 
-  public async _runBuild(
+  public async _runBuildAsync(
     ts: ExtendedTypeScript,
     measureTsPerformance: PerformanceMeasurer,
     measureTsPerformanceAsync: PerformanceMeasurerAsync
   ): Promise<void> {
-    // Ensure the cache folder exists
-    this._cachedFileSystem.ensureFolder(this._configuration.buildCacheFolder);
-
-    let tslint: Tslint | undefined = undefined;
-    if (this._tslintEnabled) {
-      if (!this._configuration.tslintToolPath) {
-        throw new Error('Unable to resolve "tslint" package');
-      }
-
-      const tslintLogger: IScopedLogger = await this.requestScopedLoggerAsync('tslint');
-      tslint = new Tslint({
-        ts: ts,
-        tslintPackagePath: this._configuration.tslintToolPath,
-        scopedLogger: tslintLogger,
-        buildFolderPath: this._configuration.buildFolder,
-        buildCacheFolderPath: this._configuration.buildCacheFolder,
-        linterConfigFilePath: this._tslintConfigFilePath,
-        cachedFileSystem: this._cachedFileSystem,
-        measurePerformance: measureTsPerformance
-      });
-    }
-
-    let eslint: Eslint | undefined = undefined;
-    if (this._eslintEnabled) {
-      if (!this._configuration.eslintToolPath) {
-        throw new Error('Unable to resolve "eslint" package');
-      }
-
-      const eslintLogger: IScopedLogger = await this.requestScopedLoggerAsync('eslint');
-      eslint = new Eslint({
-        ts: ts,
-        eslintPackagePath: this._configuration.eslintToolPath,
-        scopedLogger: eslintLogger,
-        buildFolderPath: this._configuration.buildFolder,
-        buildCacheFolderPath: this._configuration.buildCacheFolder,
-        linterConfigFilePath: this._eslintConfigFilePath,
-        measurePerformance: measureTsPerformance
-      });
-    }
-
-    if (eslint) {
-      eslint.printVersionHeader();
-    }
-
-    if (tslint) {
-      tslint.printVersionHeader();
-    }
-
     //#region CONFIGURE
     const {
       duration: configureDurationMs,
@@ -377,7 +308,10 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     } = measureTsPerformance('Configure', () => {
       this._overrideTypeScriptReadJson(ts);
       const _tsconfig: TTypescript.ParsedCommandLine = this._loadTsconfig(ts);
+      this._validateTsconfig(ts, _tsconfig);
+
       const _compilerHost: TTypescript.CompilerHost = this._buildIncrementalCompilerHost(ts, _tsconfig);
+
       return {
         tsconfig: _tsconfig,
         compilerHost: _compilerHost
@@ -386,8 +320,6 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     this._typescriptTerminal.writeVerboseLine(`Configure: ${configureDurationMs}ms`);
     //#endregion
 
-    this._validateTsconfig(ts, tsconfig);
-
     //#region PROGRAM
     // There will be only one program here; emit will get a bit abused if we produce multiple outputs
     let builderProgram: TTypescript.BuilderProgram | undefined = undefined;
@@ -415,17 +347,7 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     // Prefer the builder program, since it is what gives us incremental builds
     const genericProgram: TTypescript.BuilderProgram | TTypescript.Program = builderProgram || tsProgram;
 
-    this._typescriptTerminal.writeVerboseLine(
-      `I/O Read: ${ts.performance.getDuration('I/O Read')}ms (${ts.performance.getCount(
-        'beforeIORead'
-      )} files)`
-    );
-    this._typescriptTerminal.writeVerboseLine(
-      `Parse: ${ts.performance.getDuration('Parse')}ms (${ts.performance.getCount('beforeParse')} files)`
-    );
-    this._typescriptTerminal.writeVerboseLine(
-      `Program (includes Read + Parse): ${ts.performance.getDuration('Program')}ms`
-    );
+    this._logReadPerformance(ts);
     //#endregion
 
     //#region ANALYSIS
@@ -449,19 +371,7 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     const emitResult: IExtendedEmitResult = this._emit(ts, tsconfig, genericProgram);
     //#endregion
 
-    this._typescriptTerminal.writeVerboseLine(`Bind: ${ts.performance.getDuration('Bind')}ms`);
-    this._typescriptTerminal.writeVerboseLine(`Check: ${ts.performance.getDuration('Check')}ms`);
-    this._typescriptTerminal.writeVerboseLine(
-      `Transform: ${ts.performance.getDuration('transformTime')}ms ` +
-        `(${ts.performance.getCount('beforeTransform')} files)`
-    );
-    this._typescriptTerminal.writeVerboseLine(
-      `Print: ${ts.performance.getDuration('printTime')}ms ` +
-        `(${ts.performance.getCount('beforePrint')} files) (Includes Transform)`
-    );
-    this._typescriptTerminal.writeVerboseLine(
-      `Emit: ${ts.performance.getDuration('Emit')}ms (Includes Print)`
-    );
+    this._logEmitPerformance(ts);
 
     //#region FINAL_ANALYSIS
     // Need to ensure that we include emit diagnostics, since they might not be part of the other sets
@@ -473,6 +383,8 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     //#endregion
 
     //#region WRITE
+    // Using async file system I/O for theoretically better peak performance
+    // Also allows to run concurrently with linting
     const writePromise: Promise<{ duration: number }> = measureTsPerformanceAsync('Write', () =>
       Async.forEachLimitAsync(
         emitResult.filesToWrite,
@@ -483,27 +395,22 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     );
     //#endregion
 
-    const typeScriptFilenames: Set<string> = new Set(tsconfig.fileNames);
+    const [eslint, tslint] = await Promise.all([
+      this._initESlintAsync(ts, measureTsPerformance),
+      this._initTSlintAsync(ts, measureTsPerformance)
+    ]);
+    const lintPromises: Promise<LinterBase<unknown>>[] = [];
 
     const extendedProgram: IExtendedProgram = tsProgram as IExtendedProgram;
-
     //#region ESLINT
     if (eslint) {
-      await eslint.performLintingAsync({
-        tsProgram: extendedProgram,
-        typeScriptFilenames: typeScriptFilenames,
-        changedFiles: emitResult.changedSourceFiles
-      });
+      lintPromises.push(this._runESlintAsync(eslint, extendedProgram, emitResult.changedSourceFiles));
     }
     //#endregion
 
     //#region TSLINT
     if (tslint) {
-      await tslint.performLintingAsync({
-        tsProgram: extendedProgram,
-        typeScriptFilenames: typeScriptFilenames,
-        changedFiles: emitResult.changedSourceFiles
-      });
+      lintPromises.push(this._runTSlintAsync(tslint, extendedProgram, emitResult.changedSourceFiles));
     }
     //#endregion
 
@@ -515,124 +422,85 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     // In non-watch mode, notify EmitCompletedCallbackManager once after we complete the compile step
     this._emitCompletedCallbackManager.callback();
 
-    let typeScriptErrorCount: number = 0;
-    if (diagnostics.length > 0) {
-      this._typescriptTerminal.writeLine(
-        `Encountered ${diagnostics.length} TypeScript issue${diagnostics.length > 1 ? 's' : ''}:`
-      );
-      for (const diagnostic of diagnostics) {
-        const diagnosticCategory: TTypescript.DiagnosticCategory = this._getAdjustedDiagnosticCategory(
-          diagnostic,
-          ts
-        );
-
-        if (diagnosticCategory === ts.DiagnosticCategory.Error) {
-          typeScriptErrorCount++;
-        }
-
-        this._printDiagnosticMessage(ts, diagnostic, diagnosticCategory);
-      }
-    }
-
-    if (eslint) {
-      eslint.reportFailures();
-    }
-
-    if (tslint) {
-      tslint.reportFailures();
-    }
+    const linters: LinterBase<unknown>[] = await Promise.all(lintPromises);
 
-    if (typeScriptErrorCount > 0) {
-      throw new Error(`Encountered TypeScript error${typeScriptErrorCount > 1 ? 's' : ''}`);
-    }
+    this._logDiagnostics(ts, diagnostics, linters);
   }
 
-  public async _runSolutionBuild(
+  public async _runSolutionBuildAsync(
     ts: ExtendedTypeScript,
-    measureTsPerformance: PerformanceMeasurer
+    measureTsPerformance: PerformanceMeasurer,
+    measureTsPerformanceAsync: PerformanceMeasurerAsync
   ): Promise<void> {
-    // Ensure the cache folder exists
-    this._cachedFileSystem.ensureFolder(this._configuration.buildCacheFolder);
-
     this._typescriptTerminal.writeVerboseLine(`Using solution mode`);
 
+    const lintPromises: Promise<LinterBase<unknown>>[] = [];
+
     //#region CONFIGURE
-    const { duration: configureDurationMs } = measureTsPerformance('Configure', () => {
+    const {
+      duration: configureDurationMs,
+      rawDiagnostics,
+      solutionBuilderHost
+    } = await measureTsPerformanceAsync('Configure', async () => {
       this._overrideTypeScriptReadJson(ts);
       const _tsconfig: TTypescript.ParsedCommandLine = this._loadTsconfig(ts);
-
       this._validateTsconfig(ts, _tsconfig);
 
-      EmitFilesPatch.install(ts, _tsconfig, this._moduleKindsToEmit);
-
-      return {};
-    });
-    this._typescriptTerminal.writeVerboseLine(`Configure: ${configureDurationMs}ms`);
-    //#endregion
-
-    const rawDiagnostics: TTypescript.Diagnostic[] = [];
-    const reportDiagnostic: TTypescript.DiagnosticReporter = (diagnostic: TTypescript.Diagnostic) => {
-      rawDiagnostics.push(diagnostic);
-    };
-
-    const solutionBuilderHost: TSolutionHost = this._buildSolutionBuilderHost(ts, reportDiagnostic);
+      const _rawDiagnostics: TTypescript.Diagnostic[] = [];
+      const reportDiagnostic: TTypescript.DiagnosticReporter = (diagnostic: TTypescript.Diagnostic) => {
+        _rawDiagnostics.push(diagnostic);
+      };
 
-    const solutionBuilder: TTypescript.SolutionBuilder<TTypescript.EmitAndSemanticDiagnosticsBuilderProgram> =
-      ts.createSolutionBuilder(solutionBuilderHost, [this._configuration.tsconfigPath], {});
+      const [eslint, tslint] = await Promise.all([
+        this._initESlintAsync(ts, measureTsPerformance),
+        this._initTSlintAsync(ts, measureTsPerformance)
+      ]);
 
-    const lintPromises: Promise<LinterBase<unknown>>[] = [];
+      // TypeScript doesn't have a
+      EmitFilesPatch.install(ts, _tsconfig, this._moduleKindsToEmit);
 
-    const [eslintLogger, tslintLogger] = await Promise.all([
-      this._initESlintLogger(),
-      this._initTSlintLogger()
-    ]);
+      const _solutionBuilderHost: TSolutionHost = this._buildSolutionBuilderHost(ts, reportDiagnostic);
 
-    solutionBuilderHost.afterProgramEmitAndDiagnostics = (
-      program: TTypescript.EmitAndSemanticDiagnosticsBuilderProgram
-    ) => {
-      const tsProgram: TTypescript.Program | undefined = program.getProgram();
+      _solutionBuilderHost.afterProgramEmitAndDiagnostics = (
+        program: TTypescript.EmitAndSemanticDiagnosticsBuilderProgram
+      ) => {
+        const tsProgram: TTypescript.Program | undefined = program.getProgram();
 
-      if (tsProgram) {
-        const extendedProgram: IExtendedProgram = tsProgram as IExtendedProgram;
-        if (eslintLogger) {
-          lintPromises.push(this._runESlintAsync(ts, eslintLogger, measureTsPerformance, extendedProgram));
-        }
+        if (tsProgram) {
+          const extendedProgram: IExtendedProgram = tsProgram as IExtendedProgram;
+          if (eslint) {
+            lintPromises.push(this._runESlintAsync(eslint, extendedProgram));
+          }
 
-        if (tslintLogger) {
-          lintPromises.push(this._runTSlintAsync(ts, tslintLogger, measureTsPerformance, extendedProgram));
+          if (tslint) {
+            lintPromises.push(this._runTSlintAsync(tslint, extendedProgram));
+          }
         }
-      }
-    };
+      };
 
-    const exitStatus: TTypescript.ExitStatus = solutionBuilder.build();
+      return {
+        rawDiagnostics: _rawDiagnostics,
+        solutionBuilderHost: _solutionBuilderHost
+      };
+    });
+    this._typescriptTerminal.writeVerboseLine(`Configure: ${configureDurationMs}ms`);
+    //#endregion
 
-    const diagnostics: readonly TTypescript.Diagnostic[] = ts.sortAndDeduplicateDiagnostics(rawDiagnostics);
+    const solutionBuilder: TTypescript.SolutionBuilder<TTypescript.EmitAndSemanticDiagnosticsBuilderProgram> =
+      ts.createSolutionBuilder(solutionBuilderHost, [this._configuration.tsconfigPath], {});
 
-    this._typescriptTerminal.writeVerboseLine(
-      `I/O Read: ${ts.performance.getDuration('I/O Read')}ms (${ts.performance.getCount(
-        'beforeIORead'
-      )} files)`
-    );
-    this._typescriptTerminal.writeVerboseLine(
-      `Parse: ${ts.performance.getDuration('Parse')}ms (${ts.performance.getCount('beforeParse')} files)`
-    );
-    this._typescriptTerminal.writeVerboseLine(
-      `Program (includes Read + Parse): ${ts.performance.getDuration('Program')}ms`
-    );
+    //#region EMIT
+    // Ignoring the exit status because we only care about presence of diagnostics
+    solutionBuilder.build();
     //#endregion
 
-    this._typescriptTerminal.writeVerboseLine(`Bind: ${ts.performance.getDuration('Bind')}ms`);
-    this._typescriptTerminal.writeVerboseLine(`Check: ${ts.performance.getDuration('Check')}ms`);
+    this._logReadPerformance(ts);
+    this._logEmitPerformance(ts);
+    // Use the native metric since we aren't overwriting the writer
     this._typescriptTerminal.writeVerboseLine(
-      `Transform: ${ts.performance.getDuration('transformTime')}ms ` +
-        `(${ts.performance.getCount('beforeTransform')} files)`
-    );
-    this._typescriptTerminal.writeVerboseLine(
-      `Print: ${ts.performance.getDuration('printTime')}ms ` +
-        `(${ts.performance.getCount('beforePrint')} files) (Includes Transform)`
-    );
-    this._typescriptTerminal.writeVerboseLine(
-      `Emit: ${ts.performance.getDuration('Emit')}ms (Includes Print)`
+      `I/O Write: ${ts.performance.getDuration('I/O Write')}ms (${ts.performance.getCount(
+        'beforeIOWrite'
+      )} files)`
     );
 
     // In non-watch mode, notify EmitCompletedCallbackManager once after we complete the compile step
@@ -640,6 +508,18 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
 
     const linters: LinterBase<unknown>[] = await Promise.all(lintPromises);
 
+    this._logDiagnostics(ts, rawDiagnostics, linters);
+
+    EmitFilesPatch.uninstall(ts);
+  }
+
+  private _logDiagnostics(
+    ts: ExtendedTypeScript,
+    rawDiagnostics: readonly TTypescript.Diagnostic[],
+    linters: LinterBase<unknown>[]
+  ): void {
+    const diagnostics: readonly TTypescript.Diagnostic[] = ts.sortAndDeduplicateDiagnostics(rawDiagnostics);
+
     let typeScriptErrorCount: number = 0;
     if (diagnostics.length > 0) {
       this._typescriptTerminal.writeLine(
@@ -659,8 +539,6 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
       }
     }
 
-    this._typescriptTerminal.writeVerboseLine(`TypeScript exit status: ${exitStatus}`);
-
     for (const linter of linters) {
       linter.reportFailures();
     }
@@ -670,86 +548,120 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     }
   }
 
-  private async _initTSlintLogger(): Promise<IScopedLogger | undefined> {
+  private _logEmitPerformance(ts: ExtendedTypeScript): void {
+    this._typescriptTerminal.writeVerboseLine(`Bind: ${ts.performance.getDuration('Bind')}ms`);
+    this._typescriptTerminal.writeVerboseLine(`Check: ${ts.performance.getDuration('Check')}ms`);
+    this._typescriptTerminal.writeVerboseLine(
+      `Transform: ${ts.performance.getDuration('transformTime')}ms ` +
+        `(${ts.performance.getCount('beforeTransform')} files)`
+    );
+    this._typescriptTerminal.writeVerboseLine(
+      `Print: ${ts.performance.getDuration('printTime')}ms ` +
+        `(${ts.performance.getCount('beforePrint')} files) (Includes Transform)`
+    );
+    this._typescriptTerminal.writeVerboseLine(
+      `Emit: ${ts.performance.getDuration('Emit')}ms (Includes Print)`
+    );
+  }
+
+  private _logReadPerformance(ts: ExtendedTypeScript): void {
+    this._typescriptTerminal.writeVerboseLine(
+      `I/O Read: ${ts.performance.getDuration('I/O Read')}ms (${ts.performance.getCount(
+        'beforeIORead'
+      )} files)`
+    );
+    this._typescriptTerminal.writeVerboseLine(
+      `Parse: ${ts.performance.getDuration('Parse')}ms (${ts.performance.getCount('beforeParse')} files)`
+    );
+    this._typescriptTerminal.writeVerboseLine(
+      `Program (includes Read + Parse): ${ts.performance.getDuration('Program')}ms`
+    );
+  }
+
+  private async _initTSlintAsync(
+    ts: ExtendedTypeScript,
+    measureTsPerformance: PerformanceMeasurer
+  ): Promise<ILinterWrapper | undefined> {
     if (this._tslintEnabled) {
       if (!this._configuration.tslintToolPath) {
         throw new Error('Unable to resolve "tslint" package');
       }
 
-      return await this.requestScopedLoggerAsync('tslint');
+      const logger: IScopedLogger = await this.requestScopedLoggerAsync('tslint');
+      return {
+        logger,
+        ts,
+        measureTsPerformance
+      };
     }
   }
 
-  private async _initESlintLogger(): Promise<IScopedLogger | undefined> {
+  private async _initESlintAsync(
+    ts: ExtendedTypeScript,
+    measureTsPerformance: PerformanceMeasurer
+  ): Promise<ILinterWrapper | undefined> {
     if (this._eslintEnabled) {
       if (!this._configuration.eslintToolPath) {
         throw new Error('Unable to resolve "eslint" package');
       }
 
-      return await this.requestScopedLoggerAsync('eslint');
+      const logger: IScopedLogger = await this.requestScopedLoggerAsync('eslint');
+      return {
+        logger,
+        ts,
+        measureTsPerformance
+      };
     }
   }
 
   private async _runESlintAsync(
-    ts: ExtendedTypeScript,
-    scopedLogger: IScopedLogger,
-    measureTsPerformance: PerformanceMeasurer,
-    tsProgram: IExtendedProgram
+    linter: ILinterWrapper,
+    tsProgram: IExtendedProgram,
+    changedFiles?: Set<IExtendedSourceFile> | undefined
   ): Promise<Eslint> {
     const eslint: Eslint = new Eslint({
-      ts: ts,
+      ts: linter.ts,
       eslintPackagePath: this._configuration.eslintToolPath!,
-      scopedLogger,
+      scopedLogger: linter.logger,
       buildFolderPath: this._configuration.buildFolder,
-      buildCacheFolderPath: this._configuration.buildCacheFolder,
       linterConfigFilePath: this._eslintConfigFilePath,
-      measurePerformance: measureTsPerformance
+      measurePerformance: linter.measureTsPerformance
     });
 
     eslint.printVersionHeader();
 
     const typeScriptFilenames: Set<string> = new Set(tsProgram.getRootFileNames());
-    for (const file of typeScriptFilenames) {
-      scopedLogger.terminal.writeVerboseLine(`Linting ${file}`);
-    }
-
     await eslint.performLintingAsync({
       tsProgram,
       typeScriptFilenames,
-      changedFiles: new Set(tsProgram.getSourceFiles())
+      changedFiles: changedFiles || new Set(tsProgram.getSourceFiles())
     });
 
     return eslint;
   }
 
   private async _runTSlintAsync(
-    ts: ExtendedTypeScript,
-    scopedLogger: IScopedLogger,
-    measureTsPerformance: PerformanceMeasurer,
-    tsProgram: IExtendedProgram
+    linter: ILinterWrapper,
+    tsProgram: IExtendedProgram,
+    changedFiles?: Set<IExtendedSourceFile> | undefined
   ): Promise<Tslint> {
     const tslint: Tslint = new Tslint({
-      ts: ts,
+      ts: linter.ts,
       tslintPackagePath: this._configuration.tslintToolPath!,
-      scopedLogger,
+      scopedLogger: linter.logger,
       buildFolderPath: this._configuration.buildFolder,
-      buildCacheFolderPath: this._configuration.buildCacheFolder,
       linterConfigFilePath: this._tslintConfigFilePath,
       cachedFileSystem: this._cachedFileSystem,
-      measurePerformance: measureTsPerformance
+      measurePerformance: linter.measureTsPerformance
     });
 
     tslint.printVersionHeader();
 
     const typeScriptFilenames: Set<string> = new Set(tsProgram.getRootFileNames());
-    for (const file of typeScriptFilenames) {
-      scopedLogger.terminal.writeVerboseLine(`Linting ${file}`);
-    }
-
     await tslint.performLintingAsync({
       tsProgram,
       typeScriptFilenames,
-      changedFiles: new Set(tsProgram.getSourceFiles())
+      changedFiles: changedFiles || new Set(tsProgram.getSourceFiles())
     });
 
     return tslint;
@@ -1071,7 +983,7 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
 
     if (this._useIncrementalProgram) {
       tsconfig.options.incremental = true;
-      tsconfig.options.tsBuildInfoFile = this._tsCacheFilePath;
+      tsconfig.options.tsBuildInfoFile = `${tsconfig.options.outDir}/_tsBuildInfo.json`;
     }
 
     return tsconfig;
@@ -1088,7 +1000,7 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
 
     const compilerHost: TTypescript.SolutionBuilderHost<TTypescript.EmitAndSemanticDiagnosticsBuilderProgram> =
       ts.createSolutionBuilderHost(
-        this._getCachingSystem(ts),
+        this._getCachingTypeScriptSystem(ts),
         ts.createEmitAndSemanticDiagnosticsBuilderProgram,
         reportDiagnostic,
         reportSolutionBuilderStatus,
@@ -1103,13 +1015,13 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     tsconfig: TTypescript.ParsedCommandLine
   ): TTypescript.CompilerHost {
     if (this._useIncrementalProgram) {
-      return ts.createIncrementalCompilerHost(tsconfig.options, this._getCachingSystem(ts));
+      return ts.createIncrementalCompilerHost(tsconfig.options, this._getCachingTypeScriptSystem(ts));
     } else {
       return ts.createCompilerHost(tsconfig.options);
     }
   }
 
-  private _getCachingSystem(ts: ExtendedTypeScript): TTypescript.System {
+  private _getCachingTypeScriptSystem(ts: ExtendedTypeScript): TTypescript.System {
     const sys: TTypescript.System = {
       ...ts.sys,
       deleteFile: this._cachedFileSystem.deleteFile.bind(this._cachedFileSystem),
@@ -1172,7 +1084,7 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     return ts.createWatchCompilerHost(
       tsconfig.fileNames,
       tsconfig.options,
-      this._getCachingSystem(ts),
+      this._getCachingTypeScriptSystem(ts),
       ts.createEmitAndSemanticDiagnosticsBuilderProgram,
       reportDiagnostic,
       reportWatchStatus,
@@ -1198,7 +1110,7 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     };
 
     return ts.createSolutionBuilderWithWatchHost(
-      this._getCachingSystem(ts),
+      this._getCachingTypeScriptSystem(ts),
       ts.createEmitAndSemanticDiagnosticsBuilderProgram,
       reportDiagnostic,
       reportSolutionBuilderStatus,
diff --git a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
index f6e5036db62..9af9f1e5b81 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
@@ -278,7 +278,6 @@ export class TypeScriptPlugin implements IHeftPlugin {
 
       tsconfigPath: tsconfigFilePath,
       lintingEnabled: !!typeScriptConfiguration.isLintingEnabled,
-      buildCacheFolder: heftConfiguration.buildCacheFolder,
       additionalModuleKindsToEmit: typeScriptConfiguration.additionalModuleKindsToEmit,
       emitCjsExtensionForCommonJS: !!typeScriptConfiguration.emitCjsExtensionForCommonJS,
       emitMjsExtensionForESModule: !!typeScriptConfiguration.emitMjsExtensionForESModule,

From c7f49665ba4efe98ab8560d7f841e2046d0f86e9 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 14:13:46 -0700
Subject: [PATCH 093/155] Disable automatic incremental build

---
 .../plugins/TypeScriptPlugin/TypeScriptBuilder.ts | 15 ++-------------
 .../typescript-solution_2021-08-11-20-58.json     | 11 +++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 common/changes/@rushstack/heft/typescript-solution_2021-08-11-20-58.json

diff --git a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
index 4d24b94e2ab..1fb8a1fc2b0 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
@@ -106,7 +106,6 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
   private _typescriptParsedVersion!: semver.SemVer;
 
   private _capabilities!: ICompilerCapabilities;
-  private _useIncrementalProgram!: boolean;
   private _useSolutionBuilder!: boolean;
 
   private _eslintEnabled!: boolean;
@@ -171,11 +170,6 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
       this._capabilities.incrementalProgram = true;
     }
 
-    // Disable incremental "useIncrementalProgram" in watch mode because its compiler configuration is
-    // different, which will invalidate the incremental build cache.  In order to support this, we'd need
-    // to delete the cache when switching modes, or else maintain two separate cache folders.
-    this._useIncrementalProgram = this._capabilities.incrementalProgram && !this._configuration.watchMode;
-
     this._useSolutionBuilder = !!this._configuration.buildProjectReferences;
     if (this._useSolutionBuilder && !this._capabilities.solutionBuilder) {
       throw new Error(
@@ -325,7 +319,7 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     let builderProgram: TTypescript.BuilderProgram | undefined = undefined;
     let tsProgram: TTypescript.Program;
 
-    if (this._useIncrementalProgram) {
+    if (tsconfig.options.incremental) {
       builderProgram = ts.createIncrementalProgram({
         rootNames: tsconfig.fileNames,
         options: tsconfig.options,
@@ -981,11 +975,6 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
       currentFolder
     );
 
-    if (this._useIncrementalProgram) {
-      tsconfig.options.incremental = true;
-      tsconfig.options.tsBuildInfoFile = `${tsconfig.options.outDir}/_tsBuildInfo.json`;
-    }
-
     return tsconfig;
   }
 
@@ -1014,7 +1003,7 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     ts: ExtendedTypeScript,
     tsconfig: TTypescript.ParsedCommandLine
   ): TTypescript.CompilerHost {
-    if (this._useIncrementalProgram) {
+    if (tsconfig.options.incremental) {
       return ts.createIncrementalCompilerHost(tsconfig.options, this._getCachingTypeScriptSystem(ts));
     } else {
       return ts.createCompilerHost(tsconfig.options);
diff --git a/common/changes/@rushstack/heft/typescript-solution_2021-08-11-20-58.json b/common/changes/@rushstack/heft/typescript-solution_2021-08-11-20-58.json
new file mode 100644
index 00000000000..fc372dc1d6e
--- /dev/null
+++ b/common/changes/@rushstack/heft/typescript-solution_2021-08-11-20-58.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/heft",
+      "comment": "Retired the use of the .heft/build-cache folder for persisting build state across the \"heft clean\" or \"--clean\" invocation. Incremental TypeScript compilation is now performed either by running \"heft build\" (without \"--clean\"), or using watch mode, and requires the tsconfig to manually opt in. The feature reduced performance of cold builds and introduced bugs due to stale caches that confused users.",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@rushstack/heft",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file

From 60cc0dd302fdf5e1a375f3f3f53024a261584203 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 14:37:57 -0700
Subject: [PATCH 094/155] Remove copyFromCacheMode

---
 .../TypeScriptPlugin/TypeScriptPlugin.ts      | 29 -------------------
 apps/heft/src/schemas/typescript.schema.json  |  6 ----
 apps/heft/src/templates/typescript.json       |  8 -----
 .../config/typescript.json                    |  8 -----
 .../config/typescript.json                    |  8 -----
 .../profiles/default/config/typescript.json   |  8 -----
 .../config/typescript.json                    |  8 -----
 .../heft-sass-test/config/typescript.json     |  8 -----
 .../config/typescript.json                    |  8 -----
 .../config/typescript.json                    |  8 -----
 .../load-themed-styles/config/typescript.json |  8 -----
 .../profiles/default/config/typescript.json   |  8 -----
 .../profiles/library/config/typescript.json   |  8 -----
 13 files changed, 123 deletions(-)

diff --git a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
index 9af9f1e5b81..e365a6192b0 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
@@ -40,13 +40,6 @@ interface IEmitModuleKind {
 }
 
 export interface ISharedTypeScriptConfiguration {
-  /**
-   * Can be set to 'copy' or 'hardlink'. If set to 'copy', copy files from cache. If set to 'hardlink', files will be
-   * hardlinked to the cache location. This option is useful when producing a tarball of build output as TAR files
-   * don't handle these hardlinks correctly. 'hardlink' is the default behavior.
-   */
-  copyFromCacheMode?: CopyFromCacheMode | undefined;
-
   /**
    * If provided, emit these module kinds in addition to the modules specified in the tsconfig.
    * Note that this option only applies to the main tsconfig.json configuration.
@@ -226,7 +219,6 @@ export class TypeScriptPlugin implements IHeftPlugin {
     }
 
     const typeScriptConfiguration: ITypeScriptConfiguration = {
-      copyFromCacheMode: typescriptConfigurationJson?.copyFromCacheMode,
       additionalModuleKindsToEmit: typescriptConfigurationJson?.additionalModuleKindsToEmit,
       buildProjectReferences: typescriptConfigurationJson?.buildProjectReferences,
       emitCjsExtensionForCommonJS: typescriptConfigurationJson?.emitCjsExtensionForCommonJS,
@@ -236,26 +228,6 @@ export class TypeScriptPlugin implements IHeftPlugin {
       isLintingEnabled: !(buildProperties.lite || typescriptConfigurationJson?.disableTslint)
     };
 
-    if (heftConfiguration.projectPackageJson.private !== true) {
-      if (typeScriptConfiguration.copyFromCacheMode === undefined) {
-        logger.terminal.writeVerboseLine(
-          'Setting TypeScript copyFromCacheMode to "copy" because the "private" field ' +
-            'in package.json is not set to true. Linked files are not handled correctly ' +
-            'when package are packed for publishing.'
-        );
-        // Copy if the package is intended to be published
-        typeScriptConfiguration.copyFromCacheMode = 'copy';
-      } else if (typeScriptConfiguration.copyFromCacheMode !== 'copy') {
-        logger.emitWarning(
-          new Error(
-            `The TypeScript copyFromCacheMode is set to "${typeScriptConfiguration.copyFromCacheMode}", ` +
-              'but the the "private" field in package.json is not set to true. ' +
-              'Linked files are not handled correctly when packages are packed for publishing.'
-          )
-        );
-      }
-    }
-
     const toolPackageResolution: IToolPackageResolution =
       await this._taskPackageResolver.resolveToolPackagesAsync(heftConfiguration, logger.terminal);
     if (!toolPackageResolution.typeScriptPackagePath) {
@@ -281,7 +253,6 @@ export class TypeScriptPlugin implements IHeftPlugin {
       additionalModuleKindsToEmit: typeScriptConfiguration.additionalModuleKindsToEmit,
       emitCjsExtensionForCommonJS: !!typeScriptConfiguration.emitCjsExtensionForCommonJS,
       emitMjsExtensionForESModule: !!typeScriptConfiguration.emitMjsExtensionForESModule,
-      copyFromCacheMode: typeScriptConfiguration.copyFromCacheMode,
       watchMode: watchMode,
       maxWriteParallelism: typeScriptConfiguration.maxWriteParallelism
     };
diff --git a/apps/heft/src/schemas/typescript.schema.json b/apps/heft/src/schemas/typescript.schema.json
index 31e5e266ff5..44c9834ff26 100644
--- a/apps/heft/src/schemas/typescript.schema.json
+++ b/apps/heft/src/schemas/typescript.schema.json
@@ -17,12 +17,6 @@
       "type": "string"
     },
 
-    "copyFromCacheMode": {
-      "description": "Can be set to \"copy\" or \"hardlink\". If set to \"copy\", copy files from cache. If set to \"hardlink\", files will be hardlinked to the cache location. This option is useful when producing a tarball of build output as TAR files don't handle these hardlinks correctly. \"hardlink\" is the default behavior.",
-      "type": "string",
-      "enum": ["hardlink", "copy"]
-    },
-
     "additionalModuleKindsToEmit": {
       "type": "array",
       "description": "If provided, emit these module kinds in addition to the modules specified in the tsconfig. Note that this option only applies to the main tsconfig.json configuration.",
diff --git a/apps/heft/src/templates/typescript.json b/apps/heft/src/templates/typescript.json
index 59db48308a1..f49e8936411 100644
--- a/apps/heft/src/templates/typescript.json
+++ b/apps/heft/src/templates/typescript.json
@@ -10,14 +10,6 @@
    */
   // "extends": "base-project/config/typescript.json",
 
-  /**
-   * Can be set to "copy" or "hardlink". If set to "copy", copy files from cache.
-   * If set to "hardlink", files will be hardlinked to the cache location.
-   * This option is useful when producing a tarball of build output as TAR files don't
-   * handle these hardlinks correctly. "hardlink" is the default behavior.
-   */
-  // "copyFromCacheMode": "copy",
-
   /**
    * If provided, emit these module kinds in addition to the modules specified in the tsconfig.
    * Note that this option only applies to the main tsconfig.json configuration.
diff --git a/build-tests-samples/heft-webpack-basic-tutorial/config/typescript.json b/build-tests-samples/heft-webpack-basic-tutorial/config/typescript.json
index 72847a728a9..e671978fe5c 100644
--- a/build-tests-samples/heft-webpack-basic-tutorial/config/typescript.json
+++ b/build-tests-samples/heft-webpack-basic-tutorial/config/typescript.json
@@ -4,14 +4,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/heft/typescript.schema.json",
 
-  /**
-   * Can be set to "copy" or "hardlink". If set to "copy", copy files from cache.
-   * If set to "hardlink", files will be hardlinked to the cache location.
-   * This option is useful when producing a tarball of build output as TAR files don't
-   * handle these hardlinks correctly. "hardlink" is the default behavior.
-   */
-  // "copyFromCacheMode": "copy",
-
   /**
    * If provided, emit these module kinds in addition to the modules specified in the tsconfig.
    * Note that this option only applies to the main tsconfig.json configuration.
diff --git a/build-tests/heft-jest-reporters-test/config/typescript.json b/build-tests/heft-jest-reporters-test/config/typescript.json
index 9125b71899e..5a5a48e9b29 100644
--- a/build-tests/heft-jest-reporters-test/config/typescript.json
+++ b/build-tests/heft-jest-reporters-test/config/typescript.json
@@ -4,14 +4,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/heft/typescript.schema.json",
 
-  /**
-   * Can be set to "copy" or "hardlink". If set to "copy", copy files from cache.
-   * If set to "hardlink", files will be hardlinked to the cache location.
-   * This option is useful when producing a tarball of build output as TAR files don't
-   * handle these hardlinks correctly. "hardlink" is the default behavior.
-   */
-  // "copyFromCacheMode": "copy",
-
   /**
    * If provided, emit these module kinds in addition to the modules specified in the tsconfig.
    * Note that this option only applies to the main tsconfig.json configuration.
diff --git a/build-tests/heft-minimal-rig-test/profiles/default/config/typescript.json b/build-tests/heft-minimal-rig-test/profiles/default/config/typescript.json
index 16cf4c3abf6..e8bae3159e7 100644
--- a/build-tests/heft-minimal-rig-test/profiles/default/config/typescript.json
+++ b/build-tests/heft-minimal-rig-test/profiles/default/config/typescript.json
@@ -4,14 +4,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/heft/typescript.schema.json",
 
-  /**
-   * Can be set to "copy" or "hardlink". If set to "copy", copy files from cache.
-   * If set to "hardlink", files will be hardlinked to the cache location.
-   * This option is useful when producing a tarball of build output as TAR files don't
-   * handle these hardlinks correctly. "hardlink" is the default behavior.
-   */
-  // "copyFromCacheMode": "copy",
-
   /**
    * If provided, emit these module kinds in addition to the modules specified in the tsconfig.
    * Note that this option only applies to the main tsconfig.json configuration.
diff --git a/build-tests/heft-node-everything-test/config/typescript.json b/build-tests/heft-node-everything-test/config/typescript.json
index ef17d540227..2128e2c9596 100644
--- a/build-tests/heft-node-everything-test/config/typescript.json
+++ b/build-tests/heft-node-everything-test/config/typescript.json
@@ -4,14 +4,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/heft/typescript.schema.json",
 
-  /**
-   * Can be set to "copy" or "hardlink". If set to "copy", copy files from cache.
-   * If set to "hardlink", files will be hardlinked to the cache location.
-   * This option is useful when producing a tarball of build output as TAR files don't
-   * handle these hardlinks correctly. "hardlink" is the default behavior.
-   */
-  // "copyFromCacheMode": "copy",
-
   /**
    * If provided, emit these module kinds in addition to the modules specified in the tsconfig.
    * Note that this option only applies to the main tsconfig.json configuration.
diff --git a/build-tests/heft-sass-test/config/typescript.json b/build-tests/heft-sass-test/config/typescript.json
index de8b5eda9d3..de56984b2ef 100644
--- a/build-tests/heft-sass-test/config/typescript.json
+++ b/build-tests/heft-sass-test/config/typescript.json
@@ -4,14 +4,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/heft/typescript.schema.json",
 
-  /**
-   * Can be set to "copy" or "hardlink". If set to "copy", copy files from cache.
-   * If set to "hardlink", files will be hardlinked to the cache location.
-   * This option is useful when producing a tarball of build output as TAR files don't
-   * handle these hardlinks correctly. "hardlink" is the default behavior.
-   */
-  // "copyFromCacheMode": "copy",
-
   /**
    * If provided, emit these module kinds in addition to the modules specified in the tsconfig.
    * Note that this option only applies to the main tsconfig.json configuration.
diff --git a/build-tests/heft-webpack4-everything-test/config/typescript.json b/build-tests/heft-webpack4-everything-test/config/typescript.json
index 32db357d777..cfe694bc731 100644
--- a/build-tests/heft-webpack4-everything-test/config/typescript.json
+++ b/build-tests/heft-webpack4-everything-test/config/typescript.json
@@ -4,14 +4,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/heft/typescript.schema.json",
 
-  /**
-   * Can be set to "copy" or "hardlink". If set to "copy", copy files from cache.
-   * If set to "hardlink", files will be hardlinked to the cache location.
-   * This option is useful when producing a tarball of build output as TAR files don't
-   * handle these hardlinks correctly. "hardlink" is the default behavior.
-   */
-  // "copyFromCacheMode": "copy",
-
   /**
    * If provided, emit these module kinds in addition to the modules specified in the tsconfig.
    * Note that this option only applies to the main tsconfig.json configuration.
diff --git a/build-tests/heft-webpack5-everything-test/config/typescript.json b/build-tests/heft-webpack5-everything-test/config/typescript.json
index 32db357d777..cfe694bc731 100644
--- a/build-tests/heft-webpack5-everything-test/config/typescript.json
+++ b/build-tests/heft-webpack5-everything-test/config/typescript.json
@@ -4,14 +4,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/heft/typescript.schema.json",
 
-  /**
-   * Can be set to "copy" or "hardlink". If set to "copy", copy files from cache.
-   * If set to "hardlink", files will be hardlinked to the cache location.
-   * This option is useful when producing a tarball of build output as TAR files don't
-   * handle these hardlinks correctly. "hardlink" is the default behavior.
-   */
-  // "copyFromCacheMode": "copy",
-
   /**
    * If provided, emit these module kinds in addition to the modules specified in the tsconfig.
    * Note that this option only applies to the main tsconfig.json configuration.
diff --git a/libraries/load-themed-styles/config/typescript.json b/libraries/load-themed-styles/config/typescript.json
index 503ba96551f..84e87199ba0 100644
--- a/libraries/load-themed-styles/config/typescript.json
+++ b/libraries/load-themed-styles/config/typescript.json
@@ -4,14 +4,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/heft/typescript.schema.json",
 
-  /**
-   * Can be set to "copy" or "hardlink". If set to "copy", copy files from cache.
-   * If set to "hardlink", files will be hardlinked to the cache location.
-   * This option is useful when producing a tarball of build output as TAR files don't
-   * handle these hardlinks correctly. "hardlink" is the default behavior.
-   */
-  // "copyFromCacheMode": "copy",
-
   /**
    * If provided, emit these module kinds in addition to the modules specified in the tsconfig.
    * Note that this option only applies to the main tsconfig.json configuration.
diff --git a/rigs/heft-node-rig/profiles/default/config/typescript.json b/rigs/heft-node-rig/profiles/default/config/typescript.json
index 83fc7f4c303..b8762f344e7 100644
--- a/rigs/heft-node-rig/profiles/default/config/typescript.json
+++ b/rigs/heft-node-rig/profiles/default/config/typescript.json
@@ -4,14 +4,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/heft/typescript.schema.json",
 
-  /**
-   * Can be set to "copy" or "hardlink". If set to "copy", copy files from cache.
-   * If set to "hardlink", files will be hardlinked to the cache location.
-   * This option is useful when producing a tarball of build output as TAR files don't
-   * handle these hardlinks correctly. "hardlink" is the default behavior.
-   */
-  // "copyFromCacheMode": "copy",
-
   /**
    * If provided, emit these module kinds in addition to the modules specified in the tsconfig.
    * Note that this option only applies to the main tsconfig.json configuration.
diff --git a/rigs/heft-web-rig/profiles/library/config/typescript.json b/rigs/heft-web-rig/profiles/library/config/typescript.json
index 4a311fa6d06..dc1cefb919f 100644
--- a/rigs/heft-web-rig/profiles/library/config/typescript.json
+++ b/rigs/heft-web-rig/profiles/library/config/typescript.json
@@ -4,14 +4,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/heft/typescript.schema.json",
 
-  /**
-   * Can be set to "copy" or "hardlink". If set to "copy", copy files from cache.
-   * If set to "hardlink", files will be hardlinked to the cache location.
-   * This option is useful when producing a tarball of build output as TAR files don't
-   * handle these hardlinks correctly. "hardlink" is the default behavior.
-   */
-  // "copyFromCacheMode": "copy",
-
   /**
    * If provided, emit these module kinds in addition to the modules specified in the tsconfig.
    * Note that this option only applies to the main tsconfig.json configuration.

From d2ae314b95dbbe6f6a84972e64a06caf98915f15 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 14:40:01 -0700
Subject: [PATCH 095/155] Add change files

---
 .../typescript-solution_2021-08-11-21-38.json         | 11 +++++++++++
 .../typescript-solution_2021-08-11-21-38.json         | 11 +++++++++++
 .../typescript-solution_2021-08-11-21-38.json         | 11 +++++++++++
 .../heft/typescript-solution_2021-08-11-21-38.json    | 11 +++++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 common/changes/@microsoft/load-themed-styles/typescript-solution_2021-08-11-21-38.json
 create mode 100644 common/changes/@rushstack/heft-node-rig/typescript-solution_2021-08-11-21-38.json
 create mode 100644 common/changes/@rushstack/heft-web-rig/typescript-solution_2021-08-11-21-38.json
 create mode 100644 common/changes/@rushstack/heft/typescript-solution_2021-08-11-21-38.json

diff --git a/common/changes/@microsoft/load-themed-styles/typescript-solution_2021-08-11-21-38.json b/common/changes/@microsoft/load-themed-styles/typescript-solution_2021-08-11-21-38.json
new file mode 100644
index 00000000000..4074980dd72
--- /dev/null
+++ b/common/changes/@microsoft/load-themed-styles/typescript-solution_2021-08-11-21-38.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Remove copyFromCacheMode in typescript.json",
+      "type": "none",
+      "packageName": "@microsoft/load-themed-styles"
+    }
+  ],
+  "packageName": "@microsoft/load-themed-styles",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-node-rig/typescript-solution_2021-08-11-21-38.json b/common/changes/@rushstack/heft-node-rig/typescript-solution_2021-08-11-21-38.json
new file mode 100644
index 00000000000..36fb06fc46a
--- /dev/null
+++ b/common/changes/@rushstack/heft-node-rig/typescript-solution_2021-08-11-21-38.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Remove copyFromCacheMode in typescript.json",
+      "type": "none",
+      "packageName": "@rushstack/heft-node-rig"
+    }
+  ],
+  "packageName": "@rushstack/heft-node-rig",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-web-rig/typescript-solution_2021-08-11-21-38.json b/common/changes/@rushstack/heft-web-rig/typescript-solution_2021-08-11-21-38.json
new file mode 100644
index 00000000000..215de7d88c1
--- /dev/null
+++ b/common/changes/@rushstack/heft-web-rig/typescript-solution_2021-08-11-21-38.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Remove copyFromCacheMode in typescript.json",
+      "type": "none",
+      "packageName": "@rushstack/heft-web-rig"
+    }
+  ],
+  "packageName": "@rushstack/heft-web-rig",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft/typescript-solution_2021-08-11-21-38.json b/common/changes/@rushstack/heft/typescript-solution_2021-08-11-21-38.json
new file mode 100644
index 00000000000..0fa4e159044
--- /dev/null
+++ b/common/changes/@rushstack/heft/typescript-solution_2021-08-11-21-38.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Remove copyFromCacheMode in typescript.json",
+      "type": "none",
+      "packageName": "@rushstack/heft"
+    }
+  ],
+  "packageName": "@rushstack/heft",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file

From 0895c08d5b0d3910719c140c668fb9644a9989c5 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 14:51:02 -0700
Subject: [PATCH 096/155] Remove CopyFromCacheMode

---
 apps/heft/src/index.ts                                    | 1 -
 .../src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts     | 8 ++------
 .../heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts | 7 +------
 apps/heft/src/stages/BuildStage.ts                        | 5 -----
 common/reviews/api/heft.api.md                            | 3 ---
 5 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/apps/heft/src/index.ts b/apps/heft/src/index.ts
index 159f1127a80..fa9b3edfaf7 100644
--- a/apps/heft/src/index.ts
+++ b/apps/heft/src/index.ts
@@ -39,7 +39,6 @@ export {
   BuildSubstageHooksBase,
   CompileSubstageHooks,
   BundleSubstageHooks,
-  CopyFromCacheMode,
   IBuildStageContext,
   IBuildStageProperties,
   IBuildSubstage,
diff --git a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
index 1fb8a1fc2b0..4b47a8d0717 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
@@ -369,11 +369,7 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
 
     //#region FINAL_ANALYSIS
     // Need to ensure that we include emit diagnostics, since they might not be part of the other sets
-    const { duration: mergeDiagnosticDurationMs, diagnostics } = measureTsPerformance('Diagnostics', () => {
-      const rawDiagnostics: TTypescript.Diagnostic[] = [...preDiagnostics, ...emitResult.diagnostics];
-      return { diagnostics: ts.sortAndDeduplicateDiagnostics(rawDiagnostics) };
-    });
-    this._typescriptTerminal.writeVerboseLine(`Diagnostics: ${mergeDiagnosticDurationMs}ms`);
+    const rawDiagnostics: TTypescript.Diagnostic[] = [...preDiagnostics, ...emitResult.diagnostics];
     //#endregion
 
     //#region WRITE
@@ -418,7 +414,7 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
 
     const linters: LinterBase<unknown>[] = await Promise.all(lintPromises);
 
-    this._logDiagnostics(ts, diagnostics, linters);
+    this._logDiagnostics(ts, rawDiagnostics, linters);
   }
 
   public async _runSolutionBuildAsync(
diff --git a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
index e365a6192b0..fd8422e89ff 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
@@ -8,12 +8,7 @@ import { TypeScriptBuilder, ITypeScriptBuilderConfiguration } from './TypeScript
 import { HeftSession } from '../../pluginFramework/HeftSession';
 import { HeftConfiguration } from '../../configuration/HeftConfiguration';
 import { IHeftPlugin } from '../../pluginFramework/IHeftPlugin';
-import {
-  CopyFromCacheMode,
-  IBuildStageContext,
-  ICompileSubstage,
-  IBuildStageProperties
-} from '../../stages/BuildStage';
+import { IBuildStageContext, ICompileSubstage, IBuildStageProperties } from '../../stages/BuildStage';
 import { ToolPackageResolver, IToolPackageResolution } from '../../utilities/ToolPackageResolver';
 import { ScopedLogger } from '../../pluginFramework/logging/ScopedLogger';
 import { ICleanStageContext, ICleanStageProperties } from '../../stages/CleanStage';
diff --git a/apps/heft/src/stages/BuildStage.ts b/apps/heft/src/stages/BuildStage.ts
index 5e7d8d50add..f1ab229b765 100644
--- a/apps/heft/src/stages/BuildStage.ts
+++ b/apps/heft/src/stages/BuildStage.ts
@@ -32,11 +32,6 @@ export interface IBuildSubstage<
   properties: TBuildSubstageProperties;
 }
 
-/**
- * @public
- */
-export type CopyFromCacheMode = 'hardlink' | 'copy';
-
 /**
  * @public
  */
diff --git a/common/reviews/api/heft.api.md b/common/reviews/api/heft.api.md
index 3a85d20ec1c..4cd29905bec 100644
--- a/common/reviews/api/heft.api.md
+++ b/common/reviews/api/heft.api.md
@@ -57,9 +57,6 @@ export class CompileSubstageHooks extends BuildSubstageHooksBase {
     readonly afterRecompile: AsyncParallelHook;
 }
 
-// @public (undocumented)
-export type CopyFromCacheMode = 'hardlink' | 'copy';
-
 // @beta (undocumented)
 export type CustomActionParameterType = string | boolean | number | ReadonlyArray<string> | undefined;
 

From b8c50bbc56874507b8ce816fb5fe7b488e2ecb60 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 14:53:59 -0700
Subject: [PATCH 097/155] Enable "incremental: true" in tsconfig in rigs

---
 rigs/heft-node-rig/profiles/default/tsconfig-base.json | 3 +++
 rigs/heft-web-rig/profiles/library/tsconfig-base.json  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/rigs/heft-node-rig/profiles/default/tsconfig-base.json b/rigs/heft-node-rig/profiles/default/tsconfig-base.json
index 6f68418bbd2..b1a6dbdd117 100644
--- a/rigs/heft-node-rig/profiles/default/tsconfig-base.json
+++ b/rigs/heft-node-rig/profiles/default/tsconfig-base.json
@@ -17,6 +17,9 @@
     "noEmitOnError": false,
     "allowUnreachableCode": false,
 
+    "incremental": true,
+    "tsBuildInfoFile": "../../../../../lib/_tsBuildInfo.json",
+
     "types": [],
 
     "module": "commonjs",
diff --git a/rigs/heft-web-rig/profiles/library/tsconfig-base.json b/rigs/heft-web-rig/profiles/library/tsconfig-base.json
index 8c4d48b65b4..25fe3f97c9d 100644
--- a/rigs/heft-web-rig/profiles/library/tsconfig-base.json
+++ b/rigs/heft-web-rig/profiles/library/tsconfig-base.json
@@ -18,6 +18,9 @@
     "noEmitOnError": false,
     "allowUnreachableCode": false,
 
+    "incremental": true,
+    "tsBuildInfoFile": "../../../../../lib/_tsBuildInfo.json",
+
     "types": [],
 
     "module": "esnext",

From 6437c09d54d4e87a9b8ade825961d07a76e5d19b Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 14:55:08 -0700
Subject: [PATCH 098/155] Add change files

---
 .../typescript-solution_2021-08-11-21-54.json         | 11 +++++++++++
 .../typescript-solution_2021-08-11-21-54.json         | 11 +++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 common/changes/@rushstack/heft-node-rig/typescript-solution_2021-08-11-21-54.json
 create mode 100644 common/changes/@rushstack/heft-web-rig/typescript-solution_2021-08-11-21-54.json

diff --git a/common/changes/@rushstack/heft-node-rig/typescript-solution_2021-08-11-21-54.json b/common/changes/@rushstack/heft-node-rig/typescript-solution_2021-08-11-21-54.json
new file mode 100644
index 00000000000..bf3d372edbc
--- /dev/null
+++ b/common/changes/@rushstack/heft-node-rig/typescript-solution_2021-08-11-21-54.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/heft-node-rig",
+      "comment": "Enable \"incremental: true\" by default in tsconfig-base.json",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@rushstack/heft-node-rig",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-web-rig/typescript-solution_2021-08-11-21-54.json b/common/changes/@rushstack/heft-web-rig/typescript-solution_2021-08-11-21-54.json
new file mode 100644
index 00000000000..4d3caae4899
--- /dev/null
+++ b/common/changes/@rushstack/heft-web-rig/typescript-solution_2021-08-11-21-54.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/heft-web-rig",
+      "comment": "Enable \"incremental: true\" by default in tsconfig-base.json",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@rushstack/heft-web-rig",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file

From b71a9e6c40bc694fb02cc7df91fa0c51cadba660 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 14:55:55 -0700
Subject: [PATCH 099/155] Revise change type

---
 .../@rushstack/heft/typescript-solution_2021-08-11-20-58.json   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/changes/@rushstack/heft/typescript-solution_2021-08-11-20-58.json b/common/changes/@rushstack/heft/typescript-solution_2021-08-11-20-58.json
index fc372dc1d6e..407e34fcbee 100644
--- a/common/changes/@rushstack/heft/typescript-solution_2021-08-11-20-58.json
+++ b/common/changes/@rushstack/heft/typescript-solution_2021-08-11-20-58.json
@@ -3,7 +3,7 @@
     {
       "packageName": "@rushstack/heft",
       "comment": "Retired the use of the .heft/build-cache folder for persisting build state across the \"heft clean\" or \"--clean\" invocation. Incremental TypeScript compilation is now performed either by running \"heft build\" (without \"--clean\"), or using watch mode, and requires the tsconfig to manually opt in. The feature reduced performance of cold builds and introduced bugs due to stale caches that confused users.",
-      "type": "patch"
+      "type": "minor"
     }
   ],
   "packageName": "@rushstack/heft",

From 23ac91939376c025a8a8a7c9dcee27ef9614566c Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 15:10:11 -0700
Subject: [PATCH 100/155] Rush update

---
 common/config/rush/pnpm-lock.yaml  | 24 ++++++++++++++++++++++++
 common/config/rush/repo-state.json |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 1eba1e13496..936221a9f1d 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -795,6 +795,30 @@ importers:
       typescript: 3.9.10
       webpack: 4.44.2
 
+  ../../build-tests/heft-typescript-composite-test:
+    specifiers:
+      '@rushstack/eslint-config': workspace:*
+      '@rushstack/heft': workspace:*
+      '@rushstack/heft-jest-plugin': workspace:*
+      '@rushstack/heft-webpack5-plugin': workspace:*
+      '@types/heft-jest': 1.0.1
+      '@types/webpack-env': 1.13.0
+      eslint: ~7.30.0
+      tslint: ~5.20.1
+      tslint-microsoft-contrib: ~6.2.0
+      typescript: ~3.9.7
+    devDependencies:
+      '@rushstack/eslint-config': link:../../stack/eslint-config
+      '@rushstack/heft': link:../../apps/heft
+      '@rushstack/heft-jest-plugin': link:../../heft-plugins/heft-jest-plugin
+      '@rushstack/heft-webpack5-plugin': link:../../heft-plugins/heft-webpack5-plugin
+      '@types/heft-jest': 1.0.1
+      '@types/webpack-env': 1.13.0
+      eslint: 7.30.0
+      tslint: 5.20.1_typescript@3.9.10
+      tslint-microsoft-contrib: 6.2.0_tslint@5.20.1+typescript@3.9.10
+      typescript: 3.9.10
+
   ../../build-tests/heft-web-rig-library-test:
     specifiers:
       '@rushstack/heft': workspace:*
diff --git a/common/config/rush/repo-state.json b/common/config/rush/repo-state.json
index 59f083e61ef..f14b3786c33 100644
--- a/common/config/rush/repo-state.json
+++ b/common/config/rush/repo-state.json
@@ -1,5 +1,5 @@
 // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
 {
-  "pnpmShrinkwrapHash": "30dd6f0cf630dc4fa0c66b73735436b4e05b43c6",
+  "pnpmShrinkwrapHash": "69652ee36961f3bb815ab7f07bb0502054f9dbc2",
   "preferredVersionsHash": "1fbc26d2c5b3248616b9edccd6bef064075243bc"
 }

From f57e515dd69e8017657522a5df1f73971f84cfee Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 15:24:15 -0700
Subject: [PATCH 101/155] Address PR comments

---
 .../src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts  |  4 ++--
 apps/heft/src/schemas/typescript.schema.json          |  2 +-
 .../typescript-solution_2021-08-11-21-38.json         |  2 +-
 .../typescript-solution_2021-08-11-21-38.json         | 11 -----------
 .../typescript-solution_2021-08-11-21-38.json         | 11 -----------
 5 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 common/changes/@rushstack/heft-node-rig/typescript-solution_2021-08-11-21-38.json
 delete mode 100644 common/changes/@rushstack/heft-web-rig/typescript-solution_2021-08-11-21-38.json

diff --git a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
index fd8422e89ff..afbf2ab54e0 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
@@ -55,10 +55,10 @@ export interface ISharedTypeScriptConfiguration {
    * If true, enable behavior analogous to the "tsc --build" command. Will build projects referenced by the main project in dependency order.
    * Note that this will effectively enable \"noEmitOnError\".
    */
-  buildProjectReferences?: string;
+  buildProjectReferences?: boolean;
 
   /*
-   * Specifies the tsconfig.json file that will be used for compilation. Equivalent to the same property in the 'tsc' command line.
+   * Specifies the tsconfig.json file that will be used for compilation. Equivalent to the "project" argument for the 'tsc' and 'tslint' command line tools.
    *
    * The default value is "./tsconfig.json"
    */
diff --git a/apps/heft/src/schemas/typescript.schema.json b/apps/heft/src/schemas/typescript.schema.json
index 44c9834ff26..092cf74d31e 100644
--- a/apps/heft/src/schemas/typescript.schema.json
+++ b/apps/heft/src/schemas/typescript.schema.json
@@ -58,7 +58,7 @@
     },
 
     "project": {
-      "description": "Specifies the tsconfig.json file that will be used for compilation. Equivalent to the same property in the \"tsc\" command line.",
+      "description": "Specifies the tsconfig.json file that will be used for compilation. Equivalent to the \"project\" argument for the 'tsc' and 'tslint' command line tools. The default value is \"./tsconfig.json\".",
       "type": "string"
     },
 
diff --git a/common/changes/@microsoft/load-themed-styles/typescript-solution_2021-08-11-21-38.json b/common/changes/@microsoft/load-themed-styles/typescript-solution_2021-08-11-21-38.json
index 4074980dd72..008f1aab9d1 100644
--- a/common/changes/@microsoft/load-themed-styles/typescript-solution_2021-08-11-21-38.json
+++ b/common/changes/@microsoft/load-themed-styles/typescript-solution_2021-08-11-21-38.json
@@ -1,7 +1,7 @@
 {
   "changes": [
     {
-      "comment": "Remove copyFromCacheMode in typescript.json",
+      "comment": "",
       "type": "none",
       "packageName": "@microsoft/load-themed-styles"
     }
diff --git a/common/changes/@rushstack/heft-node-rig/typescript-solution_2021-08-11-21-38.json b/common/changes/@rushstack/heft-node-rig/typescript-solution_2021-08-11-21-38.json
deleted file mode 100644
index 36fb06fc46a..00000000000
--- a/common/changes/@rushstack/heft-node-rig/typescript-solution_2021-08-11-21-38.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "comment": "Remove copyFromCacheMode in typescript.json",
-      "type": "none",
-      "packageName": "@rushstack/heft-node-rig"
-    }
-  ],
-  "packageName": "@rushstack/heft-node-rig",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-web-rig/typescript-solution_2021-08-11-21-38.json b/common/changes/@rushstack/heft-web-rig/typescript-solution_2021-08-11-21-38.json
deleted file mode 100644
index 215de7d88c1..00000000000
--- a/common/changes/@rushstack/heft-web-rig/typescript-solution_2021-08-11-21-38.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "comment": "Remove copyFromCacheMode in typescript.json",
-      "type": "none",
-      "packageName": "@rushstack/heft-web-rig"
-    }
-  ],
-  "packageName": "@rushstack/heft-web-rig",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file

From b2c2d3398855800c76ecd31d9a0983e6fb8f767e Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 15:28:27 -0700
Subject: [PATCH 102/155] Normalize rig cache locations

---
 rigs/heft-node-rig/profiles/default/config/heft.json         | 1 +
 rigs/heft-node-rig/profiles/default/config/rush-project.json | 2 +-
 rigs/heft-node-rig/profiles/default/tsconfig-base.json       | 2 +-
 rigs/heft-web-rig/profiles/library/config/heft.json          | 3 ++-
 rigs/heft-web-rig/profiles/library/config/rush-project.json  | 2 +-
 rigs/heft-web-rig/profiles/library/tsconfig-base.json        | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/rigs/heft-node-rig/profiles/default/config/heft.json b/rigs/heft-node-rig/profiles/default/config/heft.json
index c2afa9a3ea5..8c1b7019a30 100644
--- a/rigs/heft-node-rig/profiles/default/config/heft.json
+++ b/rigs/heft-node-rig/profiles/default/config/heft.json
@@ -27,6 +27,7 @@
 
       /**
        * Glob patterns to be deleted. The paths are resolved relative to the project folder.
+       * Recommend exactly matching with "projectOutputFolderNames" in rush-project.json.
        */
       "globsToDelete": ["dist", "lib", "temp"]
     }
diff --git a/rigs/heft-node-rig/profiles/default/config/rush-project.json b/rigs/heft-node-rig/profiles/default/config/rush-project.json
index 61e414685c1..a89bd445596 100644
--- a/rigs/heft-node-rig/profiles/default/config/rush-project.json
+++ b/rigs/heft-node-rig/profiles/default/config/rush-project.json
@@ -1,3 +1,3 @@
 {
-  "projectOutputFolderNames": ["lib", "dist"]
+  "projectOutputFolderNames": ["dist", "lib", "temp"]
 }
diff --git a/rigs/heft-node-rig/profiles/default/tsconfig-base.json b/rigs/heft-node-rig/profiles/default/tsconfig-base.json
index b1a6dbdd117..7f663c6d596 100644
--- a/rigs/heft-node-rig/profiles/default/tsconfig-base.json
+++ b/rigs/heft-node-rig/profiles/default/tsconfig-base.json
@@ -18,7 +18,7 @@
     "allowUnreachableCode": false,
 
     "incremental": true,
-    "tsBuildInfoFile": "../../../../../lib/_tsBuildInfo.json",
+    "tsBuildInfoFile": "../../../../../temp/_tsBuildInfo.json",
 
     "types": [],
 
diff --git a/rigs/heft-web-rig/profiles/library/config/heft.json b/rigs/heft-web-rig/profiles/library/config/heft.json
index 890e3d75b94..c9d54bf73a5 100644
--- a/rigs/heft-web-rig/profiles/library/config/heft.json
+++ b/rigs/heft-web-rig/profiles/library/config/heft.json
@@ -27,8 +27,9 @@
 
       /**
        * Glob patterns to be deleted. The paths are resolved relative to the project folder.
+       * Recommend exactly matching with "projectOutputFolderNames" in rush-project.json.
        */
-      "globsToDelete": ["dist", "lib", "lib-amd", "lib-es6", "temp"]
+      "globsToDelete": ["dist", "lib", "lib-commonjs", "temp"]
     }
   ],
 
diff --git a/rigs/heft-web-rig/profiles/library/config/rush-project.json b/rigs/heft-web-rig/profiles/library/config/rush-project.json
index 0e0b133d934..e63d6d0b41d 100644
--- a/rigs/heft-web-rig/profiles/library/config/rush-project.json
+++ b/rigs/heft-web-rig/profiles/library/config/rush-project.json
@@ -1,3 +1,3 @@
 {
-  "projectOutputFolderNames": ["lib", "lib-commonjs", "dist"]
+  "projectOutputFolderNames": ["dist", "lib", "lib-commonjs", "temp"]
 }
diff --git a/rigs/heft-web-rig/profiles/library/tsconfig-base.json b/rigs/heft-web-rig/profiles/library/tsconfig-base.json
index 25fe3f97c9d..c92144888ab 100644
--- a/rigs/heft-web-rig/profiles/library/tsconfig-base.json
+++ b/rigs/heft-web-rig/profiles/library/tsconfig-base.json
@@ -19,7 +19,7 @@
     "allowUnreachableCode": false,
 
     "incremental": true,
-    "tsBuildInfoFile": "../../../../../lib/_tsBuildInfo.json",
+    "tsBuildInfoFile": "../../../../../temp/_tsBuildInfo.json",
 
     "types": [],
 

From 043e1845ebea2860848f2834f44b1901706f0346 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 15:28:54 -0700
Subject: [PATCH 103/155] Remove unused dependency

---
 build-tests/heft-typescript-composite-test/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build-tests/heft-typescript-composite-test/package.json b/build-tests/heft-typescript-composite-test/package.json
index ae8e4508fbd..0f4e6767628 100644
--- a/build-tests/heft-typescript-composite-test/package.json
+++ b/build-tests/heft-typescript-composite-test/package.json
@@ -11,7 +11,6 @@
     "@rushstack/eslint-config": "workspace:*",
     "@rushstack/heft": "workspace:*",
     "@rushstack/heft-jest-plugin": "workspace:*",
-    "@rushstack/heft-webpack5-plugin": "workspace:*",
     "@types/heft-jest": "1.0.1",
     "@types/webpack-env": "1.13.0",
     "eslint": "~7.30.0",

From 6cf5a729b0a1d413ef7c008988c77aaa2d52ed88 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 15:31:08 -0700
Subject: [PATCH 104/155] Rush update

---
 common/config/rush/pnpm-lock.yaml  | 2 --
 common/config/rush/repo-state.json | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 936221a9f1d..22b2542e36e 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -800,7 +800,6 @@ importers:
       '@rushstack/eslint-config': workspace:*
       '@rushstack/heft': workspace:*
       '@rushstack/heft-jest-plugin': workspace:*
-      '@rushstack/heft-webpack5-plugin': workspace:*
       '@types/heft-jest': 1.0.1
       '@types/webpack-env': 1.13.0
       eslint: ~7.30.0
@@ -811,7 +810,6 @@ importers:
       '@rushstack/eslint-config': link:../../stack/eslint-config
       '@rushstack/heft': link:../../apps/heft
       '@rushstack/heft-jest-plugin': link:../../heft-plugins/heft-jest-plugin
-      '@rushstack/heft-webpack5-plugin': link:../../heft-plugins/heft-webpack5-plugin
       '@types/heft-jest': 1.0.1
       '@types/webpack-env': 1.13.0
       eslint: 7.30.0
diff --git a/common/config/rush/repo-state.json b/common/config/rush/repo-state.json
index f14b3786c33..8aaee1375c3 100644
--- a/common/config/rush/repo-state.json
+++ b/common/config/rush/repo-state.json
@@ -1,5 +1,5 @@
 // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
 {
-  "pnpmShrinkwrapHash": "69652ee36961f3bb815ab7f07bb0502054f9dbc2",
+  "pnpmShrinkwrapHash": "803f572ee4e8460b346d4b996ee33acb9273fd2c",
   "preferredVersionsHash": "1fbc26d2c5b3248616b9edccd6bef064075243bc"
 }

From c25da536e27bedcb363f16a41c07bec2242390c0 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 15:45:11 -0700
Subject: [PATCH 105/155] Move metadata to temp/

---
 .../src/plugins/TypeScriptPlugin/LinterBase.ts     |  9 +++++++--
 .../plugins/TypeScriptPlugin/TypeScriptBuilder.ts  | 14 ++++++++++----
 .../plugins/TypeScriptPlugin/TypeScriptPlugin.ts   |  1 +
 apps/heft/src/schemas/typescript.schema.json       |  6 ++++++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/apps/heft/src/plugins/TypeScriptPlugin/LinterBase.ts b/apps/heft/src/plugins/TypeScriptPlugin/LinterBase.ts
index e0cd0cadc1e..581ba29a044 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/LinterBase.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/LinterBase.ts
@@ -17,6 +17,10 @@ export interface ILinterBaseOptions {
   ts: IExtendedTypeScript;
   scopedLogger: IScopedLogger;
   buildFolderPath: string;
+  /**
+   * The path where the linter state will be written to.
+   */
+  buildMetadataFolderPath: string;
   linterConfigFilePath: string;
 
   /**
@@ -62,6 +66,7 @@ export abstract class LinterBase<TLintResult> {
   protected readonly _scopedLogger: IScopedLogger;
   protected readonly _terminal: Terminal;
   protected readonly _buildFolderPath: string;
+  protected readonly _buildMetadataFolderPath: string;
   protected readonly _linterConfigFilePath: string;
   protected readonly _measurePerformance: PerformanceMeasurer;
 
@@ -73,6 +78,7 @@ export abstract class LinterBase<TLintResult> {
     this._terminal = this._scopedLogger.terminal;
     this._ts = options.ts;
     this._buildFolderPath = options.buildFolderPath;
+    this._buildMetadataFolderPath = options.buildMetadataFolderPath;
     this._linterConfigFilePath = options.linterConfigFilePath;
     this._linterName = linterName;
     this._measurePerformance = options.measurePerformance;
@@ -100,8 +106,7 @@ export abstract class LinterBase<TLintResult> {
 
     const tslintConfigVersion: string = this.cacheVersion;
     const cacheFilePath: string = path.resolve(
-      this._buildFolderPath,
-      options.tsProgram.getCompilerOptions().outDir || '',
+      this._buildMetadataFolderPath,
       `_${this._linterName}-${hashSuffix}.json`
     );
 
diff --git a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
index 4b47a8d0717..1719df83c73 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
@@ -42,6 +42,10 @@ interface ILinterWrapper {
 
 export interface ITypeScriptBuilderConfiguration extends ISharedTypeScriptConfiguration {
   buildFolder: string;
+  /**
+   * The folder to write build metadata.
+   */
+  buildMetadataFolder: string;
   typeScriptToolPath: string;
   tslintToolPath: string | undefined;
   eslintToolPath: string | undefined;
@@ -611,11 +615,12 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
   ): Promise<Eslint> {
     const eslint: Eslint = new Eslint({
       ts: linter.ts,
-      eslintPackagePath: this._configuration.eslintToolPath!,
       scopedLogger: linter.logger,
       buildFolderPath: this._configuration.buildFolder,
+      buildMetadataFolderPath: this._configuration.buildMetadataFolder,
       linterConfigFilePath: this._eslintConfigFilePath,
-      measurePerformance: linter.measureTsPerformance
+      measurePerformance: linter.measureTsPerformance,
+      eslintPackagePath: this._configuration.eslintToolPath!
     });
 
     eslint.printVersionHeader();
@@ -637,12 +642,13 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
   ): Promise<Tslint> {
     const tslint: Tslint = new Tslint({
       ts: linter.ts,
-      tslintPackagePath: this._configuration.tslintToolPath!,
       scopedLogger: linter.logger,
       buildFolderPath: this._configuration.buildFolder,
+      buildMetadataFolderPath: this._configuration.buildMetadataFolder,
       linterConfigFilePath: this._tslintConfigFilePath,
+      measurePerformance: linter.measureTsPerformance,
       cachedFileSystem: this._cachedFileSystem,
-      measurePerformance: linter.measureTsPerformance
+      tslintPackagePath: this._configuration.tslintToolPath!
     });
 
     tslint.printVersionHeader();
diff --git a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
index afbf2ab54e0..71071913a62 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptPlugin.ts
@@ -237,6 +237,7 @@ export class TypeScriptPlugin implements IHeftPlugin {
 
     const typeScriptBuilderConfiguration: ITypeScriptBuilderConfiguration = {
       buildFolder: heftConfiguration.buildFolder,
+      buildMetadataFolder: path.join(heftConfiguration.buildFolder, 'temp'),
       typeScriptToolPath: toolPackageResolution.typeScriptPackagePath!,
       tslintToolPath: toolPackageResolution.tslintPackagePath,
       eslintToolPath: toolPackageResolution.eslintPackagePath,
diff --git a/apps/heft/src/schemas/typescript.schema.json b/apps/heft/src/schemas/typescript.schema.json
index 092cf74d31e..394cabb5f45 100644
--- a/apps/heft/src/schemas/typescript.schema.json
+++ b/apps/heft/src/schemas/typescript.schema.json
@@ -17,6 +17,12 @@
       "type": "string"
     },
 
+    "copyFromCacheMode": {
+      "description": "DEPRECATED. Can be set to \"copy\" or \"hardlink\". If set to \"copy\", copy files from cache. If set to \"hardlink\", files will be hardlinked to the cache location. This option is useful when producing a tarball of build output as TAR files don't handle these hardlinks correctly. \"hardlink\" is the default behavior.",
+      "type": "string",
+      "enum": ["hardlink", "copy"]
+    },
+
     "additionalModuleKindsToEmit": {
       "type": "array",
       "description": "If provided, emit these module kinds in addition to the modules specified in the tsconfig. Note that this option only applies to the main tsconfig.json configuration.",

From cf317303bf80ca8f06100f3c4cd445b3cb8a4016 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 15:55:46 -0700
Subject: [PATCH 106/155] Update API

---
 common/reviews/api/rush-lib.api.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/reviews/api/rush-lib.api.md b/common/reviews/api/rush-lib.api.md
index 8d4302b92c8..23add69c91d 100644
--- a/common/reviews/api/rush-lib.api.md
+++ b/common/reviews/api/rush-lib.api.md
@@ -108,6 +108,7 @@ export const enum EnvironmentVariableNames {
     RUSH_PARALLELISM = "RUSH_PARALLELISM",
     RUSH_PNPM_STORE_PATH = "RUSH_PNPM_STORE_PATH",
     RUSH_PREVIEW_VERSION = "RUSH_PREVIEW_VERSION",
+    RUSH_TAR_BINARY_PATH = "RUSH_TAR_BINARY_PATH",
     RUSH_TEMP_FOLDER = "RUSH_TEMP_FOLDER",
     RUSH_VARIANT = "RUSH_VARIANT"
 }

From a45b43bf9ad31683e93fa2e7bdbd493db4a28c76 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 15:56:16 -0700
Subject: [PATCH 107/155] Delete copyFromCacheMode from typescript schema

---
 apps/heft/src/schemas/typescript.schema.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/apps/heft/src/schemas/typescript.schema.json b/apps/heft/src/schemas/typescript.schema.json
index 394cabb5f45..092cf74d31e 100644
--- a/apps/heft/src/schemas/typescript.schema.json
+++ b/apps/heft/src/schemas/typescript.schema.json
@@ -17,12 +17,6 @@
       "type": "string"
     },
 
-    "copyFromCacheMode": {
-      "description": "DEPRECATED. Can be set to \"copy\" or \"hardlink\". If set to \"copy\", copy files from cache. If set to \"hardlink\", files will be hardlinked to the cache location. This option is useful when producing a tarball of build output as TAR files don't handle these hardlinks correctly. \"hardlink\" is the default behavior.",
-      "type": "string",
-      "enum": ["hardlink", "copy"]
-    },
-
     "additionalModuleKindsToEmit": {
       "type": "array",
       "description": "If provided, emit these module kinds in addition to the modules specified in the tsconfig. Note that this option only applies to the main tsconfig.json configuration.",

From 2851be02715c866ddbcade6c23dff15b06265dc8 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Wed, 11 Aug 2021 23:14:18 +0000
Subject: [PATCH 108/155] Deleting change files and updating change logs for
 package updates.

---
 apps/api-documenter/CHANGELOG.json            | 15 ++++++++++
 apps/api-documenter/CHANGELOG.md              |  7 ++++-
 apps/heft/CHANGELOG.json                      | 20 +++++++++++++
 apps/heft/CHANGELOG.md                        | 10 ++++++-
 apps/rundown/CHANGELOG.json                   | 15 ++++++++++
 apps/rundown/CHANGELOG.md                     |  7 ++++-
 .../typescript-solution_2021-08-11-21-38.json | 11 -------
 .../typescript-solution_2021-08-11-21-54.json | 11 -------
 .../typescript-solution_2021-08-11-21-54.json | 11 -------
 .../typescript-solution_2021-08-09-21-26.json | 11 -------
 .../typescript-solution_2021-08-11-20-58.json | 11 -------
 .../typescript-solution_2021-08-11-21-38.json | 11 -------
 heft-plugins/heft-jest-plugin/CHANGELOG.json  | 15 ++++++++++
 heft-plugins/heft-jest-plugin/CHANGELOG.md    |  7 ++++-
 heft-plugins/heft-sass-plugin/CHANGELOG.json  | 18 ++++++++++++
 heft-plugins/heft-sass-plugin/CHANGELOG.md    |  7 ++++-
 .../heft-webpack4-plugin/CHANGELOG.json       | 18 ++++++++++++
 .../heft-webpack4-plugin/CHANGELOG.md         |  7 ++++-
 .../heft-webpack5-plugin/CHANGELOG.json       | 18 ++++++++++++
 .../heft-webpack5-plugin/CHANGELOG.md         |  7 ++++-
 .../debug-certificate-manager/CHANGELOG.json  | 15 ++++++++++
 .../debug-certificate-manager/CHANGELOG.md    |  7 ++++-
 libraries/load-themed-styles/CHANGELOG.json   | 15 ++++++++++
 libraries/load-themed-styles/CHANGELOG.md     |  7 ++++-
 libraries/package-deps-hash/CHANGELOG.json    | 15 ++++++++++
 libraries/package-deps-hash/CHANGELOG.md      |  7 ++++-
 libraries/stream-collator/CHANGELOG.json      | 18 ++++++++++++
 libraries/stream-collator/CHANGELOG.md        |  7 ++++-
 libraries/terminal/CHANGELOG.json             | 15 ++++++++++
 libraries/terminal/CHANGELOG.md               |  7 ++++-
 rigs/heft-node-rig/CHANGELOG.json             | 23 +++++++++++++++
 rigs/heft-node-rig/CHANGELOG.md               |  9 +++++-
 rigs/heft-web-rig/CHANGELOG.json              | 29 +++++++++++++++++++
 rigs/heft-web-rig/CHANGELOG.md                |  9 +++++-
 .../loader-load-themed-styles/CHANGELOG.json  | 18 ++++++++++++
 .../loader-load-themed-styles/CHANGELOG.md    |  7 ++++-
 webpack/loader-raw-script/CHANGELOG.json      | 15 ++++++++++
 webpack/loader-raw-script/CHANGELOG.md        |  7 ++++-
 webpack/localization-plugin/CHANGELOG.json    | 21 ++++++++++++++
 webpack/localization-plugin/CHANGELOG.md      |  7 ++++-
 webpack/module-minifier-plugin/CHANGELOG.json | 15 ++++++++++
 webpack/module-minifier-plugin/CHANGELOG.md   |  7 ++++-
 .../CHANGELOG.json                            | 15 ++++++++++
 .../CHANGELOG.md                              |  7 ++++-
 44 files changed, 454 insertions(+), 85 deletions(-)
 delete mode 100644 common/changes/@microsoft/load-themed-styles/typescript-solution_2021-08-11-21-38.json
 delete mode 100644 common/changes/@rushstack/heft-node-rig/typescript-solution_2021-08-11-21-54.json
 delete mode 100644 common/changes/@rushstack/heft-web-rig/typescript-solution_2021-08-11-21-54.json
 delete mode 100644 common/changes/@rushstack/heft/typescript-solution_2021-08-09-21-26.json
 delete mode 100644 common/changes/@rushstack/heft/typescript-solution_2021-08-11-20-58.json
 delete mode 100644 common/changes/@rushstack/heft/typescript-solution_2021-08-11-21-38.json

diff --git a/apps/api-documenter/CHANGELOG.json b/apps/api-documenter/CHANGELOG.json
index 183ed0e7ecc..c0a7f9b3e7b 100644
--- a/apps/api-documenter/CHANGELOG.json
+++ b/apps/api-documenter/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@microsoft/api-documenter",
   "entries": [
+    {
+      "version": "7.13.36",
+      "tag": "@microsoft/api-documenter_v7.13.36",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "7.13.35",
       "tag": "@microsoft/api-documenter_v7.13.35",
diff --git a/apps/api-documenter/CHANGELOG.md b/apps/api-documenter/CHANGELOG.md
index be4519a3339..8222ddd2fd2 100644
--- a/apps/api-documenter/CHANGELOG.md
+++ b/apps/api-documenter/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/api-documenter
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 7.13.36
+Wed, 11 Aug 2021 23:14:17 GMT
+
+_Version update only_
 
 ## 7.13.35
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/apps/heft/CHANGELOG.json b/apps/heft/CHANGELOG.json
index 422828b53f2..240b821fd8e 100644
--- a/apps/heft/CHANGELOG.json
+++ b/apps/heft/CHANGELOG.json
@@ -1,6 +1,26 @@
 {
   "name": "@rushstack/heft",
   "entries": [
+    {
+      "version": "0.36.0",
+      "tag": "@rushstack/heft_v0.36.0",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Add support to TypeScriptPlugin for composite TypeScript projects, with behavior analogous to \"tsc --build\"."
+          },
+          {
+            "comment": "Retired the use of the .heft/build-cache folder for persisting build state across the \"heft clean\" or \"--clean\" invocation. Incremental TypeScript compilation is now performed either by running \"heft build\" (without \"--clean\"), or using watch mode, and requires the tsconfig to manually opt in. The feature reduced performance of cold builds and introduced bugs due to stale caches that confused users."
+          }
+        ],
+        "none": [
+          {
+            "comment": "Remove copyFromCacheMode in typescript.json"
+          }
+        ]
+      }
+    },
     {
       "version": "0.35.1",
       "tag": "@rushstack/heft_v0.35.1",
diff --git a/apps/heft/CHANGELOG.md b/apps/heft/CHANGELOG.md
index 341af6bf836..c225cffdc52 100644
--- a/apps/heft/CHANGELOG.md
+++ b/apps/heft/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Change Log - @rushstack/heft
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 0.36.0
+Wed, 11 Aug 2021 23:14:17 GMT
+
+### Minor changes
+
+- Add support to TypeScriptPlugin for composite TypeScript projects, with behavior analogous to "tsc --build".
+- Retired the use of the .heft/build-cache folder for persisting build state across the "heft clean" or "--clean" invocation. Incremental TypeScript compilation is now performed either by running "heft build" (without "--clean"), or using watch mode, and requires the tsconfig to manually opt in. The feature reduced performance of cold builds and introduced bugs due to stale caches that confused users.
 
 ## 0.35.1
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/apps/rundown/CHANGELOG.json b/apps/rundown/CHANGELOG.json
index 2867b5c9565..2b50a21ff1b 100644
--- a/apps/rundown/CHANGELOG.json
+++ b/apps/rundown/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/rundown",
   "entries": [
+    {
+      "version": "1.0.128",
+      "tag": "@rushstack/rundown_v1.0.128",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.127",
       "tag": "@rushstack/rundown_v1.0.127",
diff --git a/apps/rundown/CHANGELOG.md b/apps/rundown/CHANGELOG.md
index 8c7f0e679f6..a890839150f 100644
--- a/apps/rundown/CHANGELOG.md
+++ b/apps/rundown/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/rundown
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 1.0.128
+Wed, 11 Aug 2021 23:14:17 GMT
+
+_Version update only_
 
 ## 1.0.127
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/common/changes/@microsoft/load-themed-styles/typescript-solution_2021-08-11-21-38.json b/common/changes/@microsoft/load-themed-styles/typescript-solution_2021-08-11-21-38.json
deleted file mode 100644
index 008f1aab9d1..00000000000
--- a/common/changes/@microsoft/load-themed-styles/typescript-solution_2021-08-11-21-38.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "comment": "",
-      "type": "none",
-      "packageName": "@microsoft/load-themed-styles"
-    }
-  ],
-  "packageName": "@microsoft/load-themed-styles",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-node-rig/typescript-solution_2021-08-11-21-54.json b/common/changes/@rushstack/heft-node-rig/typescript-solution_2021-08-11-21-54.json
deleted file mode 100644
index bf3d372edbc..00000000000
--- a/common/changes/@rushstack/heft-node-rig/typescript-solution_2021-08-11-21-54.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/heft-node-rig",
-      "comment": "Enable \"incremental: true\" by default in tsconfig-base.json",
-      "type": "minor"
-    }
-  ],
-  "packageName": "@rushstack/heft-node-rig",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-web-rig/typescript-solution_2021-08-11-21-54.json b/common/changes/@rushstack/heft-web-rig/typescript-solution_2021-08-11-21-54.json
deleted file mode 100644
index 4d3caae4899..00000000000
--- a/common/changes/@rushstack/heft-web-rig/typescript-solution_2021-08-11-21-54.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/heft-web-rig",
-      "comment": "Enable \"incremental: true\" by default in tsconfig-base.json",
-      "type": "minor"
-    }
-  ],
-  "packageName": "@rushstack/heft-web-rig",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft/typescript-solution_2021-08-09-21-26.json b/common/changes/@rushstack/heft/typescript-solution_2021-08-09-21-26.json
deleted file mode 100644
index bd5f65c845e..00000000000
--- a/common/changes/@rushstack/heft/typescript-solution_2021-08-09-21-26.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/heft",
-      "comment": "Add support to TypeScriptPlugin for composite TypeScript projects, with behavior analogous to \"tsc --build\".",
-      "type": "minor"
-    }
-  ],
-  "packageName": "@rushstack/heft",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft/typescript-solution_2021-08-11-20-58.json b/common/changes/@rushstack/heft/typescript-solution_2021-08-11-20-58.json
deleted file mode 100644
index 407e34fcbee..00000000000
--- a/common/changes/@rushstack/heft/typescript-solution_2021-08-11-20-58.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/heft",
-      "comment": "Retired the use of the .heft/build-cache folder for persisting build state across the \"heft clean\" or \"--clean\" invocation. Incremental TypeScript compilation is now performed either by running \"heft build\" (without \"--clean\"), or using watch mode, and requires the tsconfig to manually opt in. The feature reduced performance of cold builds and introduced bugs due to stale caches that confused users.",
-      "type": "minor"
-    }
-  ],
-  "packageName": "@rushstack/heft",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft/typescript-solution_2021-08-11-21-38.json b/common/changes/@rushstack/heft/typescript-solution_2021-08-11-21-38.json
deleted file mode 100644
index 0fa4e159044..00000000000
--- a/common/changes/@rushstack/heft/typescript-solution_2021-08-11-21-38.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "comment": "Remove copyFromCacheMode in typescript.json",
-      "type": "none",
-      "packageName": "@rushstack/heft"
-    }
-  ],
-  "packageName": "@rushstack/heft",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.json b/heft-plugins/heft-jest-plugin/CHANGELOG.json
index 31f7de9efe7..fcc7baf6fda 100644
--- a/heft-plugins/heft-jest-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-jest-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/heft-jest-plugin",
   "entries": [
+    {
+      "version": "0.1.17",
+      "tag": "@rushstack/heft-jest-plugin_v0.1.17",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.35.1` to `^0.36.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.16",
       "tag": "@rushstack/heft-jest-plugin_v0.1.16",
diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.md b/heft-plugins/heft-jest-plugin/CHANGELOG.md
index c06335a9a81..c38083d0cbf 100644
--- a/heft-plugins/heft-jest-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-jest-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-jest-plugin
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 0.1.17
+Wed, 11 Aug 2021 23:14:17 GMT
+
+_Version update only_
 
 ## 0.1.16
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/heft-plugins/heft-sass-plugin/CHANGELOG.json b/heft-plugins/heft-sass-plugin/CHANGELOG.json
index 1cd696e9cb2..324016213e8 100644
--- a/heft-plugins/heft-sass-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-sass-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-sass-plugin",
   "entries": [
+    {
+      "version": "0.1.2",
+      "tag": "@rushstack/heft-sass-plugin_v0.1.2",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.35.1` to `^0.36.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.1",
       "tag": "@rushstack/heft-sass-plugin_v0.1.1",
diff --git a/heft-plugins/heft-sass-plugin/CHANGELOG.md b/heft-plugins/heft-sass-plugin/CHANGELOG.md
index 440c3f4d45b..52dfcfd039a 100644
--- a/heft-plugins/heft-sass-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-sass-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-sass-plugin
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 0.1.2
+Wed, 11 Aug 2021 23:14:17 GMT
+
+_Version update only_
 
 ## 0.1.1
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
index 40379cf16eb..bbc0dc23956 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
   "entries": [
+    {
+      "version": "0.2.3",
+      "tag": "@rushstack/heft-webpack4-plugin_v0.2.3",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.35.1` to `^0.36.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.2",
       "tag": "@rushstack/heft-webpack4-plugin_v0.2.2",
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
index ce24ee531b4..36c129a087b 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-webpack4-plugin
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 0.2.3
+Wed, 11 Aug 2021 23:14:17 GMT
+
+_Version update only_
 
 ## 0.2.2
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
index 364636e9931..2f12ca15533 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
   "entries": [
+    {
+      "version": "0.2.3",
+      "tag": "@rushstack/heft-webpack5-plugin_v0.2.3",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.35.1` to `^0.36.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.2",
       "tag": "@rushstack/heft-webpack5-plugin_v0.2.2",
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
index be5cbc12b7d..20ddac63eea 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-webpack5-plugin
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 0.2.3
+Wed, 11 Aug 2021 23:14:17 GMT
+
+_Version update only_
 
 ## 0.2.2
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/libraries/debug-certificate-manager/CHANGELOG.json b/libraries/debug-certificate-manager/CHANGELOG.json
index 1bee4d41677..9e4e1078f29 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.json
+++ b/libraries/debug-certificate-manager/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/debug-certificate-manager",
   "entries": [
+    {
+      "version": "1.0.53",
+      "tag": "@rushstack/debug-certificate-manager_v1.0.53",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.52",
       "tag": "@rushstack/debug-certificate-manager_v1.0.52",
diff --git a/libraries/debug-certificate-manager/CHANGELOG.md b/libraries/debug-certificate-manager/CHANGELOG.md
index 2c13695b783..42ef485bf03 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.md
+++ b/libraries/debug-certificate-manager/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/debug-certificate-manager
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 1.0.53
+Wed, 11 Aug 2021 23:14:17 GMT
+
+_Version update only_
 
 ## 1.0.52
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/libraries/load-themed-styles/CHANGELOG.json b/libraries/load-themed-styles/CHANGELOG.json
index 81323eafea5..a4c47941226 100644
--- a/libraries/load-themed-styles/CHANGELOG.json
+++ b/libraries/load-themed-styles/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@microsoft/load-themed-styles",
   "entries": [
+    {
+      "version": "1.10.199",
+      "tag": "@microsoft/load-themed-styles_v1.10.199",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-web-rig\" to `0.4.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.10.198",
       "tag": "@microsoft/load-themed-styles_v1.10.198",
diff --git a/libraries/load-themed-styles/CHANGELOG.md b/libraries/load-themed-styles/CHANGELOG.md
index ffe1ab3f7e3..b0e748794b1 100644
--- a/libraries/load-themed-styles/CHANGELOG.md
+++ b/libraries/load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/load-themed-styles
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 1.10.199
+Wed, 11 Aug 2021 23:14:17 GMT
+
+_Version update only_
 
 ## 1.10.198
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/libraries/package-deps-hash/CHANGELOG.json b/libraries/package-deps-hash/CHANGELOG.json
index 607b1528cde..ca79d6978e3 100644
--- a/libraries/package-deps-hash/CHANGELOG.json
+++ b/libraries/package-deps-hash/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/package-deps-hash",
   "entries": [
+    {
+      "version": "3.0.57",
+      "tag": "@rushstack/package-deps-hash_v3.0.57",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "3.0.56",
       "tag": "@rushstack/package-deps-hash_v3.0.56",
diff --git a/libraries/package-deps-hash/CHANGELOG.md b/libraries/package-deps-hash/CHANGELOG.md
index a1988abdabe..670970e16d4 100644
--- a/libraries/package-deps-hash/CHANGELOG.md
+++ b/libraries/package-deps-hash/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/package-deps-hash
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 3.0.57
+Wed, 11 Aug 2021 23:14:17 GMT
+
+_Version update only_
 
 ## 3.0.56
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/libraries/stream-collator/CHANGELOG.json b/libraries/stream-collator/CHANGELOG.json
index f16d0bd0930..5514b1b64d4 100644
--- a/libraries/stream-collator/CHANGELOG.json
+++ b/libraries/stream-collator/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/stream-collator",
   "entries": [
+    {
+      "version": "4.0.112",
+      "tag": "@rushstack/stream-collator_v4.0.112",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/terminal\" to `0.2.14`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "4.0.111",
       "tag": "@rushstack/stream-collator_v4.0.111",
diff --git a/libraries/stream-collator/CHANGELOG.md b/libraries/stream-collator/CHANGELOG.md
index 8acb6c4764c..43dd067c355 100644
--- a/libraries/stream-collator/CHANGELOG.md
+++ b/libraries/stream-collator/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/stream-collator
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 4.0.112
+Wed, 11 Aug 2021 23:14:17 GMT
+
+_Version update only_
 
 ## 4.0.111
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/libraries/terminal/CHANGELOG.json b/libraries/terminal/CHANGELOG.json
index 1941728edd8..5a3baed7e89 100644
--- a/libraries/terminal/CHANGELOG.json
+++ b/libraries/terminal/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/terminal",
   "entries": [
+    {
+      "version": "0.2.14",
+      "tag": "@rushstack/terminal_v0.2.14",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.13",
       "tag": "@rushstack/terminal_v0.2.13",
diff --git a/libraries/terminal/CHANGELOG.md b/libraries/terminal/CHANGELOG.md
index bf66c4b00c1..ca9647d7b02 100644
--- a/libraries/terminal/CHANGELOG.md
+++ b/libraries/terminal/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/terminal
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 0.2.14
+Wed, 11 Aug 2021 23:14:17 GMT
+
+_Version update only_
 
 ## 0.2.13
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/rigs/heft-node-rig/CHANGELOG.json b/rigs/heft-node-rig/CHANGELOG.json
index 2ab41d3ed93..77cc003dcd4 100644
--- a/rigs/heft-node-rig/CHANGELOG.json
+++ b/rigs/heft-node-rig/CHANGELOG.json
@@ -1,6 +1,29 @@
 {
   "name": "@rushstack/heft-node-rig",
   "entries": [
+    {
+      "version": "1.2.0",
+      "tag": "@rushstack/heft-node-rig_v1.2.0",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Enable \"incremental: true\" by default in tsconfig-base.json"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-jest-plugin\" to `0.1.17`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.35.1` to `^0.36.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.1.15",
       "tag": "@rushstack/heft-node-rig_v1.1.15",
diff --git a/rigs/heft-node-rig/CHANGELOG.md b/rigs/heft-node-rig/CHANGELOG.md
index 1d64352e84a..b400cbeb3cd 100644
--- a/rigs/heft-node-rig/CHANGELOG.md
+++ b/rigs/heft-node-rig/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/heft-node-rig
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 1.2.0
+Wed, 11 Aug 2021 23:14:17 GMT
+
+### Minor changes
+
+- Enable "incremental: true" by default in tsconfig-base.json
 
 ## 1.1.15
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/rigs/heft-web-rig/CHANGELOG.json b/rigs/heft-web-rig/CHANGELOG.json
index 5f2c6838724..03123360c71 100644
--- a/rigs/heft-web-rig/CHANGELOG.json
+++ b/rigs/heft-web-rig/CHANGELOG.json
@@ -1,6 +1,35 @@
 {
   "name": "@rushstack/heft-web-rig",
   "entries": [
+    {
+      "version": "0.4.0",
+      "tag": "@rushstack/heft-web-rig_v0.4.0",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Enable \"incremental: true\" by default in tsconfig-base.json"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-jest-plugin\" to `0.1.17`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-sass-plugin\" to `0.1.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-webpack4-plugin\" to `0.2.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.35.1` to `^0.36.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.3.16",
       "tag": "@rushstack/heft-web-rig_v0.3.16",
diff --git a/rigs/heft-web-rig/CHANGELOG.md b/rigs/heft-web-rig/CHANGELOG.md
index 98a5725ba40..bb9c41abf63 100644
--- a/rigs/heft-web-rig/CHANGELOG.md
+++ b/rigs/heft-web-rig/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/heft-web-rig
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 0.4.0
+Wed, 11 Aug 2021 23:14:17 GMT
+
+### Minor changes
+
+- Enable "incremental: true" by default in tsconfig-base.json
 
 ## 0.3.16
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.json b/webpack/loader-load-themed-styles/CHANGELOG.json
index ffcba6701df..5736da03393 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.json
+++ b/webpack/loader-load-themed-styles/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
   "entries": [
+    {
+      "version": "1.9.80",
+      "tag": "@microsoft/loader-load-themed-styles_v1.9.80",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/load-themed-styles\" to `1.10.199`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.9.79",
       "tag": "@microsoft/loader-load-themed-styles_v1.9.79",
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.md b/webpack/loader-load-themed-styles/CHANGELOG.md
index ebc418a232c..d283295542c 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.md
+++ b/webpack/loader-load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/loader-load-themed-styles
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 1.9.80
+Wed, 11 Aug 2021 23:14:17 GMT
+
+_Version update only_
 
 ## 1.9.79
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/webpack/loader-raw-script/CHANGELOG.json b/webpack/loader-raw-script/CHANGELOG.json
index 4e67c31c2cc..ddb131085ff 100644
--- a/webpack/loader-raw-script/CHANGELOG.json
+++ b/webpack/loader-raw-script/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/loader-raw-script",
   "entries": [
+    {
+      "version": "1.3.166",
+      "tag": "@rushstack/loader-raw-script_v1.3.166",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.3.165",
       "tag": "@rushstack/loader-raw-script_v1.3.165",
diff --git a/webpack/loader-raw-script/CHANGELOG.md b/webpack/loader-raw-script/CHANGELOG.md
index 4290a316351..432e3826658 100644
--- a/webpack/loader-raw-script/CHANGELOG.md
+++ b/webpack/loader-raw-script/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/loader-raw-script
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 1.3.166
+Wed, 11 Aug 2021 23:14:17 GMT
+
+_Version update only_
 
 ## 1.3.165
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/webpack/localization-plugin/CHANGELOG.json b/webpack/localization-plugin/CHANGELOG.json
index 541b7f468c2..56875ed5e23 100644
--- a/webpack/localization-plugin/CHANGELOG.json
+++ b/webpack/localization-plugin/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@rushstack/localization-plugin",
   "entries": [
+    {
+      "version": "0.6.40",
+      "tag": "@rushstack/localization-plugin_v0.6.40",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/set-webpack-public-path-plugin\" to `3.2.60`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/set-webpack-public-path-plugin\" from `^3.2.59` to `^3.2.60`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.6.39",
       "tag": "@rushstack/localization-plugin_v0.6.39",
diff --git a/webpack/localization-plugin/CHANGELOG.md b/webpack/localization-plugin/CHANGELOG.md
index 4416bcc4756..da8ed9aa82d 100644
--- a/webpack/localization-plugin/CHANGELOG.md
+++ b/webpack/localization-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/localization-plugin
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 0.6.40
+Wed, 11 Aug 2021 23:14:17 GMT
+
+_Version update only_
 
 ## 0.6.39
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/webpack/module-minifier-plugin/CHANGELOG.json b/webpack/module-minifier-plugin/CHANGELOG.json
index 3ee9dda3ba8..cd053fe2c84 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.json
+++ b/webpack/module-minifier-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/module-minifier-plugin",
   "entries": [
+    {
+      "version": "0.4.4",
+      "tag": "@rushstack/module-minifier-plugin_v0.4.4",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.3",
       "tag": "@rushstack/module-minifier-plugin_v0.4.3",
diff --git a/webpack/module-minifier-plugin/CHANGELOG.md b/webpack/module-minifier-plugin/CHANGELOG.md
index 5bc2c35af90..1e0ef02dca1 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.md
+++ b/webpack/module-minifier-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/module-minifier-plugin
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 0.4.4
+Wed, 11 Aug 2021 23:14:17 GMT
+
+_Version update only_
 
 ## 0.4.3
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/webpack/set-webpack-public-path-plugin/CHANGELOG.json b/webpack/set-webpack-public-path-plugin/CHANGELOG.json
index 1a3eec8dece..81a3f4bc348 100644
--- a/webpack/set-webpack-public-path-plugin/CHANGELOG.json
+++ b/webpack/set-webpack-public-path-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/set-webpack-public-path-plugin",
   "entries": [
+    {
+      "version": "3.2.60",
+      "tag": "@rushstack/set-webpack-public-path-plugin_v3.2.60",
+      "date": "Wed, 11 Aug 2021 23:14:17 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "3.2.59",
       "tag": "@rushstack/set-webpack-public-path-plugin_v3.2.59",
diff --git a/webpack/set-webpack-public-path-plugin/CHANGELOG.md b/webpack/set-webpack-public-path-plugin/CHANGELOG.md
index 47020b0a008..8c290ef8cb6 100644
--- a/webpack/set-webpack-public-path-plugin/CHANGELOG.md
+++ b/webpack/set-webpack-public-path-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/set-webpack-public-path-plugin
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+
+## 3.2.60
+Wed, 11 Aug 2021 23:14:17 GMT
+
+_Version update only_
 
 ## 3.2.59
 Wed, 11 Aug 2021 00:07:21 GMT

From e462a1250c23dc307f7202b0197c69e287b71431 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Wed, 11 Aug 2021 23:14:20 +0000
Subject: [PATCH 109/155] Applying package updates.

---
 apps/api-documenter/package.json                    | 2 +-
 apps/heft/package.json                              | 2 +-
 apps/rundown/package.json                           | 2 +-
 heft-plugins/heft-jest-plugin/package.json          | 4 ++--
 heft-plugins/heft-sass-plugin/package.json          | 4 ++--
 heft-plugins/heft-webpack4-plugin/package.json      | 4 ++--
 heft-plugins/heft-webpack5-plugin/package.json      | 4 ++--
 libraries/debug-certificate-manager/package.json    | 2 +-
 libraries/load-themed-styles/package.json           | 2 +-
 libraries/package-deps-hash/package.json            | 2 +-
 libraries/stream-collator/package.json              | 2 +-
 libraries/terminal/package.json                     | 2 +-
 rigs/heft-node-rig/package.json                     | 4 ++--
 rigs/heft-web-rig/package.json                      | 4 ++--
 webpack/loader-load-themed-styles/package.json      | 2 +-
 webpack/loader-raw-script/package.json              | 2 +-
 webpack/localization-plugin/package.json            | 4 ++--
 webpack/module-minifier-plugin/package.json         | 2 +-
 webpack/set-webpack-public-path-plugin/package.json | 2 +-
 19 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/apps/api-documenter/package.json b/apps/api-documenter/package.json
index b911d89d393..b4ba8f8602a 100644
--- a/apps/api-documenter/package.json
+++ b/apps/api-documenter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/api-documenter",
-  "version": "7.13.35",
+  "version": "7.13.36",
   "description": "Read JSON files from api-extractor, generate documentation pages",
   "repository": {
     "type": "git",
diff --git a/apps/heft/package.json b/apps/heft/package.json
index 8c3e3c00714..2a5382fcf7a 100644
--- a/apps/heft/package.json
+++ b/apps/heft/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft",
-  "version": "0.35.1",
+  "version": "0.36.0",
   "description": "Build all your JavaScript projects the same way: A way that works.",
   "keywords": [
     "toolchain",
diff --git a/apps/rundown/package.json b/apps/rundown/package.json
index 457d383f054..380f70aa123 100644
--- a/apps/rundown/package.json
+++ b/apps/rundown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/rundown",
-  "version": "1.0.127",
+  "version": "1.0.128",
   "description": "Detect load time regressions by running an app, tracing require() calls, and generating a deterministic report",
   "repository": {
     "type": "git",
diff --git a/heft-plugins/heft-jest-plugin/package.json b/heft-plugins/heft-jest-plugin/package.json
index ae8d6a5e2f1..3b501b8a1fa 100644
--- a/heft-plugins/heft-jest-plugin/package.json
+++ b/heft-plugins/heft-jest-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-jest-plugin",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "Heft plugin for Jest",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.35.1"
+    "@rushstack/heft": "^0.36.0"
   },
   "dependencies": {
     "@jest/core": "~25.4.0",
diff --git a/heft-plugins/heft-sass-plugin/package.json b/heft-plugins/heft-sass-plugin/package.json
index 6702729cfe6..c44b8c88bcd 100644
--- a/heft-plugins/heft-sass-plugin/package.json
+++ b/heft-plugins/heft-sass-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-sass-plugin",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Heft plugin for SASS",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.35.1"
+    "@rushstack/heft": "^0.36.0"
   },
   "dependencies": {
     "@rushstack/heft-config-file": "workspace:*",
diff --git a/heft-plugins/heft-webpack4-plugin/package.json b/heft-plugins/heft-webpack4-plugin/package.json
index b70ea995240..7bd86312499 100644
--- a/heft-plugins/heft-webpack4-plugin/package.json
+++ b/heft-plugins/heft-webpack4-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Heft plugin for Webpack 4",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.35.1"
+    "@rushstack/heft": "^0.36.0"
   },
   "dependencies": {
     "@rushstack/node-core-library": "workspace:*",
diff --git a/heft-plugins/heft-webpack5-plugin/package.json b/heft-plugins/heft-webpack5-plugin/package.json
index 0a6b37c44a9..44081054c42 100644
--- a/heft-plugins/heft-webpack5-plugin/package.json
+++ b/heft-plugins/heft-webpack5-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Heft plugin for Webpack 5",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.35.1"
+    "@rushstack/heft": "^0.36.0"
   },
   "dependencies": {
     "@rushstack/node-core-library": "workspace:*",
diff --git a/libraries/debug-certificate-manager/package.json b/libraries/debug-certificate-manager/package.json
index 9531e433421..ec33e7e1b48 100644
--- a/libraries/debug-certificate-manager/package.json
+++ b/libraries/debug-certificate-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/debug-certificate-manager",
-  "version": "1.0.52",
+  "version": "1.0.53",
   "description": "Cross-platform functionality to create debug ssl certificates.",
   "main": "lib/index.js",
   "typings": "dist/debug-certificate-manager.d.ts",
diff --git a/libraries/load-themed-styles/package.json b/libraries/load-themed-styles/package.json
index 8274341a95f..96d170a973d 100644
--- a/libraries/load-themed-styles/package.json
+++ b/libraries/load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/load-themed-styles",
-  "version": "1.10.198",
+  "version": "1.10.199",
   "description": "Loads themed styles.",
   "license": "MIT",
   "repository": {
diff --git a/libraries/package-deps-hash/package.json b/libraries/package-deps-hash/package.json
index e0e84e26326..310f663dc1e 100644
--- a/libraries/package-deps-hash/package.json
+++ b/libraries/package-deps-hash/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/package-deps-hash",
-  "version": "3.0.56",
+  "version": "3.0.57",
   "description": "",
   "main": "lib/index.js",
   "typings": "dist/package-deps-hash.d.ts",
diff --git a/libraries/stream-collator/package.json b/libraries/stream-collator/package.json
index 2934ab72642..e2c70c962f8 100644
--- a/libraries/stream-collator/package.json
+++ b/libraries/stream-collator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/stream-collator",
-  "version": "4.0.111",
+  "version": "4.0.112",
   "description": "Display intelligible realtime output from concurrent processes",
   "repository": {
     "type": "git",
diff --git a/libraries/terminal/package.json b/libraries/terminal/package.json
index 21468425aa0..d8631159864 100644
--- a/libraries/terminal/package.json
+++ b/libraries/terminal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/terminal",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "description": "User interface primitives for console applications",
   "main": "lib/index.js",
   "typings": "dist/terminal.d.ts",
diff --git a/rigs/heft-node-rig/package.json b/rigs/heft-node-rig/package.json
index 38ef34a3c6f..d986bb694fa 100644
--- a/rigs/heft-node-rig/package.json
+++ b/rigs/heft-node-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-node-rig",
-  "version": "1.1.15",
+  "version": "1.2.0",
   "description": "A rig package for Node.js projects that build using Heft",
   "license": "MIT",
   "scripts": {
@@ -11,7 +11,7 @@
     "url": "https://github.com/microsoft/rushstack/tree/master/rigs/heft-node-rig"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.35.1"
+    "@rushstack/heft": "^0.36.0"
   },
   "dependencies": {
     "@microsoft/api-extractor": "workspace:*",
diff --git a/rigs/heft-web-rig/package.json b/rigs/heft-web-rig/package.json
index 6ccb1ce24d0..9cf0013c647 100644
--- a/rigs/heft-web-rig/package.json
+++ b/rigs/heft-web-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-web-rig",
-  "version": "0.3.16",
+  "version": "0.4.0",
   "description": "A rig package for web browser projects that build using Heft",
   "license": "MIT",
   "scripts": {
@@ -11,7 +11,7 @@
     "url": "https://github.com/microsoft/rushstack/tree/master/rigs/heft-web-rig"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.35.1"
+    "@rushstack/heft": "^0.36.0"
   },
   "dependencies": {
     "@microsoft/api-extractor": "workspace:*",
diff --git a/webpack/loader-load-themed-styles/package.json b/webpack/loader-load-themed-styles/package.json
index 29e756e6cf0..f4417307916 100644
--- a/webpack/loader-load-themed-styles/package.json
+++ b/webpack/loader-load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
-  "version": "1.9.79",
+  "version": "1.9.80",
   "description": "This simple loader wraps the loading of CSS in script equivalent to `require('load-themed-styles').loadStyles( /* css text */ )`. It is designed to be a replacement for style-loader.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/loader-raw-script/package.json b/webpack/loader-raw-script/package.json
index b42fa24f2f7..07ec5e71e61 100644
--- a/webpack/loader-raw-script/package.json
+++ b/webpack/loader-raw-script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/loader-raw-script",
-  "version": "1.3.165",
+  "version": "1.3.166",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/localization-plugin/package.json b/webpack/localization-plugin/package.json
index 10dd8c3c6f9..d3696a19228 100644
--- a/webpack/localization-plugin/package.json
+++ b/webpack/localization-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/localization-plugin",
-  "version": "0.6.39",
+  "version": "0.6.40",
   "description": "This plugin facilitates localization with Webpack.",
   "main": "lib/index.js",
   "typings": "dist/localization-plugin.d.ts",
@@ -13,7 +13,7 @@
     "build": "heft build --clean"
   },
   "peerDependencies": {
-    "@rushstack/set-webpack-public-path-plugin": "^3.2.59",
+    "@rushstack/set-webpack-public-path-plugin": "^3.2.60",
     "@types/webpack": "^4.39.0",
     "webpack": "^4.31.0"
   },
diff --git a/webpack/module-minifier-plugin/package.json b/webpack/module-minifier-plugin/package.json
index 1bcb1dcf0db..cb2c3242265 100644
--- a/webpack/module-minifier-plugin/package.json
+++ b/webpack/module-minifier-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/module-minifier-plugin",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "This plugin splits minification of webpack compilations into smaller units.",
   "main": "lib/index.js",
   "typings": "dist/module-minifier-plugin.d.ts",
diff --git a/webpack/set-webpack-public-path-plugin/package.json b/webpack/set-webpack-public-path-plugin/package.json
index 82c2b8aefde..0b613bf7206 100644
--- a/webpack/set-webpack-public-path-plugin/package.json
+++ b/webpack/set-webpack-public-path-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/set-webpack-public-path-plugin",
-  "version": "3.2.59",
+  "version": "3.2.60",
   "description": "This plugin sets the webpack public path at runtime.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

From f972135c73ee1abd350ab9db1dc6df07155ce726 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Wed, 11 Aug 2021 23:16:09 +0000
Subject: [PATCH 110/155] Deleting change files and updating change logs for
 package updates.

---
 apps/rush/CHANGELOG.json                      | 21 +++++++++++++++++++
 apps/rush/CHANGELOG.md                        | 12 ++++++++++-
 ...luyomi-EnvironConfig_2021-07-18-20-29.json | 11 ----------
 ...xperimental-terminal_2021-08-03-19-33.json | 11 ----------
 .../ianc-update-jszip_2021-08-10-22-48.json   | 11 ----------
 .../rush-list-selectors_2021-07-20-23-18.json | 11 ----------
 ...environment-variable_2021-08-11-21-30.json | 11 ----------
 7 files changed, 32 insertions(+), 56 deletions(-)
 delete mode 100644 common/changes/@microsoft/rush/eoluyomi-EnvironConfig_2021-07-18-20-29.json
 delete mode 100644 common/changes/@microsoft/rush/experimental-terminal_2021-08-03-19-33.json
 delete mode 100644 common/changes/@microsoft/rush/ianc-update-jszip_2021-08-10-22-48.json
 delete mode 100644 common/changes/@microsoft/rush/rush-list-selectors_2021-07-20-23-18.json
 delete mode 100644 common/changes/@microsoft/rush/tar-environment-variable_2021-08-11-21-30.json

diff --git a/apps/rush/CHANGELOG.json b/apps/rush/CHANGELOG.json
index 3a284e2f2da..38c8e96b9f8 100644
--- a/apps/rush/CHANGELOG.json
+++ b/apps/rush/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@microsoft/rush",
   "entries": [
+    {
+      "version": "5.51.0",
+      "tag": "@microsoft/rush_v5.51.0",
+      "date": "Wed, 11 Aug 2021 23:16:09 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "The --debug flag now also shows additional diagnostic information."
+          },
+          {
+            "comment": "Update JSZip dependency."
+          },
+          {
+            "comment": "Adds support for the project subset selection parameters (\"--to\", \"--from\", etc., documented at https://rushjs.io/pages/developer/selecting_subsets/) to the \"rush list\" command."
+          },
+          {
+            "comment": "Allow the tar binary path to be overridden via the RUSH_TAR_BINARY_PATH environment variable."
+          }
+        ]
+      }
+    },
     {
       "version": "5.50.0",
       "tag": "@microsoft/rush_v5.50.0",
diff --git a/apps/rush/CHANGELOG.md b/apps/rush/CHANGELOG.md
index a7a816674ff..66f238fa1ca 100644
--- a/apps/rush/CHANGELOG.md
+++ b/apps/rush/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Change Log - @microsoft/rush
 
-This log was last generated on Sat, 17 Jul 2021 01:16:04 GMT and should not be manually modified.
+This log was last generated on Wed, 11 Aug 2021 23:16:09 GMT and should not be manually modified.
+
+## 5.51.0
+Wed, 11 Aug 2021 23:16:09 GMT
+
+### Updates
+
+- The --debug flag now also shows additional diagnostic information.
+- Update JSZip dependency.
+- Adds support for the project subset selection parameters ("--to", "--from", etc., documented at https://rushjs.io/pages/developer/selecting_subsets/) to the "rush list" command.
+- Allow the tar binary path to be overridden via the RUSH_TAR_BINARY_PATH environment variable.
 
 ## 5.50.0
 Sat, 17 Jul 2021 01:16:04 GMT
diff --git a/common/changes/@microsoft/rush/eoluyomi-EnvironConfig_2021-07-18-20-29.json b/common/changes/@microsoft/rush/eoluyomi-EnvironConfig_2021-07-18-20-29.json
deleted file mode 100644
index cbcdce528a0..00000000000
--- a/common/changes/@microsoft/rush/eoluyomi-EnvironConfig_2021-07-18-20-29.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@microsoft/rush",
-      "comment": "",
-      "type": "none"
-    }
-  ],
-  "packageName": "@microsoft/rush",
-  "email": "4673363+octogonz@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@microsoft/rush/experimental-terminal_2021-08-03-19-33.json b/common/changes/@microsoft/rush/experimental-terminal_2021-08-03-19-33.json
deleted file mode 100644
index aedf310cec5..00000000000
--- a/common/changes/@microsoft/rush/experimental-terminal_2021-08-03-19-33.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@microsoft/rush",
-      "comment": "The --debug flag now also shows additional diagnostic information.",
-      "type": "none"
-    }
-  ],
-  "packageName": "@microsoft/rush",
-  "email": "elliot-nelson@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@microsoft/rush/ianc-update-jszip_2021-08-10-22-48.json b/common/changes/@microsoft/rush/ianc-update-jszip_2021-08-10-22-48.json
deleted file mode 100644
index 640b3a9606e..00000000000
--- a/common/changes/@microsoft/rush/ianc-update-jszip_2021-08-10-22-48.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@microsoft/rush",
-      "comment": "Update JSZip dependency.",
-      "type": "none"
-    }
-  ],
-  "packageName": "@microsoft/rush",
-  "email": "iclanton@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@microsoft/rush/rush-list-selectors_2021-07-20-23-18.json b/common/changes/@microsoft/rush/rush-list-selectors_2021-07-20-23-18.json
deleted file mode 100644
index c384890419f..00000000000
--- a/common/changes/@microsoft/rush/rush-list-selectors_2021-07-20-23-18.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@microsoft/rush",
-      "comment": "Adds support for the project subset selection parameters (\"--to\", \"--from\", etc., documented at https://rushjs.io/pages/developer/selecting_subsets/) to the \"rush list\" command.",
-      "type": "none"
-    }
-  ],
-  "packageName": "@microsoft/rush",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@microsoft/rush/tar-environment-variable_2021-08-11-21-30.json b/common/changes/@microsoft/rush/tar-environment-variable_2021-08-11-21-30.json
deleted file mode 100644
index 972043f9d43..00000000000
--- a/common/changes/@microsoft/rush/tar-environment-variable_2021-08-11-21-30.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@microsoft/rush",
-      "comment": "Allow the tar binary path to be overridden via the RUSH_TAR_BINARY_PATH environment variable.",
-      "type": "none"
-    }
-  ],
-  "packageName": "@microsoft/rush",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file

From d52f147bd30852f0e5b7878ba462d6647e4e59b0 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Wed, 11 Aug 2021 23:16:10 +0000
Subject: [PATCH 111/155] Applying package updates.

---
 apps/rush-lib/package.json               | 2 +-
 apps/rush/package.json                   | 2 +-
 common/config/rush/version-policies.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/rush-lib/package.json b/apps/rush-lib/package.json
index 3138116c0ae..d56c5f382a8 100644
--- a/apps/rush-lib/package.json
+++ b/apps/rush-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/rush-lib",
-  "version": "5.50.0",
+  "version": "5.51.0",
   "description": "A library for writing scripts that interact with the Rush tool",
   "repository": {
     "type": "git",
diff --git a/apps/rush/package.json b/apps/rush/package.json
index 38d07dde227..a3d9b3bbbcc 100644
--- a/apps/rush/package.json
+++ b/apps/rush/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/rush",
-  "version": "5.50.0",
+  "version": "5.51.0",
   "description": "A professional solution for consolidating all your JavaScript projects in one Git repo",
   "keywords": [
     "install",
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
index 4b5014b8a77..69c507937f4 100644
--- a/common/config/rush/version-policies.json
+++ b/common/config/rush/version-policies.json
@@ -90,7 +90,7 @@
   {
     "policyName": "rush",
     "definitionName": "lockStepVersion",
-    "version": "5.50.0",
+    "version": "5.51.0",
     "nextBump": "minor",
     "mainProject": "@microsoft/rush"
   }

From 27aa4daed0ba383f37bacef5c9155464a89ba698 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 17:42:22 -0700
Subject: [PATCH 112/155] Restore autogeneration of tsBuildInfo.json path

---
 .../TypeScriptPlugin/TypeScriptBuilder.ts     | 25 +++++++++++++++++++
 .../profiles/default/tsconfig-base.json       |  1 -
 .../profiles/library/tsconfig-base.json       |  1 -
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
index 1719df83c73..57d423f711f 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
+import * as crypto from 'crypto';
 import * as path from 'path';
 import * as semver from 'semver';
 import {
@@ -121,6 +122,7 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
   private _typescriptTerminal!: Terminal;
   private _emitCompletedCallbackManager: EmitCompletedCallbackManager;
 
+  private __tsCacheFilePath!: string;
   private _tsReadJsonCache: Map<string, object> = new Map<string, object>();
   private _cachedFileSystem: TypeScriptCachedFileSystem = new TypeScriptCachedFileSystem();
 
@@ -128,6 +130,25 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
     return __filename;
   }
 
+  private get _tsCacheFilePath(): string {
+    if (!this.__tsCacheFilePath) {
+      const configHash: crypto.Hash = Tslint.getConfigHash(
+        this._configuration.tsconfigPath,
+        this._typescriptTerminal,
+        this._cachedFileSystem
+      );
+      configHash.update(JSON.stringify(this._configuration.additionalModuleKindsToEmit || {}));
+      const serializedConfigHash: string = configHash.digest('hex');
+
+      this.__tsCacheFilePath = path.posix.join(
+        this._configuration.buildMetadataFolder,
+        `ts_${serializedConfigHash}.json`
+      );
+    }
+
+    return this.__tsCacheFilePath;
+  }
+
   public constructor(
     parentGlobalTerminalProvider: ITerminalProvider,
     configuration: ITypeScriptBuilderConfiguration,
@@ -977,6 +998,10 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
       currentFolder
     );
 
+    if (tsconfig.options.incremental) {
+      tsconfig.options.tsBuildInfoFile = this._tsCacheFilePath;
+    }
+
     return tsconfig;
   }
 
diff --git a/rigs/heft-node-rig/profiles/default/tsconfig-base.json b/rigs/heft-node-rig/profiles/default/tsconfig-base.json
index 7f663c6d596..88638a8268d 100644
--- a/rigs/heft-node-rig/profiles/default/tsconfig-base.json
+++ b/rigs/heft-node-rig/profiles/default/tsconfig-base.json
@@ -18,7 +18,6 @@
     "allowUnreachableCode": false,
 
     "incremental": true,
-    "tsBuildInfoFile": "../../../../../temp/_tsBuildInfo.json",
 
     "types": [],
 
diff --git a/rigs/heft-web-rig/profiles/library/tsconfig-base.json b/rigs/heft-web-rig/profiles/library/tsconfig-base.json
index c92144888ab..1240e4a1432 100644
--- a/rigs/heft-web-rig/profiles/library/tsconfig-base.json
+++ b/rigs/heft-web-rig/profiles/library/tsconfig-base.json
@@ -19,7 +19,6 @@
     "allowUnreachableCode": false,
 
     "incremental": true,
-    "tsBuildInfoFile": "../../../../../temp/_tsBuildInfo.json",
 
     "types": [],
 

From cfa366d5d1159c68ae483fe1b4278c7436c6f45d Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 17:43:17 -0700
Subject: [PATCH 113/155] Add change files

---
 .../lock-tsbuildinfo-path_2021-08-12-00-43.json       | 11 +++++++++++
 .../lock-tsbuildinfo-path_2021-08-12-00-43.json       | 11 +++++++++++
 .../heft/lock-tsbuildinfo-path_2021-08-12-00-43.json  | 11 +++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 common/changes/@rushstack/heft-node-rig/lock-tsbuildinfo-path_2021-08-12-00-43.json
 create mode 100644 common/changes/@rushstack/heft-web-rig/lock-tsbuildinfo-path_2021-08-12-00-43.json
 create mode 100644 common/changes/@rushstack/heft/lock-tsbuildinfo-path_2021-08-12-00-43.json

diff --git a/common/changes/@rushstack/heft-node-rig/lock-tsbuildinfo-path_2021-08-12-00-43.json b/common/changes/@rushstack/heft-node-rig/lock-tsbuildinfo-path_2021-08-12-00-43.json
new file mode 100644
index 00000000000..e74b298f390
--- /dev/null
+++ b/common/changes/@rushstack/heft-node-rig/lock-tsbuildinfo-path_2021-08-12-00-43.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Restore automatic generation of tsBuildInfo.json file path to work around odd path resolution behavior.",
+      "type": "patch",
+      "packageName": "@rushstack/heft-node-rig"
+    }
+  ],
+  "packageName": "@rushstack/heft-node-rig",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-web-rig/lock-tsbuildinfo-path_2021-08-12-00-43.json b/common/changes/@rushstack/heft-web-rig/lock-tsbuildinfo-path_2021-08-12-00-43.json
new file mode 100644
index 00000000000..9d55c53c21b
--- /dev/null
+++ b/common/changes/@rushstack/heft-web-rig/lock-tsbuildinfo-path_2021-08-12-00-43.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Restore automatic generation of tsBuildInfo.json file path to work around odd path resolution behavior.",
+      "type": "patch",
+      "packageName": "@rushstack/heft-web-rig"
+    }
+  ],
+  "packageName": "@rushstack/heft-web-rig",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft/lock-tsbuildinfo-path_2021-08-12-00-43.json b/common/changes/@rushstack/heft/lock-tsbuildinfo-path_2021-08-12-00-43.json
new file mode 100644
index 00000000000..9b07ca1300c
--- /dev/null
+++ b/common/changes/@rushstack/heft/lock-tsbuildinfo-path_2021-08-12-00-43.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Restore automatic generation of tsBuildInfo.json file path to work around odd path resolution behavior.",
+      "type": "patch",
+      "packageName": "@rushstack/heft"
+    }
+  ],
+  "packageName": "@rushstack/heft",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file

From 4e85d55d74b8979483587aa65dfdf37ea270a78b Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Wed, 11 Aug 2021 18:11:20 -0700
Subject: [PATCH 114/155] Clean up config

---
 .../TypeScriptPlugin/TypeScriptBuilder.ts     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
index 57d423f711f..c82e29c0146 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
@@ -122,7 +122,7 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
   private _typescriptTerminal!: Terminal;
   private _emitCompletedCallbackManager: EmitCompletedCallbackManager;
 
-  private __tsCacheFilePath!: string;
+  private __tsCacheFilePath: string | undefined;
   private _tsReadJsonCache: Map<string, object> = new Map<string, object>();
   private _cachedFileSystem: TypeScriptCachedFileSystem = new TypeScriptCachedFileSystem();
 
@@ -132,18 +132,18 @@ export class TypeScriptBuilder extends SubprocessRunnerBase<ITypeScriptBuilderCo
 
   private get _tsCacheFilePath(): string {
     if (!this.__tsCacheFilePath) {
-      const configHash: crypto.Hash = Tslint.getConfigHash(
-        this._configuration.tsconfigPath,
-        this._typescriptTerminal,
-        this._cachedFileSystem
-      );
+      // TypeScript internally handles if the tsconfig options have changed from when the tsbuildinfo file was created.
+      // We only need to hash our additional Heft configuration.
+      const configHash: crypto.Hash = crypto.createHash('sha1');
+
       configHash.update(JSON.stringify(this._configuration.additionalModuleKindsToEmit || {}));
-      const serializedConfigHash: string = configHash.digest('hex');
+      const serializedConfigHash: string = configHash
+        .digest('base64')
+        .slice(0, 8)
+        .replace(/\+/g, '-')
+        .replace(/\//g, '_');
 
-      this.__tsCacheFilePath = path.posix.join(
-        this._configuration.buildMetadataFolder,
-        `ts_${serializedConfigHash}.json`
-      );
+      this.__tsCacheFilePath = `${this._configuration.buildMetadataFolder}/ts_${serializedConfigHash}.json`;
     }
 
     return this.__tsCacheFilePath;

From d59e07f5be47775e581edc593df9dffe6b40aa5a Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Thu, 12 Aug 2021 01:28:39 +0000
Subject: [PATCH 115/155] Deleting change files and updating change logs for
 package updates.

---
 apps/api-documenter/CHANGELOG.json            | 15 ++++++++++
 apps/api-documenter/CHANGELOG.md              |  7 ++++-
 apps/heft/CHANGELOG.json                      | 12 ++++++++
 apps/heft/CHANGELOG.md                        |  9 +++++-
 apps/rundown/CHANGELOG.json                   | 15 ++++++++++
 apps/rundown/CHANGELOG.md                     |  7 ++++-
 ...ock-tsbuildinfo-path_2021-08-12-00-43.json | 11 -------
 ...ock-tsbuildinfo-path_2021-08-12-00-43.json | 11 -------
 ...ock-tsbuildinfo-path_2021-08-12-00-43.json | 11 -------
 heft-plugins/heft-jest-plugin/CHANGELOG.json  | 15 ++++++++++
 heft-plugins/heft-jest-plugin/CHANGELOG.md    |  7 ++++-
 heft-plugins/heft-sass-plugin/CHANGELOG.json  | 18 ++++++++++++
 heft-plugins/heft-sass-plugin/CHANGELOG.md    |  7 ++++-
 .../heft-webpack4-plugin/CHANGELOG.json       | 18 ++++++++++++
 .../heft-webpack4-plugin/CHANGELOG.md         |  7 ++++-
 .../heft-webpack5-plugin/CHANGELOG.json       | 18 ++++++++++++
 .../heft-webpack5-plugin/CHANGELOG.md         |  7 ++++-
 .../debug-certificate-manager/CHANGELOG.json  | 15 ++++++++++
 .../debug-certificate-manager/CHANGELOG.md    |  7 ++++-
 libraries/load-themed-styles/CHANGELOG.json   | 15 ++++++++++
 libraries/load-themed-styles/CHANGELOG.md     |  7 ++++-
 libraries/package-deps-hash/CHANGELOG.json    | 15 ++++++++++
 libraries/package-deps-hash/CHANGELOG.md      |  7 ++++-
 libraries/stream-collator/CHANGELOG.json      | 18 ++++++++++++
 libraries/stream-collator/CHANGELOG.md        |  7 ++++-
 libraries/terminal/CHANGELOG.json             | 15 ++++++++++
 libraries/terminal/CHANGELOG.md               |  7 ++++-
 rigs/heft-node-rig/CHANGELOG.json             | 23 +++++++++++++++
 rigs/heft-node-rig/CHANGELOG.md               |  9 +++++-
 rigs/heft-web-rig/CHANGELOG.json              | 29 +++++++++++++++++++
 rigs/heft-web-rig/CHANGELOG.md                |  9 +++++-
 .../loader-load-themed-styles/CHANGELOG.json  | 18 ++++++++++++
 .../loader-load-themed-styles/CHANGELOG.md    |  7 ++++-
 webpack/loader-raw-script/CHANGELOG.json      | 15 ++++++++++
 webpack/loader-raw-script/CHANGELOG.md        |  7 ++++-
 webpack/localization-plugin/CHANGELOG.json    | 21 ++++++++++++++
 webpack/localization-plugin/CHANGELOG.md      |  7 ++++-
 webpack/module-minifier-plugin/CHANGELOG.json | 15 ++++++++++
 webpack/module-minifier-plugin/CHANGELOG.md   |  7 ++++-
 .../CHANGELOG.json                            | 15 ++++++++++
 .../CHANGELOG.md                              |  7 ++++-
 41 files changed, 445 insertions(+), 52 deletions(-)
 delete mode 100644 common/changes/@rushstack/heft-node-rig/lock-tsbuildinfo-path_2021-08-12-00-43.json
 delete mode 100644 common/changes/@rushstack/heft-web-rig/lock-tsbuildinfo-path_2021-08-12-00-43.json
 delete mode 100644 common/changes/@rushstack/heft/lock-tsbuildinfo-path_2021-08-12-00-43.json

diff --git a/apps/api-documenter/CHANGELOG.json b/apps/api-documenter/CHANGELOG.json
index c0a7f9b3e7b..54ed5701a18 100644
--- a/apps/api-documenter/CHANGELOG.json
+++ b/apps/api-documenter/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@microsoft/api-documenter",
   "entries": [
+    {
+      "version": "7.13.37",
+      "tag": "@microsoft/api-documenter_v7.13.37",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "7.13.36",
       "tag": "@microsoft/api-documenter_v7.13.36",
diff --git a/apps/api-documenter/CHANGELOG.md b/apps/api-documenter/CHANGELOG.md
index 8222ddd2fd2..02bce7a0147 100644
--- a/apps/api-documenter/CHANGELOG.md
+++ b/apps/api-documenter/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/api-documenter
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 7.13.37
+Thu, 12 Aug 2021 01:28:38 GMT
+
+_Version update only_
 
 ## 7.13.36
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/apps/heft/CHANGELOG.json b/apps/heft/CHANGELOG.json
index 240b821fd8e..af275f97bdf 100644
--- a/apps/heft/CHANGELOG.json
+++ b/apps/heft/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/heft",
   "entries": [
+    {
+      "version": "0.36.1",
+      "tag": "@rushstack/heft_v0.36.1",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Restore automatic generation of tsBuildInfo.json file path to work around odd path resolution behavior."
+          }
+        ]
+      }
+    },
     {
       "version": "0.36.0",
       "tag": "@rushstack/heft_v0.36.0",
diff --git a/apps/heft/CHANGELOG.md b/apps/heft/CHANGELOG.md
index c225cffdc52..69a527f9e5d 100644
--- a/apps/heft/CHANGELOG.md
+++ b/apps/heft/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/heft
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 0.36.1
+Thu, 12 Aug 2021 01:28:38 GMT
+
+### Patches
+
+- Restore automatic generation of tsBuildInfo.json file path to work around odd path resolution behavior.
 
 ## 0.36.0
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/apps/rundown/CHANGELOG.json b/apps/rundown/CHANGELOG.json
index 2b50a21ff1b..4496abeefed 100644
--- a/apps/rundown/CHANGELOG.json
+++ b/apps/rundown/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/rundown",
   "entries": [
+    {
+      "version": "1.0.129",
+      "tag": "@rushstack/rundown_v1.0.129",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.128",
       "tag": "@rushstack/rundown_v1.0.128",
diff --git a/apps/rundown/CHANGELOG.md b/apps/rundown/CHANGELOG.md
index a890839150f..037371a5ac5 100644
--- a/apps/rundown/CHANGELOG.md
+++ b/apps/rundown/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/rundown
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 1.0.129
+Thu, 12 Aug 2021 01:28:38 GMT
+
+_Version update only_
 
 ## 1.0.128
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/common/changes/@rushstack/heft-node-rig/lock-tsbuildinfo-path_2021-08-12-00-43.json b/common/changes/@rushstack/heft-node-rig/lock-tsbuildinfo-path_2021-08-12-00-43.json
deleted file mode 100644
index e74b298f390..00000000000
--- a/common/changes/@rushstack/heft-node-rig/lock-tsbuildinfo-path_2021-08-12-00-43.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "comment": "Restore automatic generation of tsBuildInfo.json file path to work around odd path resolution behavior.",
-      "type": "patch",
-      "packageName": "@rushstack/heft-node-rig"
-    }
-  ],
-  "packageName": "@rushstack/heft-node-rig",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-web-rig/lock-tsbuildinfo-path_2021-08-12-00-43.json b/common/changes/@rushstack/heft-web-rig/lock-tsbuildinfo-path_2021-08-12-00-43.json
deleted file mode 100644
index 9d55c53c21b..00000000000
--- a/common/changes/@rushstack/heft-web-rig/lock-tsbuildinfo-path_2021-08-12-00-43.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "comment": "Restore automatic generation of tsBuildInfo.json file path to work around odd path resolution behavior.",
-      "type": "patch",
-      "packageName": "@rushstack/heft-web-rig"
-    }
-  ],
-  "packageName": "@rushstack/heft-web-rig",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft/lock-tsbuildinfo-path_2021-08-12-00-43.json b/common/changes/@rushstack/heft/lock-tsbuildinfo-path_2021-08-12-00-43.json
deleted file mode 100644
index 9b07ca1300c..00000000000
--- a/common/changes/@rushstack/heft/lock-tsbuildinfo-path_2021-08-12-00-43.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "comment": "Restore automatic generation of tsBuildInfo.json file path to work around odd path resolution behavior.",
-      "type": "patch",
-      "packageName": "@rushstack/heft"
-    }
-  ],
-  "packageName": "@rushstack/heft",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.json b/heft-plugins/heft-jest-plugin/CHANGELOG.json
index fcc7baf6fda..e35ccff4da1 100644
--- a/heft-plugins/heft-jest-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-jest-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/heft-jest-plugin",
   "entries": [
+    {
+      "version": "0.1.18",
+      "tag": "@rushstack/heft-jest-plugin_v0.1.18",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.0` to `^0.36.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.17",
       "tag": "@rushstack/heft-jest-plugin_v0.1.17",
diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.md b/heft-plugins/heft-jest-plugin/CHANGELOG.md
index c38083d0cbf..4e58294ed6a 100644
--- a/heft-plugins/heft-jest-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-jest-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-jest-plugin
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 0.1.18
+Thu, 12 Aug 2021 01:28:38 GMT
+
+_Version update only_
 
 ## 0.1.17
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/heft-plugins/heft-sass-plugin/CHANGELOG.json b/heft-plugins/heft-sass-plugin/CHANGELOG.json
index 324016213e8..2bf8a12af1e 100644
--- a/heft-plugins/heft-sass-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-sass-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-sass-plugin",
   "entries": [
+    {
+      "version": "0.1.3",
+      "tag": "@rushstack/heft-sass-plugin_v0.1.3",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.0` to `^0.36.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.2",
       "tag": "@rushstack/heft-sass-plugin_v0.1.2",
diff --git a/heft-plugins/heft-sass-plugin/CHANGELOG.md b/heft-plugins/heft-sass-plugin/CHANGELOG.md
index 52dfcfd039a..be0f166f60c 100644
--- a/heft-plugins/heft-sass-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-sass-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-sass-plugin
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 0.1.3
+Thu, 12 Aug 2021 01:28:38 GMT
+
+_Version update only_
 
 ## 0.1.2
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
index bbc0dc23956..669e1683f4b 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
   "entries": [
+    {
+      "version": "0.2.4",
+      "tag": "@rushstack/heft-webpack4-plugin_v0.2.4",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.0` to `^0.36.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.3",
       "tag": "@rushstack/heft-webpack4-plugin_v0.2.3",
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
index 36c129a087b..801c225ed9a 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-webpack4-plugin
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 0.2.4
+Thu, 12 Aug 2021 01:28:38 GMT
+
+_Version update only_
 
 ## 0.2.3
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
index 2f12ca15533..840d446343b 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
   "entries": [
+    {
+      "version": "0.2.4",
+      "tag": "@rushstack/heft-webpack5-plugin_v0.2.4",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.0` to `^0.36.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.3",
       "tag": "@rushstack/heft-webpack5-plugin_v0.2.3",
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
index 20ddac63eea..6aee3a3148a 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-webpack5-plugin
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 0.2.4
+Thu, 12 Aug 2021 01:28:38 GMT
+
+_Version update only_
 
 ## 0.2.3
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/libraries/debug-certificate-manager/CHANGELOG.json b/libraries/debug-certificate-manager/CHANGELOG.json
index 9e4e1078f29..0b1682fe1b1 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.json
+++ b/libraries/debug-certificate-manager/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/debug-certificate-manager",
   "entries": [
+    {
+      "version": "1.0.54",
+      "tag": "@rushstack/debug-certificate-manager_v1.0.54",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.53",
       "tag": "@rushstack/debug-certificate-manager_v1.0.53",
diff --git a/libraries/debug-certificate-manager/CHANGELOG.md b/libraries/debug-certificate-manager/CHANGELOG.md
index 42ef485bf03..61a31531457 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.md
+++ b/libraries/debug-certificate-manager/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/debug-certificate-manager
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 1.0.54
+Thu, 12 Aug 2021 01:28:38 GMT
+
+_Version update only_
 
 ## 1.0.53
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/libraries/load-themed-styles/CHANGELOG.json b/libraries/load-themed-styles/CHANGELOG.json
index a4c47941226..1c4f1e90ba5 100644
--- a/libraries/load-themed-styles/CHANGELOG.json
+++ b/libraries/load-themed-styles/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@microsoft/load-themed-styles",
   "entries": [
+    {
+      "version": "1.10.200",
+      "tag": "@microsoft/load-themed-styles_v1.10.200",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-web-rig\" to `0.4.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.10.199",
       "tag": "@microsoft/load-themed-styles_v1.10.199",
diff --git a/libraries/load-themed-styles/CHANGELOG.md b/libraries/load-themed-styles/CHANGELOG.md
index b0e748794b1..34dda938c6e 100644
--- a/libraries/load-themed-styles/CHANGELOG.md
+++ b/libraries/load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/load-themed-styles
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 1.10.200
+Thu, 12 Aug 2021 01:28:38 GMT
+
+_Version update only_
 
 ## 1.10.199
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/libraries/package-deps-hash/CHANGELOG.json b/libraries/package-deps-hash/CHANGELOG.json
index ca79d6978e3..ec999f5db9d 100644
--- a/libraries/package-deps-hash/CHANGELOG.json
+++ b/libraries/package-deps-hash/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/package-deps-hash",
   "entries": [
+    {
+      "version": "3.0.58",
+      "tag": "@rushstack/package-deps-hash_v3.0.58",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "3.0.57",
       "tag": "@rushstack/package-deps-hash_v3.0.57",
diff --git a/libraries/package-deps-hash/CHANGELOG.md b/libraries/package-deps-hash/CHANGELOG.md
index 670970e16d4..102b204d37c 100644
--- a/libraries/package-deps-hash/CHANGELOG.md
+++ b/libraries/package-deps-hash/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/package-deps-hash
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 3.0.58
+Thu, 12 Aug 2021 01:28:38 GMT
+
+_Version update only_
 
 ## 3.0.57
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/libraries/stream-collator/CHANGELOG.json b/libraries/stream-collator/CHANGELOG.json
index 5514b1b64d4..f37d5170f5d 100644
--- a/libraries/stream-collator/CHANGELOG.json
+++ b/libraries/stream-collator/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/stream-collator",
   "entries": [
+    {
+      "version": "4.0.113",
+      "tag": "@rushstack/stream-collator_v4.0.113",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/terminal\" to `0.2.15`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "4.0.112",
       "tag": "@rushstack/stream-collator_v4.0.112",
diff --git a/libraries/stream-collator/CHANGELOG.md b/libraries/stream-collator/CHANGELOG.md
index 43dd067c355..b6e7add6878 100644
--- a/libraries/stream-collator/CHANGELOG.md
+++ b/libraries/stream-collator/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/stream-collator
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 4.0.113
+Thu, 12 Aug 2021 01:28:38 GMT
+
+_Version update only_
 
 ## 4.0.112
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/libraries/terminal/CHANGELOG.json b/libraries/terminal/CHANGELOG.json
index 5a3baed7e89..5e9db9ca813 100644
--- a/libraries/terminal/CHANGELOG.json
+++ b/libraries/terminal/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/terminal",
   "entries": [
+    {
+      "version": "0.2.15",
+      "tag": "@rushstack/terminal_v0.2.15",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.14",
       "tag": "@rushstack/terminal_v0.2.14",
diff --git a/libraries/terminal/CHANGELOG.md b/libraries/terminal/CHANGELOG.md
index ca9647d7b02..15b9c874bf7 100644
--- a/libraries/terminal/CHANGELOG.md
+++ b/libraries/terminal/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/terminal
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 0.2.15
+Thu, 12 Aug 2021 01:28:38 GMT
+
+_Version update only_
 
 ## 0.2.14
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/rigs/heft-node-rig/CHANGELOG.json b/rigs/heft-node-rig/CHANGELOG.json
index 77cc003dcd4..09ac25db5f4 100644
--- a/rigs/heft-node-rig/CHANGELOG.json
+++ b/rigs/heft-node-rig/CHANGELOG.json
@@ -1,6 +1,29 @@
 {
   "name": "@rushstack/heft-node-rig",
   "entries": [
+    {
+      "version": "1.2.1",
+      "tag": "@rushstack/heft-node-rig_v1.2.1",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Restore automatic generation of tsBuildInfo.json file path to work around odd path resolution behavior."
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-jest-plugin\" to `0.1.18`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.0` to `^0.36.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.2.0",
       "tag": "@rushstack/heft-node-rig_v1.2.0",
diff --git a/rigs/heft-node-rig/CHANGELOG.md b/rigs/heft-node-rig/CHANGELOG.md
index b400cbeb3cd..701b68e4eb5 100644
--- a/rigs/heft-node-rig/CHANGELOG.md
+++ b/rigs/heft-node-rig/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/heft-node-rig
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 1.2.1
+Thu, 12 Aug 2021 01:28:38 GMT
+
+### Patches
+
+- Restore automatic generation of tsBuildInfo.json file path to work around odd path resolution behavior.
 
 ## 1.2.0
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/rigs/heft-web-rig/CHANGELOG.json b/rigs/heft-web-rig/CHANGELOG.json
index 03123360c71..23806690b64 100644
--- a/rigs/heft-web-rig/CHANGELOG.json
+++ b/rigs/heft-web-rig/CHANGELOG.json
@@ -1,6 +1,35 @@
 {
   "name": "@rushstack/heft-web-rig",
   "entries": [
+    {
+      "version": "0.4.1",
+      "tag": "@rushstack/heft-web-rig_v0.4.1",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Restore automatic generation of tsBuildInfo.json file path to work around odd path resolution behavior."
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-jest-plugin\" to `0.1.18`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-sass-plugin\" to `0.1.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-webpack4-plugin\" to `0.2.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.0` to `^0.36.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.0",
       "tag": "@rushstack/heft-web-rig_v0.4.0",
diff --git a/rigs/heft-web-rig/CHANGELOG.md b/rigs/heft-web-rig/CHANGELOG.md
index bb9c41abf63..e54ef3de569 100644
--- a/rigs/heft-web-rig/CHANGELOG.md
+++ b/rigs/heft-web-rig/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/heft-web-rig
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 0.4.1
+Thu, 12 Aug 2021 01:28:38 GMT
+
+### Patches
+
+- Restore automatic generation of tsBuildInfo.json file path to work around odd path resolution behavior.
 
 ## 0.4.0
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.json b/webpack/loader-load-themed-styles/CHANGELOG.json
index 5736da03393..5581c387a89 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.json
+++ b/webpack/loader-load-themed-styles/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
   "entries": [
+    {
+      "version": "1.9.81",
+      "tag": "@microsoft/loader-load-themed-styles_v1.9.81",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/load-themed-styles\" to `1.10.200`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.9.80",
       "tag": "@microsoft/loader-load-themed-styles_v1.9.80",
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.md b/webpack/loader-load-themed-styles/CHANGELOG.md
index d283295542c..20e2577672a 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.md
+++ b/webpack/loader-load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/loader-load-themed-styles
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 1.9.81
+Thu, 12 Aug 2021 01:28:38 GMT
+
+_Version update only_
 
 ## 1.9.80
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/webpack/loader-raw-script/CHANGELOG.json b/webpack/loader-raw-script/CHANGELOG.json
index ddb131085ff..b66867766dd 100644
--- a/webpack/loader-raw-script/CHANGELOG.json
+++ b/webpack/loader-raw-script/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/loader-raw-script",
   "entries": [
+    {
+      "version": "1.3.167",
+      "tag": "@rushstack/loader-raw-script_v1.3.167",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.3.166",
       "tag": "@rushstack/loader-raw-script_v1.3.166",
diff --git a/webpack/loader-raw-script/CHANGELOG.md b/webpack/loader-raw-script/CHANGELOG.md
index 432e3826658..e6c3b64cf7d 100644
--- a/webpack/loader-raw-script/CHANGELOG.md
+++ b/webpack/loader-raw-script/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/loader-raw-script
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 1.3.167
+Thu, 12 Aug 2021 01:28:38 GMT
+
+_Version update only_
 
 ## 1.3.166
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/webpack/localization-plugin/CHANGELOG.json b/webpack/localization-plugin/CHANGELOG.json
index 56875ed5e23..3db45d6c643 100644
--- a/webpack/localization-plugin/CHANGELOG.json
+++ b/webpack/localization-plugin/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@rushstack/localization-plugin",
   "entries": [
+    {
+      "version": "0.6.41",
+      "tag": "@rushstack/localization-plugin_v0.6.41",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/set-webpack-public-path-plugin\" to `3.2.61`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/set-webpack-public-path-plugin\" from `^3.2.60` to `^3.2.61`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.6.40",
       "tag": "@rushstack/localization-plugin_v0.6.40",
diff --git a/webpack/localization-plugin/CHANGELOG.md b/webpack/localization-plugin/CHANGELOG.md
index da8ed9aa82d..96202b99bab 100644
--- a/webpack/localization-plugin/CHANGELOG.md
+++ b/webpack/localization-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/localization-plugin
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 0.6.41
+Thu, 12 Aug 2021 01:28:38 GMT
+
+_Version update only_
 
 ## 0.6.40
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/webpack/module-minifier-plugin/CHANGELOG.json b/webpack/module-minifier-plugin/CHANGELOG.json
index cd053fe2c84..9e538e9c8db 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.json
+++ b/webpack/module-minifier-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/module-minifier-plugin",
   "entries": [
+    {
+      "version": "0.4.5",
+      "tag": "@rushstack/module-minifier-plugin_v0.4.5",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.4",
       "tag": "@rushstack/module-minifier-plugin_v0.4.4",
diff --git a/webpack/module-minifier-plugin/CHANGELOG.md b/webpack/module-minifier-plugin/CHANGELOG.md
index 1e0ef02dca1..1ba1336281c 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.md
+++ b/webpack/module-minifier-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/module-minifier-plugin
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 0.4.5
+Thu, 12 Aug 2021 01:28:38 GMT
+
+_Version update only_
 
 ## 0.4.4
 Wed, 11 Aug 2021 23:14:17 GMT
diff --git a/webpack/set-webpack-public-path-plugin/CHANGELOG.json b/webpack/set-webpack-public-path-plugin/CHANGELOG.json
index 81a3f4bc348..db3b60e1796 100644
--- a/webpack/set-webpack-public-path-plugin/CHANGELOG.json
+++ b/webpack/set-webpack-public-path-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/set-webpack-public-path-plugin",
   "entries": [
+    {
+      "version": "3.2.61",
+      "tag": "@rushstack/set-webpack-public-path-plugin_v3.2.61",
+      "date": "Thu, 12 Aug 2021 01:28:38 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "3.2.60",
       "tag": "@rushstack/set-webpack-public-path-plugin_v3.2.60",
diff --git a/webpack/set-webpack-public-path-plugin/CHANGELOG.md b/webpack/set-webpack-public-path-plugin/CHANGELOG.md
index 8c290ef8cb6..4a58b9315a9 100644
--- a/webpack/set-webpack-public-path-plugin/CHANGELOG.md
+++ b/webpack/set-webpack-public-path-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/set-webpack-public-path-plugin
 
-This log was last generated on Wed, 11 Aug 2021 23:14:17 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+
+## 3.2.61
+Thu, 12 Aug 2021 01:28:38 GMT
+
+_Version update only_
 
 ## 3.2.60
 Wed, 11 Aug 2021 23:14:17 GMT

From 0a69d4362c3009f7226d4216d3dc5ff370dc7005 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Thu, 12 Aug 2021 01:28:41 +0000
Subject: [PATCH 116/155] Applying package updates.

---
 apps/api-documenter/package.json                    | 2 +-
 apps/heft/package.json                              | 2 +-
 apps/rundown/package.json                           | 2 +-
 heft-plugins/heft-jest-plugin/package.json          | 4 ++--
 heft-plugins/heft-sass-plugin/package.json          | 4 ++--
 heft-plugins/heft-webpack4-plugin/package.json      | 4 ++--
 heft-plugins/heft-webpack5-plugin/package.json      | 4 ++--
 libraries/debug-certificate-manager/package.json    | 2 +-
 libraries/load-themed-styles/package.json           | 2 +-
 libraries/package-deps-hash/package.json            | 2 +-
 libraries/stream-collator/package.json              | 2 +-
 libraries/terminal/package.json                     | 2 +-
 rigs/heft-node-rig/package.json                     | 4 ++--
 rigs/heft-web-rig/package.json                      | 4 ++--
 webpack/loader-load-themed-styles/package.json      | 2 +-
 webpack/loader-raw-script/package.json              | 2 +-
 webpack/localization-plugin/package.json            | 4 ++--
 webpack/module-minifier-plugin/package.json         | 2 +-
 webpack/set-webpack-public-path-plugin/package.json | 2 +-
 19 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/apps/api-documenter/package.json b/apps/api-documenter/package.json
index b4ba8f8602a..b2721392f0a 100644
--- a/apps/api-documenter/package.json
+++ b/apps/api-documenter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/api-documenter",
-  "version": "7.13.36",
+  "version": "7.13.37",
   "description": "Read JSON files from api-extractor, generate documentation pages",
   "repository": {
     "type": "git",
diff --git a/apps/heft/package.json b/apps/heft/package.json
index 2a5382fcf7a..f819cf3e9d9 100644
--- a/apps/heft/package.json
+++ b/apps/heft/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft",
-  "version": "0.36.0",
+  "version": "0.36.1",
   "description": "Build all your JavaScript projects the same way: A way that works.",
   "keywords": [
     "toolchain",
diff --git a/apps/rundown/package.json b/apps/rundown/package.json
index 380f70aa123..fbda842f979 100644
--- a/apps/rundown/package.json
+++ b/apps/rundown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/rundown",
-  "version": "1.0.128",
+  "version": "1.0.129",
   "description": "Detect load time regressions by running an app, tracing require() calls, and generating a deterministic report",
   "repository": {
     "type": "git",
diff --git a/heft-plugins/heft-jest-plugin/package.json b/heft-plugins/heft-jest-plugin/package.json
index 3b501b8a1fa..60db7eb0e8f 100644
--- a/heft-plugins/heft-jest-plugin/package.json
+++ b/heft-plugins/heft-jest-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-jest-plugin",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "description": "Heft plugin for Jest",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.0"
+    "@rushstack/heft": "^0.36.1"
   },
   "dependencies": {
     "@jest/core": "~25.4.0",
diff --git a/heft-plugins/heft-sass-plugin/package.json b/heft-plugins/heft-sass-plugin/package.json
index c44b8c88bcd..da8bfa15d16 100644
--- a/heft-plugins/heft-sass-plugin/package.json
+++ b/heft-plugins/heft-sass-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-sass-plugin",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Heft plugin for SASS",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.0"
+    "@rushstack/heft": "^0.36.1"
   },
   "dependencies": {
     "@rushstack/heft-config-file": "workspace:*",
diff --git a/heft-plugins/heft-webpack4-plugin/package.json b/heft-plugins/heft-webpack4-plugin/package.json
index 7bd86312499..4ee6840218a 100644
--- a/heft-plugins/heft-webpack4-plugin/package.json
+++ b/heft-plugins/heft-webpack4-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Heft plugin for Webpack 4",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.0"
+    "@rushstack/heft": "^0.36.1"
   },
   "dependencies": {
     "@rushstack/node-core-library": "workspace:*",
diff --git a/heft-plugins/heft-webpack5-plugin/package.json b/heft-plugins/heft-webpack5-plugin/package.json
index 44081054c42..a7c5bcaf9a9 100644
--- a/heft-plugins/heft-webpack5-plugin/package.json
+++ b/heft-plugins/heft-webpack5-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Heft plugin for Webpack 5",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.0"
+    "@rushstack/heft": "^0.36.1"
   },
   "dependencies": {
     "@rushstack/node-core-library": "workspace:*",
diff --git a/libraries/debug-certificate-manager/package.json b/libraries/debug-certificate-manager/package.json
index ec33e7e1b48..466a8ca23f3 100644
--- a/libraries/debug-certificate-manager/package.json
+++ b/libraries/debug-certificate-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/debug-certificate-manager",
-  "version": "1.0.53",
+  "version": "1.0.54",
   "description": "Cross-platform functionality to create debug ssl certificates.",
   "main": "lib/index.js",
   "typings": "dist/debug-certificate-manager.d.ts",
diff --git a/libraries/load-themed-styles/package.json b/libraries/load-themed-styles/package.json
index 96d170a973d..9683bf0ab21 100644
--- a/libraries/load-themed-styles/package.json
+++ b/libraries/load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/load-themed-styles",
-  "version": "1.10.199",
+  "version": "1.10.200",
   "description": "Loads themed styles.",
   "license": "MIT",
   "repository": {
diff --git a/libraries/package-deps-hash/package.json b/libraries/package-deps-hash/package.json
index 310f663dc1e..24fd1b481cc 100644
--- a/libraries/package-deps-hash/package.json
+++ b/libraries/package-deps-hash/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/package-deps-hash",
-  "version": "3.0.57",
+  "version": "3.0.58",
   "description": "",
   "main": "lib/index.js",
   "typings": "dist/package-deps-hash.d.ts",
diff --git a/libraries/stream-collator/package.json b/libraries/stream-collator/package.json
index e2c70c962f8..7583fb1432e 100644
--- a/libraries/stream-collator/package.json
+++ b/libraries/stream-collator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/stream-collator",
-  "version": "4.0.112",
+  "version": "4.0.113",
   "description": "Display intelligible realtime output from concurrent processes",
   "repository": {
     "type": "git",
diff --git a/libraries/terminal/package.json b/libraries/terminal/package.json
index d8631159864..3db4662c762 100644
--- a/libraries/terminal/package.json
+++ b/libraries/terminal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/terminal",
-  "version": "0.2.14",
+  "version": "0.2.15",
   "description": "User interface primitives for console applications",
   "main": "lib/index.js",
   "typings": "dist/terminal.d.ts",
diff --git a/rigs/heft-node-rig/package.json b/rigs/heft-node-rig/package.json
index d986bb694fa..f73d1285a2e 100644
--- a/rigs/heft-node-rig/package.json
+++ b/rigs/heft-node-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-node-rig",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A rig package for Node.js projects that build using Heft",
   "license": "MIT",
   "scripts": {
@@ -11,7 +11,7 @@
     "url": "https://github.com/microsoft/rushstack/tree/master/rigs/heft-node-rig"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.0"
+    "@rushstack/heft": "^0.36.1"
   },
   "dependencies": {
     "@microsoft/api-extractor": "workspace:*",
diff --git a/rigs/heft-web-rig/package.json b/rigs/heft-web-rig/package.json
index 9cf0013c647..19ec5b8f7ea 100644
--- a/rigs/heft-web-rig/package.json
+++ b/rigs/heft-web-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-web-rig",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "A rig package for web browser projects that build using Heft",
   "license": "MIT",
   "scripts": {
@@ -11,7 +11,7 @@
     "url": "https://github.com/microsoft/rushstack/tree/master/rigs/heft-web-rig"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.0"
+    "@rushstack/heft": "^0.36.1"
   },
   "dependencies": {
     "@microsoft/api-extractor": "workspace:*",
diff --git a/webpack/loader-load-themed-styles/package.json b/webpack/loader-load-themed-styles/package.json
index f4417307916..b8f7e45ab18 100644
--- a/webpack/loader-load-themed-styles/package.json
+++ b/webpack/loader-load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
-  "version": "1.9.80",
+  "version": "1.9.81",
   "description": "This simple loader wraps the loading of CSS in script equivalent to `require('load-themed-styles').loadStyles( /* css text */ )`. It is designed to be a replacement for style-loader.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/loader-raw-script/package.json b/webpack/loader-raw-script/package.json
index 07ec5e71e61..0e56365e7a5 100644
--- a/webpack/loader-raw-script/package.json
+++ b/webpack/loader-raw-script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/loader-raw-script",
-  "version": "1.3.166",
+  "version": "1.3.167",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/localization-plugin/package.json b/webpack/localization-plugin/package.json
index d3696a19228..15d38d56abf 100644
--- a/webpack/localization-plugin/package.json
+++ b/webpack/localization-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/localization-plugin",
-  "version": "0.6.40",
+  "version": "0.6.41",
   "description": "This plugin facilitates localization with Webpack.",
   "main": "lib/index.js",
   "typings": "dist/localization-plugin.d.ts",
@@ -13,7 +13,7 @@
     "build": "heft build --clean"
   },
   "peerDependencies": {
-    "@rushstack/set-webpack-public-path-plugin": "^3.2.60",
+    "@rushstack/set-webpack-public-path-plugin": "^3.2.61",
     "@types/webpack": "^4.39.0",
     "webpack": "^4.31.0"
   },
diff --git a/webpack/module-minifier-plugin/package.json b/webpack/module-minifier-plugin/package.json
index cb2c3242265..ff9c5731fb5 100644
--- a/webpack/module-minifier-plugin/package.json
+++ b/webpack/module-minifier-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/module-minifier-plugin",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "This plugin splits minification of webpack compilations into smaller units.",
   "main": "lib/index.js",
   "typings": "dist/module-minifier-plugin.d.ts",
diff --git a/webpack/set-webpack-public-path-plugin/package.json b/webpack/set-webpack-public-path-plugin/package.json
index 0b613bf7206..7bb9a73d9d0 100644
--- a/webpack/set-webpack-public-path-plugin/package.json
+++ b/webpack/set-webpack-public-path-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/set-webpack-public-path-plugin",
-  "version": "3.2.60",
+  "version": "3.2.61",
   "description": "This plugin sets the webpack public path at runtime.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

From 5b3c35610b6e80789e1d3bd5c8411e2e0028418d Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Wed, 11 Aug 2021 23:48:34 -0700
Subject: [PATCH 117/155] Ensure the CWD is set correctly for subprocesses.

---
 .../ApiExtractorPlugin/ApiExtractorRunner.ts     | 14 +++++---------
 .../TypeScriptPlugin/TypeScriptBuilder.ts        | 10 +++++++---
 .../utilities/subprocess/SubprocessRunnerBase.ts | 16 ++++++++++++++--
 .../src/utilities/subprocess/startSubprocess.ts  |  9 ++++++---
 4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/apps/heft/src/plugins/ApiExtractorPlugin/ApiExtractorRunner.ts b/apps/heft/src/plugins/ApiExtractorPlugin/ApiExtractorRunner.ts
index f5990e71a54..67ebb230d6b 100644
--- a/apps/heft/src/plugins/ApiExtractorPlugin/ApiExtractorRunner.ts
+++ b/apps/heft/src/plugins/ApiExtractorPlugin/ApiExtractorRunner.ts
@@ -6,10 +6,13 @@ import * as path from 'path';
 import { Terminal, Path } from '@rushstack/node-core-library';
 import type * as TApiExtractor from '@microsoft/api-extractor';
 
-import { SubprocessRunnerBase } from '../../utilities/subprocess/SubprocessRunnerBase';
+import {
+  ISubprocessRunnerBaseConfiguration,
+  SubprocessRunnerBase
+} from '../../utilities/subprocess/SubprocessRunnerBase';
 import { IScopedLogger } from '../../pluginFramework/logging/ScopedLogger';
 
-export interface IApiExtractorRunnerConfiguration {
+export interface IApiExtractorRunnerConfiguration extends ISubprocessRunnerBaseConfiguration {
   /**
    * The path to the Extractor's config file ("api-extractor.json")
    *
@@ -31,13 +34,6 @@ export interface IApiExtractorRunnerConfiguration {
    */
   typescriptPackagePath: string | undefined;
 
-  /**
-   * The folder of the project being built
-   *
-   * For example, /home/username/code/repo/project
-   */
-  buildFolder: string;
-
   /**
    * If set to true, run API Extractor in production mode
    */
diff --git a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
index c82e29c0146..3573c2a6456 100644
--- a/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
+++ b/apps/heft/src/plugins/TypeScriptPlugin/TypeScriptBuilder.ts
@@ -20,7 +20,10 @@ import {
   IExtendedSourceFile
 } from './internalTypings/TypeScriptInternals';
 
-import { SubprocessRunnerBase } from '../../utilities/subprocess/SubprocessRunnerBase';
+import {
+  ISubprocessRunnerBaseConfiguration,
+  SubprocessRunnerBase
+} from '../../utilities/subprocess/SubprocessRunnerBase';
 import { Async } from '../../utilities/Async';
 import { PerformanceMeasurer, PerformanceMeasurerAsync } from '../../utilities/Performance';
 import { Tslint } from './Tslint';
@@ -41,8 +44,9 @@ interface ILinterWrapper {
   measureTsPerformance: PerformanceMeasurer;
 }
 
-export interface ITypeScriptBuilderConfiguration extends ISharedTypeScriptConfiguration {
-  buildFolder: string;
+export interface ITypeScriptBuilderConfiguration
+  extends ISharedTypeScriptConfiguration,
+    ISubprocessRunnerBaseConfiguration {
   /**
    * The folder to write build metadata.
    */
diff --git a/apps/heft/src/utilities/subprocess/SubprocessRunnerBase.ts b/apps/heft/src/utilities/subprocess/SubprocessRunnerBase.ts
index e1bc5bdfc8b..d755e643298 100644
--- a/apps/heft/src/utilities/subprocess/SubprocessRunnerBase.ts
+++ b/apps/heft/src/utilities/subprocess/SubprocessRunnerBase.ts
@@ -33,6 +33,15 @@ export interface ISubprocessInnerConfiguration {
 export const SUBPROCESS_RUNNER_CLASS_LABEL: unique symbol = Symbol('IsSubprocessModule');
 export const SUBPROCESS_RUNNER_INNER_INVOKE: unique symbol = Symbol('SubprocessInnerInvoke');
 
+export interface ISubprocessRunnerBaseConfiguration {
+  /**
+   * The folder of the project being built
+   *
+   * For example, /home/username/code/repo/project
+   */
+  buildFolder: string;
+}
+
 interface ISubprocessExitMessage extends ISubprocessMessageBase {
   type: 'exit';
   error: ISubprocessApiCallArg;
@@ -45,7 +54,9 @@ interface ISubprocessExitMessage extends ISubprocessMessageBase {
  * The subprocess can be provided with a configuration, which must be JSON-serializable,
  * and the subprocess can log data via a Terminal object.
  */
-export abstract class SubprocessRunnerBase<TSubprocessConfiguration> {
+export abstract class SubprocessRunnerBase<
+  TSubprocessConfiguration extends ISubprocessRunnerBaseConfiguration
+> {
   public static [SUBPROCESS_RUNNER_CLASS_LABEL]: boolean = true;
   private static _subprocessInspectorPort: number = 9229 + 1; // 9229 is the default port
 
@@ -105,7 +116,7 @@ export abstract class SubprocessRunnerBase<TSubprocessConfiguration> {
     }
   }
 
-  public static initializeSubprocess<TSubprocessConfiguration>(
+  public static initializeSubprocess<TSubprocessConfiguration extends ISubprocessRunnerBaseConfiguration>(
     thisType: new (
       parentGlobalTerminalProvider: ITerminalProvider,
       configuration: TSubprocessConfiguration,
@@ -148,6 +159,7 @@ export abstract class SubprocessRunnerBase<TSubprocessConfiguration> {
         [this.filename, JSON.stringify(this._innerConfiguration), JSON.stringify(this._configuration)],
         {
           execArgv: this._processNodeArgsForSubprocess(this._globalTerminal, process.execArgv),
+          cwd: this._configuration.buildFolder,
           ...SubprocessTerminator.RECOMMENDED_OPTIONS
         }
       );
diff --git a/apps/heft/src/utilities/subprocess/startSubprocess.ts b/apps/heft/src/utilities/subprocess/startSubprocess.ts
index 7637d98c90c..d967fd017e9 100644
--- a/apps/heft/src/utilities/subprocess/startSubprocess.ts
+++ b/apps/heft/src/utilities/subprocess/startSubprocess.ts
@@ -5,7 +5,8 @@ import {
   SubprocessRunnerBase,
   ISubprocessInnerConfiguration,
   SUBPROCESS_RUNNER_CLASS_LABEL,
-  SUBPROCESS_RUNNER_INNER_INVOKE
+  SUBPROCESS_RUNNER_INNER_INVOKE,
+  ISubprocessRunnerBaseConfiguration
 } from './SubprocessRunnerBase';
 
 const [, , subprocessModulePath, serializedInnerConfiguration, serializedSubprocessConfiguration] =
@@ -22,7 +23,7 @@ if (subprocessRunnerModuleExports.length !== 1) {
   );
 }
 
-declare class SubprocessRunnerSubclass extends SubprocessRunnerBase<object> {
+declare class SubprocessRunnerSubclass extends SubprocessRunnerBase<ISubprocessRunnerBaseConfiguration> {
   public filename: string;
   public invokeAsync(): Promise<void>;
 }
@@ -37,7 +38,9 @@ if (!SubprocessRunnerClass[SUBPROCESS_RUNNER_CLASS_LABEL]) {
 }
 
 const innerConfiguration: ISubprocessInnerConfiguration = JSON.parse(serializedInnerConfiguration);
-const subprocessConfiguration: object = JSON.parse(serializedSubprocessConfiguration);
+const subprocessConfiguration: ISubprocessRunnerBaseConfiguration = JSON.parse(
+  serializedSubprocessConfiguration
+);
 
 const subprocessRunner: SubprocessRunnerSubclass = SubprocessRunnerClass.initializeSubprocess(
   SubprocessRunnerClass,

From 5e5877d782e67594da7e8121aa49c01bde51b762 Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Wed, 11 Aug 2021 23:51:46 -0700
Subject: [PATCH 118/155] Rush change

---
 .../ianc-fix-subprocess-cwd_2021-08-12-06-51.json     | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@rushstack/heft/ianc-fix-subprocess-cwd_2021-08-12-06-51.json

diff --git a/common/changes/@rushstack/heft/ianc-fix-subprocess-cwd_2021-08-12-06-51.json b/common/changes/@rushstack/heft/ianc-fix-subprocess-cwd_2021-08-12-06-51.json
new file mode 100644
index 00000000000..6b223716ab7
--- /dev/null
+++ b/common/changes/@rushstack/heft/ianc-fix-subprocess-cwd_2021-08-12-06-51.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/heft",
+      "comment": "Fix an issue with the TypeScript compilation when Heft is invoked in a terminal with incorrect casing in the CWD.",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@rushstack/heft",
+  "email": "iclanton@users.noreply.github.com"
+}
\ No newline at end of file

From 29206c74ce417a7b4fdb77f2a9749e0e370192a2 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Thu, 12 Aug 2021 18:11:18 +0000
Subject: [PATCH 119/155] Deleting change files and updating change logs for
 package updates.

---
 apps/api-documenter/CHANGELOG.json            | 15 ++++++++++++
 apps/api-documenter/CHANGELOG.md              |  7 +++++-
 apps/heft/CHANGELOG.json                      | 12 ++++++++++
 apps/heft/CHANGELOG.md                        |  9 ++++++-
 apps/rundown/CHANGELOG.json                   | 15 ++++++++++++
 apps/rundown/CHANGELOG.md                     |  7 +++++-
 ...c-fix-subprocess-cwd_2021-08-12-06-51.json | 11 ---------
 heft-plugins/heft-jest-plugin/CHANGELOG.json  | 15 ++++++++++++
 heft-plugins/heft-jest-plugin/CHANGELOG.md    |  7 +++++-
 heft-plugins/heft-sass-plugin/CHANGELOG.json  | 18 ++++++++++++++
 heft-plugins/heft-sass-plugin/CHANGELOG.md    |  7 +++++-
 .../heft-webpack4-plugin/CHANGELOG.json       | 18 ++++++++++++++
 .../heft-webpack4-plugin/CHANGELOG.md         |  7 +++++-
 .../heft-webpack5-plugin/CHANGELOG.json       | 18 ++++++++++++++
 .../heft-webpack5-plugin/CHANGELOG.md         |  7 +++++-
 .../debug-certificate-manager/CHANGELOG.json  | 15 ++++++++++++
 .../debug-certificate-manager/CHANGELOG.md    |  7 +++++-
 libraries/load-themed-styles/CHANGELOG.json   | 15 ++++++++++++
 libraries/load-themed-styles/CHANGELOG.md     |  7 +++++-
 libraries/package-deps-hash/CHANGELOG.json    | 15 ++++++++++++
 libraries/package-deps-hash/CHANGELOG.md      |  7 +++++-
 libraries/stream-collator/CHANGELOG.json      | 18 ++++++++++++++
 libraries/stream-collator/CHANGELOG.md        |  7 +++++-
 libraries/terminal/CHANGELOG.json             | 15 ++++++++++++
 libraries/terminal/CHANGELOG.md               |  7 +++++-
 rigs/heft-node-rig/CHANGELOG.json             | 18 ++++++++++++++
 rigs/heft-node-rig/CHANGELOG.md               |  7 +++++-
 rigs/heft-web-rig/CHANGELOG.json              | 24 +++++++++++++++++++
 rigs/heft-web-rig/CHANGELOG.md                |  7 +++++-
 .../loader-load-themed-styles/CHANGELOG.json  | 18 ++++++++++++++
 .../loader-load-themed-styles/CHANGELOG.md    |  7 +++++-
 webpack/loader-raw-script/CHANGELOG.json      | 15 ++++++++++++
 webpack/loader-raw-script/CHANGELOG.md        |  7 +++++-
 webpack/localization-plugin/CHANGELOG.json    | 21 ++++++++++++++++
 webpack/localization-plugin/CHANGELOG.md      |  7 +++++-
 webpack/module-minifier-plugin/CHANGELOG.json | 15 ++++++++++++
 webpack/module-minifier-plugin/CHANGELOG.md   |  7 +++++-
 .../CHANGELOG.json                            | 15 ++++++++++++
 .../CHANGELOG.md                              |  7 +++++-
 39 files changed, 431 insertions(+), 30 deletions(-)
 delete mode 100644 common/changes/@rushstack/heft/ianc-fix-subprocess-cwd_2021-08-12-06-51.json

diff --git a/apps/api-documenter/CHANGELOG.json b/apps/api-documenter/CHANGELOG.json
index 54ed5701a18..0f56273c0e4 100644
--- a/apps/api-documenter/CHANGELOG.json
+++ b/apps/api-documenter/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@microsoft/api-documenter",
   "entries": [
+    {
+      "version": "7.13.38",
+      "tag": "@microsoft/api-documenter_v7.13.38",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "7.13.37",
       "tag": "@microsoft/api-documenter_v7.13.37",
diff --git a/apps/api-documenter/CHANGELOG.md b/apps/api-documenter/CHANGELOG.md
index 02bce7a0147..30c05a1d4ab 100644
--- a/apps/api-documenter/CHANGELOG.md
+++ b/apps/api-documenter/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/api-documenter
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 7.13.38
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 7.13.37
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/apps/heft/CHANGELOG.json b/apps/heft/CHANGELOG.json
index af275f97bdf..60460e3446b 100644
--- a/apps/heft/CHANGELOG.json
+++ b/apps/heft/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/heft",
   "entries": [
+    {
+      "version": "0.36.2",
+      "tag": "@rushstack/heft_v0.36.2",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Fix an issue with the TypeScript compilation when Heft is invoked in a terminal with incorrect casing in the CWD."
+          }
+        ]
+      }
+    },
     {
       "version": "0.36.1",
       "tag": "@rushstack/heft_v0.36.1",
diff --git a/apps/heft/CHANGELOG.md b/apps/heft/CHANGELOG.md
index 69a527f9e5d..6e528e0aabc 100644
--- a/apps/heft/CHANGELOG.md
+++ b/apps/heft/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/heft
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 0.36.2
+Thu, 12 Aug 2021 18:11:18 GMT
+
+### Patches
+
+- Fix an issue with the TypeScript compilation when Heft is invoked in a terminal with incorrect casing in the CWD.
 
 ## 0.36.1
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/apps/rundown/CHANGELOG.json b/apps/rundown/CHANGELOG.json
index 4496abeefed..12147385488 100644
--- a/apps/rundown/CHANGELOG.json
+++ b/apps/rundown/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/rundown",
   "entries": [
+    {
+      "version": "1.0.130",
+      "tag": "@rushstack/rundown_v1.0.130",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.129",
       "tag": "@rushstack/rundown_v1.0.129",
diff --git a/apps/rundown/CHANGELOG.md b/apps/rundown/CHANGELOG.md
index 037371a5ac5..37c759d8d89 100644
--- a/apps/rundown/CHANGELOG.md
+++ b/apps/rundown/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/rundown
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 1.0.130
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 1.0.129
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/common/changes/@rushstack/heft/ianc-fix-subprocess-cwd_2021-08-12-06-51.json b/common/changes/@rushstack/heft/ianc-fix-subprocess-cwd_2021-08-12-06-51.json
deleted file mode 100644
index 6b223716ab7..00000000000
--- a/common/changes/@rushstack/heft/ianc-fix-subprocess-cwd_2021-08-12-06-51.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/heft",
-      "comment": "Fix an issue with the TypeScript compilation when Heft is invoked in a terminal with incorrect casing in the CWD.",
-      "type": "patch"
-    }
-  ],
-  "packageName": "@rushstack/heft",
-  "email": "iclanton@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.json b/heft-plugins/heft-jest-plugin/CHANGELOG.json
index e35ccff4da1..323c1c45cf4 100644
--- a/heft-plugins/heft-jest-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-jest-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/heft-jest-plugin",
   "entries": [
+    {
+      "version": "0.1.19",
+      "tag": "@rushstack/heft-jest-plugin_v0.1.19",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.1` to `^0.36.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.18",
       "tag": "@rushstack/heft-jest-plugin_v0.1.18",
diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.md b/heft-plugins/heft-jest-plugin/CHANGELOG.md
index 4e58294ed6a..68a5ba2a618 100644
--- a/heft-plugins/heft-jest-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-jest-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-jest-plugin
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 0.1.19
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 0.1.18
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/heft-plugins/heft-sass-plugin/CHANGELOG.json b/heft-plugins/heft-sass-plugin/CHANGELOG.json
index 2bf8a12af1e..abf20b3a957 100644
--- a/heft-plugins/heft-sass-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-sass-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-sass-plugin",
   "entries": [
+    {
+      "version": "0.1.4",
+      "tag": "@rushstack/heft-sass-plugin_v0.1.4",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.1` to `^0.36.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.3",
       "tag": "@rushstack/heft-sass-plugin_v0.1.3",
diff --git a/heft-plugins/heft-sass-plugin/CHANGELOG.md b/heft-plugins/heft-sass-plugin/CHANGELOG.md
index be0f166f60c..601f3532fda 100644
--- a/heft-plugins/heft-sass-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-sass-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-sass-plugin
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 0.1.4
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 0.1.3
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
index 669e1683f4b..f8617d0d3a1 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
   "entries": [
+    {
+      "version": "0.2.5",
+      "tag": "@rushstack/heft-webpack4-plugin_v0.2.5",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.1` to `^0.36.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.4",
       "tag": "@rushstack/heft-webpack4-plugin_v0.2.4",
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
index 801c225ed9a..e67450e888b 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-webpack4-plugin
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 0.2.5
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 0.2.4
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
index 840d446343b..52655c2f461 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
   "entries": [
+    {
+      "version": "0.2.5",
+      "tag": "@rushstack/heft-webpack5-plugin_v0.2.5",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.1` to `^0.36.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.4",
       "tag": "@rushstack/heft-webpack5-plugin_v0.2.4",
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
index 6aee3a3148a..5cf96d78bd1 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-webpack5-plugin
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 0.2.5
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 0.2.4
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/libraries/debug-certificate-manager/CHANGELOG.json b/libraries/debug-certificate-manager/CHANGELOG.json
index 0b1682fe1b1..c8465f7a95a 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.json
+++ b/libraries/debug-certificate-manager/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/debug-certificate-manager",
   "entries": [
+    {
+      "version": "1.0.55",
+      "tag": "@rushstack/debug-certificate-manager_v1.0.55",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.54",
       "tag": "@rushstack/debug-certificate-manager_v1.0.54",
diff --git a/libraries/debug-certificate-manager/CHANGELOG.md b/libraries/debug-certificate-manager/CHANGELOG.md
index 61a31531457..c923a19e793 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.md
+++ b/libraries/debug-certificate-manager/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/debug-certificate-manager
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 1.0.55
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 1.0.54
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/libraries/load-themed-styles/CHANGELOG.json b/libraries/load-themed-styles/CHANGELOG.json
index 1c4f1e90ba5..08ae7bb60ff 100644
--- a/libraries/load-themed-styles/CHANGELOG.json
+++ b/libraries/load-themed-styles/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@microsoft/load-themed-styles",
   "entries": [
+    {
+      "version": "1.10.201",
+      "tag": "@microsoft/load-themed-styles_v1.10.201",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-web-rig\" to `0.4.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.10.200",
       "tag": "@microsoft/load-themed-styles_v1.10.200",
diff --git a/libraries/load-themed-styles/CHANGELOG.md b/libraries/load-themed-styles/CHANGELOG.md
index 34dda938c6e..76c17772ee4 100644
--- a/libraries/load-themed-styles/CHANGELOG.md
+++ b/libraries/load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/load-themed-styles
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 1.10.201
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 1.10.200
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/libraries/package-deps-hash/CHANGELOG.json b/libraries/package-deps-hash/CHANGELOG.json
index ec999f5db9d..ae6e18904ec 100644
--- a/libraries/package-deps-hash/CHANGELOG.json
+++ b/libraries/package-deps-hash/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/package-deps-hash",
   "entries": [
+    {
+      "version": "3.0.59",
+      "tag": "@rushstack/package-deps-hash_v3.0.59",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "3.0.58",
       "tag": "@rushstack/package-deps-hash_v3.0.58",
diff --git a/libraries/package-deps-hash/CHANGELOG.md b/libraries/package-deps-hash/CHANGELOG.md
index 102b204d37c..4bf9649c851 100644
--- a/libraries/package-deps-hash/CHANGELOG.md
+++ b/libraries/package-deps-hash/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/package-deps-hash
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 3.0.59
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 3.0.58
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/libraries/stream-collator/CHANGELOG.json b/libraries/stream-collator/CHANGELOG.json
index f37d5170f5d..667a2499102 100644
--- a/libraries/stream-collator/CHANGELOG.json
+++ b/libraries/stream-collator/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/stream-collator",
   "entries": [
+    {
+      "version": "4.0.114",
+      "tag": "@rushstack/stream-collator_v4.0.114",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/terminal\" to `0.2.16`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "4.0.113",
       "tag": "@rushstack/stream-collator_v4.0.113",
diff --git a/libraries/stream-collator/CHANGELOG.md b/libraries/stream-collator/CHANGELOG.md
index b6e7add6878..55bb5087b22 100644
--- a/libraries/stream-collator/CHANGELOG.md
+++ b/libraries/stream-collator/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/stream-collator
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 4.0.114
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 4.0.113
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/libraries/terminal/CHANGELOG.json b/libraries/terminal/CHANGELOG.json
index 5e9db9ca813..63d1c88abdc 100644
--- a/libraries/terminal/CHANGELOG.json
+++ b/libraries/terminal/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/terminal",
   "entries": [
+    {
+      "version": "0.2.16",
+      "tag": "@rushstack/terminal_v0.2.16",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.15",
       "tag": "@rushstack/terminal_v0.2.15",
diff --git a/libraries/terminal/CHANGELOG.md b/libraries/terminal/CHANGELOG.md
index 15b9c874bf7..69fd2d2097e 100644
--- a/libraries/terminal/CHANGELOG.md
+++ b/libraries/terminal/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/terminal
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 0.2.16
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 0.2.15
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/rigs/heft-node-rig/CHANGELOG.json b/rigs/heft-node-rig/CHANGELOG.json
index 09ac25db5f4..fda9c031f87 100644
--- a/rigs/heft-node-rig/CHANGELOG.json
+++ b/rigs/heft-node-rig/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-node-rig",
   "entries": [
+    {
+      "version": "1.2.2",
+      "tag": "@rushstack/heft-node-rig_v1.2.2",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-jest-plugin\" to `0.1.19`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.1` to `^0.36.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.2.1",
       "tag": "@rushstack/heft-node-rig_v1.2.1",
diff --git a/rigs/heft-node-rig/CHANGELOG.md b/rigs/heft-node-rig/CHANGELOG.md
index 701b68e4eb5..ae36b002575 100644
--- a/rigs/heft-node-rig/CHANGELOG.md
+++ b/rigs/heft-node-rig/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-node-rig
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 1.2.2
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 1.2.1
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/rigs/heft-web-rig/CHANGELOG.json b/rigs/heft-web-rig/CHANGELOG.json
index 23806690b64..d10b099608b 100644
--- a/rigs/heft-web-rig/CHANGELOG.json
+++ b/rigs/heft-web-rig/CHANGELOG.json
@@ -1,6 +1,30 @@
 {
   "name": "@rushstack/heft-web-rig",
   "entries": [
+    {
+      "version": "0.4.2",
+      "tag": "@rushstack/heft-web-rig_v0.4.2",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-jest-plugin\" to `0.1.19`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-sass-plugin\" to `0.1.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-webpack4-plugin\" to `0.2.5`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.1` to `^0.36.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.1",
       "tag": "@rushstack/heft-web-rig_v0.4.1",
diff --git a/rigs/heft-web-rig/CHANGELOG.md b/rigs/heft-web-rig/CHANGELOG.md
index e54ef3de569..e379febdf3c 100644
--- a/rigs/heft-web-rig/CHANGELOG.md
+++ b/rigs/heft-web-rig/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-web-rig
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 0.4.2
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 0.4.1
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.json b/webpack/loader-load-themed-styles/CHANGELOG.json
index 5581c387a89..986fa169981 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.json
+++ b/webpack/loader-load-themed-styles/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
   "entries": [
+    {
+      "version": "1.9.82",
+      "tag": "@microsoft/loader-load-themed-styles_v1.9.82",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/load-themed-styles\" to `1.10.201`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.9.81",
       "tag": "@microsoft/loader-load-themed-styles_v1.9.81",
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.md b/webpack/loader-load-themed-styles/CHANGELOG.md
index 20e2577672a..fa11f3591cf 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.md
+++ b/webpack/loader-load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/loader-load-themed-styles
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 1.9.82
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 1.9.81
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/webpack/loader-raw-script/CHANGELOG.json b/webpack/loader-raw-script/CHANGELOG.json
index b66867766dd..3866a8f5c52 100644
--- a/webpack/loader-raw-script/CHANGELOG.json
+++ b/webpack/loader-raw-script/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/loader-raw-script",
   "entries": [
+    {
+      "version": "1.3.168",
+      "tag": "@rushstack/loader-raw-script_v1.3.168",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.3.167",
       "tag": "@rushstack/loader-raw-script_v1.3.167",
diff --git a/webpack/loader-raw-script/CHANGELOG.md b/webpack/loader-raw-script/CHANGELOG.md
index e6c3b64cf7d..49d974d81e8 100644
--- a/webpack/loader-raw-script/CHANGELOG.md
+++ b/webpack/loader-raw-script/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/loader-raw-script
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 1.3.168
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 1.3.167
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/webpack/localization-plugin/CHANGELOG.json b/webpack/localization-plugin/CHANGELOG.json
index 3db45d6c643..dd82d2c1a98 100644
--- a/webpack/localization-plugin/CHANGELOG.json
+++ b/webpack/localization-plugin/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@rushstack/localization-plugin",
   "entries": [
+    {
+      "version": "0.6.42",
+      "tag": "@rushstack/localization-plugin_v0.6.42",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/set-webpack-public-path-plugin\" to `3.2.62`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/set-webpack-public-path-plugin\" from `^3.2.61` to `^3.2.62`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.6.41",
       "tag": "@rushstack/localization-plugin_v0.6.41",
diff --git a/webpack/localization-plugin/CHANGELOG.md b/webpack/localization-plugin/CHANGELOG.md
index 96202b99bab..489260c36cc 100644
--- a/webpack/localization-plugin/CHANGELOG.md
+++ b/webpack/localization-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/localization-plugin
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 0.6.42
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 0.6.41
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/webpack/module-minifier-plugin/CHANGELOG.json b/webpack/module-minifier-plugin/CHANGELOG.json
index 9e538e9c8db..14abeec8c5e 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.json
+++ b/webpack/module-minifier-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/module-minifier-plugin",
   "entries": [
+    {
+      "version": "0.4.6",
+      "tag": "@rushstack/module-minifier-plugin_v0.4.6",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.5",
       "tag": "@rushstack/module-minifier-plugin_v0.4.5",
diff --git a/webpack/module-minifier-plugin/CHANGELOG.md b/webpack/module-minifier-plugin/CHANGELOG.md
index 1ba1336281c..e38bf3e675f 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.md
+++ b/webpack/module-minifier-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/module-minifier-plugin
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 0.4.6
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 0.4.5
 Thu, 12 Aug 2021 01:28:38 GMT
diff --git a/webpack/set-webpack-public-path-plugin/CHANGELOG.json b/webpack/set-webpack-public-path-plugin/CHANGELOG.json
index db3b60e1796..ab641c67333 100644
--- a/webpack/set-webpack-public-path-plugin/CHANGELOG.json
+++ b/webpack/set-webpack-public-path-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/set-webpack-public-path-plugin",
   "entries": [
+    {
+      "version": "3.2.62",
+      "tag": "@rushstack/set-webpack-public-path-plugin_v3.2.62",
+      "date": "Thu, 12 Aug 2021 18:11:18 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.2`"
+          }
+        ]
+      }
+    },
     {
       "version": "3.2.61",
       "tag": "@rushstack/set-webpack-public-path-plugin_v3.2.61",
diff --git a/webpack/set-webpack-public-path-plugin/CHANGELOG.md b/webpack/set-webpack-public-path-plugin/CHANGELOG.md
index 4a58b9315a9..882dd4e5b61 100644
--- a/webpack/set-webpack-public-path-plugin/CHANGELOG.md
+++ b/webpack/set-webpack-public-path-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/set-webpack-public-path-plugin
 
-This log was last generated on Thu, 12 Aug 2021 01:28:38 GMT and should not be manually modified.
+This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+
+## 3.2.62
+Thu, 12 Aug 2021 18:11:18 GMT
+
+_Version update only_
 
 ## 3.2.61
 Thu, 12 Aug 2021 01:28:38 GMT

From 02e1d64548b6e03ddc77b338aaea6ffa8acee72b Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Thu, 12 Aug 2021 18:11:20 +0000
Subject: [PATCH 120/155] Applying package updates.

---
 apps/api-documenter/package.json                    | 2 +-
 apps/heft/package.json                              | 2 +-
 apps/rundown/package.json                           | 2 +-
 heft-plugins/heft-jest-plugin/package.json          | 4 ++--
 heft-plugins/heft-sass-plugin/package.json          | 4 ++--
 heft-plugins/heft-webpack4-plugin/package.json      | 4 ++--
 heft-plugins/heft-webpack5-plugin/package.json      | 4 ++--
 libraries/debug-certificate-manager/package.json    | 2 +-
 libraries/load-themed-styles/package.json           | 2 +-
 libraries/package-deps-hash/package.json            | 2 +-
 libraries/stream-collator/package.json              | 2 +-
 libraries/terminal/package.json                     | 2 +-
 rigs/heft-node-rig/package.json                     | 4 ++--
 rigs/heft-web-rig/package.json                      | 4 ++--
 webpack/loader-load-themed-styles/package.json      | 2 +-
 webpack/loader-raw-script/package.json              | 2 +-
 webpack/localization-plugin/package.json            | 4 ++--
 webpack/module-minifier-plugin/package.json         | 2 +-
 webpack/set-webpack-public-path-plugin/package.json | 2 +-
 19 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/apps/api-documenter/package.json b/apps/api-documenter/package.json
index b2721392f0a..7bd693c95ae 100644
--- a/apps/api-documenter/package.json
+++ b/apps/api-documenter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/api-documenter",
-  "version": "7.13.37",
+  "version": "7.13.38",
   "description": "Read JSON files from api-extractor, generate documentation pages",
   "repository": {
     "type": "git",
diff --git a/apps/heft/package.json b/apps/heft/package.json
index f819cf3e9d9..3a15cc7b0ee 100644
--- a/apps/heft/package.json
+++ b/apps/heft/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft",
-  "version": "0.36.1",
+  "version": "0.36.2",
   "description": "Build all your JavaScript projects the same way: A way that works.",
   "keywords": [
     "toolchain",
diff --git a/apps/rundown/package.json b/apps/rundown/package.json
index fbda842f979..04a7bf3e151 100644
--- a/apps/rundown/package.json
+++ b/apps/rundown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/rundown",
-  "version": "1.0.129",
+  "version": "1.0.130",
   "description": "Detect load time regressions by running an app, tracing require() calls, and generating a deterministic report",
   "repository": {
     "type": "git",
diff --git a/heft-plugins/heft-jest-plugin/package.json b/heft-plugins/heft-jest-plugin/package.json
index 60db7eb0e8f..209c7f0f9da 100644
--- a/heft-plugins/heft-jest-plugin/package.json
+++ b/heft-plugins/heft-jest-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-jest-plugin",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "Heft plugin for Jest",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.1"
+    "@rushstack/heft": "^0.36.2"
   },
   "dependencies": {
     "@jest/core": "~25.4.0",
diff --git a/heft-plugins/heft-sass-plugin/package.json b/heft-plugins/heft-sass-plugin/package.json
index da8bfa15d16..ab7b9b5f4af 100644
--- a/heft-plugins/heft-sass-plugin/package.json
+++ b/heft-plugins/heft-sass-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-sass-plugin",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Heft plugin for SASS",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.1"
+    "@rushstack/heft": "^0.36.2"
   },
   "dependencies": {
     "@rushstack/heft-config-file": "workspace:*",
diff --git a/heft-plugins/heft-webpack4-plugin/package.json b/heft-plugins/heft-webpack4-plugin/package.json
index 4ee6840218a..56013b1b58d 100644
--- a/heft-plugins/heft-webpack4-plugin/package.json
+++ b/heft-plugins/heft-webpack4-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Heft plugin for Webpack 4",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.1"
+    "@rushstack/heft": "^0.36.2"
   },
   "dependencies": {
     "@rushstack/node-core-library": "workspace:*",
diff --git a/heft-plugins/heft-webpack5-plugin/package.json b/heft-plugins/heft-webpack5-plugin/package.json
index a7c5bcaf9a9..60f9ea0bf84 100644
--- a/heft-plugins/heft-webpack5-plugin/package.json
+++ b/heft-plugins/heft-webpack5-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Heft plugin for Webpack 5",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.1"
+    "@rushstack/heft": "^0.36.2"
   },
   "dependencies": {
     "@rushstack/node-core-library": "workspace:*",
diff --git a/libraries/debug-certificate-manager/package.json b/libraries/debug-certificate-manager/package.json
index 466a8ca23f3..abd6fde91d0 100644
--- a/libraries/debug-certificate-manager/package.json
+++ b/libraries/debug-certificate-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/debug-certificate-manager",
-  "version": "1.0.54",
+  "version": "1.0.55",
   "description": "Cross-platform functionality to create debug ssl certificates.",
   "main": "lib/index.js",
   "typings": "dist/debug-certificate-manager.d.ts",
diff --git a/libraries/load-themed-styles/package.json b/libraries/load-themed-styles/package.json
index 9683bf0ab21..a9905df316b 100644
--- a/libraries/load-themed-styles/package.json
+++ b/libraries/load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/load-themed-styles",
-  "version": "1.10.200",
+  "version": "1.10.201",
   "description": "Loads themed styles.",
   "license": "MIT",
   "repository": {
diff --git a/libraries/package-deps-hash/package.json b/libraries/package-deps-hash/package.json
index 24fd1b481cc..ea1bd7f0e3e 100644
--- a/libraries/package-deps-hash/package.json
+++ b/libraries/package-deps-hash/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/package-deps-hash",
-  "version": "3.0.58",
+  "version": "3.0.59",
   "description": "",
   "main": "lib/index.js",
   "typings": "dist/package-deps-hash.d.ts",
diff --git a/libraries/stream-collator/package.json b/libraries/stream-collator/package.json
index 7583fb1432e..254f7fa62b1 100644
--- a/libraries/stream-collator/package.json
+++ b/libraries/stream-collator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/stream-collator",
-  "version": "4.0.113",
+  "version": "4.0.114",
   "description": "Display intelligible realtime output from concurrent processes",
   "repository": {
     "type": "git",
diff --git a/libraries/terminal/package.json b/libraries/terminal/package.json
index 3db4662c762..09a31beba79 100644
--- a/libraries/terminal/package.json
+++ b/libraries/terminal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/terminal",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "User interface primitives for console applications",
   "main": "lib/index.js",
   "typings": "dist/terminal.d.ts",
diff --git a/rigs/heft-node-rig/package.json b/rigs/heft-node-rig/package.json
index f73d1285a2e..e5484df624b 100644
--- a/rigs/heft-node-rig/package.json
+++ b/rigs/heft-node-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-node-rig",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "A rig package for Node.js projects that build using Heft",
   "license": "MIT",
   "scripts": {
@@ -11,7 +11,7 @@
     "url": "https://github.com/microsoft/rushstack/tree/master/rigs/heft-node-rig"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.1"
+    "@rushstack/heft": "^0.36.2"
   },
   "dependencies": {
     "@microsoft/api-extractor": "workspace:*",
diff --git a/rigs/heft-web-rig/package.json b/rigs/heft-web-rig/package.json
index 19ec5b8f7ea..d9529fc240a 100644
--- a/rigs/heft-web-rig/package.json
+++ b/rigs/heft-web-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-web-rig",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "A rig package for web browser projects that build using Heft",
   "license": "MIT",
   "scripts": {
@@ -11,7 +11,7 @@
     "url": "https://github.com/microsoft/rushstack/tree/master/rigs/heft-web-rig"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.1"
+    "@rushstack/heft": "^0.36.2"
   },
   "dependencies": {
     "@microsoft/api-extractor": "workspace:*",
diff --git a/webpack/loader-load-themed-styles/package.json b/webpack/loader-load-themed-styles/package.json
index b8f7e45ab18..9a229d4b7a4 100644
--- a/webpack/loader-load-themed-styles/package.json
+++ b/webpack/loader-load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
-  "version": "1.9.81",
+  "version": "1.9.82",
   "description": "This simple loader wraps the loading of CSS in script equivalent to `require('load-themed-styles').loadStyles( /* css text */ )`. It is designed to be a replacement for style-loader.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/loader-raw-script/package.json b/webpack/loader-raw-script/package.json
index 0e56365e7a5..cebb9687c88 100644
--- a/webpack/loader-raw-script/package.json
+++ b/webpack/loader-raw-script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/loader-raw-script",
-  "version": "1.3.167",
+  "version": "1.3.168",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/localization-plugin/package.json b/webpack/localization-plugin/package.json
index 15d38d56abf..5f91f7f1435 100644
--- a/webpack/localization-plugin/package.json
+++ b/webpack/localization-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/localization-plugin",
-  "version": "0.6.41",
+  "version": "0.6.42",
   "description": "This plugin facilitates localization with Webpack.",
   "main": "lib/index.js",
   "typings": "dist/localization-plugin.d.ts",
@@ -13,7 +13,7 @@
     "build": "heft build --clean"
   },
   "peerDependencies": {
-    "@rushstack/set-webpack-public-path-plugin": "^3.2.61",
+    "@rushstack/set-webpack-public-path-plugin": "^3.2.62",
     "@types/webpack": "^4.39.0",
     "webpack": "^4.31.0"
   },
diff --git a/webpack/module-minifier-plugin/package.json b/webpack/module-minifier-plugin/package.json
index ff9c5731fb5..0144c60bb31 100644
--- a/webpack/module-minifier-plugin/package.json
+++ b/webpack/module-minifier-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/module-minifier-plugin",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "This plugin splits minification of webpack compilations into smaller units.",
   "main": "lib/index.js",
   "typings": "dist/module-minifier-plugin.d.ts",
diff --git a/webpack/set-webpack-public-path-plugin/package.json b/webpack/set-webpack-public-path-plugin/package.json
index 7bb9a73d9d0..f7c72175d08 100644
--- a/webpack/set-webpack-public-path-plugin/package.json
+++ b/webpack/set-webpack-public-path-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/set-webpack-public-path-plugin",
-  "version": "3.2.61",
+  "version": "3.2.62",
   "description": "This plugin sets the webpack public path at runtime.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

From 7810545f384d5b82bff48e3bd7c9410a8dc3e08f Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Thu, 12 Aug 2021 11:45:19 -0700
Subject: [PATCH 121/155] Revert setting incremental: true in
 tsconfig-base.json

---
 rigs/heft-node-rig/profiles/default/tsconfig-base.json | 2 --
 rigs/heft-web-rig/profiles/library/tsconfig-base.json  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/rigs/heft-node-rig/profiles/default/tsconfig-base.json b/rigs/heft-node-rig/profiles/default/tsconfig-base.json
index 88638a8268d..6f68418bbd2 100644
--- a/rigs/heft-node-rig/profiles/default/tsconfig-base.json
+++ b/rigs/heft-node-rig/profiles/default/tsconfig-base.json
@@ -17,8 +17,6 @@
     "noEmitOnError": false,
     "allowUnreachableCode": false,
 
-    "incremental": true,
-
     "types": [],
 
     "module": "commonjs",
diff --git a/rigs/heft-web-rig/profiles/library/tsconfig-base.json b/rigs/heft-web-rig/profiles/library/tsconfig-base.json
index 1240e4a1432..8c4d48b65b4 100644
--- a/rigs/heft-web-rig/profiles/library/tsconfig-base.json
+++ b/rigs/heft-web-rig/profiles/library/tsconfig-base.json
@@ -18,8 +18,6 @@
     "noEmitOnError": false,
     "allowUnreachableCode": false,
 
-    "incremental": true,
-
     "types": [],
 
     "module": "esnext",

From 3cc7e65166b5fe39db8294f3a8b100df7d6d2281 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Thu, 12 Aug 2021 11:48:22 -0700
Subject: [PATCH 122/155] Add change files

---
 .../rig-revert-incremental_2021-08-12-18-47.json      | 11 +++++++++++
 .../rig-revert-incremental_2021-08-12-18-47.json      | 11 +++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 common/changes/@rushstack/heft-node-rig/rig-revert-incremental_2021-08-12-18-47.json
 create mode 100644 common/changes/@rushstack/heft-web-rig/rig-revert-incremental_2021-08-12-18-47.json

diff --git a/common/changes/@rushstack/heft-node-rig/rig-revert-incremental_2021-08-12-18-47.json b/common/changes/@rushstack/heft-node-rig/rig-revert-incremental_2021-08-12-18-47.json
new file mode 100644
index 00000000000..83e754416c1
--- /dev/null
+++ b/common/changes/@rushstack/heft-node-rig/rig-revert-incremental_2021-08-12-18-47.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Remove default use of incremental: true in tsconfig-base.json",
+      "type": "patch",
+      "packageName": "@rushstack/heft-node-rig"
+    }
+  ],
+  "packageName": "@rushstack/heft-node-rig",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-web-rig/rig-revert-incremental_2021-08-12-18-47.json b/common/changes/@rushstack/heft-web-rig/rig-revert-incremental_2021-08-12-18-47.json
new file mode 100644
index 00000000000..58cff42323b
--- /dev/null
+++ b/common/changes/@rushstack/heft-web-rig/rig-revert-incremental_2021-08-12-18-47.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Remove default use of incremental: true in tsconfig-base.json",
+      "type": "patch",
+      "packageName": "@rushstack/heft-web-rig"
+    }
+  ],
+  "packageName": "@rushstack/heft-web-rig",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file

From 0d17d92ef8137fb291e34e1b064267b3eb95b581 Mon Sep 17 00:00:00 2001
From: BPapp-MS <69489817+BPapp-MS@users.noreply.github.com>
Date: Thu, 12 Aug 2021 14:34:30 -0700
Subject: [PATCH 123/155] Update
 common/changes/@microsoft/rush/benpapp-AddFlagsToRushTelemetry_2021-08-05-20-52.json

Co-authored-by: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
---
 .../rush/benpapp-AddFlagsToRushTelemetry_2021-08-05-20-52.json  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/changes/@microsoft/rush/benpapp-AddFlagsToRushTelemetry_2021-08-05-20-52.json b/common/changes/@microsoft/rush/benpapp-AddFlagsToRushTelemetry_2021-08-05-20-52.json
index b02aef1c96e..f6cc634fb63 100644
--- a/common/changes/@microsoft/rush/benpapp-AddFlagsToRushTelemetry_2021-08-05-20-52.json
+++ b/common/changes/@microsoft/rush/benpapp-AddFlagsToRushTelemetry_2021-08-05-20-52.json
@@ -2,7 +2,7 @@
   "changes": [
     {
       "packageName": "@microsoft/rush",
-      "comment": "Adds properties to the extraData section of the telemetry file for parameter usage in the install commands",
+      "comment": "Add properties to the extraData section of the telemetry file for parameter usage in the install commands",
       "type": "none"
     }
   ],

From d8fefe2b2900f6b9de2772e2be6503a5de9c7e08 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Fri, 13 Aug 2021 00:09:14 +0000
Subject: [PATCH 124/155] Deleting change files and updating change logs for
 package updates.

---
 apps/api-documenter/CHANGELOG.json            | 12 +++++++++++
 apps/api-documenter/CHANGELOG.md              |  7 ++++++-
 apps/rundown/CHANGELOG.json                   | 12 +++++++++++
 apps/rundown/CHANGELOG.md                     |  7 ++++++-
 ...g-revert-incremental_2021-08-12-18-47.json | 11 ----------
 ...g-revert-incremental_2021-08-12-18-47.json | 11 ----------
 heft-plugins/heft-sass-plugin/CHANGELOG.json  | 12 +++++++++++
 heft-plugins/heft-sass-plugin/CHANGELOG.md    |  7 ++++++-
 .../heft-webpack4-plugin/CHANGELOG.json       | 12 +++++++++++
 .../heft-webpack4-plugin/CHANGELOG.md         |  7 ++++++-
 .../heft-webpack5-plugin/CHANGELOG.json       | 12 +++++++++++
 .../heft-webpack5-plugin/CHANGELOG.md         |  7 ++++++-
 .../debug-certificate-manager/CHANGELOG.json  | 12 +++++++++++
 .../debug-certificate-manager/CHANGELOG.md    |  7 ++++++-
 libraries/load-themed-styles/CHANGELOG.json   | 12 +++++++++++
 libraries/load-themed-styles/CHANGELOG.md     |  7 ++++++-
 libraries/package-deps-hash/CHANGELOG.json    | 12 +++++++++++
 libraries/package-deps-hash/CHANGELOG.md      |  7 ++++++-
 libraries/stream-collator/CHANGELOG.json      | 15 ++++++++++++++
 libraries/stream-collator/CHANGELOG.md        |  7 ++++++-
 libraries/terminal/CHANGELOG.json             | 12 +++++++++++
 libraries/terminal/CHANGELOG.md               |  7 ++++++-
 rigs/heft-node-rig/CHANGELOG.json             | 12 +++++++++++
 rigs/heft-node-rig/CHANGELOG.md               |  9 ++++++++-
 rigs/heft-web-rig/CHANGELOG.json              | 20 +++++++++++++++++++
 rigs/heft-web-rig/CHANGELOG.md                |  9 ++++++++-
 .../loader-load-themed-styles/CHANGELOG.json  | 15 ++++++++++++++
 .../loader-load-themed-styles/CHANGELOG.md    |  7 ++++++-
 webpack/loader-raw-script/CHANGELOG.json      | 12 +++++++++++
 webpack/loader-raw-script/CHANGELOG.md        |  7 ++++++-
 webpack/localization-plugin/CHANGELOG.json    | 18 +++++++++++++++++
 webpack/localization-plugin/CHANGELOG.md      |  7 ++++++-
 webpack/module-minifier-plugin/CHANGELOG.json | 12 +++++++++++
 webpack/module-minifier-plugin/CHANGELOG.md   |  7 ++++++-
 .../CHANGELOG.json                            | 12 +++++++++++
 .../CHANGELOG.md                              |  7 ++++++-
 36 files changed, 330 insertions(+), 39 deletions(-)
 delete mode 100644 common/changes/@rushstack/heft-node-rig/rig-revert-incremental_2021-08-12-18-47.json
 delete mode 100644 common/changes/@rushstack/heft-web-rig/rig-revert-incremental_2021-08-12-18-47.json

diff --git a/apps/api-documenter/CHANGELOG.json b/apps/api-documenter/CHANGELOG.json
index 0f56273c0e4..132aefb90e8 100644
--- a/apps/api-documenter/CHANGELOG.json
+++ b/apps/api-documenter/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@microsoft/api-documenter",
   "entries": [
+    {
+      "version": "7.13.39",
+      "tag": "@microsoft/api-documenter_v7.13.39",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "7.13.38",
       "tag": "@microsoft/api-documenter_v7.13.38",
diff --git a/apps/api-documenter/CHANGELOG.md b/apps/api-documenter/CHANGELOG.md
index 30c05a1d4ab..2b4a9ff2f70 100644
--- a/apps/api-documenter/CHANGELOG.md
+++ b/apps/api-documenter/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/api-documenter
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 7.13.39
+Fri, 13 Aug 2021 00:09:14 GMT
+
+_Version update only_
 
 ## 7.13.38
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/apps/rundown/CHANGELOG.json b/apps/rundown/CHANGELOG.json
index 12147385488..56aeb2503e9 100644
--- a/apps/rundown/CHANGELOG.json
+++ b/apps/rundown/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/rundown",
   "entries": [
+    {
+      "version": "1.0.131",
+      "tag": "@rushstack/rundown_v1.0.131",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.130",
       "tag": "@rushstack/rundown_v1.0.130",
diff --git a/apps/rundown/CHANGELOG.md b/apps/rundown/CHANGELOG.md
index 37c759d8d89..397f8215ec3 100644
--- a/apps/rundown/CHANGELOG.md
+++ b/apps/rundown/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/rundown
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 1.0.131
+Fri, 13 Aug 2021 00:09:14 GMT
+
+_Version update only_
 
 ## 1.0.130
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/common/changes/@rushstack/heft-node-rig/rig-revert-incremental_2021-08-12-18-47.json b/common/changes/@rushstack/heft-node-rig/rig-revert-incremental_2021-08-12-18-47.json
deleted file mode 100644
index 83e754416c1..00000000000
--- a/common/changes/@rushstack/heft-node-rig/rig-revert-incremental_2021-08-12-18-47.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "comment": "Remove default use of incremental: true in tsconfig-base.json",
-      "type": "patch",
-      "packageName": "@rushstack/heft-node-rig"
-    }
-  ],
-  "packageName": "@rushstack/heft-node-rig",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-web-rig/rig-revert-incremental_2021-08-12-18-47.json b/common/changes/@rushstack/heft-web-rig/rig-revert-incremental_2021-08-12-18-47.json
deleted file mode 100644
index 58cff42323b..00000000000
--- a/common/changes/@rushstack/heft-web-rig/rig-revert-incremental_2021-08-12-18-47.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "comment": "Remove default use of incremental: true in tsconfig-base.json",
-      "type": "patch",
-      "packageName": "@rushstack/heft-web-rig"
-    }
-  ],
-  "packageName": "@rushstack/heft-web-rig",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/heft-plugins/heft-sass-plugin/CHANGELOG.json b/heft-plugins/heft-sass-plugin/CHANGELOG.json
index abf20b3a957..283dc5db9df 100644
--- a/heft-plugins/heft-sass-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-sass-plugin/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/heft-sass-plugin",
   "entries": [
+    {
+      "version": "0.1.5",
+      "tag": "@rushstack/heft-sass-plugin_v0.1.5",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.4",
       "tag": "@rushstack/heft-sass-plugin_v0.1.4",
diff --git a/heft-plugins/heft-sass-plugin/CHANGELOG.md b/heft-plugins/heft-sass-plugin/CHANGELOG.md
index 601f3532fda..f86f5511472 100644
--- a/heft-plugins/heft-sass-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-sass-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-sass-plugin
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 0.1.5
+Fri, 13 Aug 2021 00:09:14 GMT
+
+_Version update only_
 
 ## 0.1.4
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
index f8617d0d3a1..717382911a7 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
   "entries": [
+    {
+      "version": "0.2.6",
+      "tag": "@rushstack/heft-webpack4-plugin_v0.2.6",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.5",
       "tag": "@rushstack/heft-webpack4-plugin_v0.2.5",
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
index e67450e888b..f55a38b709a 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-webpack4-plugin
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 0.2.6
+Fri, 13 Aug 2021 00:09:14 GMT
+
+_Version update only_
 
 ## 0.2.5
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
index 52655c2f461..4b58da500d6 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
   "entries": [
+    {
+      "version": "0.2.6",
+      "tag": "@rushstack/heft-webpack5-plugin_v0.2.6",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.5",
       "tag": "@rushstack/heft-webpack5-plugin_v0.2.5",
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
index 5cf96d78bd1..9cfe094dadd 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-webpack5-plugin
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 0.2.6
+Fri, 13 Aug 2021 00:09:14 GMT
+
+_Version update only_
 
 ## 0.2.5
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/libraries/debug-certificate-manager/CHANGELOG.json b/libraries/debug-certificate-manager/CHANGELOG.json
index c8465f7a95a..e32fdb43bbb 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.json
+++ b/libraries/debug-certificate-manager/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/debug-certificate-manager",
   "entries": [
+    {
+      "version": "1.0.56",
+      "tag": "@rushstack/debug-certificate-manager_v1.0.56",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.55",
       "tag": "@rushstack/debug-certificate-manager_v1.0.55",
diff --git a/libraries/debug-certificate-manager/CHANGELOG.md b/libraries/debug-certificate-manager/CHANGELOG.md
index c923a19e793..1587d255e7e 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.md
+++ b/libraries/debug-certificate-manager/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/debug-certificate-manager
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 1.0.56
+Fri, 13 Aug 2021 00:09:14 GMT
+
+_Version update only_
 
 ## 1.0.55
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/libraries/load-themed-styles/CHANGELOG.json b/libraries/load-themed-styles/CHANGELOG.json
index 08ae7bb60ff..c2de6356fde 100644
--- a/libraries/load-themed-styles/CHANGELOG.json
+++ b/libraries/load-themed-styles/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@microsoft/load-themed-styles",
   "entries": [
+    {
+      "version": "1.10.202",
+      "tag": "@microsoft/load-themed-styles_v1.10.202",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-web-rig\" to `0.4.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.10.201",
       "tag": "@microsoft/load-themed-styles_v1.10.201",
diff --git a/libraries/load-themed-styles/CHANGELOG.md b/libraries/load-themed-styles/CHANGELOG.md
index 76c17772ee4..7093e0c4407 100644
--- a/libraries/load-themed-styles/CHANGELOG.md
+++ b/libraries/load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/load-themed-styles
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 1.10.202
+Fri, 13 Aug 2021 00:09:14 GMT
+
+_Version update only_
 
 ## 1.10.201
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/libraries/package-deps-hash/CHANGELOG.json b/libraries/package-deps-hash/CHANGELOG.json
index ae6e18904ec..47c505205da 100644
--- a/libraries/package-deps-hash/CHANGELOG.json
+++ b/libraries/package-deps-hash/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/package-deps-hash",
   "entries": [
+    {
+      "version": "3.0.60",
+      "tag": "@rushstack/package-deps-hash_v3.0.60",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "3.0.59",
       "tag": "@rushstack/package-deps-hash_v3.0.59",
diff --git a/libraries/package-deps-hash/CHANGELOG.md b/libraries/package-deps-hash/CHANGELOG.md
index 4bf9649c851..5df63dff2ce 100644
--- a/libraries/package-deps-hash/CHANGELOG.md
+++ b/libraries/package-deps-hash/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/package-deps-hash
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 3.0.60
+Fri, 13 Aug 2021 00:09:14 GMT
+
+_Version update only_
 
 ## 3.0.59
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/libraries/stream-collator/CHANGELOG.json b/libraries/stream-collator/CHANGELOG.json
index 667a2499102..d141536a6cd 100644
--- a/libraries/stream-collator/CHANGELOG.json
+++ b/libraries/stream-collator/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/stream-collator",
   "entries": [
+    {
+      "version": "4.0.115",
+      "tag": "@rushstack/stream-collator_v4.0.115",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/terminal\" to `0.2.17`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "4.0.114",
       "tag": "@rushstack/stream-collator_v4.0.114",
diff --git a/libraries/stream-collator/CHANGELOG.md b/libraries/stream-collator/CHANGELOG.md
index 55bb5087b22..8e88e1f8eb0 100644
--- a/libraries/stream-collator/CHANGELOG.md
+++ b/libraries/stream-collator/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/stream-collator
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 4.0.115
+Fri, 13 Aug 2021 00:09:14 GMT
+
+_Version update only_
 
 ## 4.0.114
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/libraries/terminal/CHANGELOG.json b/libraries/terminal/CHANGELOG.json
index 63d1c88abdc..7088512b142 100644
--- a/libraries/terminal/CHANGELOG.json
+++ b/libraries/terminal/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/terminal",
   "entries": [
+    {
+      "version": "0.2.17",
+      "tag": "@rushstack/terminal_v0.2.17",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.16",
       "tag": "@rushstack/terminal_v0.2.16",
diff --git a/libraries/terminal/CHANGELOG.md b/libraries/terminal/CHANGELOG.md
index 69fd2d2097e..0e066b6d848 100644
--- a/libraries/terminal/CHANGELOG.md
+++ b/libraries/terminal/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/terminal
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 0.2.17
+Fri, 13 Aug 2021 00:09:14 GMT
+
+_Version update only_
 
 ## 0.2.16
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/rigs/heft-node-rig/CHANGELOG.json b/rigs/heft-node-rig/CHANGELOG.json
index fda9c031f87..3179ee4c671 100644
--- a/rigs/heft-node-rig/CHANGELOG.json
+++ b/rigs/heft-node-rig/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/heft-node-rig",
   "entries": [
+    {
+      "version": "1.2.3",
+      "tag": "@rushstack/heft-node-rig_v1.2.3",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Remove default use of incremental: true in tsconfig-base.json"
+          }
+        ]
+      }
+    },
     {
       "version": "1.2.2",
       "tag": "@rushstack/heft-node-rig_v1.2.2",
diff --git a/rigs/heft-node-rig/CHANGELOG.md b/rigs/heft-node-rig/CHANGELOG.md
index ae36b002575..2eb58681915 100644
--- a/rigs/heft-node-rig/CHANGELOG.md
+++ b/rigs/heft-node-rig/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/heft-node-rig
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 1.2.3
+Fri, 13 Aug 2021 00:09:14 GMT
+
+### Patches
+
+- Remove default use of incremental: true in tsconfig-base.json
 
 ## 1.2.2
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/rigs/heft-web-rig/CHANGELOG.json b/rigs/heft-web-rig/CHANGELOG.json
index d10b099608b..4fc1cb2a97d 100644
--- a/rigs/heft-web-rig/CHANGELOG.json
+++ b/rigs/heft-web-rig/CHANGELOG.json
@@ -1,6 +1,26 @@
 {
   "name": "@rushstack/heft-web-rig",
   "entries": [
+    {
+      "version": "0.4.3",
+      "tag": "@rushstack/heft-web-rig_v0.4.3",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Remove default use of incremental: true in tsconfig-base.json"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-sass-plugin\" to `0.1.5`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-webpack4-plugin\" to `0.2.6`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.2",
       "tag": "@rushstack/heft-web-rig_v0.4.2",
diff --git a/rigs/heft-web-rig/CHANGELOG.md b/rigs/heft-web-rig/CHANGELOG.md
index e379febdf3c..f4e77cf4a36 100644
--- a/rigs/heft-web-rig/CHANGELOG.md
+++ b/rigs/heft-web-rig/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/heft-web-rig
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 0.4.3
+Fri, 13 Aug 2021 00:09:14 GMT
+
+### Patches
+
+- Remove default use of incremental: true in tsconfig-base.json
 
 ## 0.4.2
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.json b/webpack/loader-load-themed-styles/CHANGELOG.json
index 986fa169981..3f1f737a33f 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.json
+++ b/webpack/loader-load-themed-styles/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
   "entries": [
+    {
+      "version": "1.9.83",
+      "tag": "@microsoft/loader-load-themed-styles_v1.9.83",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/load-themed-styles\" to `1.10.202`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.9.82",
       "tag": "@microsoft/loader-load-themed-styles_v1.9.82",
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.md b/webpack/loader-load-themed-styles/CHANGELOG.md
index fa11f3591cf..8c9c15c0f36 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.md
+++ b/webpack/loader-load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/loader-load-themed-styles
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 1.9.83
+Fri, 13 Aug 2021 00:09:14 GMT
+
+_Version update only_
 
 ## 1.9.82
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/webpack/loader-raw-script/CHANGELOG.json b/webpack/loader-raw-script/CHANGELOG.json
index 3866a8f5c52..7fa7e120e2d 100644
--- a/webpack/loader-raw-script/CHANGELOG.json
+++ b/webpack/loader-raw-script/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/loader-raw-script",
   "entries": [
+    {
+      "version": "1.3.169",
+      "tag": "@rushstack/loader-raw-script_v1.3.169",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.3.168",
       "tag": "@rushstack/loader-raw-script_v1.3.168",
diff --git a/webpack/loader-raw-script/CHANGELOG.md b/webpack/loader-raw-script/CHANGELOG.md
index 49d974d81e8..b47d28daf14 100644
--- a/webpack/loader-raw-script/CHANGELOG.md
+++ b/webpack/loader-raw-script/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/loader-raw-script
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 1.3.169
+Fri, 13 Aug 2021 00:09:14 GMT
+
+_Version update only_
 
 ## 1.3.168
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/webpack/localization-plugin/CHANGELOG.json b/webpack/localization-plugin/CHANGELOG.json
index dd82d2c1a98..ce9234c021b 100644
--- a/webpack/localization-plugin/CHANGELOG.json
+++ b/webpack/localization-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/localization-plugin",
   "entries": [
+    {
+      "version": "0.6.43",
+      "tag": "@rushstack/localization-plugin_v0.6.43",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/set-webpack-public-path-plugin\" to `3.2.63`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/set-webpack-public-path-plugin\" from `^3.2.62` to `^3.2.63`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.6.42",
       "tag": "@rushstack/localization-plugin_v0.6.42",
diff --git a/webpack/localization-plugin/CHANGELOG.md b/webpack/localization-plugin/CHANGELOG.md
index 489260c36cc..6541cfb84cd 100644
--- a/webpack/localization-plugin/CHANGELOG.md
+++ b/webpack/localization-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/localization-plugin
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 0.6.43
+Fri, 13 Aug 2021 00:09:14 GMT
+
+_Version update only_
 
 ## 0.6.42
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/webpack/module-minifier-plugin/CHANGELOG.json b/webpack/module-minifier-plugin/CHANGELOG.json
index 14abeec8c5e..5bdd2bf758b 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.json
+++ b/webpack/module-minifier-plugin/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/module-minifier-plugin",
   "entries": [
+    {
+      "version": "0.4.7",
+      "tag": "@rushstack/module-minifier-plugin_v0.4.7",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.6",
       "tag": "@rushstack/module-minifier-plugin_v0.4.6",
diff --git a/webpack/module-minifier-plugin/CHANGELOG.md b/webpack/module-minifier-plugin/CHANGELOG.md
index e38bf3e675f..0ef4da8f277 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.md
+++ b/webpack/module-minifier-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/module-minifier-plugin
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 0.4.7
+Fri, 13 Aug 2021 00:09:14 GMT
+
+_Version update only_
 
 ## 0.4.6
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/webpack/set-webpack-public-path-plugin/CHANGELOG.json b/webpack/set-webpack-public-path-plugin/CHANGELOG.json
index ab641c67333..26eee179e55 100644
--- a/webpack/set-webpack-public-path-plugin/CHANGELOG.json
+++ b/webpack/set-webpack-public-path-plugin/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/set-webpack-public-path-plugin",
   "entries": [
+    {
+      "version": "3.2.63",
+      "tag": "@rushstack/set-webpack-public-path-plugin_v3.2.63",
+      "date": "Fri, 13 Aug 2021 00:09:14 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "3.2.62",
       "tag": "@rushstack/set-webpack-public-path-plugin_v3.2.62",
diff --git a/webpack/set-webpack-public-path-plugin/CHANGELOG.md b/webpack/set-webpack-public-path-plugin/CHANGELOG.md
index 882dd4e5b61..c01b669e929 100644
--- a/webpack/set-webpack-public-path-plugin/CHANGELOG.md
+++ b/webpack/set-webpack-public-path-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/set-webpack-public-path-plugin
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+
+## 3.2.63
+Fri, 13 Aug 2021 00:09:14 GMT
+
+_Version update only_
 
 ## 3.2.62
 Thu, 12 Aug 2021 18:11:18 GMT

From 2d23fe9e94cfae575a117e5660ec489f8d463d4f Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Fri, 13 Aug 2021 00:09:17 +0000
Subject: [PATCH 125/155] Applying package updates.

---
 apps/api-documenter/package.json                    | 2 +-
 apps/rundown/package.json                           | 2 +-
 heft-plugins/heft-sass-plugin/package.json          | 2 +-
 heft-plugins/heft-webpack4-plugin/package.json      | 2 +-
 heft-plugins/heft-webpack5-plugin/package.json      | 2 +-
 libraries/debug-certificate-manager/package.json    | 2 +-
 libraries/load-themed-styles/package.json           | 2 +-
 libraries/package-deps-hash/package.json            | 2 +-
 libraries/stream-collator/package.json              | 2 +-
 libraries/terminal/package.json                     | 2 +-
 rigs/heft-node-rig/package.json                     | 2 +-
 rigs/heft-web-rig/package.json                      | 2 +-
 webpack/loader-load-themed-styles/package.json      | 2 +-
 webpack/loader-raw-script/package.json              | 2 +-
 webpack/localization-plugin/package.json            | 4 ++--
 webpack/module-minifier-plugin/package.json         | 2 +-
 webpack/set-webpack-public-path-plugin/package.json | 2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/api-documenter/package.json b/apps/api-documenter/package.json
index 7bd693c95ae..c382cd98017 100644
--- a/apps/api-documenter/package.json
+++ b/apps/api-documenter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/api-documenter",
-  "version": "7.13.38",
+  "version": "7.13.39",
   "description": "Read JSON files from api-extractor, generate documentation pages",
   "repository": {
     "type": "git",
diff --git a/apps/rundown/package.json b/apps/rundown/package.json
index 04a7bf3e151..b108db8dffa 100644
--- a/apps/rundown/package.json
+++ b/apps/rundown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/rundown",
-  "version": "1.0.130",
+  "version": "1.0.131",
   "description": "Detect load time regressions by running an app, tracing require() calls, and generating a deterministic report",
   "repository": {
     "type": "git",
diff --git a/heft-plugins/heft-sass-plugin/package.json b/heft-plugins/heft-sass-plugin/package.json
index ab7b9b5f4af..b95f2b08fc4 100644
--- a/heft-plugins/heft-sass-plugin/package.json
+++ b/heft-plugins/heft-sass-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-sass-plugin",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Heft plugin for SASS",
   "repository": {
     "type": "git",
diff --git a/heft-plugins/heft-webpack4-plugin/package.json b/heft-plugins/heft-webpack4-plugin/package.json
index 56013b1b58d..cbf1c9c4847 100644
--- a/heft-plugins/heft-webpack4-plugin/package.json
+++ b/heft-plugins/heft-webpack4-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Heft plugin for Webpack 4",
   "repository": {
     "type": "git",
diff --git a/heft-plugins/heft-webpack5-plugin/package.json b/heft-plugins/heft-webpack5-plugin/package.json
index 60f9ea0bf84..fa668831fb7 100644
--- a/heft-plugins/heft-webpack5-plugin/package.json
+++ b/heft-plugins/heft-webpack5-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Heft plugin for Webpack 5",
   "repository": {
     "type": "git",
diff --git a/libraries/debug-certificate-manager/package.json b/libraries/debug-certificate-manager/package.json
index abd6fde91d0..49e78624549 100644
--- a/libraries/debug-certificate-manager/package.json
+++ b/libraries/debug-certificate-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/debug-certificate-manager",
-  "version": "1.0.55",
+  "version": "1.0.56",
   "description": "Cross-platform functionality to create debug ssl certificates.",
   "main": "lib/index.js",
   "typings": "dist/debug-certificate-manager.d.ts",
diff --git a/libraries/load-themed-styles/package.json b/libraries/load-themed-styles/package.json
index a9905df316b..da7b5337531 100644
--- a/libraries/load-themed-styles/package.json
+++ b/libraries/load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/load-themed-styles",
-  "version": "1.10.201",
+  "version": "1.10.202",
   "description": "Loads themed styles.",
   "license": "MIT",
   "repository": {
diff --git a/libraries/package-deps-hash/package.json b/libraries/package-deps-hash/package.json
index ea1bd7f0e3e..7fae2ca84aa 100644
--- a/libraries/package-deps-hash/package.json
+++ b/libraries/package-deps-hash/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/package-deps-hash",
-  "version": "3.0.59",
+  "version": "3.0.60",
   "description": "",
   "main": "lib/index.js",
   "typings": "dist/package-deps-hash.d.ts",
diff --git a/libraries/stream-collator/package.json b/libraries/stream-collator/package.json
index 254f7fa62b1..8015b2c42e0 100644
--- a/libraries/stream-collator/package.json
+++ b/libraries/stream-collator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/stream-collator",
-  "version": "4.0.114",
+  "version": "4.0.115",
   "description": "Display intelligible realtime output from concurrent processes",
   "repository": {
     "type": "git",
diff --git a/libraries/terminal/package.json b/libraries/terminal/package.json
index 09a31beba79..f09aaf419d5 100644
--- a/libraries/terminal/package.json
+++ b/libraries/terminal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/terminal",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "description": "User interface primitives for console applications",
   "main": "lib/index.js",
   "typings": "dist/terminal.d.ts",
diff --git a/rigs/heft-node-rig/package.json b/rigs/heft-node-rig/package.json
index e5484df624b..aa0cbe60ab5 100644
--- a/rigs/heft-node-rig/package.json
+++ b/rigs/heft-node-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-node-rig",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "A rig package for Node.js projects that build using Heft",
   "license": "MIT",
   "scripts": {
diff --git a/rigs/heft-web-rig/package.json b/rigs/heft-web-rig/package.json
index d9529fc240a..296f9a3968a 100644
--- a/rigs/heft-web-rig/package.json
+++ b/rigs/heft-web-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-web-rig",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "A rig package for web browser projects that build using Heft",
   "license": "MIT",
   "scripts": {
diff --git a/webpack/loader-load-themed-styles/package.json b/webpack/loader-load-themed-styles/package.json
index 9a229d4b7a4..e068086b302 100644
--- a/webpack/loader-load-themed-styles/package.json
+++ b/webpack/loader-load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
-  "version": "1.9.82",
+  "version": "1.9.83",
   "description": "This simple loader wraps the loading of CSS in script equivalent to `require('load-themed-styles').loadStyles( /* css text */ )`. It is designed to be a replacement for style-loader.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/loader-raw-script/package.json b/webpack/loader-raw-script/package.json
index cebb9687c88..44e963afbeb 100644
--- a/webpack/loader-raw-script/package.json
+++ b/webpack/loader-raw-script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/loader-raw-script",
-  "version": "1.3.168",
+  "version": "1.3.169",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/localization-plugin/package.json b/webpack/localization-plugin/package.json
index 5f91f7f1435..0e70e221774 100644
--- a/webpack/localization-plugin/package.json
+++ b/webpack/localization-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/localization-plugin",
-  "version": "0.6.42",
+  "version": "0.6.43",
   "description": "This plugin facilitates localization with Webpack.",
   "main": "lib/index.js",
   "typings": "dist/localization-plugin.d.ts",
@@ -13,7 +13,7 @@
     "build": "heft build --clean"
   },
   "peerDependencies": {
-    "@rushstack/set-webpack-public-path-plugin": "^3.2.62",
+    "@rushstack/set-webpack-public-path-plugin": "^3.2.63",
     "@types/webpack": "^4.39.0",
     "webpack": "^4.31.0"
   },
diff --git a/webpack/module-minifier-plugin/package.json b/webpack/module-minifier-plugin/package.json
index 0144c60bb31..2673b5c7514 100644
--- a/webpack/module-minifier-plugin/package.json
+++ b/webpack/module-minifier-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/module-minifier-plugin",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "description": "This plugin splits minification of webpack compilations into smaller units.",
   "main": "lib/index.js",
   "typings": "dist/module-minifier-plugin.d.ts",
diff --git a/webpack/set-webpack-public-path-plugin/package.json b/webpack/set-webpack-public-path-plugin/package.json
index f7c72175d08..6e3e56d8200 100644
--- a/webpack/set-webpack-public-path-plugin/package.json
+++ b/webpack/set-webpack-public-path-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/set-webpack-public-path-plugin",
-  "version": "3.2.62",
+  "version": "3.2.63",
   "description": "This plugin sets the webpack public path at runtime.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

From 9826b3976b8e2cba05be82f0e2812e784f9c845b Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Fri, 13 Aug 2021 15:04:02 -0700
Subject: [PATCH 126/155] Decouple build cache read from project skipping

---
 .../src/logic/taskRunner/BaseBuilder.ts       |  4 ++--
 .../src/logic/taskRunner/ProjectBuilder.ts    | 19 +++++++++++++------
 .../src/logic/taskRunner/TaskRunner.ts        |  4 ++--
 .../src/logic/taskRunner/test/MockBuilder.ts  |  2 +-
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/apps/rush-lib/src/logic/taskRunner/BaseBuilder.ts b/apps/rush-lib/src/logic/taskRunner/BaseBuilder.ts
index 67ec6a2d146..508670ac4bb 100644
--- a/apps/rush-lib/src/logic/taskRunner/BaseBuilder.ts
+++ b/apps/rush-lib/src/logic/taskRunner/BaseBuilder.ts
@@ -27,9 +27,9 @@ export abstract class BaseBuilder {
   abstract readonly name: string;
 
   /**
-   * This flag determines if an incremental build is allowed for the task.
+   * This flag determines if an the task is allowed to be skipped if up to date.
    */
-  abstract isIncrementalBuildAllowed: boolean;
+  abstract isSkipAllowed: boolean;
 
   /**
    * Assigned by execute().  True if the build script was an empty string.  Operationally an empty string is
diff --git a/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts b/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts
index 9abe3de483d..b336fbc5f6b 100644
--- a/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts
+++ b/apps/rush-lib/src/logic/taskRunner/ProjectBuilder.ts
@@ -77,7 +77,10 @@ export class ProjectBuilder extends BaseBuilder {
     return ProjectBuilder.getTaskName(this._rushProject);
   }
 
-  public readonly isIncrementalBuildAllowed: boolean;
+  /**
+   * This property is mutated by TaskRunner, so is not readonly
+   */
+  public isSkipAllowed: boolean;
   public hadEmptyScript: boolean = false;
 
   private readonly _rushProject: RushConfigurationProject;
@@ -85,6 +88,7 @@ export class ProjectBuilder extends BaseBuilder {
   private readonly _buildCacheConfiguration: BuildCacheConfiguration | undefined;
   private readonly _commandName: string;
   private readonly _commandToRun: string;
+  private readonly _isCacheReadAllowed: boolean;
   private readonly _projectChangeAnalyzer: ProjectChangeAnalyzer;
   private readonly _packageDepsFilename: string;
 
@@ -101,7 +105,8 @@ export class ProjectBuilder extends BaseBuilder {
     this._buildCacheConfiguration = options.buildCacheConfiguration;
     this._commandName = options.commandName;
     this._commandToRun = options.commandToRun;
-    this.isIncrementalBuildAllowed = options.isIncrementalBuildAllowed;
+    this._isCacheReadAllowed = options.isIncrementalBuildAllowed;
+    this.isSkipAllowed = options.isIncrementalBuildAllowed;
     this._projectChangeAnalyzer = options.projectChangeAnalyzer;
     this._packageDepsFilename = options.packageDepsFilename;
   }
@@ -229,7 +234,7 @@ export class ProjectBuilder extends BaseBuilder {
             files,
             arguments: this._commandToRun
           };
-        } else if (this.isIncrementalBuildAllowed) {
+        } else if (this.isSkipAllowed) {
           // To test this code path:
           // Remove the `.git` folder then run "rush build --verbose"
           terminal.writeLine({
@@ -250,9 +255,8 @@ export class ProjectBuilder extends BaseBuilder {
         });
       }
 
-      // If the current command is allowed to do incremental builds, attempt to retrieve
-      // the project from the build cache or skip building, if appropriate.
-      if (this.isIncrementalBuildAllowed) {
+      // If allowed to read from the build cache, try retrieving the cache entry.
+      if (this._isCacheReadAllowed) {
         const projectBuildCache: ProjectBuildCache | undefined = await this._getProjectBuildCacheAsync(
           terminal,
           trackedFiles,
@@ -264,7 +268,10 @@ export class ProjectBuilder extends BaseBuilder {
         if (restoreFromCacheSuccess) {
           return TaskStatus.FromCache;
         }
+      }
 
+      // If allowed, attempt to skip building.
+      if (this.isSkipAllowed) {
         const isPackageUnchanged: boolean = !!(
           lastProjectBuildDeps &&
           projectBuildDeps &&
diff --git a/apps/rush-lib/src/logic/taskRunner/TaskRunner.ts b/apps/rush-lib/src/logic/taskRunner/TaskRunner.ts
index 4ac45d37ad8..95348060994 100644
--- a/apps/rush-lib/src/logic/taskRunner/TaskRunner.ts
+++ b/apps/rush-lib/src/logic/taskRunner/TaskRunner.ts
@@ -338,7 +338,7 @@ export class TaskRunner {
 
     task.dependents.forEach((dependent: Task) => {
       if (!this._changedProjectsOnly) {
-        dependent.builder.isIncrementalBuildAllowed = false;
+        dependent.builder.isSkipAllowed = false;
       }
       dependent.dependencies.delete(task);
     });
@@ -355,7 +355,7 @@ export class TaskRunner {
     task.status = TaskStatus.SuccessWithWarning;
     task.dependents.forEach((dependent: Task) => {
       if (!this._changedProjectsOnly) {
-        dependent.builder.isIncrementalBuildAllowed = false;
+        dependent.builder.isSkipAllowed = false;
       }
       dependent.dependencies.delete(task);
     });
diff --git a/apps/rush-lib/src/logic/taskRunner/test/MockBuilder.ts b/apps/rush-lib/src/logic/taskRunner/test/MockBuilder.ts
index a13c9fa02b3..7857aae696e 100644
--- a/apps/rush-lib/src/logic/taskRunner/test/MockBuilder.ts
+++ b/apps/rush-lib/src/logic/taskRunner/test/MockBuilder.ts
@@ -10,7 +10,7 @@ export class MockBuilder extends BaseBuilder {
   private readonly _action: ((terminal: CollatedTerminal) => Promise<TaskStatus>) | undefined;
   public readonly name: string;
   public readonly hadEmptyScript: boolean = false;
-  public readonly isIncrementalBuildAllowed: boolean = false;
+  public readonly isSkipAllowed: boolean = false;
 
   public constructor(name: string, action?: (terminal: CollatedTerminal) => Promise<TaskStatus>) {
     super();

From 268d52a44ea3ffd79b07ed1bfa2a1ff301118709 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Fri, 13 Aug 2021 15:06:18 -0700
Subject: [PATCH 127/155] Add change file

---
 .../rush/fix-rush-build-cache_2021-08-13-22-04.json   | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@microsoft/rush/fix-rush-build-cache_2021-08-13-22-04.json

diff --git a/common/changes/@microsoft/rush/fix-rush-build-cache_2021-08-13-22-04.json b/common/changes/@microsoft/rush/fix-rush-build-cache_2021-08-13-22-04.json
new file mode 100644
index 00000000000..33387fc0bef
--- /dev/null
+++ b/common/changes/@microsoft/rush/fix-rush-build-cache_2021-08-13-22-04.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "When build cache is enabled in `rush build`, allow projects downstream to be satisfied from the cache if applicable. Cache reads will still be disabled for `rush rebuild`.",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file

From e2fe81b7015081bfc5f621357094eb8871ce623a Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Fri, 13 Aug 2021 15:26:28 -0700
Subject: [PATCH 128/155] Grammar

---
 apps/rush-lib/src/logic/taskRunner/BaseBuilder.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/rush-lib/src/logic/taskRunner/BaseBuilder.ts b/apps/rush-lib/src/logic/taskRunner/BaseBuilder.ts
index 508670ac4bb..f2619323f25 100644
--- a/apps/rush-lib/src/logic/taskRunner/BaseBuilder.ts
+++ b/apps/rush-lib/src/logic/taskRunner/BaseBuilder.ts
@@ -27,7 +27,7 @@ export abstract class BaseBuilder {
   abstract readonly name: string;
 
   /**
-   * This flag determines if an the task is allowed to be skipped if up to date.
+   * This flag determines if the task is allowed to be skipped if up to date.
    */
   abstract isSkipAllowed: boolean;
 

From 98a4e9c6c2f4de12dc300e78ba4956b5435017db Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Fri, 13 Aug 2021 15:35:33 -0700
Subject: [PATCH 129/155] Make the next release of Rush a patch release.

---
 common/config/rush/version-policies.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
index 69c507937f4..e34910c542c 100644
--- a/common/config/rush/version-policies.json
+++ b/common/config/rush/version-policies.json
@@ -91,7 +91,7 @@
     "policyName": "rush",
     "definitionName": "lockStepVersion",
     "version": "5.51.0",
-    "nextBump": "minor",
+    "nextBump": "patch",
     "mainProject": "@microsoft/rush"
   }
 ]

From 9f019b2f5c06d513660f0914faa6fe5fe02c6572 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Fri, 13 Aug 2021 22:45:36 +0000
Subject: [PATCH 130/155] Deleting change files and updating change logs for
 package updates.

---
 apps/rush/CHANGELOG.json                             | 12 ++++++++++++
 apps/rush/CHANGELOG.md                               |  9 ++++++++-
 .../rush/fix-rush-build-cache_2021-08-13-22-04.json  | 11 -----------
 3 files changed, 20 insertions(+), 12 deletions(-)
 delete mode 100644 common/changes/@microsoft/rush/fix-rush-build-cache_2021-08-13-22-04.json

diff --git a/apps/rush/CHANGELOG.json b/apps/rush/CHANGELOG.json
index 38c8e96b9f8..63a2fba9b48 100644
--- a/apps/rush/CHANGELOG.json
+++ b/apps/rush/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@microsoft/rush",
   "entries": [
+    {
+      "version": "5.51.1",
+      "tag": "@microsoft/rush_v5.51.1",
+      "date": "Fri, 13 Aug 2021 22:45:36 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "When build cache is enabled in `rush build`, allow projects downstream to be satisfied from the cache if applicable. Cache reads will still be disabled for `rush rebuild`."
+          }
+        ]
+      }
+    },
     {
       "version": "5.51.0",
       "tag": "@microsoft/rush_v5.51.0",
diff --git a/apps/rush/CHANGELOG.md b/apps/rush/CHANGELOG.md
index 66f238fa1ca..f5bb13b5491 100644
--- a/apps/rush/CHANGELOG.md
+++ b/apps/rush/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @microsoft/rush
 
-This log was last generated on Wed, 11 Aug 2021 23:16:09 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Aug 2021 22:45:36 GMT and should not be manually modified.
+
+## 5.51.1
+Fri, 13 Aug 2021 22:45:36 GMT
+
+### Updates
+
+- When build cache is enabled in `rush build`, allow projects downstream to be satisfied from the cache if applicable. Cache reads will still be disabled for `rush rebuild`.
 
 ## 5.51.0
 Wed, 11 Aug 2021 23:16:09 GMT
diff --git a/common/changes/@microsoft/rush/fix-rush-build-cache_2021-08-13-22-04.json b/common/changes/@microsoft/rush/fix-rush-build-cache_2021-08-13-22-04.json
deleted file mode 100644
index 33387fc0bef..00000000000
--- a/common/changes/@microsoft/rush/fix-rush-build-cache_2021-08-13-22-04.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@microsoft/rush",
-      "comment": "When build cache is enabled in `rush build`, allow projects downstream to be satisfied from the cache if applicable. Cache reads will still be disabled for `rush rebuild`.",
-      "type": "none"
-    }
-  ],
-  "packageName": "@microsoft/rush",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file

From 99bec06b4dc50c30f1255600626eedb5b1fa5b9f Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Fri, 13 Aug 2021 22:45:38 +0000
Subject: [PATCH 131/155] Applying package updates.

---
 apps/rush-lib/package.json               | 2 +-
 apps/rush/package.json                   | 2 +-
 common/config/rush/version-policies.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/rush-lib/package.json b/apps/rush-lib/package.json
index d56c5f382a8..d034503d946 100644
--- a/apps/rush-lib/package.json
+++ b/apps/rush-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/rush-lib",
-  "version": "5.51.0",
+  "version": "5.51.1",
   "description": "A library for writing scripts that interact with the Rush tool",
   "repository": {
     "type": "git",
diff --git a/apps/rush/package.json b/apps/rush/package.json
index a3d9b3bbbcc..6a6f24c26d8 100644
--- a/apps/rush/package.json
+++ b/apps/rush/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/rush",
-  "version": "5.51.0",
+  "version": "5.51.1",
   "description": "A professional solution for consolidating all your JavaScript projects in one Git repo",
   "keywords": [
     "install",
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
index e34910c542c..7f536497095 100644
--- a/common/config/rush/version-policies.json
+++ b/common/config/rush/version-policies.json
@@ -90,7 +90,7 @@
   {
     "policyName": "rush",
     "definitionName": "lockStepVersion",
-    "version": "5.51.0",
+    "version": "5.51.1",
     "nextBump": "patch",
     "mainProject": "@microsoft/rush"
   }

From 12b7e2707f2c61971df7d5172561586da55b4686 Mon Sep 17 00:00:00 2001
From: Ben Papp <BPapp-MS@users.noreply.github.com>
Date: Fri, 13 Aug 2021 16:39:38 -0700
Subject: [PATCH 132/155] address PR comments

---
 .../src/cli/actions/BaseInstallAction.ts      | 37 +++++++++++++------
 .../rush-lib/src/cli/actions/InstallAction.ts |  6 +--
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/apps/rush-lib/src/cli/actions/BaseInstallAction.ts b/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
index 558ebdf475c..f5e9861c508 100644
--- a/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
+++ b/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
@@ -8,7 +8,10 @@ import { Import } from '@rushstack/node-core-library';
 import {
   CommandLineFlagParameter,
   CommandLineIntegerParameter,
-  CommandLineStringParameter
+  CommandLineStringParameter,
+  CommandLineParameterKind,
+  CommandLineIntegerListParameter,
+  CommandLineStringListParameter
 } from '@rushstack/ts-command-line';
 
 import { BaseRushAction } from './BaseRushAction';
@@ -190,19 +193,31 @@ export abstract class BaseInstallAction extends BaseRushAction {
       let extraData: { [key: string]: string } = {
         mode: this.actionName,
         clean: (!!this._purgeParameter.value).toString(),
-        bypassPolicy: (!!this._bypassPolicyParameter.value).toString(),
-        noLink: (!!this._noLinkParameter.value).toString(),
-        networkConcurrency: this._networkConcurrencyParameter.value
-          ? this._networkConcurrencyParameter.value.toString()
-          : 'unspecified',
-        debugPackageManager: (!!this._debugPackageManagerParameter.value).toString(),
-        maxInstallAttempts: this._maxInstallAttempts.value
-          ? this._maxInstallAttempts.value.toString()
-          : 'unspecified',
-        ignoreHooks: (!!this._ignoreHooksParameter.value).toString(),
         debug: installManagerOptions.debug.toString(),
         full: installManagerOptions.fullUpgrade.toString()
       };
+
+      for (const parameter of this.parameters) {
+        switch (parameter.kind) {
+          case CommandLineParameterKind.Flag:
+          case CommandLineParameterKind.Choice:
+          case CommandLineParameterKind.String:
+          case CommandLineParameterKind.Integer:
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            extraData[parameter.longName] = JSON.stringify((parameter as any).value);
+            break;
+          case CommandLineParameterKind.StringList:
+          case CommandLineParameterKind.IntegerList:
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const arrayValue: ReadonlyArray<any> | undefined = (
+              parameter as CommandLineIntegerListParameter | CommandLineStringListParameter
+            ).values;
+            extraData[parameter.longName] = arrayValue ? arrayValue.join(',') : '';
+            break;
+          default:
+            extraData[parameter.longName] = '?';
+        }
+      }
       if (this._selectionParameters) {
         extraData = { ...extraData, ...this._selectionParameters.getTelemetry() };
       }
diff --git a/apps/rush-lib/src/cli/actions/InstallAction.ts b/apps/rush-lib/src/cli/actions/InstallAction.ts
index db4df689136..a332d59ee8a 100644
--- a/apps/rush-lib/src/cli/actions/InstallAction.ts
+++ b/apps/rush-lib/src/cli/actions/InstallAction.ts
@@ -7,10 +7,6 @@ import { RushCommandLineParser } from '../RushCommandLineParser';
 import { SelectionParameterSet } from '../SelectionParameterSet';
 
 export class InstallAction extends BaseInstallAction {
-  // must match name of _selectionParameters in BaseInstallAction for telemetry to work
-  // worthy of the override parameter in TypeScript > 4.3
-  protected _selectionParameters!: SelectionParameterSet;
-
   public constructor(parser: RushCommandLineParser) {
     super({
       actionName: 'install',
@@ -54,7 +50,7 @@ export class InstallAction extends BaseInstallAction {
       // it is safe to assume that the value is not null
       maxInstallAttempts: this._maxInstallAttempts.value!,
       // These are derived independently of the selection for command line brevity
-      pnpmFilterArguments: this._selectionParameters.getPnpmFilterArguments()
+      pnpmFilterArguments: this._selectionParameters!.getPnpmFilterArguments()
     };
   }
 }

From 5c0559587629afd131ed8802d439ca48ce8018ae Mon Sep 17 00:00:00 2001
From: Thai Pangsakulyanont <dtinth@spacet.me>
Date: Tue, 17 Aug 2021 22:39:02 +0700
Subject: [PATCH 133/155] Add .heft to .gitignore template

---
 apps/rush-lib/assets/rush-init/[dot]gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/rush-lib/assets/rush-init/[dot]gitignore b/apps/rush-lib/assets/rush-init/[dot]gitignore
index 502e67ff90a..05d2c20293b 100644
--- a/apps/rush-lib/assets/rush-init/[dot]gitignore
+++ b/apps/rush-lib/assets/rush-init/[dot]gitignore
@@ -63,3 +63,6 @@ common/deploy/
 common/temp/
 common/autoinstallers/*/.npmrc
 **/.rush/temp/
+
+# Heft
+.heft

From c02ed7d613d780b3cdadd0aee5b05cb1d32f34a2 Mon Sep 17 00:00:00 2001
From: Thai Pangsakulyanont <dtinth@spacet.me>
Date: Tue, 17 Aug 2021 15:46:30 +0000
Subject: [PATCH 134/155] Add change file

---
 .../rush/pr-dtinth-2861_2021-08-17-15-46.json         | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@microsoft/rush/pr-dtinth-2861_2021-08-17-15-46.json

diff --git a/common/changes/@microsoft/rush/pr-dtinth-2861_2021-08-17-15-46.json b/common/changes/@microsoft/rush/pr-dtinth-2861_2021-08-17-15-46.json
new file mode 100644
index 00000000000..4ac7ca94037
--- /dev/null
+++ b/common/changes/@microsoft/rush/pr-dtinth-2861_2021-08-17-15-46.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Add .heft to .gitignore file generated by rush init",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "dtinth@spacet.me"
+}
\ No newline at end of file

From e5837f6c40ce5e44f6fecddcbf0a983c34107d98 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Tue, 17 Aug 2021 12:07:08 -0700
Subject: [PATCH 135/155] Fix erroneous error from ModuleMinifierPlugin

---
 webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
index 20c84fcdcfe..0c7d4f6bb2d 100644
--- a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
+++ b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
@@ -226,7 +226,8 @@ export class ModuleMinifierPlugin implements webpack.Plugin {
          */
         function dehydrateAsset(modules: Source, chunk: webpack.compilation.Chunk): Source {
           for (const mod of chunk.modulesIterable) {
-            if (mod.id === null || !submittedModules.has(mod.id)) {
+            // If the id is null, it won't be part of the chunk
+            if (mod.id !== null && !submittedModules.has(mod.id)) {
               console.error(
                 `Chunk ${chunk.id} failed to render module ${mod.id} for ${(mod as IExtendedModule).resource}`
               );

From 6cbbcf4c2a3936bbadcfb23886cd5e37d6075cb5 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Tue, 17 Aug 2021 14:00:30 -0700
Subject: [PATCH 136/155] Fix compatibility with mini-css-extract-plugin

---
 .../src/ModuleMinifierPlugin.ts               | 47 ++++++++++---------
 .../src/RehydrateAsset.ts                     | 18 +++++--
 2 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
index 0c7d4f6bb2d..7020371f6ea 100644
--- a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
+++ b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
@@ -221,23 +221,6 @@ export class ModuleMinifierPlugin implements webpack.Plugin {
           }
         }
 
-        /**
-         * Callback to invoke for a chunk during render to replace the modules with CHUNK_MODULES_TOKEN
-         */
-        function dehydrateAsset(modules: Source, chunk: webpack.compilation.Chunk): Source {
-          for (const mod of chunk.modulesIterable) {
-            // If the id is null, it won't be part of the chunk
-            if (mod.id !== null && !submittedModules.has(mod.id)) {
-              console.error(
-                `Chunk ${chunk.id} failed to render module ${mod.id} for ${(mod as IExtendedModule).resource}`
-              );
-            }
-          }
-
-          // Discard the rendered modules
-          return new RawSource(CHUNK_MODULES_TOKEN);
-        }
-
         const { minifier } = this;
 
         const cleanupMinifier: (() => Promise<void>) | undefined = minifier.ref?.();
@@ -468,7 +451,7 @@ export class ModuleMinifierPlugin implements webpack.Plugin {
                     }
                   );
                 } else {
-                  // Skip minification for all other assets, though the modules still are
+                  // Skip minification for all other assets, though the modules still might be
                   minifiedAssets.set(assetName, {
                     // Still need to restore ids
                     source: postProcessCode(new ReplaceSource(asset), assetName),
@@ -510,9 +493,31 @@ export class ModuleMinifierPlugin implements webpack.Plugin {
           }
         );
 
-        for (const template of [compilation.chunkTemplate, compilation.mainTemplate]) {
-          (template as unknown as IExtendedChunkTemplate).hooks.modules.tap(TAP_AFTER, dehydrateAsset);
-        }
+        (compilation.chunkTemplate as unknown as IExtendedChunkTemplate).hooks.modules.tap(
+          TAP_AFTER,
+          (source: Source, chunk: webpack.compilation.Chunk, moduleTemplate: unknown) => {
+            if (moduleTemplate !== compilation.moduleTemplates.javascript) {
+              // This is not a JavaScript asset
+              return source;
+            }
+
+            // Discard the rendered modules
+            return new RawSource(CHUNK_MODULES_TOKEN);
+          }
+        );
+
+        (compilation.mainTemplate as unknown as IExtendedChunkTemplate).hooks.modules.tap(
+          TAP_AFTER,
+          (source: Source, chunk: webpack.compilation.Chunk, hash: unknown, moduleTemplate: unknown) => {
+            if (moduleTemplate !== compilation.moduleTemplates.javascript) {
+              // This is not a JavaScript asset
+              return source;
+            }
+
+            // Discard the rendered modules
+            return new RawSource(CHUNK_MODULES_TOKEN);
+          }
+        );
       }
     );
   }
diff --git a/webpack/module-minifier-plugin/src/RehydrateAsset.ts b/webpack/module-minifier-plugin/src/RehydrateAsset.ts
index 86131c91d5e..ea3129de8dd 100644
--- a/webpack/module-minifier-plugin/src/RehydrateAsset.ts
+++ b/webpack/module-minifier-plugin/src/RehydrateAsset.ts
@@ -14,11 +14,15 @@ import { IAssetInfo, IModuleMap, IModuleInfo } from './ModuleMinifierPlugin.type
  * @public
  */
 export function rehydrateAsset(asset: IAssetInfo, moduleMap: IModuleMap, banner: string): Source {
-  const { source: assetSource, modules, externalNames } = asset;
+  const { source: assetSource, modules } = asset;
 
   const assetCode: string = assetSource.source() as string;
 
   const tokenIndex: number = assetCode.indexOf(CHUNK_MODULES_TOKEN);
+  if (tokenIndex < 0) {
+    // This is not a JS asset.
+    return handleExternals(assetSource, asset);
+  }
   const suffixStart: number = tokenIndex + CHUNK_MODULES_TOKEN.length;
   const suffix: string = assetCode.slice(suffixStart);
 
@@ -138,11 +142,15 @@ export function rehydrateAsset(asset: IAssetInfo, moduleMap: IModuleMap, banner:
 
   source.add(suffix);
 
-  const cached: CachedSource = new CachedSource(source);
+  return handleExternals(new CachedSource(source), asset);
+}
+
+function handleExternals(source: Source, asset: IAssetInfo): Source {
+  const { externalNames } = asset;
 
   if (externalNames.size) {
-    const replaceSource: ReplaceSource = new ReplaceSource(cached);
-    const code: string = cached.source() as string;
+    const replaceSource: ReplaceSource = new ReplaceSource(source);
+    const code: string = source.source() as string;
 
     const externalIdRegex: RegExp = /__WEBPACK_EXTERNAL_MODULE_[A-Za-z0-9_$]+/g;
 
@@ -162,5 +170,5 @@ export function rehydrateAsset(asset: IAssetInfo, moduleMap: IModuleMap, banner:
     return new CachedSource(replaceSource);
   }
 
-  return cached;
+  return source;
 }

From 1e18be78b5074cf93ef58624a2d1b53d6704f3e5 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Tue, 17 Aug 2021 14:30:01 -0700
Subject: [PATCH 137/155] Revise comment

---
 webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
index 7020371f6ea..13de74d5db2 100644
--- a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
+++ b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
@@ -451,7 +451,7 @@ export class ModuleMinifierPlugin implements webpack.Plugin {
                     }
                   );
                 } else {
-                  // Skip minification for all other assets, though the modules still might be
+                  // This isn't a JS asset. Don't try to minify the asset wrapper, though if it contains modules, those might still get replaced with minified versions.
                   minifiedAssets.set(assetName, {
                     // Still need to restore ids
                     source: postProcessCode(new ReplaceSource(asset), assetName),

From 331dde14d8e0263fac72d767234199ff1c784e36 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Tue, 17 Aug 2021 14:30:40 -0700
Subject: [PATCH 138/155] Add change file

---
 ...ule-minifier-mini-css-compat_2021-08-17-21-01.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@rushstack/module-minifier-plugin/module-minifier-mini-css-compat_2021-08-17-21-01.json

diff --git a/common/changes/@rushstack/module-minifier-plugin/module-minifier-mini-css-compat_2021-08-17-21-01.json b/common/changes/@rushstack/module-minifier-plugin/module-minifier-mini-css-compat_2021-08-17-21-01.json
new file mode 100644
index 00000000000..3a4bfff502e
--- /dev/null
+++ b/common/changes/@rushstack/module-minifier-plugin/module-minifier-mini-css-compat_2021-08-17-21-01.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/module-minifier-plugin",
+      "comment": "Fix compatibility issue with mini-css-extract-plugin and other plugins that introduce non-JavaScript modules and asset types.",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@rushstack/module-minifier-plugin",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file

From 48e2b9ad10092dbf351bd4005f083db5aa11fecc Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Tue, 17 Aug 2021 14:30:48 -0700
Subject: [PATCH 139/155] Add comment

---
 webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
index 13de74d5db2..baa9d394fc0 100644
--- a/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
+++ b/webpack/module-minifier-plugin/src/ModuleMinifierPlugin.ts
@@ -493,6 +493,7 @@ export class ModuleMinifierPlugin implements webpack.Plugin {
           }
         );
 
+        // This function is written twice because the parameter order is not the same between the two hooks
         (compilation.chunkTemplate as unknown as IExtendedChunkTemplate).hooks.modules.tap(
           TAP_AFTER,
           (source: Source, chunk: webpack.compilation.Chunk, moduleTemplate: unknown) => {

From 8594e7737bd2c26946fc0d2e966f78009e0aa1a2 Mon Sep 17 00:00:00 2001
From: Ben Papp <BPapp-MS@users.noreply.github.com>
Date: Tue, 17 Aug 2021 16:33:39 -0700
Subject: [PATCH 140/155] add getParameterStringMap to
 CommandLineParameterProvider

---
 .../src/cli/actions/BaseInstallAction.ts      | 28 ++-----------
 .../src/cli/scriptActions/BulkScriptAction.ts | 22 ++---------
 common/reviews/api/ts-command-line.api.md     | 24 ++++++------
 .../providers/CommandLineParameterProvider.ts | 39 +++++++++++++++++++
 4 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/apps/rush-lib/src/cli/actions/BaseInstallAction.ts b/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
index f5e9861c508..46341c24b12 100644
--- a/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
+++ b/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
@@ -8,10 +8,7 @@ import { Import } from '@rushstack/node-core-library';
 import {
   CommandLineFlagParameter,
   CommandLineIntegerParameter,
-  CommandLineStringParameter,
-  CommandLineParameterKind,
-  CommandLineIntegerListParameter,
-  CommandLineStringListParameter
+  CommandLineStringParameter
 } from '@rushstack/ts-command-line';
 
 import { BaseRushAction } from './BaseRushAction';
@@ -197,27 +194,8 @@ export abstract class BaseInstallAction extends BaseRushAction {
         full: installManagerOptions.fullUpgrade.toString()
       };
 
-      for (const parameter of this.parameters) {
-        switch (parameter.kind) {
-          case CommandLineParameterKind.Flag:
-          case CommandLineParameterKind.Choice:
-          case CommandLineParameterKind.String:
-          case CommandLineParameterKind.Integer:
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            extraData[parameter.longName] = JSON.stringify((parameter as any).value);
-            break;
-          case CommandLineParameterKind.StringList:
-          case CommandLineParameterKind.IntegerList:
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const arrayValue: ReadonlyArray<any> | undefined = (
-              parameter as CommandLineIntegerListParameter | CommandLineStringListParameter
-            ).values;
-            extraData[parameter.longName] = arrayValue ? arrayValue.join(',') : '';
-            break;
-          default:
-            extraData[parameter.longName] = '?';
-        }
-      }
+      extraData = { ...extraData, ...this.getParameterStringMap() };
+
       if (this._selectionParameters) {
         extraData = { ...extraData, ...this._selectionParameters.getTelemetry() };
       }
diff --git a/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts b/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
index cff6d6be597..8fea9d22484 100644
--- a/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
+++ b/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
@@ -5,11 +5,7 @@ import * as os from 'os';
 import colors from 'colors/safe';
 
 import { AlreadyReportedError, ConsoleTerminalProvider, Terminal } from '@rushstack/node-core-library';
-import {
-  CommandLineFlagParameter,
-  CommandLineStringParameter,
-  CommandLineParameterKind
-} from '@rushstack/ts-command-line';
+import { CommandLineFlagParameter, CommandLineStringParameter } from '@rushstack/ts-command-line';
 
 import { Event } from '../../index';
 import { SetupChecks } from '../../logic/SetupChecks';
@@ -378,21 +374,9 @@ export class BulkScriptAction extends BaseScriptAction {
   }
 
   private _collectTelemetry(stopwatch: Stopwatch, success: boolean): void {
-    const extraData: { [key: string]: string } = this._selectionParameters.getTelemetry();
+    let extraData: { [key: string]: string } = this._selectionParameters.getTelemetry();
 
-    for (const customParameter of this.customParameters) {
-      switch (customParameter.kind) {
-        case CommandLineParameterKind.Flag:
-        case CommandLineParameterKind.Choice:
-        case CommandLineParameterKind.String:
-        case CommandLineParameterKind.Integer:
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          extraData[customParameter.longName] = JSON.stringify((customParameter as any).value);
-          break;
-        default:
-          extraData[customParameter.longName] = '?';
-      }
-    }
+    extraData = { ...extraData, ...this.getParameterStringMap() };
 
     if (this.parser.telemetry) {
       this.parser.telemetry.log({
diff --git a/common/reviews/api/ts-command-line.api.md b/common/reviews/api/ts-command-line.api.md
index 1b6468e5719..4709a390a61 100644
--- a/common/reviews/api/ts-command-line.api.md
+++ b/common/reviews/api/ts-command-line.api.md
@@ -36,7 +36,7 @@ export class CommandLineChoiceListParameter extends CommandLineParameter {
     // @internal
     _setValue(data: any): void;
     get values(): ReadonlyArray<string>;
-    }
+}
 
 // @public
 export class CommandLineChoiceParameter extends CommandLineParameter {
@@ -53,7 +53,7 @@ export class CommandLineChoiceParameter extends CommandLineParameter {
     // @internal
     _setValue(data: any): void;
     get value(): string | undefined;
-    }
+}
 
 // @public
 export const enum CommandLineConstants {
@@ -70,7 +70,7 @@ export class CommandLineFlagParameter extends CommandLineParameter {
     // @internal
     _setValue(data: any): void;
     get value(): boolean;
-    }
+}
 
 // @public
 export class CommandLineHelper {
@@ -87,7 +87,7 @@ export class CommandLineIntegerListParameter extends CommandLineParameterWithArg
     // @internal
     _setValue(data: any): void;
     get values(): ReadonlyArray<number>;
-    }
+}
 
 // @public
 export class CommandLineIntegerParameter extends CommandLineParameterWithArgument {
@@ -102,7 +102,7 @@ export class CommandLineIntegerParameter extends CommandLineParameterWithArgumen
     // @internal
     _setValue(data: any): void;
     get value(): number | undefined;
-    }
+}
 
 // @public
 export abstract class CommandLineParameter {
@@ -157,6 +157,9 @@ export abstract class CommandLineParameterProvider {
     getFlagParameter(parameterLongName: string): CommandLineFlagParameter;
     getIntegerListParameter(parameterLongName: string): CommandLineIntegerListParameter;
     getIntegerParameter(parameterLongName: string): CommandLineIntegerParameter;
+    getParameterStringMap(): {
+        [key: string]: string;
+    };
     getStringListParameter(parameterLongName: string): CommandLineStringListParameter;
     getStringParameter(parameterLongName: string): CommandLineStringParameter;
     protected abstract onDefineParameters(): void;
@@ -173,7 +176,7 @@ export abstract class CommandLineParameterWithArgument extends CommandLineParame
     constructor(definition: IBaseCommandLineDefinitionWithArgument);
     readonly argumentName: string;
     readonly completions: (() => Promise<string[]>) | undefined;
-    }
+}
 
 // @public
 export abstract class CommandLineParser extends CommandLineParameterProvider {
@@ -188,7 +191,7 @@ export abstract class CommandLineParser extends CommandLineParameterProvider {
     protected onExecute(): Promise<void>;
     selectedAction: CommandLineAction | undefined;
     tryGetAction(actionName: string): CommandLineAction | undefined;
-    }
+}
 
 // @public
 export class CommandLineRemainder {
@@ -200,7 +203,7 @@ export class CommandLineRemainder {
     // @internal
     _setValue(data: any): void;
     get values(): ReadonlyArray<string>;
-    }
+}
 
 // @public
 export class CommandLineStringListParameter extends CommandLineParameterWithArgument {
@@ -212,7 +215,7 @@ export class CommandLineStringListParameter extends CommandLineParameterWithArgu
     // @internal
     _setValue(data: any): void;
     get values(): ReadonlyArray<string>;
-    }
+}
 
 // @public
 export class CommandLineStringParameter extends CommandLineParameterWithArgument {
@@ -227,7 +230,7 @@ export class CommandLineStringParameter extends CommandLineParameterWithArgument
     // @internal
     _setValue(data: any): void;
     get value(): string | undefined;
-    }
+}
 
 // @public (undocumented)
 export class DynamicCommandLineAction extends CommandLineAction {
@@ -321,5 +324,4 @@ export interface ICommandLineStringDefinition extends IBaseCommandLineDefinition
 export interface ICommandLineStringListDefinition extends IBaseCommandLineDefinitionWithArgument {
 }
 
-
 ```
diff --git a/libraries/ts-command-line/src/providers/CommandLineParameterProvider.ts b/libraries/ts-command-line/src/providers/CommandLineParameterProvider.ts
index 0d9d8cf320d..89f22d3d783 100644
--- a/libraries/ts-command-line/src/providers/CommandLineParameterProvider.ts
+++ b/libraries/ts-command-line/src/providers/CommandLineParameterProvider.ts
@@ -289,6 +289,45 @@ export abstract class CommandLineParameterProvider {
     return this._getArgumentParser().formatHelp();
   }
 
+  /**
+   * Returns a object which maps the long name of each parameter in this.parameters
+   * to the stringified form of its value. This is useful for logging telemetry, but
+   * it is not the proper way of accessing parameters or their values.
+   */
+  public getParameterStringMap(): { [key: string]: string } {
+    const parameterMap: { [key: string]: string } = {};
+    for (const parameter of this.parameters) {
+      switch (parameter.kind) {
+        case CommandLineParameterKind.Flag:
+        case CommandLineParameterKind.Choice:
+        case CommandLineParameterKind.String:
+        case CommandLineParameterKind.Integer:
+          parameterMap[parameter.longName] = JSON.stringify(
+            (
+              parameter as
+                | CommandLineFlagParameter
+                | CommandLineIntegerParameter
+                | CommandLineChoiceParameter
+                | CommandLineStringParameter
+            ).value
+          );
+          break;
+        case CommandLineParameterKind.StringList:
+        case CommandLineParameterKind.IntegerList:
+        case CommandLineParameterKind.ChoiceList:
+          const arrayValue: ReadonlyArray<string | number> | undefined = (
+            parameter as
+              | CommandLineIntegerListParameter
+              | CommandLineStringListParameter
+              | CommandLineChoiceListParameter
+          ).values;
+          parameterMap[parameter.longName] = arrayValue ? arrayValue.join(',') : '';
+          break;
+      }
+    }
+    return parameterMap;
+  }
+
   /**
    * The child class should implement this hook to define its command-line parameters,
    * e.g. by calling defineFlagParameter().

From 1639fc4ce1f26287f79748d9bc62c72c90ae4c1b Mon Sep 17 00:00:00 2001
From: Ben Papp <BPapp-MS@users.noreply.github.com>
Date: Tue, 17 Aug 2021 16:35:50 -0700
Subject: [PATCH 141/155] changefile

---
 ...papp-AddFlagsToRushTelemetry_2021-08-17-23-35.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@rushstack/ts-command-line/benpapp-AddFlagsToRushTelemetry_2021-08-17-23-35.json

diff --git a/common/changes/@rushstack/ts-command-line/benpapp-AddFlagsToRushTelemetry_2021-08-17-23-35.json b/common/changes/@rushstack/ts-command-line/benpapp-AddFlagsToRushTelemetry_2021-08-17-23-35.json
new file mode 100644
index 00000000000..a5132068653
--- /dev/null
+++ b/common/changes/@rushstack/ts-command-line/benpapp-AddFlagsToRushTelemetry_2021-08-17-23-35.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/ts-command-line",
+      "comment": "Add getParameterStringMap to CommandLineParameterProvider, to easily query parameter usage for telemetry",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@rushstack/ts-command-line",
+  "email": "BPapp-MS@users.noreply.github.com"
+}
\ No newline at end of file

From bb576f0d0fe069a1d1b3bdbd189d472b3956da69 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Wed, 18 Aug 2021 00:06:54 +0000
Subject: [PATCH 142/155] Deleting change files and updating change logs for
 package updates.

---
 ...le-minifier-mini-css-compat_2021-08-17-21-01.json | 11 -----------
 webpack/module-minifier-plugin/CHANGELOG.json        | 12 ++++++++++++
 webpack/module-minifier-plugin/CHANGELOG.md          |  9 ++++++++-
 3 files changed, 20 insertions(+), 12 deletions(-)
 delete mode 100644 common/changes/@rushstack/module-minifier-plugin/module-minifier-mini-css-compat_2021-08-17-21-01.json

diff --git a/common/changes/@rushstack/module-minifier-plugin/module-minifier-mini-css-compat_2021-08-17-21-01.json b/common/changes/@rushstack/module-minifier-plugin/module-minifier-mini-css-compat_2021-08-17-21-01.json
deleted file mode 100644
index 3a4bfff502e..00000000000
--- a/common/changes/@rushstack/module-minifier-plugin/module-minifier-mini-css-compat_2021-08-17-21-01.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/module-minifier-plugin",
-      "comment": "Fix compatibility issue with mini-css-extract-plugin and other plugins that introduce non-JavaScript modules and asset types.",
-      "type": "patch"
-    }
-  ],
-  "packageName": "@rushstack/module-minifier-plugin",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/webpack/module-minifier-plugin/CHANGELOG.json b/webpack/module-minifier-plugin/CHANGELOG.json
index 5bdd2bf758b..7ac1003b603 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.json
+++ b/webpack/module-minifier-plugin/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/module-minifier-plugin",
   "entries": [
+    {
+      "version": "0.4.8",
+      "tag": "@rushstack/module-minifier-plugin_v0.4.8",
+      "date": "Wed, 18 Aug 2021 00:06:54 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Fix compatibility issue with mini-css-extract-plugin and other plugins that introduce non-JavaScript modules and asset types."
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.7",
       "tag": "@rushstack/module-minifier-plugin_v0.4.7",
diff --git a/webpack/module-minifier-plugin/CHANGELOG.md b/webpack/module-minifier-plugin/CHANGELOG.md
index 0ef4da8f277..59aab208253 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.md
+++ b/webpack/module-minifier-plugin/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/module-minifier-plugin
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Wed, 18 Aug 2021 00:06:54 GMT and should not be manually modified.
+
+## 0.4.8
+Wed, 18 Aug 2021 00:06:54 GMT
+
+### Patches
+
+- Fix compatibility issue with mini-css-extract-plugin and other plugins that introduce non-JavaScript modules and asset types.
 
 ## 0.4.7
 Fri, 13 Aug 2021 00:09:14 GMT

From 0aaba00199da8579e5e9391f48b4709fd2a386d0 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Wed, 18 Aug 2021 00:06:56 +0000
Subject: [PATCH 143/155] Applying package updates.

---
 webpack/module-minifier-plugin/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack/module-minifier-plugin/package.json b/webpack/module-minifier-plugin/package.json
index 2673b5c7514..3eca2ea3a27 100644
--- a/webpack/module-minifier-plugin/package.json
+++ b/webpack/module-minifier-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/module-minifier-plugin",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "This plugin splits minification of webpack compilations into smaller units.",
   "main": "lib/index.js",
   "typings": "dist/module-minifier-plugin.d.ts",

From 72fdd6d7bf2cfea17ce70f7f649c8b17df9cbd21 Mon Sep 17 00:00:00 2001
From: BPapp-MS <69489817+BPapp-MS@users.noreply.github.com>
Date: Wed, 18 Aug 2021 16:24:01 -0700
Subject: [PATCH 144/155] Succinct assembly of extraData

Co-authored-by: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
---
 apps/rush-lib/src/cli/actions/BaseInstallAction.ts | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/apps/rush-lib/src/cli/actions/BaseInstallAction.ts b/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
index 46341c24b12..86e35f248d6 100644
--- a/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
+++ b/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
@@ -187,18 +187,14 @@ export abstract class BaseInstallAction extends BaseRushAction {
     success: boolean
   ): void {
     if (this.parser.telemetry) {
-      let extraData: { [key: string]: string } = {
+      const extraData: Record<string, string> = {
         mode: this.actionName,
         clean: (!!this._purgeParameter.value).toString(),
         debug: installManagerOptions.debug.toString(),
-        full: installManagerOptions.fullUpgrade.toString()
+        full: installManagerOptions.fullUpgrade.toString(),
+        ...this.getParameterStringMap(),
+        ...this._selectionParameters?.getTelemetry() };
       };
-
-      extraData = { ...extraData, ...this.getParameterStringMap() };
-
-      if (this._selectionParameters) {
-        extraData = { ...extraData, ...this._selectionParameters.getTelemetry() };
-      }
       this.parser.telemetry.log({
         name: 'install',
         duration: stopwatch.duration,

From bd48e11b05397c4c302a6ecf5704104a9aee8343 Mon Sep 17 00:00:00 2001
From: Ben Papp <BPapp-MS@users.noreply.github.com>
Date: Wed, 18 Aug 2021 16:39:49 -0700
Subject: [PATCH 145/155] clean up extraData definitions and types

---
 apps/rush-lib/src/cli/actions/BaseInstallAction.ts         | 2 +-
 apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts    | 7 ++++---
 common/reviews/api/ts-command-line.api.md                  | 4 +---
 .../src/providers/CommandLineParameterProvider.ts          | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/apps/rush-lib/src/cli/actions/BaseInstallAction.ts b/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
index 86e35f248d6..7e7766e3eab 100644
--- a/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
+++ b/apps/rush-lib/src/cli/actions/BaseInstallAction.ts
@@ -193,7 +193,7 @@ export abstract class BaseInstallAction extends BaseRushAction {
         debug: installManagerOptions.debug.toString(),
         full: installManagerOptions.fullUpgrade.toString(),
         ...this.getParameterStringMap(),
-        ...this._selectionParameters?.getTelemetry() };
+        ...this._selectionParameters?.getTelemetry()
       };
       this.parser.telemetry.log({
         name: 'install',
diff --git a/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts b/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
index 8fea9d22484..a97f32bee6b 100644
--- a/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
+++ b/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
@@ -374,9 +374,10 @@ export class BulkScriptAction extends BaseScriptAction {
   }
 
   private _collectTelemetry(stopwatch: Stopwatch, success: boolean): void {
-    let extraData: { [key: string]: string } = this._selectionParameters.getTelemetry();
-
-    extraData = { ...extraData, ...this.getParameterStringMap() };
+    const extraData: Record<string, string> = {
+      ...this._selectionParameters.getTelemetry(),
+      ...this.getParameterStringMap()
+    };
 
     if (this.parser.telemetry) {
       this.parser.telemetry.log({
diff --git a/common/reviews/api/ts-command-line.api.md b/common/reviews/api/ts-command-line.api.md
index 4709a390a61..a3b47e51bca 100644
--- a/common/reviews/api/ts-command-line.api.md
+++ b/common/reviews/api/ts-command-line.api.md
@@ -157,9 +157,7 @@ export abstract class CommandLineParameterProvider {
     getFlagParameter(parameterLongName: string): CommandLineFlagParameter;
     getIntegerListParameter(parameterLongName: string): CommandLineIntegerListParameter;
     getIntegerParameter(parameterLongName: string): CommandLineIntegerParameter;
-    getParameterStringMap(): {
-        [key: string]: string;
-    };
+    getParameterStringMap(): Record<string, string>;
     getStringListParameter(parameterLongName: string): CommandLineStringListParameter;
     getStringParameter(parameterLongName: string): CommandLineStringParameter;
     protected abstract onDefineParameters(): void;
diff --git a/libraries/ts-command-line/src/providers/CommandLineParameterProvider.ts b/libraries/ts-command-line/src/providers/CommandLineParameterProvider.ts
index 89f22d3d783..688203dfe12 100644
--- a/libraries/ts-command-line/src/providers/CommandLineParameterProvider.ts
+++ b/libraries/ts-command-line/src/providers/CommandLineParameterProvider.ts
@@ -294,8 +294,8 @@ export abstract class CommandLineParameterProvider {
    * to the stringified form of its value. This is useful for logging telemetry, but
    * it is not the proper way of accessing parameters or their values.
    */
-  public getParameterStringMap(): { [key: string]: string } {
-    const parameterMap: { [key: string]: string } = {};
+  public getParameterStringMap(): Record<string, string> {
+    const parameterMap: Record<string, string> = {};
     for (const parameter of this.parameters) {
       switch (parameter.kind) {
         case CommandLineParameterKind.Flag:

From 80209512135b2aa81c013ef297b7bec6f7e97609 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Fri, 20 Aug 2021 15:08:10 +0000
Subject: [PATCH 146/155] Deleting change files and updating change logs for
 package updates.

---
 apps/api-documenter/CHANGELOG.json            | 18 +++++++++++++
 apps/api-documenter/CHANGELOG.md              |  7 ++++-
 apps/api-extractor/CHANGELOG.json             | 12 +++++++++
 apps/api-extractor/CHANGELOG.md               |  7 ++++-
 apps/heft/CHANGELOG.json                      | 15 +++++++++++
 apps/heft/CHANGELOG.md                        |  7 ++++-
 apps/rundown/CHANGELOG.json                   | 18 +++++++++++++
 apps/rundown/CHANGELOG.md                     |  7 ++++-
 ...FlagsToRushTelemetry_2021-08-17-23-35.json | 11 --------
 ...ctogonz-upgrade-deps_2021-07-13-21-50.json | 11 --------
 heft-plugins/heft-jest-plugin/CHANGELOG.json  | 18 +++++++++++++
 heft-plugins/heft-jest-plugin/CHANGELOG.md    |  7 ++++-
 heft-plugins/heft-sass-plugin/CHANGELOG.json  | 21 +++++++++++++++
 heft-plugins/heft-sass-plugin/CHANGELOG.md    |  7 ++++-
 .../heft-webpack4-plugin/CHANGELOG.json       | 18 +++++++++++++
 .../heft-webpack4-plugin/CHANGELOG.md         |  7 ++++-
 .../heft-webpack5-plugin/CHANGELOG.json       | 18 +++++++++++++
 .../heft-webpack5-plugin/CHANGELOG.md         |  7 ++++-
 .../debug-certificate-manager/CHANGELOG.json  | 15 +++++++++++
 .../debug-certificate-manager/CHANGELOG.md    |  7 ++++-
 libraries/load-themed-styles/CHANGELOG.json   | 15 +++++++++++
 libraries/load-themed-styles/CHANGELOG.md     |  7 ++++-
 libraries/package-deps-hash/CHANGELOG.json    | 15 +++++++++++
 libraries/package-deps-hash/CHANGELOG.md      |  7 ++++-
 libraries/stream-collator/CHANGELOG.json      | 18 +++++++++++++
 libraries/stream-collator/CHANGELOG.md        |  7 ++++-
 libraries/terminal/CHANGELOG.json             | 15 +++++++++++
 libraries/terminal/CHANGELOG.md               |  7 ++++-
 libraries/ts-command-line/CHANGELOG.json      | 12 +++++++++
 libraries/ts-command-line/CHANGELOG.md        |  9 ++++++-
 rigs/heft-node-rig/CHANGELOG.json             | 21 +++++++++++++++
 rigs/heft-node-rig/CHANGELOG.md               |  7 ++++-
 rigs/heft-web-rig/CHANGELOG.json              | 27 +++++++++++++++++++
 rigs/heft-web-rig/CHANGELOG.md                |  7 ++++-
 .../loader-load-themed-styles/CHANGELOG.json  | 18 +++++++++++++
 .../loader-load-themed-styles/CHANGELOG.md    |  7 ++++-
 webpack/loader-raw-script/CHANGELOG.json      | 15 +++++++++++
 webpack/loader-raw-script/CHANGELOG.md        |  7 ++++-
 webpack/localization-plugin/CHANGELOG.json    | 21 +++++++++++++++
 webpack/localization-plugin/CHANGELOG.md      |  7 ++++-
 webpack/module-minifier-plugin/CHANGELOG.json | 15 +++++++++++
 webpack/module-minifier-plugin/CHANGELOG.md   |  7 ++++-
 .../CHANGELOG.json                            | 15 +++++++++++
 .../CHANGELOG.md                              |  7 ++++-
 44 files changed, 488 insertions(+), 43 deletions(-)
 delete mode 100644 common/changes/@rushstack/ts-command-line/benpapp-AddFlagsToRushTelemetry_2021-08-17-23-35.json
 delete mode 100644 common/changes/@rushstack/ts-command-line/octogonz-upgrade-deps_2021-07-13-21-50.json

diff --git a/apps/api-documenter/CHANGELOG.json b/apps/api-documenter/CHANGELOG.json
index 132aefb90e8..c1f79ce97fa 100644
--- a/apps/api-documenter/CHANGELOG.json
+++ b/apps/api-documenter/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@microsoft/api-documenter",
   "entries": [
+    {
+      "version": "7.13.40",
+      "tag": "@microsoft/api-documenter_v7.13.40",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/ts-command-line\" to `4.9.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "7.13.39",
       "tag": "@microsoft/api-documenter_v7.13.39",
diff --git a/apps/api-documenter/CHANGELOG.md b/apps/api-documenter/CHANGELOG.md
index 2b4a9ff2f70..ef066467ba7 100644
--- a/apps/api-documenter/CHANGELOG.md
+++ b/apps/api-documenter/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/api-documenter
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 7.13.40
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 7.13.39
 Fri, 13 Aug 2021 00:09:14 GMT
diff --git a/apps/api-extractor/CHANGELOG.json b/apps/api-extractor/CHANGELOG.json
index d3ef72c1bd1..feb49545bcb 100644
--- a/apps/api-extractor/CHANGELOG.json
+++ b/apps/api-extractor/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@microsoft/api-extractor",
   "entries": [
+    {
+      "version": "7.18.6",
+      "tag": "@microsoft/api-extractor_v7.18.6",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/ts-command-line\" to `4.9.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "7.18.5",
       "tag": "@microsoft/api-extractor_v7.18.5",
diff --git a/apps/api-extractor/CHANGELOG.md b/apps/api-extractor/CHANGELOG.md
index d00666e3b52..c43c7aaa280 100644
--- a/apps/api-extractor/CHANGELOG.md
+++ b/apps/api-extractor/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/api-extractor
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 7.18.6
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 7.18.5
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/apps/heft/CHANGELOG.json b/apps/heft/CHANGELOG.json
index 60460e3446b..857443546b4 100644
--- a/apps/heft/CHANGELOG.json
+++ b/apps/heft/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/heft",
   "entries": [
+    {
+      "version": "0.36.3",
+      "tag": "@rushstack/heft_v0.36.3",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/ts-command-line\" to `4.9.0`"
+          },
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor\" to `7.18.6`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.36.2",
       "tag": "@rushstack/heft_v0.36.2",
diff --git a/apps/heft/CHANGELOG.md b/apps/heft/CHANGELOG.md
index 6e528e0aabc..c4411c0eb76 100644
--- a/apps/heft/CHANGELOG.md
+++ b/apps/heft/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 0.36.3
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 0.36.2
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/apps/rundown/CHANGELOG.json b/apps/rundown/CHANGELOG.json
index 56aeb2503e9..8046c62b9cb 100644
--- a/apps/rundown/CHANGELOG.json
+++ b/apps/rundown/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/rundown",
   "entries": [
+    {
+      "version": "1.0.132",
+      "tag": "@rushstack/rundown_v1.0.132",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/ts-command-line\" to `4.9.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.131",
       "tag": "@rushstack/rundown_v1.0.131",
diff --git a/apps/rundown/CHANGELOG.md b/apps/rundown/CHANGELOG.md
index 397f8215ec3..cd400aa71ea 100644
--- a/apps/rundown/CHANGELOG.md
+++ b/apps/rundown/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/rundown
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 1.0.132
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 1.0.131
 Fri, 13 Aug 2021 00:09:14 GMT
diff --git a/common/changes/@rushstack/ts-command-line/benpapp-AddFlagsToRushTelemetry_2021-08-17-23-35.json b/common/changes/@rushstack/ts-command-line/benpapp-AddFlagsToRushTelemetry_2021-08-17-23-35.json
deleted file mode 100644
index a5132068653..00000000000
--- a/common/changes/@rushstack/ts-command-line/benpapp-AddFlagsToRushTelemetry_2021-08-17-23-35.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/ts-command-line",
-      "comment": "Add getParameterStringMap to CommandLineParameterProvider, to easily query parameter usage for telemetry",
-      "type": "minor"
-    }
-  ],
-  "packageName": "@rushstack/ts-command-line",
-  "email": "BPapp-MS@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/ts-command-line/octogonz-upgrade-deps_2021-07-13-21-50.json b/common/changes/@rushstack/ts-command-line/octogonz-upgrade-deps_2021-07-13-21-50.json
deleted file mode 100644
index 5d3eac0e90a..00000000000
--- a/common/changes/@rushstack/ts-command-line/octogonz-upgrade-deps_2021-07-13-21-50.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/ts-command-line",
-      "comment": "",
-      "type": "none"
-    }
-  ],
-  "packageName": "@rushstack/ts-command-line",
-  "email": "4673363+octogonz@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.json b/heft-plugins/heft-jest-plugin/CHANGELOG.json
index 323c1c45cf4..edfe808bf40 100644
--- a/heft-plugins/heft-jest-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-jest-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-jest-plugin",
   "entries": [
+    {
+      "version": "0.1.20",
+      "tag": "@rushstack/heft-jest-plugin_v0.1.20",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor\" to `7.18.6`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.2` to `^0.36.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.19",
       "tag": "@rushstack/heft-jest-plugin_v0.1.19",
diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.md b/heft-plugins/heft-jest-plugin/CHANGELOG.md
index 68a5ba2a618..1185f6f14fb 100644
--- a/heft-plugins/heft-jest-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-jest-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-jest-plugin
 
-This log was last generated on Thu, 12 Aug 2021 18:11:18 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 0.1.20
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 0.1.19
 Thu, 12 Aug 2021 18:11:18 GMT
diff --git a/heft-plugins/heft-sass-plugin/CHANGELOG.json b/heft-plugins/heft-sass-plugin/CHANGELOG.json
index 283dc5db9df..524115b3f68 100644
--- a/heft-plugins/heft-sass-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-sass-plugin/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@rushstack/heft-sass-plugin",
   "entries": [
+    {
+      "version": "0.1.6",
+      "tag": "@rushstack/heft-sass-plugin_v0.1.6",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor\" to `7.18.6`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.2` to `^0.36.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.5",
       "tag": "@rushstack/heft-sass-plugin_v0.1.5",
diff --git a/heft-plugins/heft-sass-plugin/CHANGELOG.md b/heft-plugins/heft-sass-plugin/CHANGELOG.md
index f86f5511472..736f122d691 100644
--- a/heft-plugins/heft-sass-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-sass-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-sass-plugin
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 0.1.6
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 0.1.5
 Fri, 13 Aug 2021 00:09:14 GMT
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
index 717382911a7..d3df2fa289c 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
   "entries": [
+    {
+      "version": "0.2.7",
+      "tag": "@rushstack/heft-webpack4-plugin_v0.2.7",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.2` to `^0.36.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.6",
       "tag": "@rushstack/heft-webpack4-plugin_v0.2.6",
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
index f55a38b709a..b35f6b4e7a7 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-webpack4-plugin
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 0.2.7
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 0.2.6
 Fri, 13 Aug 2021 00:09:14 GMT
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
index 4b58da500d6..c780eb39249 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
   "entries": [
+    {
+      "version": "0.2.7",
+      "tag": "@rushstack/heft-webpack5-plugin_v0.2.7",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.2` to `^0.36.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.6",
       "tag": "@rushstack/heft-webpack5-plugin_v0.2.6",
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
index 9cfe094dadd..cc886c370d2 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-webpack5-plugin
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 0.2.7
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 0.2.6
 Fri, 13 Aug 2021 00:09:14 GMT
diff --git a/libraries/debug-certificate-manager/CHANGELOG.json b/libraries/debug-certificate-manager/CHANGELOG.json
index e32fdb43bbb..e4c5442a859 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.json
+++ b/libraries/debug-certificate-manager/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/debug-certificate-manager",
   "entries": [
+    {
+      "version": "1.0.57",
+      "tag": "@rushstack/debug-certificate-manager_v1.0.57",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.56",
       "tag": "@rushstack/debug-certificate-manager_v1.0.56",
diff --git a/libraries/debug-certificate-manager/CHANGELOG.md b/libraries/debug-certificate-manager/CHANGELOG.md
index 1587d255e7e..d49ea3d4145 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.md
+++ b/libraries/debug-certificate-manager/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/debug-certificate-manager
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 1.0.57
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 1.0.56
 Fri, 13 Aug 2021 00:09:14 GMT
diff --git a/libraries/load-themed-styles/CHANGELOG.json b/libraries/load-themed-styles/CHANGELOG.json
index c2de6356fde..39a0203bc8d 100644
--- a/libraries/load-themed-styles/CHANGELOG.json
+++ b/libraries/load-themed-styles/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@microsoft/load-themed-styles",
   "entries": [
+    {
+      "version": "1.10.203",
+      "tag": "@microsoft/load-themed-styles_v1.10.203",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-web-rig\" to `0.4.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.10.202",
       "tag": "@microsoft/load-themed-styles_v1.10.202",
diff --git a/libraries/load-themed-styles/CHANGELOG.md b/libraries/load-themed-styles/CHANGELOG.md
index 7093e0c4407..108692c4013 100644
--- a/libraries/load-themed-styles/CHANGELOG.md
+++ b/libraries/load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/load-themed-styles
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 1.10.203
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 1.10.202
 Fri, 13 Aug 2021 00:09:14 GMT
diff --git a/libraries/package-deps-hash/CHANGELOG.json b/libraries/package-deps-hash/CHANGELOG.json
index 47c505205da..4ba24d59cf2 100644
--- a/libraries/package-deps-hash/CHANGELOG.json
+++ b/libraries/package-deps-hash/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/package-deps-hash",
   "entries": [
+    {
+      "version": "3.0.61",
+      "tag": "@rushstack/package-deps-hash_v3.0.61",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "3.0.60",
       "tag": "@rushstack/package-deps-hash_v3.0.60",
diff --git a/libraries/package-deps-hash/CHANGELOG.md b/libraries/package-deps-hash/CHANGELOG.md
index 5df63dff2ce..1946c233ce5 100644
--- a/libraries/package-deps-hash/CHANGELOG.md
+++ b/libraries/package-deps-hash/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/package-deps-hash
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 3.0.61
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 3.0.60
 Fri, 13 Aug 2021 00:09:14 GMT
diff --git a/libraries/stream-collator/CHANGELOG.json b/libraries/stream-collator/CHANGELOG.json
index d141536a6cd..68930df09a7 100644
--- a/libraries/stream-collator/CHANGELOG.json
+++ b/libraries/stream-collator/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/stream-collator",
   "entries": [
+    {
+      "version": "4.0.116",
+      "tag": "@rushstack/stream-collator_v4.0.116",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/terminal\" to `0.2.18`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "4.0.115",
       "tag": "@rushstack/stream-collator_v4.0.115",
diff --git a/libraries/stream-collator/CHANGELOG.md b/libraries/stream-collator/CHANGELOG.md
index 8e88e1f8eb0..a0550b10daf 100644
--- a/libraries/stream-collator/CHANGELOG.md
+++ b/libraries/stream-collator/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/stream-collator
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 4.0.116
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 4.0.115
 Fri, 13 Aug 2021 00:09:14 GMT
diff --git a/libraries/terminal/CHANGELOG.json b/libraries/terminal/CHANGELOG.json
index 7088512b142..fe40eeffe10 100644
--- a/libraries/terminal/CHANGELOG.json
+++ b/libraries/terminal/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/terminal",
   "entries": [
+    {
+      "version": "0.2.18",
+      "tag": "@rushstack/terminal_v0.2.18",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.17",
       "tag": "@rushstack/terminal_v0.2.17",
diff --git a/libraries/terminal/CHANGELOG.md b/libraries/terminal/CHANGELOG.md
index 0e066b6d848..2e7c85d4815 100644
--- a/libraries/terminal/CHANGELOG.md
+++ b/libraries/terminal/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/terminal
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 0.2.18
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 0.2.17
 Fri, 13 Aug 2021 00:09:14 GMT
diff --git a/libraries/ts-command-line/CHANGELOG.json b/libraries/ts-command-line/CHANGELOG.json
index 4487670e68d..618ef0a11c6 100644
--- a/libraries/ts-command-line/CHANGELOG.json
+++ b/libraries/ts-command-line/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/ts-command-line",
   "entries": [
+    {
+      "version": "4.9.0",
+      "tag": "@rushstack/ts-command-line_v4.9.0",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Add getParameterStringMap to CommandLineParameterProvider, to easily query parameter usage for telemetry"
+          }
+        ]
+      }
+    },
     {
       "version": "4.8.1",
       "tag": "@rushstack/ts-command-line_v4.8.1",
diff --git a/libraries/ts-command-line/CHANGELOG.md b/libraries/ts-command-line/CHANGELOG.md
index 6dedf9b5a13..b2f33c91742 100644
--- a/libraries/ts-command-line/CHANGELOG.md
+++ b/libraries/ts-command-line/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/ts-command-line
 
-This log was last generated on Mon, 12 Jul 2021 23:08:26 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 4.9.0
+Fri, 20 Aug 2021 15:08:10 GMT
+
+### Minor changes
+
+- Add getParameterStringMap to CommandLineParameterProvider, to easily query parameter usage for telemetry
 
 ## 4.8.1
 Mon, 12 Jul 2021 23:08:26 GMT
diff --git a/rigs/heft-node-rig/CHANGELOG.json b/rigs/heft-node-rig/CHANGELOG.json
index 3179ee4c671..136ddb4adfa 100644
--- a/rigs/heft-node-rig/CHANGELOG.json
+++ b/rigs/heft-node-rig/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@rushstack/heft-node-rig",
   "entries": [
+    {
+      "version": "1.2.4",
+      "tag": "@rushstack/heft-node-rig_v1.2.4",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor\" to `7.18.6`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-jest-plugin\" to `0.1.20`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.2` to `^0.36.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.2.3",
       "tag": "@rushstack/heft-node-rig_v1.2.3",
diff --git a/rigs/heft-node-rig/CHANGELOG.md b/rigs/heft-node-rig/CHANGELOG.md
index 2eb58681915..01628f87262 100644
--- a/rigs/heft-node-rig/CHANGELOG.md
+++ b/rigs/heft-node-rig/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-node-rig
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 1.2.4
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 1.2.3
 Fri, 13 Aug 2021 00:09:14 GMT
diff --git a/rigs/heft-web-rig/CHANGELOG.json b/rigs/heft-web-rig/CHANGELOG.json
index 4fc1cb2a97d..c8fbfeb2ec7 100644
--- a/rigs/heft-web-rig/CHANGELOG.json
+++ b/rigs/heft-web-rig/CHANGELOG.json
@@ -1,6 +1,33 @@
 {
   "name": "@rushstack/heft-web-rig",
   "entries": [
+    {
+      "version": "0.4.4",
+      "tag": "@rushstack/heft-web-rig_v0.4.4",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor\" to `7.18.6`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-jest-plugin\" to `0.1.20`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-sass-plugin\" to `0.1.6`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-webpack4-plugin\" to `0.2.7`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.2` to `^0.36.3`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.3",
       "tag": "@rushstack/heft-web-rig_v0.4.3",
diff --git a/rigs/heft-web-rig/CHANGELOG.md b/rigs/heft-web-rig/CHANGELOG.md
index f4e77cf4a36..f8bf3aa3e71 100644
--- a/rigs/heft-web-rig/CHANGELOG.md
+++ b/rigs/heft-web-rig/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-web-rig
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 0.4.4
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 0.4.3
 Fri, 13 Aug 2021 00:09:14 GMT
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.json b/webpack/loader-load-themed-styles/CHANGELOG.json
index 3f1f737a33f..a3524bd4659 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.json
+++ b/webpack/loader-load-themed-styles/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
   "entries": [
+    {
+      "version": "1.9.84",
+      "tag": "@microsoft/loader-load-themed-styles_v1.9.84",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/load-themed-styles\" to `1.10.203`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.9.83",
       "tag": "@microsoft/loader-load-themed-styles_v1.9.83",
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.md b/webpack/loader-load-themed-styles/CHANGELOG.md
index 8c9c15c0f36..64122934265 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.md
+++ b/webpack/loader-load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/loader-load-themed-styles
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 1.9.84
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 1.9.83
 Fri, 13 Aug 2021 00:09:14 GMT
diff --git a/webpack/loader-raw-script/CHANGELOG.json b/webpack/loader-raw-script/CHANGELOG.json
index 7fa7e120e2d..1d474c35394 100644
--- a/webpack/loader-raw-script/CHANGELOG.json
+++ b/webpack/loader-raw-script/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/loader-raw-script",
   "entries": [
+    {
+      "version": "1.3.170",
+      "tag": "@rushstack/loader-raw-script_v1.3.170",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.3.169",
       "tag": "@rushstack/loader-raw-script_v1.3.169",
diff --git a/webpack/loader-raw-script/CHANGELOG.md b/webpack/loader-raw-script/CHANGELOG.md
index b47d28daf14..205d5264f0f 100644
--- a/webpack/loader-raw-script/CHANGELOG.md
+++ b/webpack/loader-raw-script/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/loader-raw-script
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 1.3.170
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 1.3.169
 Fri, 13 Aug 2021 00:09:14 GMT
diff --git a/webpack/localization-plugin/CHANGELOG.json b/webpack/localization-plugin/CHANGELOG.json
index ce9234c021b..83887352505 100644
--- a/webpack/localization-plugin/CHANGELOG.json
+++ b/webpack/localization-plugin/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@rushstack/localization-plugin",
   "entries": [
+    {
+      "version": "0.6.44",
+      "tag": "@rushstack/localization-plugin_v0.6.44",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/set-webpack-public-path-plugin\" to `3.2.64`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/set-webpack-public-path-plugin\" from `^3.2.63` to `^3.2.64`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.6.43",
       "tag": "@rushstack/localization-plugin_v0.6.43",
diff --git a/webpack/localization-plugin/CHANGELOG.md b/webpack/localization-plugin/CHANGELOG.md
index 6541cfb84cd..6328de8aa1f 100644
--- a/webpack/localization-plugin/CHANGELOG.md
+++ b/webpack/localization-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/localization-plugin
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 0.6.44
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 0.6.43
 Fri, 13 Aug 2021 00:09:14 GMT
diff --git a/webpack/module-minifier-plugin/CHANGELOG.json b/webpack/module-minifier-plugin/CHANGELOG.json
index 7ac1003b603..114956e1f03 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.json
+++ b/webpack/module-minifier-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/module-minifier-plugin",
   "entries": [
+    {
+      "version": "0.4.9",
+      "tag": "@rushstack/module-minifier-plugin_v0.4.9",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.8",
       "tag": "@rushstack/module-minifier-plugin_v0.4.8",
diff --git a/webpack/module-minifier-plugin/CHANGELOG.md b/webpack/module-minifier-plugin/CHANGELOG.md
index 59aab208253..ee8e6dd8fe8 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.md
+++ b/webpack/module-minifier-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/module-minifier-plugin
 
-This log was last generated on Wed, 18 Aug 2021 00:06:54 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 0.4.9
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 0.4.8
 Wed, 18 Aug 2021 00:06:54 GMT
diff --git a/webpack/set-webpack-public-path-plugin/CHANGELOG.json b/webpack/set-webpack-public-path-plugin/CHANGELOG.json
index 26eee179e55..855d27a75cf 100644
--- a/webpack/set-webpack-public-path-plugin/CHANGELOG.json
+++ b/webpack/set-webpack-public-path-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/set-webpack-public-path-plugin",
   "entries": [
+    {
+      "version": "3.2.64",
+      "tag": "@rushstack/set-webpack-public-path-plugin_v3.2.64",
+      "date": "Fri, 20 Aug 2021 15:08:10 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "3.2.63",
       "tag": "@rushstack/set-webpack-public-path-plugin_v3.2.63",
diff --git a/webpack/set-webpack-public-path-plugin/CHANGELOG.md b/webpack/set-webpack-public-path-plugin/CHANGELOG.md
index c01b669e929..103cd617474 100644
--- a/webpack/set-webpack-public-path-plugin/CHANGELOG.md
+++ b/webpack/set-webpack-public-path-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/set-webpack-public-path-plugin
 
-This log was last generated on Fri, 13 Aug 2021 00:09:14 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+
+## 3.2.64
+Fri, 20 Aug 2021 15:08:10 GMT
+
+_Version update only_
 
 ## 3.2.63
 Fri, 13 Aug 2021 00:09:14 GMT

From c2c7c2c8124ca499b76c715a6d7decd188be1e69 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Fri, 20 Aug 2021 15:08:13 +0000
Subject: [PATCH 147/155] Applying package updates.

---
 apps/api-documenter/package.json                    | 2 +-
 apps/api-extractor/package.json                     | 2 +-
 apps/heft/package.json                              | 2 +-
 apps/rundown/package.json                           | 2 +-
 heft-plugins/heft-jest-plugin/package.json          | 4 ++--
 heft-plugins/heft-sass-plugin/package.json          | 4 ++--
 heft-plugins/heft-webpack4-plugin/package.json      | 4 ++--
 heft-plugins/heft-webpack5-plugin/package.json      | 4 ++--
 libraries/debug-certificate-manager/package.json    | 2 +-
 libraries/load-themed-styles/package.json           | 2 +-
 libraries/package-deps-hash/package.json            | 2 +-
 libraries/stream-collator/package.json              | 2 +-
 libraries/terminal/package.json                     | 2 +-
 libraries/ts-command-line/package.json              | 2 +-
 rigs/heft-node-rig/package.json                     | 4 ++--
 rigs/heft-web-rig/package.json                      | 4 ++--
 webpack/loader-load-themed-styles/package.json      | 2 +-
 webpack/loader-raw-script/package.json              | 2 +-
 webpack/localization-plugin/package.json            | 4 ++--
 webpack/module-minifier-plugin/package.json         | 2 +-
 webpack/set-webpack-public-path-plugin/package.json | 2 +-
 21 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/apps/api-documenter/package.json b/apps/api-documenter/package.json
index c382cd98017..4ee52e32102 100644
--- a/apps/api-documenter/package.json
+++ b/apps/api-documenter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/api-documenter",
-  "version": "7.13.39",
+  "version": "7.13.40",
   "description": "Read JSON files from api-extractor, generate documentation pages",
   "repository": {
     "type": "git",
diff --git a/apps/api-extractor/package.json b/apps/api-extractor/package.json
index 4d7e923c390..7a4fbf95de7 100644
--- a/apps/api-extractor/package.json
+++ b/apps/api-extractor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/api-extractor",
-  "version": "7.18.5",
+  "version": "7.18.6",
   "description": "Analyze the exported API for a TypeScript library and generate reviews, documentation, and .d.ts rollups",
   "keywords": [
     "typescript",
diff --git a/apps/heft/package.json b/apps/heft/package.json
index 3a15cc7b0ee..b85dfe49daa 100644
--- a/apps/heft/package.json
+++ b/apps/heft/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft",
-  "version": "0.36.2",
+  "version": "0.36.3",
   "description": "Build all your JavaScript projects the same way: A way that works.",
   "keywords": [
     "toolchain",
diff --git a/apps/rundown/package.json b/apps/rundown/package.json
index b108db8dffa..7238b39f5a3 100644
--- a/apps/rundown/package.json
+++ b/apps/rundown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/rundown",
-  "version": "1.0.131",
+  "version": "1.0.132",
   "description": "Detect load time regressions by running an app, tracing require() calls, and generating a deterministic report",
   "repository": {
     "type": "git",
diff --git a/heft-plugins/heft-jest-plugin/package.json b/heft-plugins/heft-jest-plugin/package.json
index 209c7f0f9da..d7fad062ecb 100644
--- a/heft-plugins/heft-jest-plugin/package.json
+++ b/heft-plugins/heft-jest-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-jest-plugin",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "Heft plugin for Jest",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.2"
+    "@rushstack/heft": "^0.36.3"
   },
   "dependencies": {
     "@jest/core": "~25.4.0",
diff --git a/heft-plugins/heft-sass-plugin/package.json b/heft-plugins/heft-sass-plugin/package.json
index b95f2b08fc4..31b017764d9 100644
--- a/heft-plugins/heft-sass-plugin/package.json
+++ b/heft-plugins/heft-sass-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-sass-plugin",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Heft plugin for SASS",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.2"
+    "@rushstack/heft": "^0.36.3"
   },
   "dependencies": {
     "@rushstack/heft-config-file": "workspace:*",
diff --git a/heft-plugins/heft-webpack4-plugin/package.json b/heft-plugins/heft-webpack4-plugin/package.json
index cbf1c9c4847..29929152b24 100644
--- a/heft-plugins/heft-webpack4-plugin/package.json
+++ b/heft-plugins/heft-webpack4-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Heft plugin for Webpack 4",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.2"
+    "@rushstack/heft": "^0.36.3"
   },
   "dependencies": {
     "@rushstack/node-core-library": "workspace:*",
diff --git a/heft-plugins/heft-webpack5-plugin/package.json b/heft-plugins/heft-webpack5-plugin/package.json
index fa668831fb7..8a1e462dc1f 100644
--- a/heft-plugins/heft-webpack5-plugin/package.json
+++ b/heft-plugins/heft-webpack5-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Heft plugin for Webpack 5",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.2"
+    "@rushstack/heft": "^0.36.3"
   },
   "dependencies": {
     "@rushstack/node-core-library": "workspace:*",
diff --git a/libraries/debug-certificate-manager/package.json b/libraries/debug-certificate-manager/package.json
index 49e78624549..5c9617c4347 100644
--- a/libraries/debug-certificate-manager/package.json
+++ b/libraries/debug-certificate-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/debug-certificate-manager",
-  "version": "1.0.56",
+  "version": "1.0.57",
   "description": "Cross-platform functionality to create debug ssl certificates.",
   "main": "lib/index.js",
   "typings": "dist/debug-certificate-manager.d.ts",
diff --git a/libraries/load-themed-styles/package.json b/libraries/load-themed-styles/package.json
index da7b5337531..c684a845c15 100644
--- a/libraries/load-themed-styles/package.json
+++ b/libraries/load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/load-themed-styles",
-  "version": "1.10.202",
+  "version": "1.10.203",
   "description": "Loads themed styles.",
   "license": "MIT",
   "repository": {
diff --git a/libraries/package-deps-hash/package.json b/libraries/package-deps-hash/package.json
index 7fae2ca84aa..250775d7972 100644
--- a/libraries/package-deps-hash/package.json
+++ b/libraries/package-deps-hash/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/package-deps-hash",
-  "version": "3.0.60",
+  "version": "3.0.61",
   "description": "",
   "main": "lib/index.js",
   "typings": "dist/package-deps-hash.d.ts",
diff --git a/libraries/stream-collator/package.json b/libraries/stream-collator/package.json
index 8015b2c42e0..d5c8fe12786 100644
--- a/libraries/stream-collator/package.json
+++ b/libraries/stream-collator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/stream-collator",
-  "version": "4.0.115",
+  "version": "4.0.116",
   "description": "Display intelligible realtime output from concurrent processes",
   "repository": {
     "type": "git",
diff --git a/libraries/terminal/package.json b/libraries/terminal/package.json
index f09aaf419d5..d072fd51b5b 100644
--- a/libraries/terminal/package.json
+++ b/libraries/terminal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/terminal",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "description": "User interface primitives for console applications",
   "main": "lib/index.js",
   "typings": "dist/terminal.d.ts",
diff --git a/libraries/ts-command-line/package.json b/libraries/ts-command-line/package.json
index b06fadc550e..b6249137675 100644
--- a/libraries/ts-command-line/package.json
+++ b/libraries/ts-command-line/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/ts-command-line",
-  "version": "4.8.1",
+  "version": "4.9.0",
   "description": "An object-oriented command-line parser for TypeScript",
   "repository": {
     "type": "git",
diff --git a/rigs/heft-node-rig/package.json b/rigs/heft-node-rig/package.json
index aa0cbe60ab5..9f571c37625 100644
--- a/rigs/heft-node-rig/package.json
+++ b/rigs/heft-node-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-node-rig",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "A rig package for Node.js projects that build using Heft",
   "license": "MIT",
   "scripts": {
@@ -11,7 +11,7 @@
     "url": "https://github.com/microsoft/rushstack/tree/master/rigs/heft-node-rig"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.2"
+    "@rushstack/heft": "^0.36.3"
   },
   "dependencies": {
     "@microsoft/api-extractor": "workspace:*",
diff --git a/rigs/heft-web-rig/package.json b/rigs/heft-web-rig/package.json
index 296f9a3968a..77df699ddf5 100644
--- a/rigs/heft-web-rig/package.json
+++ b/rigs/heft-web-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-web-rig",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "A rig package for web browser projects that build using Heft",
   "license": "MIT",
   "scripts": {
@@ -11,7 +11,7 @@
     "url": "https://github.com/microsoft/rushstack/tree/master/rigs/heft-web-rig"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.2"
+    "@rushstack/heft": "^0.36.3"
   },
   "dependencies": {
     "@microsoft/api-extractor": "workspace:*",
diff --git a/webpack/loader-load-themed-styles/package.json b/webpack/loader-load-themed-styles/package.json
index e068086b302..3362723af8e 100644
--- a/webpack/loader-load-themed-styles/package.json
+++ b/webpack/loader-load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
-  "version": "1.9.83",
+  "version": "1.9.84",
   "description": "This simple loader wraps the loading of CSS in script equivalent to `require('load-themed-styles').loadStyles( /* css text */ )`. It is designed to be a replacement for style-loader.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/loader-raw-script/package.json b/webpack/loader-raw-script/package.json
index 44e963afbeb..12356cd2231 100644
--- a/webpack/loader-raw-script/package.json
+++ b/webpack/loader-raw-script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/loader-raw-script",
-  "version": "1.3.169",
+  "version": "1.3.170",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/localization-plugin/package.json b/webpack/localization-plugin/package.json
index 0e70e221774..92ac347575a 100644
--- a/webpack/localization-plugin/package.json
+++ b/webpack/localization-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/localization-plugin",
-  "version": "0.6.43",
+  "version": "0.6.44",
   "description": "This plugin facilitates localization with Webpack.",
   "main": "lib/index.js",
   "typings": "dist/localization-plugin.d.ts",
@@ -13,7 +13,7 @@
     "build": "heft build --clean"
   },
   "peerDependencies": {
-    "@rushstack/set-webpack-public-path-plugin": "^3.2.63",
+    "@rushstack/set-webpack-public-path-plugin": "^3.2.64",
     "@types/webpack": "^4.39.0",
     "webpack": "^4.31.0"
   },
diff --git a/webpack/module-minifier-plugin/package.json b/webpack/module-minifier-plugin/package.json
index 3eca2ea3a27..f6c2aa306c7 100644
--- a/webpack/module-minifier-plugin/package.json
+++ b/webpack/module-minifier-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/module-minifier-plugin",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "description": "This plugin splits minification of webpack compilations into smaller units.",
   "main": "lib/index.js",
   "typings": "dist/module-minifier-plugin.d.ts",
diff --git a/webpack/set-webpack-public-path-plugin/package.json b/webpack/set-webpack-public-path-plugin/package.json
index 6e3e56d8200..7ae33f368a4 100644
--- a/webpack/set-webpack-public-path-plugin/package.json
+++ b/webpack/set-webpack-public-path-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/set-webpack-public-path-plugin",
-  "version": "3.2.63",
+  "version": "3.2.64",
   "description": "This plugin sets the webpack public path at runtime.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

From 1b46e16ff9ee32d4fe92bec233240e7839498876 Mon Sep 17 00:00:00 2001
From: Ian Clanton-Thuon <iclanton@users.noreply.github.com>
Date: Mon, 23 Aug 2021 14:26:22 -0700
Subject: [PATCH 148/155] Make the next release of Rush a minor bump.

---
 common/config/rush/version-policies.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
index 7f536497095..49538dd0ccf 100644
--- a/common/config/rush/version-policies.json
+++ b/common/config/rush/version-policies.json
@@ -91,7 +91,7 @@
     "policyName": "rush",
     "definitionName": "lockStepVersion",
     "version": "5.51.1",
-    "nextBump": "patch",
+    "nextBump": "minor",
     "mainProject": "@microsoft/rush"
   }
 ]

From 6449a2a08e7a5011b1a52ffd9f6233bdc73f1f27 Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Mon, 23 Aug 2021 21:34:46 +0000
Subject: [PATCH 149/155] Deleting change files and updating change logs for
 package updates.

---
 apps/rush/CHANGELOG.json                          | 15 +++++++++++++++
 apps/rush/CHANGELOG.md                            | 10 +++++++++-
 ...-AddFlagsToRushTelemetry_2021-08-05-20-52.json | 11 -----------
 .../rush/pr-dtinth-2861_2021-08-17-15-46.json     | 11 -----------
 4 files changed, 24 insertions(+), 23 deletions(-)
 delete mode 100644 common/changes/@microsoft/rush/benpapp-AddFlagsToRushTelemetry_2021-08-05-20-52.json
 delete mode 100644 common/changes/@microsoft/rush/pr-dtinth-2861_2021-08-17-15-46.json

diff --git a/apps/rush/CHANGELOG.json b/apps/rush/CHANGELOG.json
index 63a2fba9b48..16199b516fa 100644
--- a/apps/rush/CHANGELOG.json
+++ b/apps/rush/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@microsoft/rush",
   "entries": [
+    {
+      "version": "5.52.0",
+      "tag": "@microsoft/rush_v5.52.0",
+      "date": "Mon, 23 Aug 2021 21:34:46 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "Add properties to the extraData section of the telemetry file for parameter usage in the install commands"
+          },
+          {
+            "comment": "Add .heft to .gitignore file generated by rush init"
+          }
+        ]
+      }
+    },
     {
       "version": "5.51.1",
       "tag": "@microsoft/rush_v5.51.1",
diff --git a/apps/rush/CHANGELOG.md b/apps/rush/CHANGELOG.md
index f5bb13b5491..61b1d75c205 100644
--- a/apps/rush/CHANGELOG.md
+++ b/apps/rush/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Change Log - @microsoft/rush
 
-This log was last generated on Fri, 13 Aug 2021 22:45:36 GMT and should not be manually modified.
+This log was last generated on Mon, 23 Aug 2021 21:34:46 GMT and should not be manually modified.
+
+## 5.52.0
+Mon, 23 Aug 2021 21:34:46 GMT
+
+### Updates
+
+- Add properties to the extraData section of the telemetry file for parameter usage in the install commands
+- Add .heft to .gitignore file generated by rush init
 
 ## 5.51.1
 Fri, 13 Aug 2021 22:45:36 GMT
diff --git a/common/changes/@microsoft/rush/benpapp-AddFlagsToRushTelemetry_2021-08-05-20-52.json b/common/changes/@microsoft/rush/benpapp-AddFlagsToRushTelemetry_2021-08-05-20-52.json
deleted file mode 100644
index f6cc634fb63..00000000000
--- a/common/changes/@microsoft/rush/benpapp-AddFlagsToRushTelemetry_2021-08-05-20-52.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@microsoft/rush",
-      "comment": "Add properties to the extraData section of the telemetry file for parameter usage in the install commands",
-      "type": "none"
-    }
-  ],
-  "packageName": "@microsoft/rush",
-  "email": "BPapp-MS@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@microsoft/rush/pr-dtinth-2861_2021-08-17-15-46.json b/common/changes/@microsoft/rush/pr-dtinth-2861_2021-08-17-15-46.json
deleted file mode 100644
index 4ac7ca94037..00000000000
--- a/common/changes/@microsoft/rush/pr-dtinth-2861_2021-08-17-15-46.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@microsoft/rush",
-      "comment": "Add .heft to .gitignore file generated by rush init",
-      "type": "none"
-    }
-  ],
-  "packageName": "@microsoft/rush",
-  "email": "dtinth@spacet.me"
-}
\ No newline at end of file

From 5e5623cbdb9ddeb09a1a94a34e1f2659f4bf606c Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Mon, 23 Aug 2021 21:34:48 +0000
Subject: [PATCH 150/155] Applying package updates.

---
 apps/rush-lib/package.json               | 2 +-
 apps/rush/package.json                   | 2 +-
 common/config/rush/version-policies.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/rush-lib/package.json b/apps/rush-lib/package.json
index d034503d946..5d7033ed11b 100644
--- a/apps/rush-lib/package.json
+++ b/apps/rush-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/rush-lib",
-  "version": "5.51.1",
+  "version": "5.52.0",
   "description": "A library for writing scripts that interact with the Rush tool",
   "repository": {
     "type": "git",
diff --git a/apps/rush/package.json b/apps/rush/package.json
index 6a6f24c26d8..ff31ac4dde5 100644
--- a/apps/rush/package.json
+++ b/apps/rush/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/rush",
-  "version": "5.51.1",
+  "version": "5.52.0",
   "description": "A professional solution for consolidating all your JavaScript projects in one Git repo",
   "keywords": [
     "install",
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
index 49538dd0ccf..e77300daa09 100644
--- a/common/config/rush/version-policies.json
+++ b/common/config/rush/version-policies.json
@@ -90,7 +90,7 @@
   {
     "policyName": "rush",
     "definitionName": "lockStepVersion",
-    "version": "5.51.1",
+    "version": "5.52.0",
     "nextBump": "minor",
     "mainProject": "@microsoft/rush"
   }

From 9e2f410ab56ae26dca64a0b2a3798d30c385c720 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Thu, 26 Aug 2021 15:27:24 -0700
Subject: [PATCH 151/155] Enable caching in RigConfig

---
 .../project-cache_2021-08-02-23-04.json       |  11 ++
 common/reviews/api/rig-package.api.md         |   4 +-
 libraries/rig-package/src/RigConfig.ts        | 147 +++++++++++-------
 .../rig-package/src/test/RigConfig.test.ts    |  42 ++++-
 4 files changed, 142 insertions(+), 62 deletions(-)
 create mode 100644 common/changes/@rushstack/rig-package/project-cache_2021-08-02-23-04.json

diff --git a/common/changes/@rushstack/rig-package/project-cache_2021-08-02-23-04.json b/common/changes/@rushstack/rig-package/project-cache_2021-08-02-23-04.json
new file mode 100644
index 00000000000..8a6994def46
--- /dev/null
+++ b/common/changes/@rushstack/rig-package/project-cache_2021-08-02-23-04.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/rig-package",
+      "comment": "Cache rig.json reads",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@rushstack/rig-package",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file
diff --git a/common/reviews/api/rig-package.api.md b/common/reviews/api/rig-package.api.md
index c2b3f90f3f9..f01bc2f44af 100644
--- a/common/reviews/api/rig-package.api.md
+++ b/common/reviews/api/rig-package.api.md
@@ -6,6 +6,7 @@
 
 // @public
 export interface ILoadForProjectFolderOptions {
+    bypassCache?: boolean;
     overrideRigJsonObject?: IRigConfigJson;
     projectFolderPath: string;
 }
@@ -33,7 +34,6 @@ export class RigConfig {
     readonly rigProfile: string;
     tryResolveConfigFilePath(configFileRelativePath: string): string | undefined;
     tryResolveConfigFilePathAsync(configFileRelativePath: string): Promise<string | undefined>;
-    }
-
+}
 
 ```
diff --git a/libraries/rig-package/src/RigConfig.ts b/libraries/rig-package/src/RigConfig.ts
index aa41fe17130..e354301faa2 100644
--- a/libraries/rig-package/src/RigConfig.ts
+++ b/libraries/rig-package/src/RigConfig.ts
@@ -42,7 +42,7 @@ interface IRigConfigOptions {
   rigFound: boolean;
   filePath: string;
   rigPackageName: string;
-  rigProfile: string;
+  rigProfile?: string;
 }
 
 /**
@@ -60,6 +60,11 @@ export interface ILoadForProjectFolderOptions {
    * If specified, instead of loading the `config/rig.json` from disk, this object will be substituted instead.
    */
   overrideRigJsonObject?: IRigConfigJson;
+
+  /**
+   * If specified, force a fresh load instead of returning a cached entry, if one existed.
+   */
+  bypassCache?: boolean;
 }
 
 /**
@@ -91,6 +96,8 @@ export class RigConfig {
   public static jsonSchemaPath: string = path.resolve(__dirname, './schemas/rig.schema.json');
   private static _jsonSchemaObject: object | undefined = undefined;
 
+  private static readonly _configCache: Map<string, RigConfig> = new Map();
+
   /**
    * The project folder path that was passed to {@link RigConfig.loadForProjectFolder},
    * which maybe an absolute or relative path.
@@ -160,13 +167,15 @@ export class RigConfig {
   private _resolvedProfileFolder: string | undefined;
 
   private constructor(options: IRigConfigOptions) {
-    this.projectFolderOriginalPath = options.projectFolderPath;
-    this.projectFolderPath = path.resolve(options.projectFolderPath);
+    const { projectFolderPath, rigFound, filePath, rigPackageName, rigProfile = 'default' } = options;
+
+    this.projectFolderOriginalPath = projectFolderPath;
+    this.projectFolderPath = path.resolve(projectFolderPath);
 
-    this.rigFound = options.rigFound;
-    this.filePath = options.filePath;
-    this.rigPackageName = options.rigPackageName;
-    this.rigProfile = options.rigProfile;
+    this.rigFound = rigFound;
+    this.filePath = filePath;
+    this.rigPackageName = rigPackageName;
+    this.rigProfile = rigProfile;
 
     if (this.rigFound) {
       this.relativeProfileFolderPath = 'profiles/' + this.rigProfile;
@@ -199,80 +208,110 @@ export class RigConfig {
    * equal to `false`.
    */
   public static loadForProjectFolder(options: ILoadForProjectFolderOptions): RigConfig {
-    const rigConfigFilePath: string = path.join(options.projectFolderPath, 'config/rig.json');
+    const { overrideRigJsonObject, projectFolderPath } = options;
 
-    let json: IRigConfigJson;
-    try {
-      if (options.overrideRigJsonObject) {
-        json = options.overrideRigJsonObject;
-      } else {
-        if (!fs.existsSync(rigConfigFilePath)) {
-          return new RigConfig({
-            projectFolderPath: options.projectFolderPath,
-
-            rigFound: false,
-            filePath: '',
-            rigPackageName: '',
-            rigProfile: ''
-          });
-        }
+    const fromCache: RigConfig | undefined =
+      !options.bypassCache && !overrideRigJsonObject
+        ? RigConfig._configCache.get(projectFolderPath)
+        : undefined;
 
+    if (fromCache) {
+      return fromCache;
+    }
+
+    const rigConfigFilePath: string = path.join(projectFolderPath, 'config/rig.json');
+
+    let config: RigConfig | undefined;
+    let json: IRigConfigJson | undefined = overrideRigJsonObject;
+    try {
+      if (!json) {
         const rigConfigFileContent: string = fs.readFileSync(rigConfigFilePath).toString();
-        json = JSON.parse(stripJsonComments(rigConfigFileContent));
+        json = JSON.parse(stripJsonComments(rigConfigFileContent)) as IRigConfigJson;
       }
       RigConfig._validateSchema(json);
     } catch (error) {
-      throw new Error(error.message + '\nError loading config file: ' + rigConfigFilePath);
+      config = RigConfig._handleConfigError(error, projectFolderPath, rigConfigFilePath);
     }
 
-    return new RigConfig({
-      projectFolderPath: options.projectFolderPath,
+    if (!config) {
+      config = new RigConfig({
+        projectFolderPath: projectFolderPath,
 
-      rigFound: true,
-      filePath: rigConfigFilePath,
-      rigPackageName: json.rigPackageName,
-      rigProfile: json.rigProfile || 'default'
-    });
+        rigFound: true,
+        filePath: rigConfigFilePath,
+        rigPackageName: json!.rigPackageName,
+        rigProfile: json!.rigProfile
+      });
+    }
+
+    if (!overrideRigJsonObject) {
+      RigConfig._configCache.set(projectFolderPath, config);
+    }
+    return config;
   }
 
   /**
    * An async variant of {@link RigConfig.loadForProjectFolder}
    */
   public static async loadForProjectFolderAsync(options: ILoadForProjectFolderOptions): Promise<RigConfig> {
-    const rigConfigFilePath: string = path.join(options.projectFolderPath, 'config/rig.json');
+    const { overrideRigJsonObject, projectFolderPath } = options;
 
-    let json: IRigConfigJson;
-    try {
-      if (options.overrideRigJsonObject) {
-        json = options.overrideRigJsonObject;
-      } else {
-        if (!(await Helpers.fsExistsAsync(rigConfigFilePath))) {
-          return new RigConfig({
-            projectFolderPath: options.projectFolderPath,
-
-            rigFound: false,
-            filePath: '',
-            rigPackageName: '',
-            rigProfile: ''
-          });
-        }
+    const fromCache: RigConfig | false | undefined =
+      !options.bypassCache && !overrideRigJsonObject && RigConfig._configCache.get(projectFolderPath);
+
+    if (fromCache) {
+      return fromCache;
+    }
+
+    const rigConfigFilePath: string = path.join(projectFolderPath, 'config/rig.json');
 
+    let config: RigConfig | undefined;
+    let json: IRigConfigJson | undefined = overrideRigJsonObject;
+    try {
+      if (!json) {
         const rigConfigFileContent: string = (await fs.promises.readFile(rigConfigFilePath)).toString();
-        json = JSON.parse(stripJsonComments(rigConfigFileContent));
+        json = JSON.parse(stripJsonComments(rigConfigFileContent)) as IRigConfigJson;
       }
 
       RigConfig._validateSchema(json);
     } catch (error) {
+      config = RigConfig._handleConfigError(error, projectFolderPath, rigConfigFilePath);
+    }
+
+    if (!config) {
+      config = new RigConfig({
+        projectFolderPath: projectFolderPath,
+
+        rigFound: true,
+        filePath: rigConfigFilePath,
+        rigPackageName: json!.rigPackageName,
+        rigProfile: json!.rigProfile
+      });
+    }
+
+    if (!overrideRigJsonObject) {
+      RigConfig._configCache.set(projectFolderPath, config);
+    }
+    return config;
+  }
+
+  private static _handleConfigError(
+    error: NodeJS.ErrnoException,
+    projectFolderPath: string,
+    rigConfigFilePath: string
+  ): RigConfig {
+    if (error.code !== 'ENOENT' && error.code !== 'ENOTDIR') {
       throw new Error(error.message + '\nError loading config file: ' + rigConfigFilePath);
     }
 
+    // File not found, i.e. no rig config
     return new RigConfig({
-      projectFolderPath: options.projectFolderPath,
+      projectFolderPath,
 
-      rigFound: true,
-      filePath: rigConfigFilePath,
-      rigPackageName: json.rigPackageName,
-      rigProfile: json.rigProfile || 'default'
+      rigFound: false,
+      filePath: '',
+      rigPackageName: '',
+      rigProfile: ''
     });
   }
 
diff --git a/libraries/rig-package/src/test/RigConfig.test.ts b/libraries/rig-package/src/test/RigConfig.test.ts
index 523211e927a..58ff03deece 100644
--- a/libraries/rig-package/src/test/RigConfig.test.ts
+++ b/libraries/rig-package/src/test/RigConfig.test.ts
@@ -28,15 +28,29 @@ describe('RigConfig tests', () => {
     }
 
     it('synchronously', () => {
-      const rigConfig: RigConfig = RigConfig.loadForProjectFolder({ projectFolderPath: testProjectFolder });
+      const rigConfig: RigConfig = RigConfig.loadForProjectFolder({
+        projectFolderPath: testProjectFolder,
+        bypassCache: true
+      });
       validate(rigConfig);
+
+      // Should cache result
+      const rigConfig2: RigConfig = RigConfig.loadForProjectFolder({ projectFolderPath: testProjectFolder });
+      expect(rigConfig2).toBe(rigConfig);
     });
 
     it('asynchronously', async () => {
       const rigConfig: RigConfig = await RigConfig.loadForProjectFolderAsync({
-        projectFolderPath: testProjectFolder
+        projectFolderPath: testProjectFolder,
+        bypassCache: true
       });
       validate(rigConfig);
+
+      // Should cache result
+      const rigConfig2: RigConfig = await RigConfig.loadForProjectFolderAsync({
+        projectFolderPath: testProjectFolder
+      });
+      expect(rigConfig2).toBe(rigConfig);
     });
   });
 
@@ -51,15 +65,29 @@ describe('RigConfig tests', () => {
     }
 
     it('synchronously', () => {
-      const rigConfig: RigConfig = RigConfig.loadForProjectFolder({ projectFolderPath: __dirname });
+      const rigConfig: RigConfig = RigConfig.loadForProjectFolder({
+        projectFolderPath: __dirname,
+        bypassCache: true
+      });
       validate(rigConfig);
+
+      // Should cache result
+      const rigConfig2: RigConfig = RigConfig.loadForProjectFolder({ projectFolderPath: __dirname });
+      expect(rigConfig2).toBe(rigConfig);
     });
 
     it('asynchronously', async () => {
       const rigConfig: RigConfig = await RigConfig.loadForProjectFolderAsync({
-        projectFolderPath: __dirname
+        projectFolderPath: __dirname,
+        bypassCache: true
       });
       validate(rigConfig);
+
+      // Should cache result
+      const rigConfig2: RigConfig = await RigConfig.loadForProjectFolderAsync({
+        projectFolderPath: __dirname
+      });
+      expect(rigConfig2).toBe(rigConfig);
     });
   });
 
@@ -126,7 +154,8 @@ describe('RigConfig tests', () => {
   describe(`resolves a config file path`, () => {
     it('synchronously', () => {
       const rigConfig: RigConfig = RigConfig.loadForProjectFolder({
-        projectFolderPath: testProjectFolder
+        projectFolderPath: testProjectFolder,
+        bypassCache: true
       });
 
       expect(rigConfig.rigFound).toBe(true);
@@ -142,7 +171,8 @@ describe('RigConfig tests', () => {
 
     it('asynchronously', async () => {
       const rigConfig: RigConfig = await RigConfig.loadForProjectFolderAsync({
-        projectFolderPath: testProjectFolder
+        projectFolderPath: testProjectFolder,
+        bypassCache: true
       });
 
       expect(rigConfig.rigFound).toBe(true);

From c21927afbc932f26b750ee94c4af013da5719dc6 Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Thu, 26 Aug 2021 15:30:25 -0700
Subject: [PATCH 152/155] Only initialize ignorer when required

---
 .../src/logic/ProjectChangeAnalyzer.ts        | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/apps/rush-lib/src/logic/ProjectChangeAnalyzer.ts b/apps/rush-lib/src/logic/ProjectChangeAnalyzer.ts
index 4421e65b5ab..07e339f2ab6 100644
--- a/apps/rush-lib/src/logic/ProjectChangeAnalyzer.ts
+++ b/apps/rush-lib/src/logic/ProjectChangeAnalyzer.ts
@@ -184,7 +184,11 @@ export class ProjectChangeAnalyzer {
       return undefined;
     }
 
-    const projectHashDeps: Map<string, Map<string, string>> = new Map<string, Map<string, string>>();
+    const projectHashDeps: Map<string, Map<string, string>> = new Map();
+
+    for (const project of this._rushConfiguration.projects) {
+      projectHashDeps.set(project.packageName, new Map());
+    }
 
     // Sort each project folder into its own package deps hash
     for (const [filePath, fileHash] of repoDeps) {
@@ -192,14 +196,9 @@ export class ProjectChangeAnalyzer {
       // K being the maximum folder depth of any project in rush.json (usually on the order of 3)
       const owningProject: RushConfigurationProject | undefined =
         this._rushConfiguration.findProjectForPosixRelativePath(filePath);
+
       if (owningProject) {
-        let owningProjectHashDeps: Map<string, string> | undefined = projectHashDeps.get(
-          owningProject.packageName
-        );
-        if (!owningProjectHashDeps) {
-          owningProjectHashDeps = new Map<string, string>();
-          projectHashDeps.set(owningProject.packageName, owningProjectHashDeps);
-        }
+        const owningProjectHashDeps: Map<string, string> = projectHashDeps.get(owningProject.packageName)!;
         owningProjectHashDeps.set(filePath, fileHash);
       }
     }
@@ -268,16 +267,15 @@ export class ProjectChangeAnalyzer {
   private async _getIgnoreMatcherForProjectAsync(
     project: RushConfigurationProject,
     terminal: Terminal
-  ): Promise<Ignore> {
+  ): Promise<Ignore | undefined> {
     const projectConfiguration: RushProjectConfiguration | undefined =
       await RushProjectConfiguration.tryLoadForProjectAsync(project, undefined, terminal);
-    const ignoreMatcher: Ignore = ignore();
 
     if (projectConfiguration && projectConfiguration.incrementalBuildIgnoredGlobs) {
+      const ignoreMatcher: Ignore = ignore();
       ignoreMatcher.add(projectConfiguration.incrementalBuildIgnoredGlobs);
+      return ignoreMatcher;
     }
-
-    return ignoreMatcher;
   }
 
   private _getRepoDeps(terminal: Terminal): Map<string, string> | undefined {

From ff1db15d6505d4c7e6ba3f9444228c8abd9632ab Mon Sep 17 00:00:00 2001
From: David Michon <dmichon-msft@users.noreply.github.com>
Date: Thu, 26 Aug 2021 15:31:52 -0700
Subject: [PATCH 153/155] Cache rush-project.json reads

---
 .../src/api/RushProjectConfiguration.ts       | 19 +++++++++++++++++--
 .../rush/project-cache_2021-08-02-23-04.json  | 11 +++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 common/changes/@microsoft/rush/project-cache_2021-08-02-23-04.json

diff --git a/apps/rush-lib/src/api/RushProjectConfiguration.ts b/apps/rush-lib/src/api/RushProjectConfiguration.ts
index 30974b54998..05e4499238c 100644
--- a/apps/rush-lib/src/api/RushProjectConfiguration.ts
+++ b/apps/rush-lib/src/api/RushProjectConfiguration.ts
@@ -126,6 +126,9 @@ export class RushProjectConfiguration {
       }
     });
 
+  private static readonly _configCache: Map<RushConfigurationProject, RushProjectConfiguration | false> =
+    new Map();
+
   public readonly project: RushConfigurationProject;
 
   /**
@@ -177,8 +180,17 @@ export class RushProjectConfiguration {
   public static async tryLoadForProjectAsync(
     project: RushConfigurationProject,
     repoCommandLineConfiguration: CommandLineConfiguration | undefined,
-    terminal: Terminal
+    terminal: Terminal,
+    skipCache?: boolean
   ): Promise<RushProjectConfiguration | undefined> {
+    // false is a signal that the project config does not exist
+    const cacheEntry: RushProjectConfiguration | false | undefined = skipCache
+      ? undefined
+      : RushProjectConfiguration._configCache.get(project);
+    if (cacheEntry !== undefined) {
+      return cacheEntry || undefined;
+    }
+
     const rigConfig: RigConfig = await RigConfig.loadForProjectFolderAsync({
       projectFolderPath: project.projectFolder
     });
@@ -197,8 +209,11 @@ export class RushProjectConfiguration {
         repoCommandLineConfiguration,
         terminal
       );
-      return new RushProjectConfiguration(project, rushProjectJson);
+      const result: RushProjectConfiguration = new RushProjectConfiguration(project, rushProjectJson);
+      RushProjectConfiguration._configCache.set(project, result);
+      return result;
     } else {
+      RushProjectConfiguration._configCache.set(project, false);
       return undefined;
     }
   }
diff --git a/common/changes/@microsoft/rush/project-cache_2021-08-02-23-04.json b/common/changes/@microsoft/rush/project-cache_2021-08-02-23-04.json
new file mode 100644
index 00000000000..aa9d231103b
--- /dev/null
+++ b/common/changes/@microsoft/rush/project-cache_2021-08-02-23-04.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Cache rush-project.json reads",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "dmichon-msft@users.noreply.github.com"
+}
\ No newline at end of file

From 24a1efbfc89b87835f8168690bb184ab4b3a163f Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Fri, 27 Aug 2021 00:07:26 +0000
Subject: [PATCH 154/155] Deleting change files and updating change logs for
 package updates.

---
 apps/api-documenter/CHANGELOG.json            | 15 +++++++++++
 apps/api-documenter/CHANGELOG.md              |  7 ++++-
 apps/api-extractor/CHANGELOG.json             | 12 +++++++++
 apps/api-extractor/CHANGELOG.md               |  7 ++++-
 apps/heft/CHANGELOG.json                      | 18 +++++++++++++
 apps/heft/CHANGELOG.md                        |  7 ++++-
 apps/rundown/CHANGELOG.json                   | 15 +++++++++++
 apps/rundown/CHANGELOG.md                     |  7 ++++-
 ...ctogonz-upgrade-deps_2021-07-13-21-50.json | 11 --------
 .../project-cache_2021-08-02-23-04.json       | 11 --------
 heft-plugins/heft-jest-plugin/CHANGELOG.json  | 21 +++++++++++++++
 heft-plugins/heft-jest-plugin/CHANGELOG.md    |  7 ++++-
 heft-plugins/heft-sass-plugin/CHANGELOG.json  | 24 +++++++++++++++++
 heft-plugins/heft-sass-plugin/CHANGELOG.md    |  7 ++++-
 .../heft-webpack4-plugin/CHANGELOG.json       | 18 +++++++++++++
 .../heft-webpack4-plugin/CHANGELOG.md         |  7 ++++-
 .../heft-webpack5-plugin/CHANGELOG.json       | 18 +++++++++++++
 .../heft-webpack5-plugin/CHANGELOG.md         |  7 ++++-
 .../debug-certificate-manager/CHANGELOG.json  | 15 +++++++++++
 .../debug-certificate-manager/CHANGELOG.md    |  7 ++++-
 libraries/heft-config-file/CHANGELOG.json     | 12 +++++++++
 libraries/heft-config-file/CHANGELOG.md       |  7 ++++-
 libraries/load-themed-styles/CHANGELOG.json   | 15 +++++++++++
 libraries/load-themed-styles/CHANGELOG.md     |  7 ++++-
 libraries/package-deps-hash/CHANGELOG.json    | 15 +++++++++++
 libraries/package-deps-hash/CHANGELOG.md      |  7 ++++-
 libraries/rig-package/CHANGELOG.json          | 12 +++++++++
 libraries/rig-package/CHANGELOG.md            |  9 ++++++-
 libraries/stream-collator/CHANGELOG.json      | 18 +++++++++++++
 libraries/stream-collator/CHANGELOG.md        |  7 ++++-
 libraries/terminal/CHANGELOG.json             | 15 +++++++++++
 libraries/terminal/CHANGELOG.md               |  7 ++++-
 rigs/heft-node-rig/CHANGELOG.json             | 21 +++++++++++++++
 rigs/heft-node-rig/CHANGELOG.md               |  7 ++++-
 rigs/heft-web-rig/CHANGELOG.json              | 27 +++++++++++++++++++
 rigs/heft-web-rig/CHANGELOG.md                |  7 ++++-
 .../loader-load-themed-styles/CHANGELOG.json  | 18 +++++++++++++
 .../loader-load-themed-styles/CHANGELOG.md    |  7 ++++-
 webpack/loader-raw-script/CHANGELOG.json      | 15 +++++++++++
 webpack/loader-raw-script/CHANGELOG.md        |  7 ++++-
 webpack/localization-plugin/CHANGELOG.json    | 21 +++++++++++++++
 webpack/localization-plugin/CHANGELOG.md      |  7 ++++-
 webpack/module-minifier-plugin/CHANGELOG.json | 15 +++++++++++
 webpack/module-minifier-plugin/CHANGELOG.md   |  7 ++++-
 .../CHANGELOG.json                            | 15 +++++++++++
 .../CHANGELOG.md                              |  7 ++++-
 46 files changed, 509 insertions(+), 44 deletions(-)
 delete mode 100644 common/changes/@rushstack/rig-package/octogonz-upgrade-deps_2021-07-13-21-50.json
 delete mode 100644 common/changes/@rushstack/rig-package/project-cache_2021-08-02-23-04.json

diff --git a/apps/api-documenter/CHANGELOG.json b/apps/api-documenter/CHANGELOG.json
index c1f79ce97fa..f1ea2b7e65c 100644
--- a/apps/api-documenter/CHANGELOG.json
+++ b/apps/api-documenter/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@microsoft/api-documenter",
   "entries": [
+    {
+      "version": "7.13.41",
+      "tag": "@microsoft/api-documenter_v7.13.41",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.5`"
+          }
+        ]
+      }
+    },
     {
       "version": "7.13.40",
       "tag": "@microsoft/api-documenter_v7.13.40",
diff --git a/apps/api-documenter/CHANGELOG.md b/apps/api-documenter/CHANGELOG.md
index ef066467ba7..c7d768c7239 100644
--- a/apps/api-documenter/CHANGELOG.md
+++ b/apps/api-documenter/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/api-documenter
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 7.13.41
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 7.13.40
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/apps/api-extractor/CHANGELOG.json b/apps/api-extractor/CHANGELOG.json
index feb49545bcb..1cfd4433b2e 100644
--- a/apps/api-extractor/CHANGELOG.json
+++ b/apps/api-extractor/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@microsoft/api-extractor",
   "entries": [
+    {
+      "version": "7.18.7",
+      "tag": "@microsoft/api-extractor_v7.18.7",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/rig-package\" to `0.3.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "7.18.6",
       "tag": "@microsoft/api-extractor_v7.18.6",
diff --git a/apps/api-extractor/CHANGELOG.md b/apps/api-extractor/CHANGELOG.md
index c43c7aaa280..b46d93c7357 100644
--- a/apps/api-extractor/CHANGELOG.md
+++ b/apps/api-extractor/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/api-extractor
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 7.18.7
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 7.18.6
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/apps/heft/CHANGELOG.json b/apps/heft/CHANGELOG.json
index 857443546b4..488a6612973 100644
--- a/apps/heft/CHANGELOG.json
+++ b/apps/heft/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft",
   "entries": [
+    {
+      "version": "0.36.4",
+      "tag": "@rushstack/heft_v0.36.4",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-config-file\" to `0.6.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/rig-package\" to `0.3.0`"
+          },
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor\" to `7.18.7`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.36.3",
       "tag": "@rushstack/heft_v0.36.3",
diff --git a/apps/heft/CHANGELOG.md b/apps/heft/CHANGELOG.md
index c4411c0eb76..82beb4daeb1 100644
--- a/apps/heft/CHANGELOG.md
+++ b/apps/heft/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 0.36.4
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 0.36.3
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/apps/rundown/CHANGELOG.json b/apps/rundown/CHANGELOG.json
index 8046c62b9cb..f4ab5e8777d 100644
--- a/apps/rundown/CHANGELOG.json
+++ b/apps/rundown/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/rundown",
   "entries": [
+    {
+      "version": "1.0.133",
+      "tag": "@rushstack/rundown_v1.0.133",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.5`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.132",
       "tag": "@rushstack/rundown_v1.0.132",
diff --git a/apps/rundown/CHANGELOG.md b/apps/rundown/CHANGELOG.md
index cd400aa71ea..997ce8bd7d2 100644
--- a/apps/rundown/CHANGELOG.md
+++ b/apps/rundown/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/rundown
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 1.0.133
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 1.0.132
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/common/changes/@rushstack/rig-package/octogonz-upgrade-deps_2021-07-13-21-50.json b/common/changes/@rushstack/rig-package/octogonz-upgrade-deps_2021-07-13-21-50.json
deleted file mode 100644
index b58b78fb075..00000000000
--- a/common/changes/@rushstack/rig-package/octogonz-upgrade-deps_2021-07-13-21-50.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/rig-package",
-      "comment": "",
-      "type": "none"
-    }
-  ],
-  "packageName": "@rushstack/rig-package",
-  "email": "4673363+octogonz@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/common/changes/@rushstack/rig-package/project-cache_2021-08-02-23-04.json b/common/changes/@rushstack/rig-package/project-cache_2021-08-02-23-04.json
deleted file mode 100644
index 8a6994def46..00000000000
--- a/common/changes/@rushstack/rig-package/project-cache_2021-08-02-23-04.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "changes": [
-    {
-      "packageName": "@rushstack/rig-package",
-      "comment": "Cache rig.json reads",
-      "type": "minor"
-    }
-  ],
-  "packageName": "@rushstack/rig-package",
-  "email": "dmichon-msft@users.noreply.github.com"
-}
\ No newline at end of file
diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.json b/heft-plugins/heft-jest-plugin/CHANGELOG.json
index edfe808bf40..9e3064594e7 100644
--- a/heft-plugins/heft-jest-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-jest-plugin/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@rushstack/heft-jest-plugin",
   "entries": [
+    {
+      "version": "0.1.21",
+      "tag": "@rushstack/heft-jest-plugin_v0.1.21",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-config-file\" to `0.6.3`"
+          },
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor\" to `7.18.7`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.3` to `^0.36.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.20",
       "tag": "@rushstack/heft-jest-plugin_v0.1.20",
diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.md b/heft-plugins/heft-jest-plugin/CHANGELOG.md
index 1185f6f14fb..02554bb7c6a 100644
--- a/heft-plugins/heft-jest-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-jest-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-jest-plugin
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 0.1.21
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 0.1.20
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/heft-plugins/heft-sass-plugin/CHANGELOG.json b/heft-plugins/heft-sass-plugin/CHANGELOG.json
index 524115b3f68..1112bfcf069 100644
--- a/heft-plugins/heft-sass-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-sass-plugin/CHANGELOG.json
@@ -1,6 +1,30 @@
 {
   "name": "@rushstack/heft-sass-plugin",
   "entries": [
+    {
+      "version": "0.1.7",
+      "tag": "@rushstack/heft-sass-plugin_v0.1.7",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-config-file\" to `0.6.3`"
+          },
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor\" to `7.18.7`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.5`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.3` to `^0.36.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.6",
       "tag": "@rushstack/heft-sass-plugin_v0.1.6",
diff --git a/heft-plugins/heft-sass-plugin/CHANGELOG.md b/heft-plugins/heft-sass-plugin/CHANGELOG.md
index 736f122d691..3a57717d951 100644
--- a/heft-plugins/heft-sass-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-sass-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-sass-plugin
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 0.1.7
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 0.1.6
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
index d3df2fa289c..4f9cac6ad6c 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
   "entries": [
+    {
+      "version": "0.2.8",
+      "tag": "@rushstack/heft-webpack4-plugin_v0.2.8",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.5`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.3` to `^0.36.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.7",
       "tag": "@rushstack/heft-webpack4-plugin_v0.2.7",
diff --git a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
index b35f6b4e7a7..279b2e5113f 100644
--- a/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack4-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-webpack4-plugin
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 0.2.8
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 0.2.7
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
index c780eb39249..ffbf1d9b7af 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
   "entries": [
+    {
+      "version": "0.2.8",
+      "tag": "@rushstack/heft-webpack5-plugin_v0.2.8",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.5`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.3` to `^0.36.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.7",
       "tag": "@rushstack/heft-webpack5-plugin_v0.2.7",
diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
index cc886c370d2..2300ad1be5b 100644
--- a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
+++ b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-webpack5-plugin
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 0.2.8
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 0.2.7
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/libraries/debug-certificate-manager/CHANGELOG.json b/libraries/debug-certificate-manager/CHANGELOG.json
index e4c5442a859..d391cca6094 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.json
+++ b/libraries/debug-certificate-manager/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/debug-certificate-manager",
   "entries": [
+    {
+      "version": "1.0.58",
+      "tag": "@rushstack/debug-certificate-manager_v1.0.58",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.5`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.57",
       "tag": "@rushstack/debug-certificate-manager_v1.0.57",
diff --git a/libraries/debug-certificate-manager/CHANGELOG.md b/libraries/debug-certificate-manager/CHANGELOG.md
index d49ea3d4145..ea37b2bfc55 100644
--- a/libraries/debug-certificate-manager/CHANGELOG.md
+++ b/libraries/debug-certificate-manager/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/debug-certificate-manager
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 1.0.58
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 1.0.57
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/libraries/heft-config-file/CHANGELOG.json b/libraries/heft-config-file/CHANGELOG.json
index 99d96f77416..8cdf7895839 100644
--- a/libraries/heft-config-file/CHANGELOG.json
+++ b/libraries/heft-config-file/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/heft-config-file",
   "entries": [
+    {
+      "version": "0.6.3",
+      "tag": "@rushstack/heft-config-file_v0.6.3",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/rig-package\" to `0.3.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.6.2",
       "tag": "@rushstack/heft-config-file_v0.6.2",
diff --git a/libraries/heft-config-file/CHANGELOG.md b/libraries/heft-config-file/CHANGELOG.md
index 55ba06ab9b0..386129ff7f7 100644
--- a/libraries/heft-config-file/CHANGELOG.md
+++ b/libraries/heft-config-file/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-config-file
 
-This log was last generated on Wed, 11 Aug 2021 00:07:21 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 0.6.3
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 0.6.2
 Wed, 11 Aug 2021 00:07:21 GMT
diff --git a/libraries/load-themed-styles/CHANGELOG.json b/libraries/load-themed-styles/CHANGELOG.json
index 39a0203bc8d..818cd0d8a88 100644
--- a/libraries/load-themed-styles/CHANGELOG.json
+++ b/libraries/load-themed-styles/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@microsoft/load-themed-styles",
   "entries": [
+    {
+      "version": "1.10.204",
+      "tag": "@microsoft/load-themed-styles_v1.10.204",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-web-rig\" to `0.4.5`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.10.203",
       "tag": "@microsoft/load-themed-styles_v1.10.203",
diff --git a/libraries/load-themed-styles/CHANGELOG.md b/libraries/load-themed-styles/CHANGELOG.md
index 108692c4013..7a89ca7998a 100644
--- a/libraries/load-themed-styles/CHANGELOG.md
+++ b/libraries/load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/load-themed-styles
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 1.10.204
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 1.10.203
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/libraries/package-deps-hash/CHANGELOG.json b/libraries/package-deps-hash/CHANGELOG.json
index 4ba24d59cf2..f7d0e8be3b1 100644
--- a/libraries/package-deps-hash/CHANGELOG.json
+++ b/libraries/package-deps-hash/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/package-deps-hash",
   "entries": [
+    {
+      "version": "3.0.62",
+      "tag": "@rushstack/package-deps-hash_v3.0.62",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.5`"
+          }
+        ]
+      }
+    },
     {
       "version": "3.0.61",
       "tag": "@rushstack/package-deps-hash_v3.0.61",
diff --git a/libraries/package-deps-hash/CHANGELOG.md b/libraries/package-deps-hash/CHANGELOG.md
index 1946c233ce5..2a261729728 100644
--- a/libraries/package-deps-hash/CHANGELOG.md
+++ b/libraries/package-deps-hash/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/package-deps-hash
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 3.0.62
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 3.0.61
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/libraries/rig-package/CHANGELOG.json b/libraries/rig-package/CHANGELOG.json
index 1c4eef531e2..bd3d68900fc 100644
--- a/libraries/rig-package/CHANGELOG.json
+++ b/libraries/rig-package/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/rig-package",
   "entries": [
+    {
+      "version": "0.3.0",
+      "tag": "@rushstack/rig-package_v0.3.0",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Cache rig.json reads"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.13",
       "tag": "@rushstack/rig-package_v0.2.13",
diff --git a/libraries/rig-package/CHANGELOG.md b/libraries/rig-package/CHANGELOG.md
index fac46a6ce61..623dc41c967 100644
--- a/libraries/rig-package/CHANGELOG.md
+++ b/libraries/rig-package/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/rig-package
 
-This log was last generated on Mon, 12 Jul 2021 23:08:26 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 0.3.0
+Fri, 27 Aug 2021 00:07:25 GMT
+
+### Minor changes
+
+- Cache rig.json reads
 
 ## 0.2.13
 Mon, 12 Jul 2021 23:08:26 GMT
diff --git a/libraries/stream-collator/CHANGELOG.json b/libraries/stream-collator/CHANGELOG.json
index 68930df09a7..50d624ef678 100644
--- a/libraries/stream-collator/CHANGELOG.json
+++ b/libraries/stream-collator/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@rushstack/stream-collator",
   "entries": [
+    {
+      "version": "4.0.117",
+      "tag": "@rushstack/stream-collator_v4.0.117",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/terminal\" to `0.2.19`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.5`"
+          }
+        ]
+      }
+    },
     {
       "version": "4.0.116",
       "tag": "@rushstack/stream-collator_v4.0.116",
diff --git a/libraries/stream-collator/CHANGELOG.md b/libraries/stream-collator/CHANGELOG.md
index a0550b10daf..48bea5a09f8 100644
--- a/libraries/stream-collator/CHANGELOG.md
+++ b/libraries/stream-collator/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/stream-collator
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 4.0.117
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 4.0.116
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/libraries/terminal/CHANGELOG.json b/libraries/terminal/CHANGELOG.json
index fe40eeffe10..2e24e00b9bf 100644
--- a/libraries/terminal/CHANGELOG.json
+++ b/libraries/terminal/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/terminal",
   "entries": [
+    {
+      "version": "0.2.19",
+      "tag": "@rushstack/terminal_v0.2.19",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.5`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.18",
       "tag": "@rushstack/terminal_v0.2.18",
diff --git a/libraries/terminal/CHANGELOG.md b/libraries/terminal/CHANGELOG.md
index 2e7c85d4815..a28c7456016 100644
--- a/libraries/terminal/CHANGELOG.md
+++ b/libraries/terminal/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/terminal
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 0.2.19
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 0.2.18
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/rigs/heft-node-rig/CHANGELOG.json b/rigs/heft-node-rig/CHANGELOG.json
index 136ddb4adfa..ba8ccc29fb7 100644
--- a/rigs/heft-node-rig/CHANGELOG.json
+++ b/rigs/heft-node-rig/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@rushstack/heft-node-rig",
   "entries": [
+    {
+      "version": "1.2.5",
+      "tag": "@rushstack/heft-node-rig_v1.2.5",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor\" to `7.18.7`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-jest-plugin\" to `0.1.21`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.3` to `^0.36.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.2.4",
       "tag": "@rushstack/heft-node-rig_v1.2.4",
diff --git a/rigs/heft-node-rig/CHANGELOG.md b/rigs/heft-node-rig/CHANGELOG.md
index 01628f87262..dd59f978e3f 100644
--- a/rigs/heft-node-rig/CHANGELOG.md
+++ b/rigs/heft-node-rig/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-node-rig
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 1.2.5
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 1.2.4
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/rigs/heft-web-rig/CHANGELOG.json b/rigs/heft-web-rig/CHANGELOG.json
index c8fbfeb2ec7..6067fac16ed 100644
--- a/rigs/heft-web-rig/CHANGELOG.json
+++ b/rigs/heft-web-rig/CHANGELOG.json
@@ -1,6 +1,33 @@
 {
   "name": "@rushstack/heft-web-rig",
   "entries": [
+    {
+      "version": "0.4.5",
+      "tag": "@rushstack/heft-web-rig_v0.4.5",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor\" to `7.18.7`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-jest-plugin\" to `0.1.21`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-sass-plugin\" to `0.1.7`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-webpack4-plugin\" to `0.2.8`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" from `^0.36.3` to `^0.36.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.4",
       "tag": "@rushstack/heft-web-rig_v0.4.4",
diff --git a/rigs/heft-web-rig/CHANGELOG.md b/rigs/heft-web-rig/CHANGELOG.md
index f8bf3aa3e71..7a6d52f912f 100644
--- a/rigs/heft-web-rig/CHANGELOG.md
+++ b/rigs/heft-web-rig/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/heft-web-rig
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 0.4.5
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 0.4.4
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.json b/webpack/loader-load-themed-styles/CHANGELOG.json
index a3524bd4659..1c92e3a2663 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.json
+++ b/webpack/loader-load-themed-styles/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
   "entries": [
+    {
+      "version": "1.9.85",
+      "tag": "@microsoft/loader-load-themed-styles_v1.9.85",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@microsoft/load-themed-styles\" to `1.10.204`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.5`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.9.84",
       "tag": "@microsoft/loader-load-themed-styles_v1.9.84",
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.md b/webpack/loader-load-themed-styles/CHANGELOG.md
index 64122934265..8e02fd85df7 100644
--- a/webpack/loader-load-themed-styles/CHANGELOG.md
+++ b/webpack/loader-load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/loader-load-themed-styles
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 1.9.85
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 1.9.84
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/webpack/loader-raw-script/CHANGELOG.json b/webpack/loader-raw-script/CHANGELOG.json
index 1d474c35394..e7fc33ad898 100644
--- a/webpack/loader-raw-script/CHANGELOG.json
+++ b/webpack/loader-raw-script/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/loader-raw-script",
   "entries": [
+    {
+      "version": "1.3.171",
+      "tag": "@rushstack/loader-raw-script_v1.3.171",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.5`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.3.170",
       "tag": "@rushstack/loader-raw-script_v1.3.170",
diff --git a/webpack/loader-raw-script/CHANGELOG.md b/webpack/loader-raw-script/CHANGELOG.md
index 205d5264f0f..7cb39d36e32 100644
--- a/webpack/loader-raw-script/CHANGELOG.md
+++ b/webpack/loader-raw-script/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/loader-raw-script
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 1.3.171
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 1.3.170
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/webpack/localization-plugin/CHANGELOG.json b/webpack/localization-plugin/CHANGELOG.json
index 83887352505..7b9af399893 100644
--- a/webpack/localization-plugin/CHANGELOG.json
+++ b/webpack/localization-plugin/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@rushstack/localization-plugin",
   "entries": [
+    {
+      "version": "0.6.45",
+      "tag": "@rushstack/localization-plugin_v0.6.45",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.5`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/set-webpack-public-path-plugin\" to `3.2.65`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/set-webpack-public-path-plugin\" from `^3.2.64` to `^3.2.65`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.6.44",
       "tag": "@rushstack/localization-plugin_v0.6.44",
diff --git a/webpack/localization-plugin/CHANGELOG.md b/webpack/localization-plugin/CHANGELOG.md
index 6328de8aa1f..f20a6750580 100644
--- a/webpack/localization-plugin/CHANGELOG.md
+++ b/webpack/localization-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/localization-plugin
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 0.6.45
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 0.6.44
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/webpack/module-minifier-plugin/CHANGELOG.json b/webpack/module-minifier-plugin/CHANGELOG.json
index 114956e1f03..3ff8b89fa8a 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.json
+++ b/webpack/module-minifier-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/module-minifier-plugin",
   "entries": [
+    {
+      "version": "0.4.10",
+      "tag": "@rushstack/module-minifier-plugin_v0.4.10",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.5`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.9",
       "tag": "@rushstack/module-minifier-plugin_v0.4.9",
diff --git a/webpack/module-minifier-plugin/CHANGELOG.md b/webpack/module-minifier-plugin/CHANGELOG.md
index ee8e6dd8fe8..f8c2e9ae566 100644
--- a/webpack/module-minifier-plugin/CHANGELOG.md
+++ b/webpack/module-minifier-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/module-minifier-plugin
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 0.4.10
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 0.4.9
 Fri, 20 Aug 2021 15:08:10 GMT
diff --git a/webpack/set-webpack-public-path-plugin/CHANGELOG.json b/webpack/set-webpack-public-path-plugin/CHANGELOG.json
index 855d27a75cf..2d2e2c65e87 100644
--- a/webpack/set-webpack-public-path-plugin/CHANGELOG.json
+++ b/webpack/set-webpack-public-path-plugin/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@rushstack/set-webpack-public-path-plugin",
   "entries": [
+    {
+      "version": "3.2.65",
+      "tag": "@rushstack/set-webpack-public-path-plugin_v3.2.65",
+      "date": "Fri, 27 Aug 2021 00:07:25 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.36.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.2.5`"
+          }
+        ]
+      }
+    },
     {
       "version": "3.2.64",
       "tag": "@rushstack/set-webpack-public-path-plugin_v3.2.64",
diff --git a/webpack/set-webpack-public-path-plugin/CHANGELOG.md b/webpack/set-webpack-public-path-plugin/CHANGELOG.md
index 103cd617474..2e681dbd256 100644
--- a/webpack/set-webpack-public-path-plugin/CHANGELOG.md
+++ b/webpack/set-webpack-public-path-plugin/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @rushstack/set-webpack-public-path-plugin
 
-This log was last generated on Fri, 20 Aug 2021 15:08:10 GMT and should not be manually modified.
+This log was last generated on Fri, 27 Aug 2021 00:07:25 GMT and should not be manually modified.
+
+## 3.2.65
+Fri, 27 Aug 2021 00:07:25 GMT
+
+_Version update only_
 
 ## 3.2.64
 Fri, 20 Aug 2021 15:08:10 GMT

From 1c9ecf2a65b15e629950ac2a0e5939823be3713d Mon Sep 17 00:00:00 2001
From: Rushbot <rushbot@users.noreply.github.com>
Date: Fri, 27 Aug 2021 00:07:28 +0000
Subject: [PATCH 155/155] Applying package updates.

---
 apps/api-documenter/package.json                    | 2 +-
 apps/api-extractor/package.json                     | 2 +-
 apps/heft/package.json                              | 2 +-
 apps/rundown/package.json                           | 2 +-
 heft-plugins/heft-jest-plugin/package.json          | 4 ++--
 heft-plugins/heft-sass-plugin/package.json          | 4 ++--
 heft-plugins/heft-webpack4-plugin/package.json      | 4 ++--
 heft-plugins/heft-webpack5-plugin/package.json      | 4 ++--
 libraries/debug-certificate-manager/package.json    | 2 +-
 libraries/heft-config-file/package.json             | 2 +-
 libraries/load-themed-styles/package.json           | 2 +-
 libraries/package-deps-hash/package.json            | 2 +-
 libraries/rig-package/package.json                  | 2 +-
 libraries/stream-collator/package.json              | 2 +-
 libraries/terminal/package.json                     | 2 +-
 rigs/heft-node-rig/package.json                     | 4 ++--
 rigs/heft-web-rig/package.json                      | 4 ++--
 webpack/loader-load-themed-styles/package.json      | 2 +-
 webpack/loader-raw-script/package.json              | 2 +-
 webpack/localization-plugin/package.json            | 4 ++--
 webpack/module-minifier-plugin/package.json         | 2 +-
 webpack/set-webpack-public-path-plugin/package.json | 2 +-
 22 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/apps/api-documenter/package.json b/apps/api-documenter/package.json
index 4ee52e32102..62d37be38e2 100644
--- a/apps/api-documenter/package.json
+++ b/apps/api-documenter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/api-documenter",
-  "version": "7.13.40",
+  "version": "7.13.41",
   "description": "Read JSON files from api-extractor, generate documentation pages",
   "repository": {
     "type": "git",
diff --git a/apps/api-extractor/package.json b/apps/api-extractor/package.json
index 7a4fbf95de7..99585ad471e 100644
--- a/apps/api-extractor/package.json
+++ b/apps/api-extractor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/api-extractor",
-  "version": "7.18.6",
+  "version": "7.18.7",
   "description": "Analyze the exported API for a TypeScript library and generate reviews, documentation, and .d.ts rollups",
   "keywords": [
     "typescript",
diff --git a/apps/heft/package.json b/apps/heft/package.json
index b85dfe49daa..01ba204653b 100644
--- a/apps/heft/package.json
+++ b/apps/heft/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft",
-  "version": "0.36.3",
+  "version": "0.36.4",
   "description": "Build all your JavaScript projects the same way: A way that works.",
   "keywords": [
     "toolchain",
diff --git a/apps/rundown/package.json b/apps/rundown/package.json
index 7238b39f5a3..495bbbea02a 100644
--- a/apps/rundown/package.json
+++ b/apps/rundown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/rundown",
-  "version": "1.0.132",
+  "version": "1.0.133",
   "description": "Detect load time regressions by running an app, tracing require() calls, and generating a deterministic report",
   "repository": {
     "type": "git",
diff --git a/heft-plugins/heft-jest-plugin/package.json b/heft-plugins/heft-jest-plugin/package.json
index d7fad062ecb..a1f5e567a2e 100644
--- a/heft-plugins/heft-jest-plugin/package.json
+++ b/heft-plugins/heft-jest-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-jest-plugin",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "Heft plugin for Jest",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.3"
+    "@rushstack/heft": "^0.36.4"
   },
   "dependencies": {
     "@jest/core": "~25.4.0",
diff --git a/heft-plugins/heft-sass-plugin/package.json b/heft-plugins/heft-sass-plugin/package.json
index 31b017764d9..0bcd689b76c 100644
--- a/heft-plugins/heft-sass-plugin/package.json
+++ b/heft-plugins/heft-sass-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-sass-plugin",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Heft plugin for SASS",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.3"
+    "@rushstack/heft": "^0.36.4"
   },
   "dependencies": {
     "@rushstack/heft-config-file": "workspace:*",
diff --git a/heft-plugins/heft-webpack4-plugin/package.json b/heft-plugins/heft-webpack4-plugin/package.json
index 29929152b24..1977cd7b0dc 100644
--- a/heft-plugins/heft-webpack4-plugin/package.json
+++ b/heft-plugins/heft-webpack4-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack4-plugin",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Heft plugin for Webpack 4",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.3"
+    "@rushstack/heft": "^0.36.4"
   },
   "dependencies": {
     "@rushstack/node-core-library": "workspace:*",
diff --git a/heft-plugins/heft-webpack5-plugin/package.json b/heft-plugins/heft-webpack5-plugin/package.json
index 8a1e462dc1f..9839748dda3 100644
--- a/heft-plugins/heft-webpack5-plugin/package.json
+++ b/heft-plugins/heft-webpack5-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Heft plugin for Webpack 5",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "start": "heft test --clean --watch"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.3"
+    "@rushstack/heft": "^0.36.4"
   },
   "dependencies": {
     "@rushstack/node-core-library": "workspace:*",
diff --git a/libraries/debug-certificate-manager/package.json b/libraries/debug-certificate-manager/package.json
index 5c9617c4347..fb8bc3d9076 100644
--- a/libraries/debug-certificate-manager/package.json
+++ b/libraries/debug-certificate-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/debug-certificate-manager",
-  "version": "1.0.57",
+  "version": "1.0.58",
   "description": "Cross-platform functionality to create debug ssl certificates.",
   "main": "lib/index.js",
   "typings": "dist/debug-certificate-manager.d.ts",
diff --git a/libraries/heft-config-file/package.json b/libraries/heft-config-file/package.json
index d211b8c4445..3fa48fd4db6 100644
--- a/libraries/heft-config-file/package.json
+++ b/libraries/heft-config-file/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-config-file",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "Configuration file loader for @rushstack/heft",
   "repository": {
     "type": "git",
diff --git a/libraries/load-themed-styles/package.json b/libraries/load-themed-styles/package.json
index c684a845c15..d8ee1fc1b5c 100644
--- a/libraries/load-themed-styles/package.json
+++ b/libraries/load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/load-themed-styles",
-  "version": "1.10.203",
+  "version": "1.10.204",
   "description": "Loads themed styles.",
   "license": "MIT",
   "repository": {
diff --git a/libraries/package-deps-hash/package.json b/libraries/package-deps-hash/package.json
index 250775d7972..d344b862410 100644
--- a/libraries/package-deps-hash/package.json
+++ b/libraries/package-deps-hash/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/package-deps-hash",
-  "version": "3.0.61",
+  "version": "3.0.62",
   "description": "",
   "main": "lib/index.js",
   "typings": "dist/package-deps-hash.d.ts",
diff --git a/libraries/rig-package/package.json b/libraries/rig-package/package.json
index db71134c626..da87bcd409b 100644
--- a/libraries/rig-package/package.json
+++ b/libraries/rig-package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/rig-package",
-  "version": "0.2.13",
+  "version": "0.3.0",
   "description": "A system for sharing tool configurations between projects without duplicating config files.",
   "main": "lib/index.js",
   "typings": "dist/rig-package.d.ts",
diff --git a/libraries/stream-collator/package.json b/libraries/stream-collator/package.json
index d5c8fe12786..ba2e3781ccb 100644
--- a/libraries/stream-collator/package.json
+++ b/libraries/stream-collator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/stream-collator",
-  "version": "4.0.116",
+  "version": "4.0.117",
   "description": "Display intelligible realtime output from concurrent processes",
   "repository": {
     "type": "git",
diff --git a/libraries/terminal/package.json b/libraries/terminal/package.json
index d072fd51b5b..2f21c7cc8fe 100644
--- a/libraries/terminal/package.json
+++ b/libraries/terminal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/terminal",
-  "version": "0.2.18",
+  "version": "0.2.19",
   "description": "User interface primitives for console applications",
   "main": "lib/index.js",
   "typings": "dist/terminal.d.ts",
diff --git a/rigs/heft-node-rig/package.json b/rigs/heft-node-rig/package.json
index 9f571c37625..1ab5bfb6a0c 100644
--- a/rigs/heft-node-rig/package.json
+++ b/rigs/heft-node-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-node-rig",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "A rig package for Node.js projects that build using Heft",
   "license": "MIT",
   "scripts": {
@@ -11,7 +11,7 @@
     "url": "https://github.com/microsoft/rushstack/tree/master/rigs/heft-node-rig"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.3"
+    "@rushstack/heft": "^0.36.4"
   },
   "dependencies": {
     "@microsoft/api-extractor": "workspace:*",
diff --git a/rigs/heft-web-rig/package.json b/rigs/heft-web-rig/package.json
index 77df699ddf5..4ce20108de2 100644
--- a/rigs/heft-web-rig/package.json
+++ b/rigs/heft-web-rig/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-web-rig",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "A rig package for web browser projects that build using Heft",
   "license": "MIT",
   "scripts": {
@@ -11,7 +11,7 @@
     "url": "https://github.com/microsoft/rushstack/tree/master/rigs/heft-web-rig"
   },
   "peerDependencies": {
-    "@rushstack/heft": "^0.36.3"
+    "@rushstack/heft": "^0.36.4"
   },
   "dependencies": {
     "@microsoft/api-extractor": "workspace:*",
diff --git a/webpack/loader-load-themed-styles/package.json b/webpack/loader-load-themed-styles/package.json
index 3362723af8e..7eb1c1552af 100644
--- a/webpack/loader-load-themed-styles/package.json
+++ b/webpack/loader-load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
-  "version": "1.9.84",
+  "version": "1.9.85",
   "description": "This simple loader wraps the loading of CSS in script equivalent to `require('load-themed-styles').loadStyles( /* css text */ )`. It is designed to be a replacement for style-loader.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/loader-raw-script/package.json b/webpack/loader-raw-script/package.json
index 12356cd2231..ac050709774 100644
--- a/webpack/loader-raw-script/package.json
+++ b/webpack/loader-raw-script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/loader-raw-script",
-  "version": "1.3.170",
+  "version": "1.3.171",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/localization-plugin/package.json b/webpack/localization-plugin/package.json
index 92ac347575a..227fd726aaf 100644
--- a/webpack/localization-plugin/package.json
+++ b/webpack/localization-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/localization-plugin",
-  "version": "0.6.44",
+  "version": "0.6.45",
   "description": "This plugin facilitates localization with Webpack.",
   "main": "lib/index.js",
   "typings": "dist/localization-plugin.d.ts",
@@ -13,7 +13,7 @@
     "build": "heft build --clean"
   },
   "peerDependencies": {
-    "@rushstack/set-webpack-public-path-plugin": "^3.2.64",
+    "@rushstack/set-webpack-public-path-plugin": "^3.2.65",
     "@types/webpack": "^4.39.0",
     "webpack": "^4.31.0"
   },
diff --git a/webpack/module-minifier-plugin/package.json b/webpack/module-minifier-plugin/package.json
index f6c2aa306c7..b466f8ed687 100644
--- a/webpack/module-minifier-plugin/package.json
+++ b/webpack/module-minifier-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/module-minifier-plugin",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "This plugin splits minification of webpack compilations into smaller units.",
   "main": "lib/index.js",
   "typings": "dist/module-minifier-plugin.d.ts",
diff --git a/webpack/set-webpack-public-path-plugin/package.json b/webpack/set-webpack-public-path-plugin/package.json
index 7ae33f368a4..d1a0487f71a 100644
--- a/webpack/set-webpack-public-path-plugin/package.json
+++ b/webpack/set-webpack-public-path-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/set-webpack-public-path-plugin",
-  "version": "3.2.64",
+  "version": "3.2.65",
   "description": "This plugin sets the webpack public path at runtime.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",