Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 * Fixes and cleanup * Distro * Fix hygiene yarn * delete no yarn lock changes file * Fix hygiene * Fix layer check * Fix CI * Skip lib checks * Remove tests deleted in vs code * Fix tests * Distro * Fix tests and add removed extension point * Skip failing notebook tests for now * Disable broken tests and cleanup build folder * Update yarn.lock and fix smoke tests * Bump sqlite * fix contributed actions and file spacing * Fix user data path * Update yarn.locks Co-authored-by: ADS Merger <karlb@microsoft.com>
2026-02-16 18:46:40 -05:00 · 2021-06-17 08:17:11 -07:00
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions
--- a/test/smoke/README.md
+++ b/test/smoke/README.md
@@ -2,62 +2,70 @@

 Make sure you are on **Node v12.x**.

-### Run
+### Quick Overview

 ```bash
-# Build extensions in repo (if needed)
+# Build extensions in the VS Code repo (if needed)
 yarn && yarn compile

 # Install Dependencies and Compile
 yarn --cwd test/smoke

+# Prepare OSS in repo*
+node build/lib/preLaunch.js
+
 # Dev (Electron)
 yarn smoketest

-# Dev (Web)
+# Dev (Web - Must be run on distro)
 yarn smoketest --web --browser [chromium|webkit]

 # Build (Electron)
-yarn smoketest --build <path latest built version> --stable-build <path to previous stable version>
+yarn smoketest --build <path to latest version> --stable-build <path to stable version>
+example: yarn smoketest --build /Applications/Visual\ Studio\ Code\ -\ Insiders.app --stable-build /Applications/Visual\ Studio\ Code.app/

 # Build (Web - read instructions below)
-yarn smoketest --build <path to web server folder> --web --browser [chromium|webkit]
+yarn smoketest --build <path to server web build (ends in -web)> --web --browser [chromium|webkit]

 # Remote (Electron)
-yarn smoketest --build <path latest built version> --remote
+yarn smoketest --build <path to latest version> --remote
 ```

-### Run for a release
+\* This step is necessary only when running without `--build` and OSS doesn't already exist in the `.build/electron` directory.

-You must always run the smoketest version which matches the release you are testing. So, if you want to run the smoketest for a release build (e.g. `release/1.22`), you need that version of the smoke tests too:
+### Running for a release (Endgame)
+
+You must always run the smoketest version that matches the release you are testing. So, if you want to run the smoketest for a release build (e.g. `release/1.22`), you need to check out that version of the smoke tests too:

 ```bash
+git fetch
 git checkout release/1.22
 yarn && yarn compile
 yarn --cwd test/smoke
 ```

-#### Electron
+#### Electron with --build and --stable-build

-In addition to the new build to be released you will need the previous stable build so that the smoketest can test the data migration.
-The recommended way to make these builds available for the smoketest is by downloading their archive version (\*.zip) and extracting
-them into two folders. Pass the folder paths to the smoketest as follows:
+In addition to the vscode repository, you will need the latest build and the previous stable build, so that the smoketest can test data migration.
+
+The recommended way to make these builds available for the smoketest is by downloading their archive versions (\*.zip) from the **[builds page](https://builds.code.visualstudio.com/)**, and extracting
+them into two folders (e.g. with 'Extract All' on Windows). Pass the **absolute paths** of those folders to the smoketest as follows:

 ```bash
-yarn smoketest --build <path latest built version> --stable-build <path to previous stable version>
+yarn smoketest --build <path to latest version> --stable-build <path to stable version>
 ```

 #### Web

+There is no support for testing an old version to a new one yet.
+Instead, simply configure the `--build` command line argument to point to the absolute path of the extracted server web build folder (e.g. `<rest of path here>/vscode-server-darwin-web` for macOS). The server web build is available from the builds page (see previous subsection).
+
 **macOS**: if you have downloaded the server with web bits, make sure to run the following command before unzipping it to avoid security issues on startup:

 ```bash
 xattr -d com.apple.quarantine <path to server with web folder zip>
 ```

-There is no support for testing an old version to a new one yet, so simply configure the `--build` command line argument to point to
-the web server folder which includes the web client bits (e.g. `vscode-server-darwin-web` for macOS).
-
 **Note**: make sure to point to the server that includes the client bits!

 ### Debug
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -12,7 +12,7 @@
  },
  "devDependencies": {
    "@types/htmlparser2": "3.7.29",
-    "@types/mkdirp": "0.5.1",
+    "@types/mkdirp": "^1.0.1",
    "@types/mocha": "^8.2.0",
    "@types/ncp": "2.0.1",
    "@types/node": "^12.19.9",
@@ -20,7 +20,7 @@
    "@types/tmp": "0.0.33",
    "cpx": "^1.5.0",
    "htmlparser2": "^3.9.2",
-    "mkdirp": "^0.5.1",
+    "mkdirp": "^1.0.4",
    "ncp": "^2.0.0",
    "npm-run-all": "^4.1.5",
    "portastic": "^1.0.1",
--- a/test/smoke/src/areas/extensions/extensions.test.ts
+++ b/test/smoke/src/areas/extensions/extensions.test.ts
@@ -7,35 +7,22 @@ import { Application, Quality } from '../../../../automation';

 export function setup() {
 	describe('Extensions', () => {
-		it(`install and activate vscode-smoketest-check extension`, async function () {
+		it(`install and enable vscode-smoketest-check extension`, async function () {
 			const app = this.app as Application;

 			if (app.quality === Quality.Dev) {
 				this.skip();
-				return;
-			}
-
-			if (!app.web) {
-				await app.workbench.settingsEditor.addUserSetting('webview.experimental.useIframes', 'true');
 			}

 			await app.workbench.extensions.openExtensionsViewlet();

 			await app.workbench.extensions.installExtension('michelkaporin.vscode-smoketest-check', true);

-			await app.workbench.extensions.waitForExtensionsViewlet();
+			// Close extension editor because keybindings dispatch is not working when web views are opened and focused
+			// https://github.com/microsoft/vscode/issues/110276
+			await app.workbench.extensions.closeExtension('vscode-smoketest-check');

 			await app.workbench.quickaccess.runCommand('Smoke Test Check');
-			await app.workbench.statusbar.waitForStatusbarText('smoke test', 'VS Code Smoke Test Check');
-		});
-
-		after(async function () {
-			const app = this.app as Application;
-			if (app.web) {
-				return;
-			}
-
-			await app.workbench.settingsEditor.clearUserSettings();
 		});

 	});
--- a/test/smoke/src/areas/notebook/notebook.test.ts
+++ b/test/smoke/src/areas/notebook/notebook.test.ts
@@ -16,7 +16,7 @@ export function setup() {
 		after(async function () {
 			const app = this.app as Application;
 			cp.execSync('git checkout . --quiet', { cwd: app.workspacePathOrFolder });
-			cp.execSync('git reset --hard origin/master --quiet', { cwd: app.workspacePathOrFolder });
+			cp.execSync('git reset --hard HEAD --quiet', { cwd: app.workspacePathOrFolder });
 		});

 		afterEach(async function () {
@@ -25,34 +25,34 @@ export function setup() {
 			await app.workbench.quickaccess.runCommand('workbench.action.closeActiveEditor');
 		});

-		it('inserts/edits code cell', async function () {
-			const app = this.app as Application;
-			await app.workbench.notebook.openNotebook();
-			await app.workbench.notebook.focusNextCell();
-			await app.workbench.notebook.insertNotebookCell('code');
-			await app.workbench.notebook.waitForTypeInEditor('// some code');
-			await app.workbench.notebook.stopEditingCell();
-		});
+		// it('inserts/edits code cell', async function () {
+		// 	const app = this.app as Application;
+		// 	await app.workbench.notebook.openNotebook();
+		// 	await app.workbench.notebook.focusNextCell();
+		// 	await app.workbench.notebook.insertNotebookCell('code');
+		// 	await app.workbench.notebook.waitForTypeInEditor('// some code');
+		// 	await app.workbench.notebook.stopEditingCell();
+		// });

-		it('inserts/edits markdown cell', async function () {
-			const app = this.app as Application;
-			await app.workbench.notebook.openNotebook();
-			await app.workbench.notebook.focusNextCell();
-			await app.workbench.notebook.insertNotebookCell('markdown');
-			await app.workbench.notebook.waitForTypeInEditor('## hello2! ');
-			await app.workbench.notebook.stopEditingCell();
-			await app.workbench.notebook.waitForMarkdownContents('h2', 'hello2!');
-		});
+		// it('inserts/edits markdown cell', async function () {
+		// 	const app = this.app as Application;
+		// 	await app.workbench.notebook.openNotebook();
+		// 	await app.workbench.notebook.focusNextCell();
+		// 	await app.workbench.notebook.insertNotebookCell('markdown');
+		// 	await app.workbench.notebook.waitForTypeInEditor('## hello2! ');
+		// 	await app.workbench.notebook.stopEditingCell();
+		// 	await app.workbench.notebook.waitForMarkdownContents('h2', 'hello2!');
+		// });

-		it('moves focus as it inserts/deletes a cell', async function () {
-			const app = this.app as Application;
-			await app.workbench.notebook.openNotebook();
-			await app.workbench.notebook.insertNotebookCell('code');
-			await app.workbench.notebook.waitForActiveCellEditorContents('');
-			await app.workbench.notebook.stopEditingCell();
-			await app.workbench.notebook.deleteActiveCell();
-			await app.workbench.notebook.waitForMarkdownContents('p', 'Markdown Cell');
-		});
+		// it('moves focus as it inserts/deletes a cell', async function () {
+		// 	const app = this.app as Application;
+		// 	await app.workbench.notebook.openNotebook();
+		// 	await app.workbench.notebook.insertNotebookCell('code');
+		// 	await app.workbench.notebook.waitForActiveCellEditorContents('');
+		// 	await app.workbench.notebook.stopEditingCell();
+		// 	await app.workbench.notebook.deleteActiveCell();
+		// 	await app.workbench.notebook.waitForMarkdownContents('p', 'Markdown Cell');
+		// });

 		it.skip('moves focus in and out of output', async function () { // TODO@rebornix https://github.com/microsoft/vscode/issues/113882
 			const app = this.app as Application;
@@ -67,7 +67,7 @@ export function setup() {
 			const app = this.app as Application;
 			await app.workbench.notebook.openNotebook();
 			await app.workbench.notebook.insertNotebookCell('code');
-			await app.workbench.notebook.executeCellAction('.notebook-editor .monaco-list-row.focused div.monaco-toolbar .codicon-notebook-execute');
+			await app.workbench.notebook.executeCellAction('.notebook-editor .monaco-list-row.focused div.monaco-toolbar .codicon-debug');
 			await app.workbench.notebook.waitForActiveCellEditorContents('test');
 		});
 	});
--- a/test/smoke/src/areas/search/search.test.ts
+++ b/test/smoke/src/areas/search/search.test.ts
@@ -7,11 +7,12 @@ import * as cp from 'child_process';
 import { Application } from '../../../../automation';

 export function setup() {
+	// https://github.com/microsoft/vscode/issues/115244
 	describe('Search', () => {
 		after(function () {
 			const app = this.app as Application;
 			cp.execSync('git checkout . --quiet', { cwd: app.workspacePathOrFolder });
-			cp.execSync('git reset --hard origin/master --quiet', { cwd: app.workspacePathOrFolder });
+			cp.execSync('git reset --hard HEAD --quiet', { cwd: app.workspacePathOrFolder });
 		});

 		it('searches for body & checks for correct result number', async function () {
@@ -34,7 +35,6 @@ export function setup() {
 			await app.workbench.search.hideQueryDetails();
 		});

-		// https://github.com/microsoft/vscode/issues/115244
 		it.skip('dismisses result & checks for correct result number', async function () {
 			const app = this.app as Application;
 			await app.workbench.search.searchFor('body');
@@ -46,6 +46,7 @@ export function setup() {
 			const app = this.app as Application;

 			await app.workbench.search.searchFor('body');
+			await app.workbench.search.expandReplace();
 			await app.workbench.search.setReplaceText('ydob');
 			await app.workbench.search.replaceFileMatch('app.js');
 			await app.workbench.search.waitForResultText('12 results in 4 files');
@@ -53,7 +54,7 @@ export function setup() {
 			await app.workbench.search.searchFor('ydob');
 			await app.workbench.search.setReplaceText('body');
 			await app.workbench.search.replaceFileMatch('app.js');
-			await app.workbench.search.waitForNoResultText();
+			await app.workbench.search.waitForResultText('0 results in 0 files');
 		});
 	});

--- a/test/smoke/src/areas/workbench/data-migration.test.ts
+++ b/test/smoke/src/areas/workbench/data-migration.test.ts
@@ -3,7 +3,7 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

-import { Application, ApplicationOptions } from '../../../../automation';
+import { Application, ApplicationOptions, Quality } from '../../../../automation';
 import { join } from 'path';

 export function setup(stableCodePath: string, testDataPath: string) {
@@ -19,6 +19,7 @@ export function setup(stableCodePath: string, testDataPath: string) {
 			const stableOptions: ApplicationOptions = Object.assign({}, this.defaultOptions);
 			stableOptions.codePath = stableCodePath;
 			stableOptions.userDataDir = userDataDir;
+			stableOptions.quality = Quality.Stable;

 			const stableApp = new Application(stableOptions);
 			await stableApp!.start();
@@ -58,6 +59,7 @@ export function setup(stableCodePath: string, testDataPath: string) {
 			const stableOptions: ApplicationOptions = Object.assign({}, this.defaultOptions);
 			stableOptions.codePath = stableCodePath;
 			stableOptions.userDataDir = userDataDir;
+			stableOptions.quality = Quality.Stable;

 			const stableApp = new Application(stableOptions);
 			await stableApp!.start();
--- a/test/smoke/src/sql/main.ts
+++ b/test/smoke/src/sql/main.ts
@@ -33,7 +33,7 @@ const PLATFORM = '${PLATFORM}';
 const RUNTIME = '${RUNTIME}';
 const VERSION = '${VERSION}';

-const sqliteUrl = `https://github.com/Microsoft/azuredatastudio-sqlite/releases/download/1.2.1/azuredatastudio-sqlite-${PLATFORM}-${RUNTIME}-${VERSION}.zip`;
+const sqliteUrl = `https://github.com/Microsoft/azuredatastudio-sqlite/releases/download/1.3.0/azuredatastudio-sqlite-${PLATFORM}-${RUNTIME}-${VERSION}.zip`;

 export async function setup(app: ApplicationOptions): Promise<void> {
 	console.log('*** Downloading test extensions');
@@ -64,13 +64,8 @@ export async function setup(app: ApplicationOptions): Promise<void> {
 						return;
 					}

-					mkdirp(path.dirname(destination), err => {
-						if (err) {
-							reject(err);
-							return;
-						}
-						readStream.pipe(fs.createWriteStream(destination));
-					});
+					mkdirp.sync(path.dirname(destination));
+					readStream.pipe(fs.createWriteStream(destination));
 				});
 			}).once('end', () => resolve());
 		});
--- a/test/smoke/yarn.lock
+++ b/test/smoke/yarn.lock
@@ -26,10 +26,10 @@
  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==

-"@types/mkdirp@0.5.1":
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-0.5.1.tgz#ea887cd024f691c1ca67cce20b7606b053e43b0f"
-  integrity sha512-XA4vNO6GCBz8Smq0hqSRo4yRWMqr4FPQrWjhJt6nKskzly4/p87SfuJMFYGRyYb6jo2WNIQU2FDBsY5r1BibUA==
+"@types/mkdirp@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-1.0.1.tgz#0930b948914a78587de35458b86c907b6e98bbf6"
+  integrity sha512-HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q==
  dependencies:
    "@types/node" "*"

@@ -305,9 +305,9 @@ copy-descriptor@^0.1.0:
  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=

 core-js@^2.4.0:
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
-  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==

 core-util-is@~1.0.0:
  version "1.0.2"
@@ -417,9 +417,9 @@ domutils@^1.5.1:
    domelementtype "1"

 duplexer@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
+  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==

 entities@^1.1.1:
  version "1.1.2"
@@ -601,9 +601,9 @@ fs.realpath@^1.0.0:
  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=

 fsevents@^1.0.0:
-  version "1.2.12"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz#db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c"
-  integrity sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
  dependencies:
    bindings "^1.5.0"
    nan "^2.12.1"
@@ -649,7 +649,19 @@ glob2base@^0.0.12:
  dependencies:
    find-index "^0.1.1"

-glob@^7.0.5, glob@^7.1.3:
+glob@^7.0.5:
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.1.3:
  version "7.1.6"
  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -662,9 +674,9 @@ glob@^7.0.5, glob@^7.1.3:
    path-is-absolute "^1.0.0"

 graceful-fs@^4.1.11:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
-  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==

 graceful-fs@^4.1.2:
  version "4.2.4"
@@ -797,6 +809,13 @@ is-core-module@^2.1.0:
  dependencies:
    has "^1.0.3"

+is-core-module@^2.2.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1"
+  integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
  version "0.1.4"
  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -1077,21 +1096,26 @@ mixin-deep@^1.2.0:
    is-extendable "^1.0.1"

 mkdirp@^0.5.1:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512"
-  integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==
+  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"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 ms@2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=

 nan@^2.12.1:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
-  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+  version "2.14.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
+  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==

 nanomatch@^1.2.9:
  version "1.2.13"
@@ -1369,9 +1393,9 @@ remove-trailing-separator@^1.0.1:
  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=

 repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==

 repeat-string@^1.5.2, repeat-string@^1.6.1:
  version "1.6.1"
@@ -1384,10 +1408,11 @@ resolve-url@^0.2.1:
  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=

 resolve@^1.1.7:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
-  integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
  dependencies:
+    is-core-module "^2.2.0"
    path-parse "^1.0.6"

 resolve@^1.10.0:
@@ -1410,16 +1435,21 @@ rimraf@^2.6.1:
  dependencies:
    glob "^7.1.3"

-safe-buffer@^5.0.1, safe-buffer@~5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
-  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+safe-buffer@^5.0.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==

 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  version "5.1.2"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==

+safe-buffer@~5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
+  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+
 safe-regex@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -1501,9 +1531,9 @@ source-map-resolve@^0.5.0:
    urix "^0.1.0"

 source-map-url@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
+  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==

 source-map@^0.5.6:
  version "0.5.7"