Merge remote-tracking branch 'origin' into user/halfnibble/update-nod…

…e-sass

apps/api-documenter/CHANGELOG.json

@@ -1,6 +1,63 @@
 {
   "name": "@microsoft/api-documenter",
   "entries": [
+    {
+      "version": "7.12.11",
+      "tag": "@microsoft/api-documenter_v7.12.11",
+      "date": "Wed, 10 Mar 2021 06:23:29 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.0.0`"
+          }
+        ]
+      }
+    },
+    {
+      "version": "7.12.10",
+      "tag": "@microsoft/api-documenter_v7.12.10",
+      "date": "Wed, 10 Mar 2021 05:10:05 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.25.0`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `0.2.7`"
+          }
+        ]
+      }
+    },
+    {
+      "version": "7.12.9",
+      "tag": "@microsoft/api-documenter_v7.12.9",
+      "date": "Thu, 04 Mar 2021 01:11:31 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.24.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `0.2.6`"
+          }
+        ]
+      }
+    },
+    {
+      "version": "7.12.8",
+      "tag": "@microsoft/api-documenter_v7.12.8",
+      "date": "Tue, 02 Mar 2021 23:25:05 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.24.3`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `0.2.5`"
+          }
+        ]
+      }
+    },
     {
       "version": "7.12.7",
       "tag": "@microsoft/api-documenter_v7.12.7",

apps/api-documenter/CHANGELOG.md

@@ -1,6 +1,26 @@
 # Change Log - @microsoft/api-documenter
 
-This log was last generated on Fri, 05 Feb 2021 16:10:42 GMT and should not be manually modified.
+This log was last generated on Wed, 10 Mar 2021 06:23:29 GMT and should not be manually modified.
+
+## 7.12.11
+Wed, 10 Mar 2021 06:23:29 GMT
+
+_Version update only_
+
+## 7.12.10
+Wed, 10 Mar 2021 05:10:05 GMT
+
+_Version update only_
+
+## 7.12.9
+Thu, 04 Mar 2021 01:11:31 GMT
+
+_Version update only_
+
+## 7.12.8
+Tue, 02 Mar 2021 23:25:05 GMT
+
+_Version update only_
 
 ## 7.12.7
 Fri, 05 Feb 2021 16:10:42 GMT

apps/api-documenter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/api-documenter",
-  "version": "7.12.7",
+  "version": "7.12.11",
   "description": "Read JSON files from api-extractor, generate documentation pages",
   "repository": {
     "type": "git",

apps/api-extractor/CHANGELOG.json

@@ -1,6 +1,18 @@
 {
   "name": "@microsoft/api-extractor",
   "entries": [
+    {
+      "version": "7.13.2",
+      "tag": "@microsoft/api-extractor_v7.13.2",
+      "date": "Thu, 04 Mar 2021 01:11:31 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/rig-package\" to `0.2.10`"
+          }
+        ]
+      }
+    },
     {
       "version": "7.13.1",
       "tag": "@microsoft/api-extractor_v7.13.1",

apps/api-extractor/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log - @microsoft/api-extractor
 
-This log was last generated on Fri, 05 Feb 2021 16:10:42 GMT and should not be manually modified.
+This log was last generated on Thu, 04 Mar 2021 01:11:31 GMT and should not be manually modified.
+
+## 7.13.2
+Thu, 04 Mar 2021 01:11:31 GMT
+
+_Version update only_
 
 ## 7.13.1
 Fri, 05 Feb 2021 16:10:42 GMT

apps/api-extractor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/api-extractor",
-  "version": "7.13.1",
+  "version": "7.13.2",
   "description": "Analyze the exported API for a TypeScript library and generate reviews, documentation, and .d.ts rollups",
   "keywords": [
     "typescript",

apps/heft/CHANGELOG.json

@@ -1,6 +1,51 @@
 {
   "name": "@rushstack/heft",
   "entries": [
+    {
+      "version": "0.25.0",
+      "tag": "@rushstack/heft_v0.25.0",
+      "date": "Wed, 10 Mar 2021 05:10:05 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "(BREAKING CHANGE) Change the logic that resolves typescript, eslint, tslint, and api-extractor to look for a devDependency in the current project, and then for a dependency in the rig project, and then as any kind of dependency in the current project."
+          }
+        ]
+      }
+    },
+    {
+      "version": "0.24.4",
+      "tag": "@rushstack/heft_v0.24.4",
+      "date": "Thu, 04 Mar 2021 01:11:31 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-config-file\" to `0.3.17`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/rig-package\" to `0.2.10`"
+          },
+          {
+            "comment": "Updating dependency \"@microsoft/api-extractor\" to `7.13.2`"
+          }
+        ]
+      }
+    },
+    {
+      "version": "0.24.3",
+      "tag": "@rushstack/heft_v0.24.3",
+      "date": "Tue, 02 Mar 2021 23:25:05 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Fix an issue where build would continue even if TS reported errors."
+          },
+          {
+            "comment": "Determine the default static assets destination folder from the TSConfig's \"outDir\" property, instead of hardcoding \"lib.\""
+          }
+        ]
+      }
+    },
     {
       "version": "0.24.2",
       "tag": "@rushstack/heft_v0.24.2",

apps/heft/CHANGELOG.md

@@ -1,6 +1,26 @@
 # Change Log - @rushstack/heft
 
-This log was last generated on Fri, 05 Feb 2021 16:10:42 GMT and should not be manually modified.
+This log was last generated on Wed, 10 Mar 2021 05:10:05 GMT and should not be manually modified.
+
+## 0.25.0
+Wed, 10 Mar 2021 05:10:05 GMT
+
+### Minor changes
+
+- (BREAKING CHANGE) Change the logic that resolves typescript, eslint, tslint, and api-extractor to look for a devDependency in the current project, and then for a dependency in the rig project, and then as any kind of dependency in the current project.
+
+## 0.24.4
+Thu, 04 Mar 2021 01:11:31 GMT
+
+_Version update only_
+
+## 0.24.3
+Tue, 02 Mar 2021 23:25:05 GMT
+
+### Patches
+
+- Fix an issue where build would continue even if TS reported errors.
+- Determine the default static assets destination folder from the TSConfig's "outDir" property, instead of hardcoding "lib."
 
 ## 0.24.2
 Fri, 05 Feb 2021 16:10:42 GMT

apps/heft/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft",
-  "version": "0.24.2",
+  "version": "0.25.0",
   "description": "The Rush Stack extensible build system",
   "keywords": [
     "toolchain",
@@ -41,36 +41,36 @@
     "@rushstack/ts-command-line": "workspace:*",
     "@rushstack/typings-generator": "workspace:*",
     "@types/tapable": "1.0.6",
-    "@types/webpack-dev-server": "3.11.0",
     "@types/webpack": "4.41.24",
+    "@types/webpack-dev-server": "3.11.0",
     "argparse": "~1.0.9",
     "chokidar": "~3.4.0",
     "fast-glob": "~3.2.4",
-    "glob-escape": "~0.0.2",
     "glob": "~7.0.5",
+    "glob-escape": "~0.0.2",
     "jest-snapshot": "~25.4.0",
     "node-sass": "5.0.0",
-    "postcss-modules": "~1.5.0",
     "postcss": "7.0.32",
+    "postcss-modules": "~1.5.0",
     "prettier": "~2.1.1",
     "semver": "~7.3.0",
     "tapable": "1.1.3",
     "true-case-path": "~2.2.1",
-    "webpack-dev-server": "~3.11.0",
-    "webpack": "~4.44.2"
+    "webpack": "~4.44.2",
+    "webpack-dev-server": "~3.11.0"
   },
   "devDependencies": {
     "@jest/types": "~25.4.0",
     "@microsoft/api-extractor": "workspace:*",
     "@rushstack/eslint-config": "workspace:*",
-    "@rushstack/heft-node-rig": "0.2.0",
     "@rushstack/heft": "0.23.1",
+    "@rushstack/heft-node-rig": "0.2.0",
     "@types/argparse": "1.0.38",
     "@types/eslint": "7.2.0",
     "@types/glob": "7.1.1",
     "@types/heft-jest": "1.0.1",
-    "@types/node-sass": "4.11.1",
     "@types/node": "10.17.13",
+    "@types/node-sass": "4.11.1",
     "@types/semver": "~7.3.1",
     "colors": "~1.2.1",
     "tslint": "~5.20.1",

apps/heft/src/configuration/HeftConfiguration.ts

@@ -12,7 +12,6 @@ import {
 import { trueCasePathSync } from 'true-case-path';
 import { RigConfig } from '@rushstack/rig-package';
 
-import { TaskPackageResolver, ITaskPackageResolution } from '../utilities/TaskPackageResolver';
 import { Constants } from '../utilities/Constants';
 
 /**
@@ -50,16 +49,6 @@ export interface IHeftActionConfigurationOptions {
   mergeArrays?: boolean;
 }
 
-/**
- * @public
- */
-export interface ICompilerPackage {
-  apiExtractorPackagePath: string | undefined;
-  typeScriptPackagePath: string;
-  tslintPackagePath: string | undefined;
-  eslintPackagePath: string | undefined;
-}
-
 /**
  * @public
  */
@@ -72,9 +61,6 @@ export class HeftConfiguration {
   private _globalTerminal!: Terminal;
   private _terminalProvider!: ITerminalProvider;
 
-  private _compilerPackage: ICompilerPackage | undefined;
-  private _hasCompilerPackageBeenAccessed: boolean = false;
-
   /**
    * Project build folder. This is the folder containing the project's package.json file.
    */
@@ -158,26 +144,6 @@ export class HeftConfiguration {
     return PackageJsonLookup.instance.tryLoadPackageJsonFor(this.buildFolder)!;
   }
 
-  /**
-   * If used by the project being built, the tool package paths exported from
-   * the rush-stack-compiler-* package.
-   */
-  public get compilerPackage(): ICompilerPackage | undefined {
-    if (!this._hasCompilerPackageBeenAccessed) {
-      const resolution: ITaskPackageResolution | undefined = TaskPackageResolver.resolveTaskPackages(
-        this._buildFolder,
-        this.globalTerminal
-      );
-
-      this._hasCompilerPackageBeenAccessed = true;
-      if (resolution) {
-        this._compilerPackage = resolution;
-      }
-    }
-
-    return this._compilerPackage;
-  }
-
   private constructor() {}
 
   /**

apps/heft/src/index.ts

@@ -6,7 +6,6 @@ export {
   HeftConfiguration,
   IHeftActionConfiguration,
   IHeftActionConfigurationOptions,
-  ICompilerPackage,
   IHeftConfigurationInitializationOptions as _IHeftConfigurationInitializationOptions
 } from './configuration/HeftConfiguration';
 export {

apps/heft/src/pluginFramework/PluginManager.ts

@@ -24,6 +24,7 @@ import { BasicConfigureWebpackPlugin } from '../plugins/Webpack/BasicConfigureWe
 import { WebpackPlugin } from '../plugins/Webpack/WebpackPlugin';
 import { SassTypingsPlugin } from '../plugins/SassTypingsPlugin/SassTypingsPlugin';
 import { ProjectValidatorPlugin } from '../plugins/ProjectValidatorPlugin';
+import { ToolPackageResolver } from '../utilities/ToolPackageResolver';
 
 export interface IPluginManagerOptions {
   terminal: Terminal;
@@ -45,11 +46,13 @@ export class PluginManager {
   }
 
   public initializeDefaultPlugins(): void {
-    this._applyPlugin(new TypeScriptPlugin());
+    const taskPackageResolver: ToolPackageResolver = new ToolPackageResolver();
+
+    this._applyPlugin(new TypeScriptPlugin(taskPackageResolver));
     this._applyPlugin(new CopyStaticAssetsPlugin());
     this._applyPlugin(new CopyFilesPlugin());
     this._applyPlugin(new DeleteGlobsPlugin());
-    this._applyPlugin(new ApiExtractorPlugin());
+    this._applyPlugin(new ApiExtractorPlugin(taskPackageResolver));
     this._applyPlugin(new JestPlugin());
     this._applyPlugin(new BasicConfigureWebpackPlugin());
     this._applyPlugin(new WebpackPlugin());