From e8097c53458cee3f13453cec58460159ec98c3de Mon Sep 17 00:00:00 2001 From: Praveen Kuttappan Date: Mon, 4 Oct 2021 12:41:53 -0400 Subject: [PATCH 1/2] Update rush version to latest --- rush.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rush.json b/rush.json index d55ea3797916..b0d6698589c9 100644 --- a/rush.json +++ b/rush.json @@ -15,7 +15,7 @@ * path segment in the "$schema" field for all your Rush config files. This will ensure * correct error-underlining and tab-completion for editors such as VS Code. */ - "rushVersion": "5.51.1", + "rushVersion": "5.54.0", /** * The next field selects which package manager should be installed and determines its version. * Rush installs its own local copy of the package manager to ensure that your build process From 95dd6b143f71b2bfc9e96c0af32e45f4da544b88 Mon Sep 17 00:00:00 2001 From: Praveen Kuttappan Date: Tue, 5 Oct 2021 14:39:47 -0400 Subject: [PATCH 2/2] Update generated script files --- common/scripts/install-run-rush.js | 8 ++++---- common/scripts/install-run.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/scripts/install-run-rush.js b/common/scripts/install-run-rush.js index 71ca9fe4676a..5afdb9ad8409 100644 --- a/common/scripts/install-run-rush.js +++ b/common/scripts/install-run-rush.js @@ -16,7 +16,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? ( var __importStar = (this && this.__importStar) || function (mod) { if (mod && mod.__esModule) return mod; var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); __setModuleDefault(result, mod); return result; }; @@ -42,7 +42,7 @@ function _getRushVersion() { console.log(`Using Rush version from environment variable ${RUSH_PREVIEW_VERSION}=${rushPreviewVersion}`); return rushPreviewVersion; } - const rushJsonFolder = install_run_1.findRushJsonFolder(); + const rushJsonFolder = (0, install_run_1.findRushJsonFolder)(); const rushJsonPath = path.join(rushJsonFolder, install_run_1.RUSH_JSON_FILENAME); try { const rushJsonContents = fs.readFileSync(rushJsonPath, 'utf-8'); @@ -76,10 +76,10 @@ function _run() { } process.exit(1); } - install_run_1.runWithErrorAndStatusCode(() => { + (0, install_run_1.runWithErrorAndStatusCode)(() => { const version = _getRushVersion(); console.log(`The rush.json configuration requests Rush version ${version}`); - return install_run_1.installAndRun(PACKAGE_NAME, version, bin, packageBinArgs); + return (0, install_run_1.installAndRun)(PACKAGE_NAME, version, bin, packageBinArgs); }); } _run(); diff --git a/common/scripts/install-run.js b/common/scripts/install-run.js index 22eedeeaaa44..fa5522e847cf 100644 --- a/common/scripts/install-run.js +++ b/common/scripts/install-run.js @@ -16,7 +16,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? ( var __importStar = (this && this.__importStar) || function (mod) { if (mod && mod.__esModule) return mod; var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); __setModuleDefault(result, mod); return result; };