@rushstack/rush-http-build-cache-plugin 5.97.1-pr3481.18 → 5.97.1

package/.heft/build-cache/jest-cache/jest-transform-cache-bae913f9b9aa720eb4deeae0a60a4b27-474488b31a4a940a3990e9eaf06f1647/{42/Import_42731f0220476b7d949a2d8f3a6f3333 → 12/Import_12af6d2ca109ffba883fc5079062e0e8}

@@ -1,4 +1,4 @@
-209e9cf9090ea89efb6e5d699ef8c518
+17c8f45b5493500142a3994514f4c6eb
 "use strict";
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
@@ -145,32 +145,105 @@ class Import {
      * and a system module is found, then its name is returned without any file path.
      */
     static resolveModule(options) {
-        const { modulePath, baseFolderPath, includeSystemModules, allowSelfReference } = options;
+        const { modulePath, baseFolderPath, includeSystemModules, allowSelfReference, getRealPath } = options;
         if (path.isAbsolute(modulePath)) {
             return modulePath;
         }
-        const normalizedRootPath = FileSystem_1.FileSystem.getRealPath(baseFolderPath);
+        const normalizedRootPath = (getRealPath || FileSystem_1.FileSystem.getRealPath)(baseFolderPath);
         if (modulePath.startsWith('.')) {
             // This looks like a conventional relative path
             return path.resolve(normalizedRootPath, modulePath);
         }
-        if (includeSystemModules === true && Import._builtInModules.has(modulePath)) {
-            return modulePath;
+        // Built-in modules do not have a scope, so if there is a slash, then we need to check
+        // against the first path segment
+        const slashIndex = modulePath.indexOf('/');
+        const moduleName = slashIndex === -1 ? modulePath : modulePath.slice(0, slashIndex);
+        if (!includeSystemModules && Import._builtInModules.has(moduleName)) {
+            throw new Error(`Cannot find module "${modulePath}" from "${options.baseFolderPath}".`);
         }
         if (allowSelfReference === true) {
             const ownPackage = Import._getPackageName(baseFolderPath);
-            if (ownPackage && modulePath.startsWith(ownPackage.packageName)) {
-                const packagePath = modulePath.substr(ownPackage.packageName.length + 1);
+            if (ownPackage &&
+                (modulePath === ownPackage.packageName || modulePath.startsWith(`${ownPackage.packageName}/`))) {
+                const packagePath = modulePath.slice(ownPackage.packageName.length + 1);
                 return path.resolve(ownPackage.packageRootPath, packagePath);
             }
         }
         try {
-            return Resolve.sync(
-            // Append a slash to the package name to ensure `resolve.sync` doesn't attempt to return a system package
-            includeSystemModules !== true && modulePath.indexOf('/') === -1 ? `${modulePath}/` : modulePath, {
+            return Resolve.sync(modulePath, {
                 basedir: normalizedRootPath,
-                preserveSymlinks: false
+                preserveSymlinks: false,
+                realpathSync: getRealPath
+            });
+        }
+        catch (e) {
+            throw new Error(`Cannot find module "${modulePath}" from "${options.baseFolderPath}".`);
+        }
+    }
+    /**
+     * Async version of {@link Import.resolveModule}.
+     */
+    static async resolveModuleAsync(options) {
+        const { modulePath, baseFolderPath, includeSystemModules, allowSelfReference, getRealPath, getRealPathAsync } = options;
+        if (path.isAbsolute(modulePath)) {
+            return modulePath;
+        }
+        const normalizedRootPath = await (getRealPathAsync || getRealPath || FileSystem_1.FileSystem.getRealPathAsync)(baseFolderPath);
+        if (modulePath.startsWith('.')) {
+            // This looks like a conventional relative path
+            return path.resolve(normalizedRootPath, modulePath);
+        }
+        // Built-in modules do not have a scope, so if there is a slash, then we need to check
+        // against the first path segment
+        const slashIndex = modulePath.indexOf('/');
+        const moduleName = slashIndex === -1 ? modulePath : modulePath.slice(0, slashIndex);
+        if (!includeSystemModules && Import._builtInModules.has(moduleName)) {
+            throw new Error(`Cannot find module "${modulePath}" from "${options.baseFolderPath}".`);
+        }
+        if (allowSelfReference === true) {
+            const ownPackage = Import._getPackageName(baseFolderPath);
+            if (ownPackage &&
+                (modulePath === ownPackage.packageName || modulePath.startsWith(`${ownPackage.packageName}/`))) {
+                const packagePath = modulePath.slice(ownPackage.packageName.length + 1);
+                return path.resolve(ownPackage.packageRootPath, packagePath);
+            }
+        }
+        try {
+            const resolvePromise = new Promise((resolve, reject) => {
+                const realPathFn = getRealPathAsync || getRealPath
+                    ? (filePath, callback) => {
+                        if (getRealPathAsync) {
+                            getRealPathAsync(filePath)
+                                .then((resolvedPath) => callback(null, resolvedPath))
+                                .catch((error) => callback(error));
+                        }
+                        else {
+                            try {
+                                const resolvedPath = getRealPath(filePath);
+                                callback(null, resolvedPath);
+                            }
+                            catch (error) {
+                                callback(error);
+                            }
+                        }
+                    }
+                    : undefined;
+                Resolve.default(modulePath, {
+                    basedir: normalizedRootPath,
+                    preserveSymlinks: false,
+                    realpath: realPathFn
+                }, (error, resolvedPath) => {
+                    if (error) {
+                        reject(error);
+                    }
+                    else {
+                        // Resolve docs state that either an error will be returned, or the resolved path.
+                        // In this case, the resolved path should always be populated.
+                        resolve(resolvedPath);
+                    }
+                });
             });
+            return await resolvePromise;
         }
         catch (e) {
             throw new Error(`Cannot find module "${modulePath}" from "${options.baseFolderPath}".`);
@@ -197,11 +270,11 @@ class Import {
      * and a system module is found, then its name is returned without any file path.
      */
     static resolvePackage(options) {
-        const { packageName, includeSystemModules, baseFolderPath, allowSelfReference } = options;
+        const { packageName, includeSystemModules, baseFolderPath, allowSelfReference, getRealPath } = options;
         if (includeSystemModules && Import._builtInModules.has(packageName)) {
             return packageName;
         }
-        const normalizedRootPath = FileSystem_1.FileSystem.getRealPath(baseFolderPath);
+        const normalizedRootPath = (getRealPath || FileSystem_1.FileSystem.getRealPath)(baseFolderPath);
         if (allowSelfReference) {
             const ownPackage = Import._getPackageName(baseFolderPath);
             if (ownPackage && ownPackage.packageName === packageName) {
@@ -221,8 +294,78 @@ class Import {
                     // even if the real entry point was in an subfolder with arbitrary nesting.
                     pkg.main = 'package.json';
                     return pkg;
-                }
+                },
+                realpathSync: getRealPath
+            });
+            const packagePath = path.dirname(resolvedPath);
+            return packagePath;
+        }
+        catch (_a) {
+            throw new Error(`Cannot find package "${packageName}" from "${baseFolderPath}".`);
+        }
+    }
+    /**
+     * Async version of {@link Import.resolvePackage}.
+     */
+    static async resolvePackageAsync(options) {
+        const { packageName, includeSystemModules, baseFolderPath, allowSelfReference, getRealPath, getRealPathAsync } = options;
+        if (includeSystemModules && Import._builtInModules.has(packageName)) {
+            return packageName;
+        }
+        const normalizedRootPath = await (getRealPathAsync || getRealPath || FileSystem_1.FileSystem.getRealPathAsync)(baseFolderPath);
+        if (allowSelfReference) {
+            const ownPackage = Import._getPackageName(baseFolderPath);
+            if (ownPackage && ownPackage.packageName === packageName) {
+                return ownPackage.packageRootPath;
+            }
+        }
+        PackageName_1.PackageName.parse(packageName); // Ensure the package name is valid and doesn't contain a path
+        try {
+            const resolvePromise = new Promise((resolve, reject) => {
+                const realPathFn = getRealPathAsync || getRealPath
+                    ? (filePath, callback) => {
+                        if (getRealPathAsync) {
+                            getRealPathAsync(filePath)
+                                .then((resolvedPath) => callback(null, resolvedPath))
+                                .catch((error) => callback(error));
+                        }
+                        else {
+                            try {
+                                const resolvedPath = getRealPath(filePath);
+                                callback(null, resolvedPath);
+                            }
+                            catch (error) {
+                                callback(error);
+                            }
+                        }
+                    }
+                    : undefined;
+                Resolve.default(
+                // Append a slash to the package name to ensure `resolve` doesn't attempt to return a system package
+                `${packageName}/`, {
+                    basedir: normalizedRootPath,
+                    preserveSymlinks: false,
+                    packageFilter: (pkg, pkgFile, dir) => {
+                        // Hardwire "main" to point to a file that is guaranteed to exist.
+                        // This helps resolve packages such as @types/node that have no entry point.
+                        // And then we can use path.dirname() below to locate the package folder,
+                        // even if the real entry point was in an subfolder with arbitrary nesting.
+                        pkg.main = 'package.json';
+                        return pkg;
+                    },
+                    realpath: realPathFn
+                }, (error, resolvedPath) => {
+                    if (error) {
+                        reject(error);
+                    }
+                    else {
+                        // Resolve docs state that either an error will be returned, or the resolved path.
+                        // In this case, the resolved path should always be populated.
+                        resolve(resolvedPath);
+                    }
+                });
             });
+            const resolvedPath = await resolvePromise;
             const packagePath = path.dirname(resolvedPath);
             return packagePath;
         }

package/.heft/build-cache/jest-cache/jest-transform-cache-bae913f9b9aa720eb4deeae0a60a4b27-474488b31a4a940a3990e9eaf06f1647/{26/package_263c59db6933ba9581588638fb19da5c → 2f/package_2f923ac6ad9bbd4966f8472750ef7770}

@@ -1,7 +1,7 @@
-8a7c57b19616090b7a25ecded908799c
+d7ca309fcdee7a342a3c0286b2254732
 {
   "name": "@rushstack/rush-http-build-cache-plugin",
-  "version": "5.97.1-pr3481.18",
+  "version": "5.97.1",
   "description": "Rush plugin for generic HTTP cloud build cache",
   "repository": {
     "type": "git",

package/.heft/build-cache/jest-cache/jest-transform-cache-bae913f9b9aa720eb4deeae0a60a4b27-474488b31a4a940a3990e9eaf06f1647/{58/index_58c57a8f2a96bf6fdf5db35a2e44baa7 → 53/index_53d9d5a344c3984994c801733764f503}

@@ -1,9 +1,9 @@
-3fc85697379a38faf34a7605e1fb101f
+adb811159db27c5599c1a613d0999adf
 "use strict";
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeUuid = exports.StringBufferTerminalProvider = exports.ConsoleTerminalProvider = exports.TerminalProviderSeverity = exports.TextAttribute = exports.ColorValue = exports.Colors = exports.Terminal = exports.SubprocessTerminator = exports.StringBuilder = exports.LegacyAdapters = exports.FileWriter = exports.FileSystem = exports.AlreadyExistsBehavior = exports.Sort = exports.NewlineKind = exports.Text = exports.Encoding = exports.Path = exports.PackageNameParser = exports.PackageName = exports.PackageJsonLookup = exports.ProtectableMap = exports.PosixModeBits = exports.MapExtensions = exports.LockFile = exports.JsonSchema = exports.JsonFile = exports.JsonSyntax = exports.InternalError = exports.Import = exports.FileError = exports.Executable = exports.EnvironmentMap = exports.Enum = exports.FolderConstants = exports.FileConstants = exports.Async = exports.AnsiEscape = exports.AlreadyReportedError = void 0;
+exports.TypeUuid = exports.StringBufferTerminalProvider = exports.ConsoleTerminalProvider = exports.TerminalProviderSeverity = exports.TextAttribute = exports.ColorValue = exports.Colors = exports.Terminal = exports.SubprocessTerminator = exports.StringBuilder = exports.LegacyAdapters = exports.FileWriter = exports.FileSystem = exports.AlreadyExistsBehavior = exports.Sort = exports.NewlineKind = exports.Text = exports.Encoding = exports.Path = exports.PackageNameParser = exports.PackageName = exports.PackageJsonLookup = exports.ProtectableMap = exports.PosixModeBits = exports.MapExtensions = exports.LockFile = exports.JsonSchema = exports.JsonFile = exports.JsonSyntax = exports.InternalError = exports.Import = exports.FileError = exports.Executable = exports.EnvironmentMap = exports.Enum = exports.FolderConstants = exports.FileConstants = exports.AsyncQueue = exports.Async = exports.AnsiEscape = exports.AlreadyReportedError = void 0;
 /**
  * Core libraries that every NodeJS toolchain project should use.
  *
@@ -15,6 +15,7 @@ var AnsiEscape_1 = require("./Terminal/AnsiEscape");
 Object.defineProperty(exports, "AnsiEscape", { enumerable: true, get: function () { return AnsiEscape_1.AnsiEscape; } });
 var Async_1 = require("./Async");
 Object.defineProperty(exports, "Async", { enumerable: true, get: function () { return Async_1.Async; } });
+Object.defineProperty(exports, "AsyncQueue", { enumerable: true, get: function () { return Async_1.AsyncQueue; } });
 var Constants_1 = require("./Constants");
 Object.defineProperty(exports, "FileConstants", { enumerable: true, get: function () { return Constants_1.FileConstants; } });
 Object.defineProperty(exports, "FolderConstants", { enumerable: true, get: function () { return Constants_1.FolderConstants; } });

package/.heft/build-cache/jest-cache/jest-transform-cache-bae913f9b9aa720eb4deeae0a60a4b27-474488b31a4a940a3990e9eaf06f1647/{fa/rushlib_fa830331d24a41292b5cb91040384188 → 68/rushlib_68c59fa059ba441c9c6883bcfed4a8d2}

@@ -1,4 +1,4 @@
-473b627574fe4fcbad35df266fec1453
+a6ae40f8d161627615c097829cdb31c8
 /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
@@ -56,6 +56,17 @@ module.exports = require("@rushstack/package-deps-hash");
 
 /***/ }),
 
+/***/ 484344:
+/*!********************************************************************!*\
+  !*** external "@rushstack/package-extractor/lib/PackageExtractor" ***!
+  \********************************************************************/
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("@rushstack/package-extractor/lib/PackageExtractor");
+
+/***/ }),
+
 /***/ 192492:
 /*!*****************************************!*\
   !*** external "@rushstack/rig-package" ***!
@@ -254,17 +265,6 @@ module.exports = require("inquirer/lib/utils/paginator");
 
 /***/ }),
 
-/***/ 609227:
-/*!************************!*\
-  !*** external "jszip" ***!
-  \************************/
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("jszip");
-
-/***/ }),
-
 /***/ 374809:
 /*!*****************************!*\
   !*** external "node-fetch" ***!
@@ -298,17 +298,6 @@ module.exports = require("npm-package-arg");
 
 /***/ }),
 
-/***/ 172644:
-/*!*******************************!*\
-  !*** external "npm-packlist" ***!
-  \*******************************/
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("npm-packlist");
-
-/***/ }),
-
 /***/ 5745:
 /*!************************************!*\
   !*** external "read-package-tree" ***!
@@ -320,17 +309,6 @@ module.exports = require("read-package-tree");
 
 /***/ }),
 
-/***/ 288048:
-/*!**************************!*\
-  !*** external "resolve" ***!
-  \**************************/
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("resolve");
-
-/***/ }),
-
 /***/ 315863:
 /*!*********************************!*\
   !*** external "rxjs/operators" ***!