@salesforce/core-bundle 8.2.8 → 8.3.0

package/lib/index.d.ts

@@ -6159,6 +6159,13 @@ declare module '@salesforce/core-bundle/util/fileLocking' {
    * See its documentation for details.
    */
   export const lockInitSync: (filePath: string) => LockInitSyncResponse;
+  /**
+   * Poll until the file is unlocked.
+   *
+   * @param filePath file path to check
+   */
+  export const pollUntilUnlock: (filePath: string) => Promise<void>;
+  export const pollUntilUnlockSync: (filePath: string) => void;
   export {};
 
 }

package/lib/index.js

@@ -4629,7 +4629,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@salesforce/core-bundle",
-      version: "8.2.8",
+      version: "8.3.0",
       description: "Core libraries to interact with SFDX projects, orgs, and APIs.",
       main: "lib/index",
       types: "lib/index.d.ts",
@@ -4648,6 +4648,7 @@ var require_package = __commonJS({
         lint: "wireit",
         "lint-fix": "yarn sf-lint --fix",
         test: "wireit",
+        "test:nuts": 'mocha "test/**/*.nut.ts" --timeout 500000',
         "test:only": "wireit",
         "test:perf": "ts-node test/perf/logger/main.test.ts"
       },
@@ -4763,7 +4764,7 @@ var require_package = __commonJS({
           output: []
         },
         "test:only": {
-          command: 'nyc mocha "test/**/*Test.ts"',
+          command: 'nyc mocha "test/unit/**/*.test.ts"',
           env: {
             FORCE_COLOR: "2"
           },
@@ -12371,6 +12372,360 @@ var require_proper_lockfile = __commonJS({
   }
 });
 
+// node_modules/ts-retry-promise/dist/timeout.js
+var require_timeout = __commonJS({
+  "node_modules/ts-retry-promise/dist/timeout.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.timeout = void 0;
+    exports2.timeout = function(millies, f) {
+      if (millies === "INFINITELY") {
+        return f(function() {
+          return false;
+        });
+      }
+      var done = false;
+      var doneF = function() {
+        return done;
+      };
+      return new Promise(function(resolve, reject) {
+        var timeoutRef = setTimeout(function() {
+          done = true;
+          reject(new Error("Timeout after " + millies + "ms"));
+        }, millies);
+        var result = f(doneF);
+        result.then(function(r) {
+          resolve(r);
+          clearTimeout(timeoutRef);
+        }, function(e) {
+          reject(e);
+          clearTimeout(timeoutRef);
+        });
+      });
+    };
+  }
+});
+
+// node_modules/ts-retry-promise/dist/retry-promise.js
+var require_retry_promise = __commonJS({
+  "node_modules/ts-retry-promise/dist/retry-promise.js"(exports2) {
+    "use strict";
+    var __extends2 = exports2 && exports2.__extends || /* @__PURE__ */ function() {
+      var extendStatics2 = function(d, b) {
+        extendStatics2 = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(d2, b2) {
+          d2.__proto__ = b2;
+        } || function(d2, b2) {
+          for (var p in b2)
+            if (b2.hasOwnProperty(p))
+              d2[p] = b2[p];
+        };
+        return extendStatics2(d, b);
+      };
+      return function(d, b) {
+        extendStatics2(d, b);
+        function __() {
+          this.constructor = d;
+        }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+      };
+    }();
+    var __awaiter2 = exports2 && exports2.__awaiter || function(thisArg, _arguments, P, generator) {
+      function adopt(value) {
+        return value instanceof P ? value : new P(function(resolve) {
+          resolve(value);
+        });
+      }
+      return new (P || (P = Promise))(function(resolve, reject) {
+        function fulfilled(value) {
+          try {
+            step(generator.next(value));
+          } catch (e) {
+            reject(e);
+          }
+        }
+        function rejected(value) {
+          try {
+            step(generator["throw"](value));
+          } catch (e) {
+            reject(e);
+          }
+        }
+        function step(result) {
+          result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+        }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+      });
+    };
+    var __generator2 = exports2 && exports2.__generator || function(thisArg, body) {
+      var _ = { label: 0, sent: function() {
+        if (t[0] & 1)
+          throw t[1];
+        return t[1];
+      }, trys: [], ops: [] }, f, y, t, g;
+      return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+      }), g;
+      function verb(n) {
+        return function(v) {
+          return step([n, v]);
+        };
+      }
+      function step(op) {
+        if (f)
+          throw new TypeError("Generator is already executing.");
+        while (_)
+          try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
+              return t;
+            if (y = 0, t)
+              op = [op[0] & 2, t.value];
+            switch (op[0]) {
+              case 0:
+              case 1:
+                t = op;
+                break;
+              case 4:
+                _.label++;
+                return { value: op[1], done: false };
+              case 5:
+                _.label++;
+                y = op[1];
+                op = [0];
+                continue;
+              case 7:
+                op = _.ops.pop();
+                _.trys.pop();
+                continue;
+              default:
+                if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                  _ = 0;
+                  continue;
+                }
+                if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                  _.label = op[1];
+                  break;
+                }
+                if (op[0] === 6 && _.label < t[1]) {
+                  _.label = t[1];
+                  t = op;
+                  break;
+                }
+                if (t && _.label < t[2]) {
+                  _.label = t[2];
+                  _.ops.push(op);
+                  break;
+                }
+                if (t[2])
+                  _.ops.pop();
+                _.trys.pop();
+                continue;
+            }
+            op = body.call(thisArg, _);
+          } catch (e) {
+            op = [6, e];
+            y = 0;
+          } finally {
+            f = t = 0;
+          }
+        if (op[0] & 5)
+          throw op[1];
+        return { value: op[0] ? op[1] : void 0, done: true };
+      }
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.NotRetryableError = exports2.RetryError = exports2.notEmpty = exports2.customizeRetry = exports2.customizeDecorator = exports2.retryDecorator = exports2.retry = exports2.wait = exports2.defaultRetryConfig = void 0;
+    var timeout_1 = require_timeout();
+    var fixedBackoff = function(attempt, delay) {
+      return delay;
+    };
+    var linearBackoff = function(attempt, delay) {
+      return attempt * delay;
+    };
+    var exponentialBackoff = function(attempt, delay) {
+      return Math.pow(delay, attempt);
+    };
+    exports2.defaultRetryConfig = {
+      backoff: "FIXED",
+      delay: 100,
+      logger: function() {
+        return void 0;
+      },
+      maxBackOff: 5 * 60 * 1e3,
+      retries: 10,
+      timeout: 60 * 1e3,
+      until: function() {
+        return true;
+      },
+      retryIf: function() {
+        return true;
+      }
+    };
+    function wait(ms) {
+      return __awaiter2(this, void 0, void 0, function() {
+        return __generator2(this, function(_a) {
+          return [2, new Promise(function(resolve) {
+            return setTimeout(resolve, ms);
+          })];
+        });
+      });
+    }
+    exports2.wait = wait;
+    function retry(f, config) {
+      return __awaiter2(this, void 0, void 0, function() {
+        var effectiveConfig;
+        return __generator2(this, function(_a) {
+          effectiveConfig = Object.assign({}, exports2.defaultRetryConfig, config);
+          return [2, timeout_1.timeout(effectiveConfig.timeout, function(done) {
+            return _retry(f, effectiveConfig, done);
+          })];
+        });
+      });
+    }
+    exports2.retry = retry;
+    function retryDecorator(func, config) {
+      return function() {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+          args[_i] = arguments[_i];
+        }
+        return retry(function() {
+          return func.apply(void 0, args);
+        }, config);
+      };
+    }
+    exports2.retryDecorator = retryDecorator;
+    function customizeDecorator(customConfig) {
+      return function(args, config) {
+        return retryDecorator(args, Object.assign({}, customConfig, config));
+      };
+    }
+    exports2.customizeDecorator = customizeDecorator;
+    function customizeRetry(customConfig) {
+      return function(f, c) {
+        var customized = Object.assign({}, customConfig, c);
+        return retry(f, customized);
+      };
+    }
+    exports2.customizeRetry = customizeRetry;
+    function _retry(f, config, done) {
+      return __awaiter2(this, void 0, void 0, function() {
+        var lastError, delay, retries, i, result, error_1, millisToWait;
+        return __generator2(this, function(_a) {
+          switch (_a.label) {
+            case 0:
+              switch (config.backoff) {
+                case "EXPONENTIAL":
+                  delay = exponentialBackoff;
+                  break;
+                case "FIXED":
+                  delay = fixedBackoff;
+                  break;
+                case "LINEAR":
+                  delay = linearBackoff;
+                  break;
+                default:
+                  delay = config.backoff;
+              }
+              if (config.retries === "INFINITELY") {
+                retries = Number.MAX_SAFE_INTEGER;
+              } else {
+                retries = config.retries;
+              }
+              i = 0;
+              _a.label = 1;
+            case 1:
+              if (!(i <= retries))
+                return [3, 8];
+              _a.label = 2;
+            case 2:
+              _a.trys.push([2, 4, , 5]);
+              return [4, f()];
+            case 3:
+              result = _a.sent();
+              if (config.until(result)) {
+                return [2, result];
+              }
+              config.logger("Until condition not met by " + result);
+              return [3, 5];
+            case 4:
+              error_1 = _a.sent();
+              if (!config.retryIf(error_1)) {
+                throw error_1;
+              }
+              if (error_1.name === NotRetryableError.name) {
+                throw new RetryError("Met not retryable error. Last error: " + error_1, error_1);
+              }
+              lastError = error_1;
+              config.logger("Retry failed: " + error_1.message);
+              return [3, 5];
+            case 5:
+              millisToWait = delay(i + 1, config.delay);
+              return [4, wait(millisToWait > config.maxBackOff ? config.maxBackOff : millisToWait)];
+            case 6:
+              _a.sent();
+              if (done()) {
+                return [3, 8];
+              }
+              _a.label = 7;
+            case 7:
+              i++;
+              return [3, 1];
+            case 8:
+              throw new RetryError("All retries failed. Last error: " + lastError, lastError);
+          }
+        });
+      });
+    }
+    exports2.notEmpty = function(result) {
+      if (Array.isArray(result)) {
+        return result.length > 0;
+      }
+      return result !== null && result !== void 0;
+    };
+    var RetryError = (
+      /** @class */
+      function(_super) {
+        __extends2(RetryError2, _super);
+        function RetryError2(message, lastError) {
+          var _this = _super.call(this, message) || this;
+          _this.lastError = lastError;
+          return _this;
+        }
+        return RetryError2;
+      }(Error)
+    );
+    exports2.RetryError = RetryError;
+    var BaseError = (
+      /** @class */
+      /* @__PURE__ */ function() {
+        function BaseError2(message) {
+          var args = [];
+          for (var _i = 1; _i < arguments.length; _i++) {
+            args[_i - 1] = arguments[_i];
+          }
+          this.message = message;
+          Error.apply(this, args);
+        }
+        return BaseError2;
+      }()
+    );
+    BaseError.prototype = new Error();
+    var NotRetryableError = (
+      /** @class */
+      function(_super) {
+        __extends2(NotRetryableError2, _super);
+        function NotRetryableError2(message) {
+          var _this = _super.call(this, message) || this;
+          Object.defineProperty(_this, "name", { value: _this.constructor.name });
+          return _this;
+        }
+        return NotRetryableError2;
+      }(BaseError)
+    );
+    exports2.NotRetryableError = NotRetryableError;
+  }
+});
+
 // lib/util/lockRetryOptions.js
 var require_lockRetryOptions = __commonJS({
   "lib/util/lockRetryOptions.js"(exports2) {
@@ -12422,10 +12777,12 @@ var require_fileLocking = __commonJS({
       return result;
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.lockInitSync = exports2.lockInit = void 0;
+    exports2.pollUntilUnlockSync = exports2.pollUntilUnlock = exports2.lockInitSync = exports2.lockInit = void 0;
     var fs = __importStar2(require("node:fs"));
     var node_path_1 = require("node:path");
     var proper_lockfile_1 = require_proper_lockfile();
+    var kit_1 = require_lib2();
+    var ts_retry_promise_1 = require_retry_promise();
     var sfError_12 = require_sfError();
     var logger_12 = require_logger();
     var lockRetryOptions_1 = require_lockRetryOptions();
@@ -12489,6 +12846,32 @@ var require_fileLocking = __commonJS({
       };
     };
     exports2.lockInitSync = lockInitSync;
+    var pollUntilUnlock = async (filePath) => {
+      try {
+        await (0, ts_retry_promise_1.retryDecorator)(proper_lockfile_1.check, {
+          timeout: kit_1.Duration.minutes(1).milliseconds,
+          delay: 10,
+          until: (locked) => locked === false,
+          // don't retry errors (typically enoent or access on the lockfile, therefore not locked)
+          retryIf: () => false
+        })(filePath, lockRetryOptions_1.lockRetryOptions);
+      } catch (e) {
+      }
+    };
+    exports2.pollUntilUnlock = pollUntilUnlock;
+    var pollUntilUnlockSync = (filePath) => {
+      let counter = 0;
+      let locked = true;
+      while (locked && counter < 100) {
+        try {
+          locked = (0, proper_lockfile_1.checkSync)(filePath, lockRetryOptions_1.lockOptions);
+          counter++;
+        } catch {
+          locked = false;
+        }
+      }
+    };
+    exports2.pollUntilUnlockSync = pollUntilUnlockSync;
   }
 });
 
@@ -14050,6 +14433,7 @@ var require_configFile = __commonJS({
         try {
           if (!this.hasRead || force) {
             this.logger.debug(`Reading config file: ${this.getPath()} because ${!this.hasRead ? "hasRead is false" : "force parameter is true"}`);
+            await (0, fileLocking_12.pollUntilUnlock)(this.getPath());
             const obj = (0, kit_1.parseJsonMap)(await fs.promises.readFile(this.getPath(), "utf8"), this.getPath());
             this.setContentsFromFileContents(obj, (await fs.promises.stat(this.getPath(), { bigint: true })).mtimeNs);
           }
@@ -14078,6 +14462,7 @@ var require_configFile = __commonJS({
       readSync(throwOnNotFound = false, force = false) {
         try {
           if (!this.hasRead || force) {
+            (0, fileLocking_12.pollUntilUnlockSync)(this.getPath());
             this.logger.debug(`Reading config file: ${this.getPath()}`);
             const obj = (0, kit_1.parseJsonMap)(fs.readFileSync(this.getPath(), "utf8"));
             this.setContentsFromFileContents(obj, fs.statSync(this.getPath(), { bigint: true }).mtimeNs);
@@ -85007,360 +85392,6 @@ var require_jsonwebtoken = __commonJS({
   }
 });
 
-// node_modules/ts-retry-promise/dist/timeout.js
-var require_timeout = __commonJS({
-  "node_modules/ts-retry-promise/dist/timeout.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.timeout = void 0;
-    exports2.timeout = function(millies, f) {
-      if (millies === "INFINITELY") {
-        return f(function() {
-          return false;
-        });
-      }
-      var done = false;
-      var doneF = function() {
-        return done;
-      };
-      return new Promise(function(resolve, reject) {
-        var timeoutRef = setTimeout(function() {
-          done = true;
-          reject(new Error("Timeout after " + millies + "ms"));
-        }, millies);
-        var result = f(doneF);
-        result.then(function(r) {
-          resolve(r);
-          clearTimeout(timeoutRef);
-        }, function(e) {
-          reject(e);
-          clearTimeout(timeoutRef);
-        });
-      });
-    };
-  }
-});
-
-// node_modules/ts-retry-promise/dist/retry-promise.js
-var require_retry_promise = __commonJS({
-  "node_modules/ts-retry-promise/dist/retry-promise.js"(exports2) {
-    "use strict";
-    var __extends2 = exports2 && exports2.__extends || /* @__PURE__ */ function() {
-      var extendStatics2 = function(d, b) {
-        extendStatics2 = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(d2, b2) {
-          d2.__proto__ = b2;
-        } || function(d2, b2) {
-          for (var p in b2)
-            if (b2.hasOwnProperty(p))
-              d2[p] = b2[p];
-        };
-        return extendStatics2(d, b);
-      };
-      return function(d, b) {
-        extendStatics2(d, b);
-        function __() {
-          this.constructor = d;
-        }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-      };
-    }();
-    var __awaiter2 = exports2 && exports2.__awaiter || function(thisArg, _arguments, P, generator) {
-      function adopt(value) {
-        return value instanceof P ? value : new P(function(resolve) {
-          resolve(value);
-        });
-      }
-      return new (P || (P = Promise))(function(resolve, reject) {
-        function fulfilled(value) {
-          try {
-            step(generator.next(value));
-          } catch (e) {
-            reject(e);
-          }
-        }
-        function rejected(value) {
-          try {
-            step(generator["throw"](value));
-          } catch (e) {
-            reject(e);
-          }
-        }
-        function step(result) {
-          result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-        }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-      });
-    };
-    var __generator2 = exports2 && exports2.__generator || function(thisArg, body) {
-      var _ = { label: 0, sent: function() {
-        if (t[0] & 1)
-          throw t[1];
-        return t[1];
-      }, trys: [], ops: [] }, f, y, t, g;
-      return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
-      }), g;
-      function verb(n) {
-        return function(v) {
-          return step([n, v]);
-        };
-      }
-      function step(op) {
-        if (f)
-          throw new TypeError("Generator is already executing.");
-        while (_)
-          try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
-              return t;
-            if (y = 0, t)
-              op = [op[0] & 2, t.value];
-            switch (op[0]) {
-              case 0:
-              case 1:
-                t = op;
-                break;
-              case 4:
-                _.label++;
-                return { value: op[1], done: false };
-              case 5:
-                _.label++;
-                y = op[1];
-                op = [0];
-                continue;
-              case 7:
-                op = _.ops.pop();
-                _.trys.pop();
-                continue;
-              default:
-                if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-                  _ = 0;
-                  continue;
-                }
-                if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-                  _.label = op[1];
-                  break;
-                }
-                if (op[0] === 6 && _.label < t[1]) {
-                  _.label = t[1];
-                  t = op;
-                  break;
-                }
-                if (t && _.label < t[2]) {
-                  _.label = t[2];
-                  _.ops.push(op);
-                  break;
-                }
-                if (t[2])
-                  _.ops.pop();
-                _.trys.pop();
-                continue;
-            }
-            op = body.call(thisArg, _);
-          } catch (e) {
-            op = [6, e];
-            y = 0;
-          } finally {
-            f = t = 0;
-          }
-        if (op[0] & 5)
-          throw op[1];
-        return { value: op[0] ? op[1] : void 0, done: true };
-      }
-    };
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.NotRetryableError = exports2.RetryError = exports2.notEmpty = exports2.customizeRetry = exports2.customizeDecorator = exports2.retryDecorator = exports2.retry = exports2.wait = exports2.defaultRetryConfig = void 0;
-    var timeout_1 = require_timeout();
-    var fixedBackoff = function(attempt, delay) {
-      return delay;
-    };
-    var linearBackoff = function(attempt, delay) {
-      return attempt * delay;
-    };
-    var exponentialBackoff = function(attempt, delay) {
-      return Math.pow(delay, attempt);
-    };
-    exports2.defaultRetryConfig = {
-      backoff: "FIXED",
-      delay: 100,
-      logger: function() {
-        return void 0;
-      },
-      maxBackOff: 5 * 60 * 1e3,
-      retries: 10,
-      timeout: 60 * 1e3,
-      until: function() {
-        return true;
-      },
-      retryIf: function() {
-        return true;
-      }
-    };
-    function wait(ms) {
-      return __awaiter2(this, void 0, void 0, function() {
-        return __generator2(this, function(_a) {
-          return [2, new Promise(function(resolve) {
-            return setTimeout(resolve, ms);
-          })];
-        });
-      });
-    }
-    exports2.wait = wait;
-    function retry(f, config) {
-      return __awaiter2(this, void 0, void 0, function() {
-        var effectiveConfig;
-        return __generator2(this, function(_a) {
-          effectiveConfig = Object.assign({}, exports2.defaultRetryConfig, config);
-          return [2, timeout_1.timeout(effectiveConfig.timeout, function(done) {
-            return _retry(f, effectiveConfig, done);
-          })];
-        });
-      });
-    }
-    exports2.retry = retry;
-    function retryDecorator(func, config) {
-      return function() {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-          args[_i] = arguments[_i];
-        }
-        return retry(function() {
-          return func.apply(void 0, args);
-        }, config);
-      };
-    }
-    exports2.retryDecorator = retryDecorator;
-    function customizeDecorator(customConfig) {
-      return function(args, config) {
-        return retryDecorator(args, Object.assign({}, customConfig, config));
-      };
-    }
-    exports2.customizeDecorator = customizeDecorator;
-    function customizeRetry(customConfig) {
-      return function(f, c) {
-        var customized = Object.assign({}, customConfig, c);
-        return retry(f, customized);
-      };
-    }
-    exports2.customizeRetry = customizeRetry;
-    function _retry(f, config, done) {
-      return __awaiter2(this, void 0, void 0, function() {
-        var lastError, delay, retries, i, result, error_1, millisToWait;
-        return __generator2(this, function(_a) {
-          switch (_a.label) {
-            case 0:
-              switch (config.backoff) {
-                case "EXPONENTIAL":
-                  delay = exponentialBackoff;
-                  break;
-                case "FIXED":
-                  delay = fixedBackoff;
-                  break;
-                case "LINEAR":
-                  delay = linearBackoff;
-                  break;
-                default:
-                  delay = config.backoff;
-              }
-              if (config.retries === "INFINITELY") {
-                retries = Number.MAX_SAFE_INTEGER;
-              } else {
-                retries = config.retries;
-              }
-              i = 0;
-              _a.label = 1;
-            case 1:
-              if (!(i <= retries))
-                return [3, 8];
-              _a.label = 2;
-            case 2:
-              _a.trys.push([2, 4, , 5]);
-              return [4, f()];
-            case 3:
-              result = _a.sent();
-              if (config.until(result)) {
-                return [2, result];
-              }
-              config.logger("Until condition not met by " + result);
-              return [3, 5];
-            case 4:
-              error_1 = _a.sent();
-              if (!config.retryIf(error_1)) {
-                throw error_1;
-              }
-              if (error_1.name === NotRetryableError.name) {
-                throw new RetryError("Met not retryable error. Last error: " + error_1, error_1);
-              }
-              lastError = error_1;
-              config.logger("Retry failed: " + error_1.message);
-              return [3, 5];
-            case 5:
-              millisToWait = delay(i + 1, config.delay);
-              return [4, wait(millisToWait > config.maxBackOff ? config.maxBackOff : millisToWait)];
-            case 6:
-              _a.sent();
-              if (done()) {
-                return [3, 8];
-              }
-              _a.label = 7;
-            case 7:
-              i++;
-              return [3, 1];
-            case 8:
-              throw new RetryError("All retries failed. Last error: " + lastError, lastError);
-          }
-        });
-      });
-    }
-    exports2.notEmpty = function(result) {
-      if (Array.isArray(result)) {
-        return result.length > 0;
-      }
-      return result !== null && result !== void 0;
-    };
-    var RetryError = (
-      /** @class */
-      function(_super) {
-        __extends2(RetryError2, _super);
-        function RetryError2(message, lastError) {
-          var _this = _super.call(this, message) || this;
-          _this.lastError = lastError;
-          return _this;
-        }
-        return RetryError2;
-      }(Error)
-    );
-    exports2.RetryError = RetryError;
-    var BaseError = (
-      /** @class */
-      /* @__PURE__ */ function() {
-        function BaseError2(message) {
-          var args = [];
-          for (var _i = 1; _i < arguments.length; _i++) {
-            args[_i - 1] = arguments[_i];
-          }
-          this.message = message;
-          Error.apply(this, args);
-        }
-        return BaseError2;
-      }()
-    );
-    BaseError.prototype = new Error();
-    var NotRetryableError = (
-      /** @class */
-      function(_super) {
-        __extends2(NotRetryableError2, _super);
-        function NotRetryableError2(message) {
-          var _this = _super.call(this, message) || this;
-          Object.defineProperty(_this, "name", { value: _this.constructor.name });
-          return _this;
-        }
-        return NotRetryableError2;
-      }(BaseError)
-    );
-    exports2.NotRetryableError = NotRetryableError;
-  }
-});
-
 // lib/status/pollingClient.js
 var require_pollingClient = __commonJS({
   "lib/status/pollingClient.js"(exports2) {
@@ -109124,6 +109155,7 @@ var require_scratchOrgInfoGenerator = __commonJS({
       try {
         const fileData = await node_fs_1.promises.readFile(definitionFile, "utf8");
         const defFileContents = (0, kit_1.parseJson)(fileData);
+        delete defFileContents["$schema"];
         return defFileContents;
       } catch (err) {
         const error = err;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core-bundle",
-  "version": "8.2.8",
+  "version": "8.3.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/index",
   "types": "lib/index.d.ts",
@@ -19,6 +19,7 @@
     "lint": "wireit",
     "lint-fix": "yarn sf-lint --fix",
     "test": "wireit",
+    "test:nuts": "mocha \"test/**/*.nut.ts\" --timeout 500000",
     "test:only": "wireit",
     "test:perf": "ts-node test/perf/logger/main.test.ts"
   },
@@ -134,7 +135,7 @@
       "output": []
     },
     "test:only": {
-      "command": "nyc mocha \"test/**/*Test.ts\"",
+      "command": "nyc mocha \"test/unit/**/*.test.ts\"",
       "env": {
         "FORCE_COLOR": "2"
       },