Update rush to 5.133.4.
This commit is contained in:
Родитель
0267734a62
Коммит
31d115a31a
|
@ -10,6 +10,9 @@
|
||||||
// node common/scripts/install-run-rush-pnpm.js pnpm-command
|
// node common/scripts/install-run-rush-pnpm.js pnpm-command
|
||||||
//
|
//
|
||||||
// For more information, see: https://rushjs.io/pages/maintainer/setup_new_repo/
|
// For more information, see: https://rushjs.io/pages/maintainer/setup_new_repo/
|
||||||
|
//
|
||||||
|
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
|
||||||
|
// See the @microsoft/rush package's LICENSE file for details.
|
||||||
|
|
||||||
/******/ (() => { // webpackBootstrap
|
/******/ (() => { // webpackBootstrap
|
||||||
/******/ "use strict";
|
/******/ "use strict";
|
||||||
|
|
|
@ -8,6 +8,9 @@
|
||||||
// node common/scripts/install-run-rush.js install
|
// node common/scripts/install-run-rush.js install
|
||||||
//
|
//
|
||||||
// For more information, see: https://rushjs.io/pages/maintainer/setup_new_repo/
|
// For more information, see: https://rushjs.io/pages/maintainer/setup_new_repo/
|
||||||
|
//
|
||||||
|
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
|
||||||
|
// See the @microsoft/rush package's LICENSE file for details.
|
||||||
|
|
||||||
/******/ (() => { // webpackBootstrap
|
/******/ (() => { // webpackBootstrap
|
||||||
/******/ "use strict";
|
/******/ "use strict";
|
||||||
|
|
|
@ -10,6 +10,9 @@
|
||||||
// node common/scripts/install-run-rushx.js custom-command
|
// node common/scripts/install-run-rushx.js custom-command
|
||||||
//
|
//
|
||||||
// For more information, see: https://rushjs.io/pages/maintainer/setup_new_repo/
|
// For more information, see: https://rushjs.io/pages/maintainer/setup_new_repo/
|
||||||
|
//
|
||||||
|
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
|
||||||
|
// See the @microsoft/rush package's LICENSE file for details.
|
||||||
|
|
||||||
/******/ (() => { // webpackBootstrap
|
/******/ (() => { // webpackBootstrap
|
||||||
/******/ "use strict";
|
/******/ "use strict";
|
||||||
|
|
|
@ -8,6 +8,9 @@
|
||||||
// node common/scripts/install-run.js qrcode@1.2.2 qrcode https://rushjs.io
|
// node common/scripts/install-run.js qrcode@1.2.2 qrcode https://rushjs.io
|
||||||
//
|
//
|
||||||
// For more information, see: https://rushjs.io/pages/maintainer/setup_new_repo/
|
// For more information, see: https://rushjs.io/pages/maintainer/setup_new_repo/
|
||||||
|
//
|
||||||
|
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
|
||||||
|
// See the @microsoft/rush package's LICENSE file for details.
|
||||||
|
|
||||||
/******/ (() => { // webpackBootstrap
|
/******/ (() => { // webpackBootstrap
|
||||||
/******/ "use strict";
|
/******/ "use strict";
|
||||||
|
@ -338,7 +341,7 @@ let _npmPath = undefined;
|
||||||
function getNpmPath() {
|
function getNpmPath() {
|
||||||
if (!_npmPath) {
|
if (!_npmPath) {
|
||||||
try {
|
try {
|
||||||
if (os__WEBPACK_IMPORTED_MODULE_2__.platform() === 'win32') {
|
if (_isWindows()) {
|
||||||
// We're on Windows
|
// We're on Windows
|
||||||
const whereOutput = child_process__WEBPACK_IMPORTED_MODULE_0__.execSync('where npm', { stdio: [] }).toString();
|
const whereOutput = child_process__WEBPACK_IMPORTED_MODULE_0__.execSync('where npm', { stdio: [] }).toString();
|
||||||
const lines = whereOutput.split(os__WEBPACK_IMPORTED_MODULE_2__.EOL).filter((line) => !!line);
|
const lines = whereOutput.split(os__WEBPACK_IMPORTED_MODULE_2__.EOL).filter((line) => !!line);
|
||||||
|
@ -457,10 +460,13 @@ function _resolvePackageVersion(logger, rushCommonFolder, { name, version }) {
|
||||||
// ```
|
// ```
|
||||||
//
|
//
|
||||||
// if only a single version matches.
|
// if only a single version matches.
|
||||||
const npmVersionSpawnResult = child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(npmPath, ['view', `${name}@${version}`, 'version', '--no-update-notifier', '--json'], {
|
const spawnSyncOptions = {
|
||||||
cwd: rushTempFolder,
|
cwd: rushTempFolder,
|
||||||
stdio: []
|
stdio: [],
|
||||||
});
|
shell: _isWindows()
|
||||||
|
};
|
||||||
|
const platformNpmPath = _getPlatformPath(npmPath);
|
||||||
|
const npmVersionSpawnResult = child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(platformNpmPath, ['view', `${name}@${version}`, 'version', '--no-update-notifier', '--json'], spawnSyncOptions);
|
||||||
if (npmVersionSpawnResult.status !== 0) {
|
if (npmVersionSpawnResult.status !== 0) {
|
||||||
throw new Error(`"npm view" returned error code ${npmVersionSpawnResult.status}`);
|
throw new Error(`"npm view" returned error code ${npmVersionSpawnResult.status}`);
|
||||||
}
|
}
|
||||||
|
@ -593,10 +599,12 @@ function _installPackage(logger, packageInstallFolder, name, version, command) {
|
||||||
try {
|
try {
|
||||||
logger.info(`Installing ${name}...`);
|
logger.info(`Installing ${name}...`);
|
||||||
const npmPath = getNpmPath();
|
const npmPath = getNpmPath();
|
||||||
const result = child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(npmPath, [command], {
|
const platformNpmPath = _getPlatformPath(npmPath);
|
||||||
|
const result = child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(platformNpmPath, [command], {
|
||||||
stdio: 'inherit',
|
stdio: 'inherit',
|
||||||
cwd: packageInstallFolder,
|
cwd: packageInstallFolder,
|
||||||
env: process.env
|
env: process.env,
|
||||||
|
shell: _isWindows()
|
||||||
});
|
});
|
||||||
if (result.status !== 0) {
|
if (result.status !== 0) {
|
||||||
throw new Error(`"npm ${command}" encountered an error`);
|
throw new Error(`"npm ${command}" encountered an error`);
|
||||||
|
@ -612,9 +620,18 @@ function _installPackage(logger, packageInstallFolder, name, version, command) {
|
||||||
*/
|
*/
|
||||||
function _getBinPath(packageInstallFolder, binName) {
|
function _getBinPath(packageInstallFolder, binName) {
|
||||||
const binFolderPath = path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, NODE_MODULES_FOLDER_NAME, '.bin');
|
const binFolderPath = path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, NODE_MODULES_FOLDER_NAME, '.bin');
|
||||||
const resolvedBinName = os__WEBPACK_IMPORTED_MODULE_2__.platform() === 'win32' ? `${binName}.cmd` : binName;
|
const resolvedBinName = _isWindows() ? `${binName}.cmd` : binName;
|
||||||
return path__WEBPACK_IMPORTED_MODULE_3__.resolve(binFolderPath, resolvedBinName);
|
return path__WEBPACK_IMPORTED_MODULE_3__.resolve(binFolderPath, resolvedBinName);
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Returns a cross-platform path - windows must enclose any path containing spaces within double quotes.
|
||||||
|
*/
|
||||||
|
function _getPlatformPath(platformPath) {
|
||||||
|
return _isWindows() && platformPath.includes(' ') ? `"${platformPath}"` : platformPath;
|
||||||
|
}
|
||||||
|
function _isWindows() {
|
||||||
|
return os__WEBPACK_IMPORTED_MODULE_2__.platform() === 'win32';
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* Write a flag file to the package's install directory, signifying that the install was successful.
|
* Write a flag file to the package's install directory, signifying that the install was successful.
|
||||||
*/
|
*/
|
||||||
|
@ -656,15 +673,14 @@ function installAndRun(logger, packageName, packageVersion, packageBinName, pack
|
||||||
const originalEnvPath = process.env.PATH || '';
|
const originalEnvPath = process.env.PATH || '';
|
||||||
let result;
|
let result;
|
||||||
try {
|
try {
|
||||||
// Node.js on Windows can not spawn a file when the path has a space on it
|
// `npm` bin stubs on Windows are `.cmd` files
|
||||||
// unless the path gets wrapped in a cmd friendly way and shell mode is used
|
// Node.js will not directly invoke a `.cmd` file unless `shell` is set to `true`
|
||||||
const shouldUseShell = binPath.includes(' ') && os__WEBPACK_IMPORTED_MODULE_2__.platform() === 'win32';
|
const platformBinPath = _getPlatformPath(binPath);
|
||||||
const platformBinPath = shouldUseShell ? `"${binPath}"` : binPath;
|
|
||||||
process.env.PATH = [binFolderPath, originalEnvPath].join(path__WEBPACK_IMPORTED_MODULE_3__.delimiter);
|
process.env.PATH = [binFolderPath, originalEnvPath].join(path__WEBPACK_IMPORTED_MODULE_3__.delimiter);
|
||||||
result = child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(platformBinPath, packageBinArgs, {
|
result = child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(platformBinPath, packageBinArgs, {
|
||||||
stdio: 'inherit',
|
stdio: 'inherit',
|
||||||
windowsVerbatimArguments: false,
|
windowsVerbatimArguments: false,
|
||||||
shell: shouldUseShell,
|
shell: _isWindows(),
|
||||||
cwd: process.cwd(),
|
cwd: process.cwd(),
|
||||||
env: process.env
|
env: process.env
|
||||||
});
|
});
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* path segment in the "$schema" field for all your Rush config files. This will ensure
|
* 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.
|
* correct error-underlining and tab-completion for editors such as VS Code.
|
||||||
*/
|
*/
|
||||||
"rushVersion": "5.118.4",
|
"rushVersion": "5.133.4",
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The next field selects which package manager should be installed and determines its version.
|
* The next field selects which package manager should be installed and determines its version.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче