diff --git a/.gitignore b/.gitignore index 4306e9589e8..32f514ad07a 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ vscode.lsif vscode.db /.profile-oss /cli/target +/cli/openssl product.overrides.json diff --git a/build/gulpfile.cli.js b/build/gulpfile.cli.js new file mode 100644 index 00000000000..2ed09314fc5 --- /dev/null +++ b/build/gulpfile.cli.js @@ -0,0 +1,189 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +//@ts-check + +const es = require('event-stream'); +const gulp = require('gulp'); +const path = require('path'); +const fancyLog = require('fancy-log'); +const ansiColors = require('ansi-colors'); +const cp = require('child_process'); +const { tmpdir } = require('os'); +const { promises: fs, existsSync, mkdirSync, rmSync } = require('fs'); + +const task = require('./lib/task'); +const watcher = require('./lib/watch'); +const { debounce } = require('./lib/util'); +const createReporter = require('./lib/reporter').createReporter; + +const root = 'cli'; +const rootAbs = path.resolve(__dirname, '..', root); +const src = `${root}/src`; +const targetCliPath = path.join(root, 'target', 'debug', process.platform === 'win32' ? 'code.exe' : 'code'); + +const platformOpensslDirName = + process.platform === 'win32' ? ( + process.arch === 'arm64' + ? 'arm64-windows-static-md' + : process.arch === 'ia32' + ? 'x86-windows-static-md' + : 'x64-windows-static-md') + : process.platform === 'darwin' ? ( + process.arch === 'arm64' + ? 'arm64-osx' + : 'x64-osx') + : (process.arch === 'arm64' + ? 'arm64-linux' + : process.arch === 'arm' + ? 'arm-linux' + : 'x64-linux'); +const platformOpensslDir = path.join(rootAbs, 'openssl', 'package', 'out', platformOpensslDirName); + +const hasLocalRust = (() => { + /** @type boolean | undefined */ + let result = undefined; + return () => { + if (result !== undefined) { + return result; + } + + try { + const r = cp.spawnSync('cargo', ['--version']); + result = r.status === 0; + } catch (e) { + result = false; + } + + return result; + }; +})(); + +const debounceEsStream = (fn, duration = 100) => { + let handle = undefined; + let pending = []; + const sendAll = (pending) => (event, ...args) => { + for (const stream of pending) { + pending.emit(event, ...args); + } + }; + + return es.map(function (_, callback) { + console.log('defer'); + if (handle !== undefined) { + clearTimeout(handle); + } + + handle = setTimeout(() => { + handle = undefined; + + const previous = pending; + pending = []; + fn() + .on('error', sendAll('error')) + .on('data', sendAll('data')) + .on('end', sendAll('end')); + }, duration); + + pending.push(this); + }); +}; + +const compileFromSources = (callback) => { + const proc = cp.spawn('cargo', ['--color', 'always', 'build'], { + cwd: root, + stdio: ['ignore', 'pipe', 'pipe'], + env: existsSync(platformOpensslDir) ? { OPENSSL_DIR: platformOpensslDir, ...process.env } : process.env + }); + + /** @type Buffer[] */ + const stdoutErr = []; + proc.stdout.on('data', d => stdoutErr.push(d)); + proc.stderr.on('data', d => stdoutErr.push(d)); + proc.on('error', callback); + proc.on('exit', code => { + if (code !== 0) { + callback(Buffer.concat(stdoutErr).toString()); + } else { + callback(); + } + }); +}; + +const acquireBuiltOpenSSL = (callback) => { + const untar = require('gulp-untar'); + const gunzip = require('gulp-gunzip'); + const dir = path.join(tmpdir(), 'vscode-openssl-download'); + mkdirSync(dir, { recursive: true }); + + cp.spawnSync( + process.platform === 'win32' ? 'npm.cmd' : 'npm', + ['pack', '@vscode/openssl-prebuilt'], + { stdio: ['ignore', 'ignore', 'inherit'], cwd: dir } + ); + + gulp.src('*.tgz', { cwd: dir }) + .pipe(gunzip()) + .pipe(untar()) + .pipe(gulp.dest(`${root}/openssl`)) + .on('error', callback) + .on('end', () => { + rmSync(dir, { recursive: true, force: true }); + callback(); + }); +}; + +const compileWithOpenSSLCheck = (/** @type import('./lib/reporter').IReporter */ reporter) => es.map((_, callback) => { + compileFromSources(err => { + if (!err) { + // no-op + } else if (err.toString().includes('Could not find directory of OpenSSL installation') && !existsSync(platformOpensslDir)) { + fancyLog(ansiColors.yellow(`[cli]`), 'OpenSSL libraries not found, acquiring prebuilt bits...'); + acquireBuiltOpenSSL(err => { + if (err) { + callback(err); + } else { + compileFromSources(err => { + if (err) { + reporter(err.toString()); + } + callback(null, ''); + }); + } + }); + } else { + reporter(err.toString()); + } + + callback(null, ''); + }); +}); + +const warnIfRustNotInstalled = () => { + if (!hasLocalRust()) { + fancyLog(ansiColors.yellow(`[cli]`), 'No local Rust install detected, compilation may fail.'); + fancyLog(ansiColors.yellow(`[cli]`), 'Get rust from: https://rustup.rs/'); + } +}; + +const compileCliTask = task.define('compile-cli', () => { + warnIfRustNotInstalled(); + const reporter = createReporter('cli'); + return gulp.src(`${root}/Cargo.toml`) + .pipe(compileWithOpenSSLCheck(reporter)) + .pipe(reporter.end(true)); +}); + + +const watchCliTask = task.define('watch-cli', () => { + warnIfRustNotInstalled(); + return watcher(`${src}/**`, { read: false }) + .pipe(debounce(compileCliTask)); +}); + +gulp.task(compileCliTask); +gulp.task(watchCliTask); diff --git a/build/lib/util.js b/build/lib/util.js index c6c45010223..b06cd43dc29 100644 --- a/build/lib/util.js +++ b/build/lib/util.js @@ -55,7 +55,7 @@ function incremental(streamProvider, initial, supportsCancellation) { return es.duplex(input, output); } exports.incremental = incremental; -function debounce(task) { +function debounce(task, duration = 500) { const input = es.through(); const output = es.through(); let state = 'idle'; @@ -72,7 +72,7 @@ function debounce(task) { .pipe(output); }; run(); - const eventuallyRun = _debounce(() => run(), 500); + const eventuallyRun = _debounce(() => run(), duration); input.on('data', () => { if (state === 'idle') { eventuallyRun(); @@ -406,4 +406,4 @@ function buildWebNodePaths(outDir) { return result; } exports.buildWebNodePaths = buildWebNodePaths; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.js","sourceRoot":"","sources":["util.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.js","sourceRoot":"","sources":["util.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/build/lib/util.ts b/build/lib/util.ts index b0f9c054997..6648ce42364 100644 --- a/build/lib/util.ts +++ b/build/lib/util.ts @@ -77,7 +77,7 @@ export function incremental(streamProvider: IStreamProvider, initial: NodeJS.Rea return es.duplex(input, output); } -export function debounce(task: () => NodeJS.ReadWriteStream): NodeJS.ReadWriteStream { +export function debounce(task: () => NodeJS.ReadWriteStream, duration = 500): NodeJS.ReadWriteStream { const input = es.through(); const output = es.through(); let state = 'idle'; @@ -99,7 +99,7 @@ export function debounce(task: () => NodeJS.ReadWriteStream): NodeJS.ReadWriteSt run(); - const eventuallyRun = _debounce(() => run(), 500); + const eventuallyRun = _debounce(() => run(), duration); input.on('data', () => { if (state === 'idle') { diff --git a/package.json b/package.json index 2d0c215c838..98401afa88b 100644 --- a/package.json +++ b/package.json @@ -45,8 +45,10 @@ "valid-layers-check": "node build/lib/layersChecker.js", "update-distro": "node build/npm/update-distro.mjs", "web": "echo 'yarn web' is replaced by './scripts/code-server' or './scripts/code-web'", + "compile-cli": "gulp compile-cli", "compile-web": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js compile-web", "watch-web": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js watch-web", + "watch-cli": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js watch-cli", "eslint": "node build/eslint", "stylelint": "node build/stylelint", "playwright-install": "node build/azure-pipelines/common/installPlaywright.js", diff --git a/test/smoke/package.json b/test/smoke/package.json index ef9ec209501..72ed55e68e1 100644 --- a/test/smoke/package.json +++ b/test/smoke/package.json @@ -11,7 +11,7 @@ "mocha": "node ../node_modules/mocha/bin/mocha" }, "dependencies": { - "@vscode/test-electron": "^2.2.1", + "@vscode/test-electron": "^2.3.2", "mkdirp": "^1.0.4", "ncp": "^2.0.0", "node-fetch": "^2.6.7", diff --git a/test/smoke/yarn.lock b/test/smoke/yarn.lock index ab0960284b8..42787b9e371 100644 --- a/test/smoke/yarn.lock +++ b/test/smoke/yarn.lock @@ -71,15 +71,15 @@ "@types/glob" "*" "@types/node" "*" -"@vscode/test-electron@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@vscode/test-electron/-/test-electron-2.2.1.tgz#6d1ac128e27c18e1d20bcb299e830b50587f74ca" - integrity sha512-DUdwSYVc9p/PbGveaq20dbAAXHfvdq4zQ24ILp6PKizOBxrOfMsOq8Vts5nMzeIo0CxtA/RxZLFyDv001PiUSg== +"@vscode/test-electron@^2.3.2": + version "2.3.2" + resolved "https://registry.yarnpkg.com/@vscode/test-electron/-/test-electron-2.3.2.tgz#25db8d1a94e8274c27015cf806ae8b180c83545b" + integrity sha512-CRfQIs5Wi5Ok5SUCC3PTvRRXa74LD43cSXHC8EuNlmHHEPaJa/AGrv76brcA1hVSxrdja9tiYwp95Lq8kwY0tw== dependencies: http-proxy-agent "^4.0.1" https-proxy-agent "^5.0.0" - rimraf "^3.0.2" - unzipper "^0.10.11" + jszip "^3.10.1" + semver "^7.3.8" agent-base@6: version "6.0.2" @@ -105,24 +105,6 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -big-integer@^1.6.17: - version "1.6.51" - resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686" - integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg== - -binary@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79" - integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk= - dependencies: - buffers "~0.1.1" - chainsaw "~0.1.0" - -bluebird@~3.4.1: - version "3.4.7" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" - integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM= - brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -131,16 +113,6 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -buffer-indexof-polyfill@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz#d2732135c5999c64b277fcf9b1abe3498254729c" - integrity sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A== - -buffers@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" - integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s= - call-bind@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce" @@ -149,13 +121,6 @@ call-bind@^1.0.0: function-bind "^1.1.1" get-intrinsic "^1.0.0" -chainsaw@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" - integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg= - dependencies: - traverse ">=0.3.0 <0.4" - chalk@^2.4.1: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -224,13 +189,6 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= -duplexer2@~0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" - integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= - dependencies: - readable-stream "^2.0.2" - error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -291,16 +249,6 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fstream@^1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" - integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -332,11 +280,6 @@ graceful-fs@^4.1.2: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== -graceful-fs@^4.2.2: - version "4.2.9" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" - integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -376,6 +319,11 @@ https-proxy-agent@^5.0.0: agent-base "6" debug "4" +immediate@~3.0.5: + version "3.0.6" + resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" + integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ== + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -384,7 +332,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@~2.0.0, inherits@~2.0.3: +inherits@2, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -450,10 +398,22 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== -listenercount@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937" - integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc= +jszip@^3.10.1: + version "3.10.1" + resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2" + integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g== + dependencies: + lie "~3.3.0" + pako "~1.0.2" + readable-stream "~2.3.6" + setimmediate "^1.0.5" + +lie@~3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a" + integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ== + dependencies: + immediate "~3.0.5" load-json-file@^4.0.0: version "4.0.0" @@ -465,6 +425,13 @@ load-json-file@^4.0.0: pify "^3.0.0" strip-bom "^3.0.0" +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + memorystream@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2" @@ -494,18 +461,11 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimist@^1.2.0, minimist@^1.2.5: +minimist@^1.2.0: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== -"mkdirp@>=0.5 0": - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" - mkdirp@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" @@ -585,6 +545,11 @@ once@^1.3.0: dependencies: wrappy "1" +pako@~1.0.2: + version "1.0.11" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" + integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== + parse-json@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" @@ -639,7 +604,7 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" -readable-stream@^2.0.2, readable-stream@~2.3.6: +readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -660,14 +625,7 @@ resolve@^1.10.0: is-core-module "^2.1.0" path-parse "^1.0.6" -rimraf@2: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - -rimraf@3.0.2, rimraf@^3.0.2: +rimraf@3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -684,10 +642,17 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -setimmediate@~1.0.4: +semver@^7.3.8: + version "7.5.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec" + integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw== + dependencies: + lru-cache "^6.0.0" + +setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= + integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA== shebang-command@^1.2.0: version "1.2.0" @@ -781,27 +746,6 @@ tr46@~0.0.3: resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= -"traverse@>=0.3.0 <0.4": - version "0.3.9" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" - integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk= - -unzipper@^0.10.11: - version "0.10.11" - resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.10.11.tgz#0b4991446472cbdb92ee7403909f26c2419c782e" - integrity sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw== - dependencies: - big-integer "^1.6.17" - binary "~0.3.0" - bluebird "~3.4.1" - buffer-indexof-polyfill "~1.0.0" - duplexer2 "~0.1.4" - fstream "^1.0.12" - graceful-fs "^4.2.2" - listenercount "~1.0.1" - readable-stream "~2.3.6" - setimmediate "~1.0.4" - util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -847,3 +791,8 @@ wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==