Use isolated transpilation for local projects.

.gitignore

@@ -107,17 +107,17 @@ common/autoinstallers/*/.npmrc
 *.lock
 
 # Common toolchain intermediate files
-temp/
-lib/
+dist-storybook/
+dist/
 lib-amd/
+lib-commonjs/
 lib-dts/
 lib-es6/
 lib-esm/
 lib-esnext/
-lib-commonjs/
 lib-shim/
-dist/
-dist-storybook/
+lib/
+temp/
 *.tsbuildinfo
 
 # Heft temporary files

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

@@ -1,7 +1,7 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
 
-  "mainEntryPointFilePath": "<projectFolder>/lib/index.d.ts",
+  "mainEntryPointFilePath": "<projectFolder>/lib-dts/index.d.ts",
 
   "apiReport": {
     "enabled": true,

apps/api-documenter/package.json

@@ -17,8 +17,29 @@
   "bin": {
     "api-documenter": "./bin/api-documenter"
   },
-  "main": "lib/index.js",
+  "main": "lib-commonjs/index.js",
+  "module": "lib-esm/index.js",
   "typings": "dist/rollup.d.ts",
+  "exports": {
+    ".": {
+      "import": "./lib-esm/index.js",
+      "require": "./lib-commonjs/index.js",
+      "types": "./dist/rollup.d.ts"
+    },
+    "./lib/*": {
+      "import": "./lib-esm/*.js",
+      "require": "./lib-commonjs/*.js",
+      "types": "./lib-dts/*.d.ts"
+    },
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "lib/*": [
+        "lib-dts/*"
+      ]
+    }
+  },
   "dependencies": {
     "@microsoft/api-extractor-model": "workspace:*",
     "@microsoft/tsdoc": "~0.15.1",

apps/api-documenter/src/documenters/OfficeYamlDocumenter.ts

@@ -2,7 +2,7 @@
 // See LICENSE in the project root for license information.
 
 import * as path from 'path';
-import yaml = require('js-yaml');
+import yaml from 'js-yaml';
 
 import type { ApiModel } from '@microsoft/api-extractor-model';
 import { FileSystem } from '@rushstack/node-core-library';

apps/api-documenter/src/documenters/YamlDocumenter.ts

@@ -3,7 +3,7 @@
 
 import * as path from 'path';
 
-import yaml = require('js-yaml');
+import yaml from 'js-yaml';
 import {
   JsonFile,
   JsonSchema,

apps/api-documenter/src/utils/ToSdpConvertHelper.ts

@@ -19,7 +19,7 @@ import type {
 } from '../yaml/ISDPYamlFile';
 import path from 'path';
 import { FileSystem, Encoding, NewlineKind } from '@rushstack/node-core-library';
-import yaml = require('js-yaml');
+import yaml from 'js-yaml';
 
 export function convertUDPYamlToSDP(folderPath: string): void {
   convert(folderPath, folderPath);

apps/api-extractor/.npmignore

@@ -30,4 +30,3 @@
 # ---------------------------------------------------------------------------
 # DO NOT MODIFY ABOVE THIS LINE!  Add any project-specific overrides below.
 # ---------------------------------------------------------------------------
-!/extends/*.json

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

@@ -1,7 +1,7 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
 
-  "mainEntryPointFilePath": "<projectFolder>/lib/index.d.ts",
+  "mainEntryPointFilePath": "<projectFolder>/lib-dts/index.d.ts",
 
   "apiReport": {
     "enabled": true,

apps/api-extractor/package.json

@@ -25,8 +25,29 @@
     "directory": "apps/api-extractor"
   },
   "homepage": "https://api-extractor.com",
-  "main": "lib/index.js",
+  "main": "lib-commonjs/index.js",
+  "module": "lib-esm/index.js",
   "typings": "dist/rollup.d.ts",
+  "exports": {
+    ".": {
+      "import": "./lib-esm/index.js",
+      "require": "./lib-commonjs/index.js",
+      "types": "./dist/rollup.d.ts"
+    },
+    "./lib/*": {
+      "import": "./lib-esm/*.js",
+      "require": "./lib-commonjs/*.js",
+      "types": "./lib-dts/*.d.ts"
+    },
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "lib/*": [
+        "lib-dts/*"
+      ]
+    }
+  },
   "bin": {
     "api-extractor": "./bin/api-extractor"
   },
@@ -53,7 +74,7 @@
   },
   "devDependencies": {
     "decoupled-local-node-rig": "workspace:*",
-    "@rushstack/heft": "0.71.2",
+    "@rushstack/heft": "0.73.1",
     "@types/lodash": "4.14.116",
     "@types/minimatch": "3.0.5",
     "@types/resolve": "1.20.2",

apps/api-extractor/src/api/ExtractorConfig.ts

@@ -3,7 +3,7 @@
 
 import * as path from 'path';
 import * as resolve from 'resolve';
-import lodash = require('lodash');
+import lodash from 'lodash';
 import {
   JsonFile,
   JsonSchema,

apps/heft/.npmignore

@@ -33,4 +33,4 @@
 
 !/includes/**
 !UPGRADING.md
-
+lib-*/root-lib/

apps/heft/bin/heft

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../lib/startWithVersionSelector.js');
+require('../lib-commonjs/startWithVersionSelector.js');

apps/heft/config/api-extractor.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
 
-  "mainEntryPointFilePath": "<projectFolder>/lib/index.d.ts",
+  "mainEntryPointFilePath": "<projectFolder>/lib-dts/index.d.ts",
   "apiReport": {
     "enabled": true,
     "reportFolder": "../../../common/reviews/api"

apps/heft/config/heft.json

@@ -0,0 +1,37 @@
+/**
+ * Defines configuration used by core Heft.
+ */
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/heft/v0/heft.schema.json",
+
+  /**
+   * Optionally specifies another JSON config file that this file extends from. This provides a way for standard
+   * settings to be shared across multiple projects.
+   *
+   * To delete an inherited setting, set it to `null` in this file.
+   */
+  "extends": "decoupled-local-node-rig/profiles/default/config/heft.json",
+
+  "phasesByName": {
+    "build": {
+      "tasksByName": {
+        "copy-lib-start": {
+          "taskDependencies": ["transpile"],
+          "taskPlugin": {
+            "pluginPackage": "@rushstack/heft",
+            "pluginName": "copy-files-plugin",
+            "options": {
+              "copyOperations": [
+                {
+                  "sourcePath": "lib-commonjs/root-lib",
+                  "destinationFolders": ["lib"],
+                  "fileExtensions": [".js", ".map"]
+                }
+              ]
+            }
+          }
+        }
+      }
+    }
+  }
+}

apps/heft/heft-plugin.json

@@ -6,17 +6,17 @@
   "taskPlugins": [
     {
       "pluginName": "copy-files-plugin",
-      "entryPoint": "./lib/plugins/CopyFilesPlugin",
-      "optionsSchema": "./lib/schemas/copy-files-options.schema.json"
+      "entryPoint": "./lib-commonjs/plugins/CopyFilesPlugin",
+      "optionsSchema": "./lib-commonjs/schemas/copy-files-options.schema.json"
     },
     {
       "pluginName": "delete-files-plugin",
-      "entryPoint": "./lib/plugins/DeleteFilesPlugin",
-      "optionsSchema": "./lib/schemas/delete-files-options.schema.json"
+      "entryPoint": "./lib-commonjs/plugins/DeleteFilesPlugin",
+      "optionsSchema": "./lib-commonjs/schemas/delete-files-options.schema.json"
     },
     {
       "pluginName": "node-service-plugin",
-      "entryPoint": "./lib/plugins/NodeServicePlugin",
+      "entryPoint": "./lib-commonjs/plugins/NodeServicePlugin",
       "parameterScope": "node-service",
       "parameters": [
         {
@@ -28,13 +28,13 @@
     },
     {
       "pluginName": "run-script-plugin",
-      "entryPoint": "./lib/plugins/RunScriptPlugin",
-      "optionsSchema": "./lib/schemas/run-script-options.schema.json"
+      "entryPoint": "./lib-commonjs/plugins/RunScriptPlugin",
+      "optionsSchema": "./lib-commonjs/schemas/run-script-options.schema.json"
     },
     {
-      "entryPoint": "./lib/plugins/SetEnvironmentVariablesPlugin",
+      "entryPoint": "./lib-commonjs/plugins/SetEnvironmentVariablesPlugin",
       "pluginName": "set-environment-variables-plugin",
-      "optionsSchema": "./lib/schemas/set-environment-variables-plugin.schema.json"
+      "optionsSchema": "./lib-commonjs/schemas/set-environment-variables-plugin.schema.json"
     }
   ]
 }

apps/heft/package.json

@@ -21,8 +21,29 @@
     "node": ">=10.13.0"
   },
   "homepage": "https://rushstack.io/pages/heft/overview/",
-  "main": "lib/index.js",
-  "types": "dist/heft.d.ts",
+  "main": "lib-commonjs/index.js",
+  "module": "lib-esm/index.js",
+  "typings": "dist/heft.d.ts",
+  "exports": {
+    ".": {
+      "import": "./lib-esm/index.js",
+      "require": "./lib-commonjs/index.js",
+      "types": "./dist/heft.d.ts"
+    },
+    "./lib/*": {
+      "import": "./lib-esm/*.js",
+      "require": "./lib-commonjs/*.js",
+      "types": "./lib-dts/*.d.ts"
+    },
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "lib/*": [
+        "lib-dts/*"
+      ]
+    }
+  },
   "bin": {
     "heft": "./bin/heft"
   },
@@ -49,7 +70,7 @@
   },
   "devDependencies": {
     "@microsoft/api-extractor": "workspace:*",
-    "@rushstack/heft": "0.71.2",
+    "@rushstack/heft": "0.73.1",
     "@types/watchpack": "2.4.0",
     "decoupled-local-node-rig": "workspace:*",
     "local-eslint-config": "workspace:*"

apps/heft/src/root-lib/start.ts

@@ -0,0 +1,7 @@
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
+
+// For compatibility globally-installed copies of Heft have the `startWithVersionSelector.js` script that points
+// at 'lib/start.js'
+
+require('../lib-commonjs/start');

apps/heft/src/startWithVersionSelector.ts

@@ -20,7 +20,7 @@ function tryGetPackageFolderFor(resolvedFileOrFolderPath: string): string | unde
   // }
 
   // Is resolvedFileOrFolderPath itself a folder with a package.json file?  If so, return it.
-  if (fs.existsSync(path.join(resolvedFileOrFolderPath, 'package.json'))) {
+  if (fs.existsSync(`${resolvedFileOrFolderPath}/package.json`)) {
     // this._packageFolderCache.set(resolvedFileOrFolderPath, resolvedFileOrFolderPath);
     return resolvedFileOrFolderPath;
   }
@@ -69,7 +69,7 @@ function tryStartLocalHeft(): boolean {
   if (projectFolder) {
     let heftEntryPoint: string;
     try {
-      const packageJsonPath: string = path.join(projectFolder, 'package.json');
+      const packageJsonPath: string = `${projectFolder}/package.json`;
       const packageJsonContent: string = fs.readFileSync(packageJsonPath).toString();
       let packageJson: IPackageJson;
       try {
@@ -89,9 +89,9 @@ function tryStartLocalHeft(): boolean {
 
       // To avoid a loading the "resolve" NPM package, let's assume that the Heft dependency must be
       // installed as "<projectFolder>/node_modules/@rushstack/heft".
-      const heftFolder: string = path.join(projectFolder, 'node_modules', Constants.heftPackageName);
+      const heftFolder: string = `${projectFolder}/node_modules/${Constants.heftPackageName}`;
 
-      heftEntryPoint = path.join(heftFolder, 'lib', 'start.js');
+      heftEntryPoint = `${heftFolder}/lib-commonjs/start.js`;
       if (!fs.existsSync(heftEntryPoint)) {
         throw new Error('Unable to find Heft entry point: ' + heftEntryPoint);
       }

apps/rundown/src/launcher.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 moduleApi = require('module');
+import moduleApi from 'module';
 import process from 'process';
 
 import { LauncherAction } from './LauncherTypes'; // "import type" doesn't work with const enums

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

@@ -7,7 +7,7 @@ console.log('rush-lib-test loading Rush configuration...');
 
 // Important: Since we're calling an internal API, we need to use the unbundled .d.ts files
 // instead of the normal .d.ts rollup
-import { RushConfiguration } from '@microsoft/rush-lib/lib/';
+import { RushConfiguration } from '@microsoft/rush-lib/lib/index';
 
 const config: RushConfiguration = RushConfiguration.loadFromDefaultLocation();
 console.log(config.commonFolder);

build-tests-subspace/rush-sdk-test/config/heft.json

@@ -7,12 +7,12 @@
     "build": {
       "tasksByName": {
         "run-start": {
-          "taskDependencies": ["typescript"],
+          "taskDependencies": ["transpile"],
           "taskPlugin": {
             "pluginPackage": "@rushstack/heft",
             "pluginName": "run-script-plugin",
             "options": {
-              "scriptPath": "./lib/run-start.js"
+              "scriptPath": "./lib-commonjs/run-start.js"
             }
           }
         }

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

@@ -158,6 +158,10 @@
       "name": "@rushstack/heft-dev-cert-plugin",
       "allowedCategories": [ "libraries", "tests" ]
     },
+    {
+      "name": "@rushstack/heft-isolated-typescript-transpile-plugin",
+      "allowedCategories": [ "libraries" ]
+    },
     {
       "name": "@rushstack/heft-jest-plugin",
       "allowedCategories": [ "libraries", "tests" ]