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 10:58:30 -05:00 · 2021-06-17 08:17:11 -07:00
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions
--- a/build/.cachesalt
+++ b/build/.cachesalt
@@ -1 +1 @@
-2021-04-07T00:04:17.775Z
+2021-04-07T03:52:18.011Z
--- a/build/.moduleignore
+++ b/build/.moduleignore
@@ -104,13 +104,11 @@ kerberos/build/**

 # END SQL Modules

-vscode-nsfw/binding.gyp
-vscode-nsfw/build/**
-vscode-nsfw/src/**
-vscode-nsfw/openpa/**
-vscode-nsfw/includes/**
-!vscode-nsfw/build/Release/*.node
-!vscode-nsfw/**/*.a
+nsfw/binding.gyp
+nsfw/build/**
+nsfw/src/**
+nsfw/includes/**
+!nsfw/build/Release/*.node

 vsda/build/**
 vsda/ci/**
--- a/build/azure-pipelines/darwin/app-entitlements.plist
+++ b/build/azure-pipelines/darwin/app-entitlements.plist
@@ -8,5 +8,11 @@
    <true/>
    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
    <true/>
+    <key>com.apple.security.device.audio-input</key>
+    <true/>
+    <key>com.apple.security.device.camera</key>
+    <true/>
+    <key>com.apple.security.automation.apple-events</key>
+    <true/>
 </dict>
 </plist>
--- a/build/azure-pipelines/darwin/product-build-darwin-sign.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-sign.yml
@@ -0,0 +1,129 @@
+steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: "14.x"
+
+  - task: AzureKeyVault@1
+    displayName: "Azure Key Vault: Get Secrets"
+    inputs:
+      azureSubscription: "vscode-builds-subscription"
+      KeyVaultName: vscode
+
+  - script: |
+      set -e
+      cat << EOF > ~/.netrc
+      machine github.com
+      login vscode
+      password $(github-distro-mixin-password)
+      EOF
+
+      git config user.email "vscode@microsoft.com"
+      git config user.name "VSCode"
+    displayName: Prepare tooling
+
+  - script: |
+      set -e
+      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
+    displayName: Merge distro
+
+  - script: |
+      pushd build \
+      && yarn \
+      && npm install -g typescript \
+      && tsc azure-pipelines/common/createAsset.ts \
+      && popd
+    displayName: Restore modules for just build folder and compile it
+
+  - download: current
+    artifact: vscode-darwin-$(VSCODE_ARCH)
+    displayName: Download $(VSCODE_ARCH) artifact
+
+  - script: |
+      set -e
+      unzip $(Pipeline.Workspace)/vscode-darwin-$(VSCODE_ARCH)/VSCode-darwin-$(VSCODE_ARCH).zip -d $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      mv $(Pipeline.Workspace)/vscode-darwin-$(VSCODE_ARCH)/VSCode-darwin-$(VSCODE_ARCH).zip $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
+    displayName: Unzip & move
+
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+    inputs:
+      ConnectedServiceName: "ESRP CodeSign"
+      FolderPath: "$(agent.builddirectory)"
+      Pattern: "VSCode-darwin-$(VSCODE_ARCH).zip"
+      signConfigType: inlineSignParams
+      inlineOperation: |
+        [
+          {
+            "keyCode": "CP-401337-Apple",
+            "operationSetCode": "MacAppDeveloperSign",
+            "parameters": [
+              {
+                "parameterName": "Hardening",
+                "parameterValue": "--options=runtime"
+              }
+            ],
+            "toolName": "sign",
+            "toolVersion": "1.0"
+          }
+        ]
+      SessionTimeout: 60
+    displayName: Codesign
+
+  - script: |
+      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
+      BUNDLE_IDENTIFIER=$(node -p "require(\"$APP_ROOT/$APP_NAME/Contents/Resources/app/product.json\").darwinBundleIdentifier")
+      echo "##vso[task.setvariable variable=BundleIdentifier]$BUNDLE_IDENTIFIER"
+    displayName: Export bundle identifier
+
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+    inputs:
+      ConnectedServiceName: "ESRP CodeSign"
+      FolderPath: "$(agent.builddirectory)"
+      Pattern: "VSCode-darwin-$(VSCODE_ARCH).zip"
+      signConfigType: inlineSignParams
+      inlineOperation: |
+        [
+          {
+            "keyCode": "CP-401337-Apple",
+            "operationSetCode": "MacAppNotarize",
+            "parameters": [
+              {
+                "parameterName": "BundleId",
+                "parameterValue": "$(BundleIdentifier)"
+              }
+            ],
+            "toolName": "sign",
+            "toolVersion": "1.0"
+          }
+        ]
+      SessionTimeout: 60
+    displayName: Notarization
+
+  - script: |
+      set -e
+      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
+      "$APP_ROOT/$APP_NAME/Contents/Resources/app/bin/code" --export-default-configuration=.build
+    displayName: Verify start after signing (export configuration)
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
+
+  - script: |
+      set -e
+
+      # For legacy purposes, arch for x64 is just 'darwin'
+      case $VSCODE_ARCH in
+        x64) ASSET_ID="darwin" ;;
+        arm64) ASSET_ID="darwin-arm64" ;;
+        universal) ASSET_ID="darwin-universal" ;;
+      esac
+
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+      AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
+      AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
+      node build/azure-pipelines/common/createAsset.js \
+        "$ASSET_ID" \
+        archive \
+        "VSCode-$ASSET_ID.zip" \
+        ../VSCode-darwin-$(VSCODE_ARCH).zip
+    displayName: Publish Clients
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -1,7 +1,7 @@
 steps:
  - task: NodeTool@0
    inputs:
-      versionSpec: "12.18.3"
+      versionSpec: "14.x"

  - task: AzureKeyVault@1
    displayName: "Azure Key Vault: Get Secrets"
@@ -22,6 +22,8 @@ steps:
    displayName: Extract compilation output
    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))

+  # Set up the credentials to retrieve distro repo and setup git persona
+  # to create a merge commit for when we merge distro into oss
  - script: |
      set -e
      cat << EOF > ~/.netrc
@@ -71,6 +73,7 @@ steps:
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

  - script: |
+      set -e
      npx https://aka.ms/enablesecurefeed standAlone
    timeoutInMinutes: 5
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
@@ -80,6 +83,7 @@ steps:
      set -e
      export npm_config_arch=$(VSCODE_ARCH)
      export npm_config_node_gyp=$(which node-gyp)
+      export npm_config_build_from_source=true
      export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk

      for i in {1..3}; do # try 3 times, for Terrapin
@@ -104,30 +108,7 @@ steps:
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
    displayName: Create node_modules archive

-  - script: |
-      set -e
-      export npm_config_arch=$(VSCODE_ARCH)
-      export npm_config_node_gyp=$(which node-gyp)
-      export npm_config_build_from_source=true
-      export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
-      ls /Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
-      yarn electron-rebuild
-      # remove once https://github.com/prebuild/prebuild-install/pull/140 is merged and found in keytar
-      cd ./node_modules/keytar
-      node-gyp rebuild
-    displayName: Rebuild native modules for ARM64
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64'))
-
-  - download: current
-    artifact: vscode-darwin-x64
-    displayName: Download x64 artifact
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
-
-  - download: current
-    artifact: vscode-darwin-arm64
-    displayName: Download arm64 artifact
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
-
+  # This script brings in the right resources (images, icons, etc) based on the quality (insiders, stable, exploration)
  - script: |
      set -e
      node build/azure-pipelines/mixin
@@ -137,7 +118,7 @@ steps:
      set -e
      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
        yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
-    displayName: Build
+    displayName: Build client
    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))

  - script: |
@@ -149,14 +130,6 @@ steps:
    displayName: Build Server
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))

-  - script: |
-      set -e
-      unzip $(Pipeline.Workspace)/vscode-darwin-x64/VSCode-darwin-x64.zip -d $(agent.builddirectory)/vscode-x64
-      unzip $(Pipeline.Workspace)/vscode-darwin-arm64/VSCode-darwin-arm64.zip -d $(agent.builddirectory)/vscode-arm64
-      DEBUG=* node build/darwin/create-universal-app.js
-    displayName: Create Universal App
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
-
  - script: |
      set -e
      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
@@ -164,6 +137,29 @@ steps:
    displayName: Download Electron and Playwright
    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

+  - download: current
+    artifact: vscode-darwin-x64
+    displayName: Download x64 artifact
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
+
+  - download: current
+    artifact: vscode-darwin-arm64
+    displayName: Download arm64 artifact
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
+
+  - script: |
+      set -e
+      cp $(Pipeline.Workspace)/vscode-darwin-x64/VSCode-darwin-x64.zip $(agent.builddirectory)/VSCode-darwin-x64.zip
+      cp $(Pipeline.Workspace)/vscode-darwin-arm64/VSCode-darwin-arm64.zip $(agent.builddirectory)/VSCode-darwin-arm64.zip
+      unzip $(agent.builddirectory)/VSCode-darwin-x64.zip -d $(agent.builddirectory)/VSCode-darwin-x64
+      unzip $(agent.builddirectory)/VSCode-darwin-arm64.zip -d $(agent.builddirectory)/VSCode-darwin-arm64
+      DEBUG=* node build/darwin/create-universal-app.js
+    displayName: Create Universal App
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
+
+  # Setting hardened entitlements is a requirement for:
+  # * Apple notarization
+  # * Running tests on Big Sur (because Big Sur has additional security precautions)
  - script: |
      set -e
      security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
@@ -172,22 +168,21 @@ steps:
      echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
      security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
      security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
-      VSCODE_ARCH="$(VSCODE_ARCH)" DEBUG=electron-osx-sign* node build/darwin/sign.js
+      VSCODE_ARCH=$(VSCODE_ARCH) DEBUG=electron-osx-sign* node build/darwin/sign.js
    displayName: Set Hardened Entitlements
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))

  - script: |
      set -e
      ./scripts/test.sh --build --tfs "Unit Tests"
    displayName: Run unit tests (Electron)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 7
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
      set -e
      yarn test-browser --build --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests"
    displayName: Run unit tests (Browser)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 7
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
@@ -215,7 +210,7 @@ steps:
      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
      ./resources/server/test/test-web-integration.sh --browser webkit
    displayName: Run integration tests (Browser)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 10
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
@@ -226,7 +221,7 @@ steps:
      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
      ./resources/server/test/test-remote-integration.sh
    displayName: Run remote integration tests (Electron)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 7
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
@@ -283,91 +278,19 @@ steps:
    displayName: Archive build
    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))

-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    inputs:
-      ConnectedServiceName: "ESRP CodeSign"
-      FolderPath: "$(agent.builddirectory)"
-      Pattern: "VSCode-darwin-$(VSCODE_ARCH).zip"
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-401337-Apple",
-            "operationSetCode": "MacAppDeveloperSign",
-            "parameters": [
-              {
-                "parameterName": "Hardening",
-                "parameterValue": "--options=runtime"
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 60
-    displayName: Codesign
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - script: |
-      zip -d $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip "*.pkg"
-    displayName: Clean
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - script: |
-      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-      APP_NAME="`ls $APP_ROOT | head -n 1`"
-      BUNDLE_IDENTIFIER=$(node -p "require(\"$APP_ROOT/$APP_NAME/Contents/Resources/app/product.json\").darwinBundleIdentifier")
-      echo "##vso[task.setvariable variable=BundleIdentifier]$BUNDLE_IDENTIFIER"
-    displayName: Export bundle identifier
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
-    inputs:
-      ConnectedServiceName: "ESRP CodeSign"
-      FolderPath: "$(agent.builddirectory)"
-      Pattern: "VSCode-darwin-$(VSCODE_ARCH).zip"
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-          {
-            "keyCode": "CP-401337-Apple",
-            "operationSetCode": "MacAppNotarize",
-            "parameters": [
-              {
-                "parameterName": "BundleId",
-                "parameterValue": "$(BundleIdentifier)"
-              }
-            ],
-            "toolName": "sign",
-            "toolVersion": "1.0"
-          }
-        ]
-      SessionTimeout: 60
-    displayName: Notarization
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - script: |
-      set -e
-      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-      APP_NAME="`ls $APP_ROOT | head -n 1`"
-      "$APP_ROOT/$APP_NAME/Contents/Resources/app/bin/code" --export-default-configuration=.build
-    displayName: Verify start after signing (export configuration)
-    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'), ne(variables['VSCODE_PUBLISH'], 'false'))
-
  - script: |
      set -e
      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
      AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
      AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-      VSCODE_ARCH="$(VSCODE_ARCH)" \
-      ./build/azure-pipelines/darwin/publish.sh
-    displayName: Publish
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+      VSCODE_ARCH="$(VSCODE_ARCH)" ./build/azure-pipelines/darwin/publish-server.sh
+    displayName: Publish Servers
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))

  - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
    artifact: vscode-darwin-$(VSCODE_ARCH)
-    displayName: Publish archive
+    displayName: Publish client archive
    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))

  - publish: $(Agent.BuildDirectory)/vscode-server-darwin.zip
@@ -385,9 +308,5 @@ steps:
      VSCODE_ARCH="$(VSCODE_ARCH)" \
      yarn gulp upload-vscode-configuration
    displayName: Upload configuration (for Bing settings search)
-    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false'))
-    continueOnError: true
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: "Component Detection"
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
    continueOnError: true
--- a/build/azure-pipelines/darwin/publish-server.sh
+++ b/build/azure-pipelines/darwin/publish-server.sh
@@ -1,20 +1,6 @@
 #!/usr/bin/env bash
 set -e

-# Publish DEB
-case $VSCODE_ARCH in
-	x64) ASSET_ID="darwin" ;;
-	arm64) ASSET_ID="darwin-arm64" ;;
-	universal) ASSET_ID="darwin-universal" ;;
-esac
-
-# publish the build
-node build/azure-pipelines/common/createAsset.js \
-	"$ASSET_ID" \
-	archive \
-	"VSCode-$ASSET_ID.zip" \
-	../VSCode-darwin-$VSCODE_ARCH.zip
-
 if [ "$VSCODE_ARCH" == "x64" ]; then
 	# package Remote Extension Host
 	pushd .. && mv vscode-reh-darwin vscode-server-darwin && zip -Xry vscode-server-darwin.zip vscode-server-darwin && popd
--- a/build/azure-pipelines/distro-build.yml
+++ b/build/azure-pipelines/distro-build.yml
@@ -3,39 +3,39 @@ pool:

 trigger:
  branches:
-    include: ['main', 'release/*']
+    include: ["main", "release/*"]
 pr:
  branches:
-    include: ['main', 'release/*']
+    include: ["main", "release/*"]

 steps:
  - task: NodeTool@0
    inputs:
-      versionSpec: "12.18.3"
+      versionSpec: "14.x"

- task: AzureKeyVault@1
-  displayName: 'Azure Key Vault: Get Secrets'
-  inputs:
-    azureSubscription: 'azuredatastudio-adointegration'
-    KeyVaultName: ado-secrets
+  - task: AzureKeyVault@1
+    displayName: "Azure Key Vault: Get Secrets"
+    inputs:
+      azureSubscription: "vscode-builds-subscription"
+      KeyVaultName: vscode

  - script: |
      set -e

-    cat << EOF > ~/.netrc
-    machine github.com
-    login azuredatastudio
-    password $(github-distro-mixin-password)
-    EOF
+      cat << EOF > ~/.netrc
+      machine github.com
+      login vscode
+      password $(github-distro-mixin-password)
+      EOF

-    git config user.email "sqltools@service.microsoft.com"
-    git config user.name "AzureDataStudio"
+      git config user.email "vscode@microsoft.com"
+      git config user.name "VSCode"

-    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
-    git fetch distro
+      git remote add distro "https://github.com/$VSCODE_MIXIN_REPO.git"
+      git fetch distro

-    # Push main branch into oss/master
-    git push distro origin/main:refs/heads/oss/master
+      # Push main branch into oss/main
+      git push distro origin/main:refs/heads/oss/main

      # Push every release branch into oss/release
      git for-each-ref --format="%(refname:short)" refs/remotes/origin/release/* | sed 's/^origin\/\(.*\)$/\0:refs\/heads\/oss\/\1/' | xargs git push distro
--- a/build/azure-pipelines/exploration-build.yml
+++ b/build/azure-pipelines/exploration-build.yml
@@ -11,7 +11,7 @@ pr:
 steps:
  - task: NodeTool@0
    inputs:
-      versionSpec: "12.18.3"
+      versionSpec: "14.x"

  - task: AzureKeyVault@1
    displayName: "Azure Key Vault: Get Secrets"
@@ -31,10 +31,10 @@ steps:
      git config user.email "vscode@microsoft.com"
      git config user.name "VSCode"

-      git checkout origin/electron-11.x.y
-      git merge origin/master
+      git checkout origin/electron-12.x.y
+      git merge origin/main

-      # Push master branch into exploration branch
-      git push origin HEAD:electron-11.x.y
+      # Push main branch into exploration branch
+      git push origin HEAD:electron-12.x.y

    displayName: Sync & Merge Exploration
--- a/build/azure-pipelines/linux/product-build-alpine.yml
+++ b/build/azure-pipelines/linux/product-build-alpine.yml
@@ -1,7 +1,7 @@
 steps:
  - task: NodeTool@0
    inputs:
-      versionSpec: "12.18.3"
+      versionSpec: "14.x"

  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
    inputs:
@@ -69,6 +69,7 @@ steps:
    displayName: Extract node_modules cache

  - script: |
+      set -e
      npx https://aka.ms/enablesecurefeed standAlone
    timeoutInMinutes: 5
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
@@ -132,7 +133,3 @@ steps:
    artifact: vscode-server-linux-alpine-web
    displayName: Publish web server archive
    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: "Component Detection"
-    continueOnError: true
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -1,7 +1,7 @@
 steps:
  - task: NodeTool@0
    inputs:
-      versionSpec: "12.18.3"
+      versionSpec: "14.x"

  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
    inputs:
@@ -61,12 +61,6 @@ steps:

  - script: |
      set -e
-      npm install -g node-gyp@latest
-      node-gyp --version
-    displayName: Update node-gyp
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['VSCODE_ARCH'], 'x64'))
-
-  - script: |
      npx https://aka.ms/enablesecurefeed standAlone
    timeoutInMinutes: 5
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
@@ -85,7 +79,6 @@ steps:
      if [ "$VSCODE_ARCH" == "x64" ]; then
        export VSCODE_REMOTE_CC=$(which gcc-4.8)
        export VSCODE_REMOTE_CXX=$(which g++-4.8)
-        export VSCODE_REMOTE_NODE_GYP=$(which node-gyp)
      fi

      for i in {1..3}; do # try 3 times, for Terrapin
@@ -96,10 +89,6 @@ steps:
        fi
        echo "Yarn failed $i, trying again..."
      done
-
-      # remove once https://github.com/prebuild/prebuild-install/pull/140 is merged and found in keytar
-      cd ./node_modules/keytar
-      npx node-gyp rebuild
    env:
      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
@@ -144,14 +133,14 @@ steps:
      set -e
      DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
    displayName: Run unit tests (Electron)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 7
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
      set -e
      DISPLAY=:10 yarn test-browser --build --browser chromium --tfs "Browser Unit Tests"
    displayName: Run unit tests (Browser)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 7
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
@@ -180,7 +169,7 @@ steps:
      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \
      DISPLAY=:10 ./resources/server/test/test-web-integration.sh --browser chromium
    displayName: Run integration tests (Browser)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 10
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - script: |
@@ -192,7 +181,7 @@ steps:
      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
      DISPLAY=:10 ./resources/server/test/test-remote-integration.sh
    displayName: Run remote integration tests (Electron)
-    timeoutInMinutes: 5
+    timeoutInMinutes: 7
    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

  - task: PublishPipelineArtifact@0
@@ -286,7 +275,3 @@ steps:
      artifactName: "snap-$(VSCODE_ARCH)"
      targetPath: .build/linux/snap-tarball
    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: "Component Detection"
-    continueOnError: true
--- a/build/azure-pipelines/linux/snap-build-linux.yml
+++ b/build/azure-pipelines/linux/snap-build-linux.yml
@@ -1,7 +1,7 @@
 steps:
  - task: NodeTool@0
    inputs:
-      versionSpec: "12.18.3"
+      versionSpec: "14.x"

  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
    inputs:
@@ -48,7 +48,7 @@ steps:
        x64) SNAPCRAFT_TARGET_ARGS="" ;;
        *) SNAPCRAFT_TARGET_ARGS="--target-arch $(VSCODE_ARCH)" ;;
      esac
-      (cd $SNAP_ROOT/code-* && sudo --preserve-env snapcraft snap $SNAPCRAFT_TARGET_ARGS --output "$SNAP_PATH")
+      (cd $SNAP_ROOT/code-* && sudo --preserve-env snapcraft prime $SNAPCRAFT_TARGET_ARGS && snap pack prime --compression=lzo --filename="$SNAP_PATH")

      # Publish snap package
      AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -5,7 +5,7 @@ schedules:
    displayName: Mon-Fri at 7:00
    branches:
      include:
-        - master
+        - main

 parameters:
  - name: VSCODE_QUALITY
@@ -254,6 +254,15 @@ stages:
              VSCODE_ARCH: x64
            steps:
              - template: darwin/product-build-darwin.yml
+          - ${{ if ne(variables['VSCODE_PUBLISH'], 'false') }}:
+            - job: macOSSign
+              dependsOn:
+                - macOS
+              timeoutInMinutes: 90
+              variables:
+                VSCODE_ARCH: x64
+              steps:
+                - template: darwin/product-build-darwin-sign.yml

        - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}:
          - job: macOSARM64
@@ -262,6 +271,15 @@ stages:
              VSCODE_ARCH: arm64
            steps:
              - template: darwin/product-build-darwin.yml
+          - ${{ if ne(variables['VSCODE_PUBLISH'], 'false') }}:
+            - job: macOSARM64Sign
+              dependsOn:
+                - macOSARM64
+              timeoutInMinutes: 90
+              variables:
+                VSCODE_ARCH: arm64
+              steps:
+                - template: darwin/product-build-darwin-sign.yml

        - ${{ if eq(variables['VSCODE_BUILD_MACOS_UNIVERSAL'], true) }}:
          - job: macOSUniversal
@@ -273,6 +291,15 @@ stages:
              VSCODE_ARCH: universal
            steps:
              - template: darwin/product-build-darwin.yml
+          - ${{ if ne(variables['VSCODE_PUBLISH'], 'false') }}:
+            - job: macOSUniversalSign
+              dependsOn:
+                - macOSUniversal
+              timeoutInMinutes: 90
+              variables:
+                VSCODE_ARCH: universal
+              steps:
+                - template: darwin/product-build-darwin-sign.yml

  - ${{ if and(eq(variables['VSCODE_PUBLISH'], true), eq(parameters.VSCODE_COMPILE_ONLY, false)) }}:
    - stage: Mooncake
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -1,7 +1,7 @@
 steps:
  - task: NodeTool@0
    inputs:
-      versionSpec: "12.18.3"
+      versionSpec: "14.x"

  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
    inputs:
@@ -30,39 +30,41 @@ steps:
      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
    displayName: Merge distro

-  - script: |
-      npx https://aka.ms/enablesecurefeed standAlone
-    displayName: Switch to Terrapin packages
-    timeoutInMinutes: 5
-    condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true'))
-
  - script: |
      mkdir -p .build
-      echo -n $(VSCODE_ARCH) > .build/arch
-      echo -n $ENABLE_TERRAPIN > .build/terrapin
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
    displayName: Prepare yarn cache flags

-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+  # using `genericNodeModules` instead of `nodeModules` here to avoid sharing the cache with builds running inside containers
+  - task: Cache@2
    inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "npm-vscode"
+      key: 'genericNodeModules | $(Agent.OS) | .build/yarnlockhash'
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache

  - script: |
      set -e
-      export npm_config_arch=$(NPM_ARCH)
+      tar -xzf .build/node_modules_cache/cache.tgz
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache

-      if [ -z "$CC" ] || [ -z "$CXX" ]; then
-        export CC=$(which gcc-5)
-        export CXX=$(which g++-5)
-      fi
+  - script: |
+      set -e
+      npx https://aka.ms/enablesecurefeed standAlone
+    timeoutInMinutes: 5
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
+    displayName: Switch to Terrapin packages

-      if [ "$VSCODE_ARCH" == "x64" ]; then
-        export VSCODE_REMOTE_CC=$(which gcc-4.8)
-        export VSCODE_REMOTE_CXX=$(which g++-4.8)
-        export VSCODE_REMOTE_NODE_GYP=$(which node-gyp)
-      fi
+  - script: |
+      set -e
+      sudo apt update -y
+      sudo apt install -y build-essential pkg-config libx11-dev libx11-xcb-dev libxkbfile-dev libsecret-1-dev libnotify-bin
+    displayName: Install build tools
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

+  - script: |
+      set -e
      for i in {1..3}; do # try 3 times, for Terrapin
        yarn --frozen-lockfile && break
        if [ $i -eq 3 ]; then
@@ -75,14 +77,15 @@ steps:
      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
    displayName: Install dependencies
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-    inputs:
-      keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "npm-vscode"
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+  - script: |
+      set -e
+      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      mkdir -p .build/node_modules_cache
+      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive

  # Mixin must run before optimize, because the CSS loader will inline small SVGs
  - script: |
@@ -92,12 +95,8 @@ steps:

  - script: |
      set -e
-      yarn gulp compile-build
-      yarn gulp compile-extensions-build
-      yarn gulp minify-vscode
-      yarn gulp vscode-reh-linux-x64-min
-      yarn gulp vscode-reh-web-linux-x64-min
-    displayName: Compile
+      yarn npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check
+    displayName: Compile & Hygiene

  - script: |
      set -e
@@ -106,6 +105,19 @@ steps:
    displayName: Upload sourcemaps
    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))

+  - script: |
+      set -
+      ./build/azure-pipelines/common/extract-telemetry.sh
+    displayName: Extract Telemetry
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - script: |
+      set -e
+      AZURE_WEBVIEW_STORAGE_ACCESS_KEY="$(vscode-webview-storage-key)" \
+      ./build/azure-pipelines/common/publish-webview.sh
+    displayName: Publish Webview
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
  - script: |
      set -e
      VERSION=`node -p "require(\"./package.json\").version"`
@@ -125,3 +137,15 @@ steps:
      targetPath: $(Build.ArtifactStagingDirectory)/compilation.tar.gz
      artifactName: Compilation
    displayName: Publish compilation artifact
+
+  - script: |
+      set -e
+      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+        yarn download-builtin-extensions-cg
+    displayName: Built-in extensions component details
+
+  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+    displayName: "Component Detection"
+    inputs:
+      sourceScanPath: $(Build.SourcesDirectory)
+    continueOnError: true
--- a/build/azure-pipelines/publish-types/publish-types.yml
+++ b/build/azure-pipelines/publish-types/publish-types.yml
@@ -9,7 +9,7 @@ pr: none
 steps:
  - task: NodeTool@0
    inputs:
-      versionSpec: "12.18.3"
+      versionSpec: "14.x"

  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
    inputs:
@@ -61,7 +61,7 @@ steps:
      TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
      CHANNEL="G1C14HJ2F"

-      MESSAGE="DefinitelyTyped/DefinitelyTyped#vscode-types-$TAG_VERSION created. Endgame master, please open this link, examine changes and create a PR:"
+      MESSAGE="DefinitelyTyped/DefinitelyTyped#vscode-types-$TAG_VERSION created. Endgame champion, please open this link, examine changes and create a PR:"
      LINK="https://github.com/DefinitelyTyped/DefinitelyTyped/compare/vscode-types-$TAG_VERSION?quick_pull=1&body=Updating%20VS%20Code%20Extension%20API.%20See%20https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fvscode%2Fissues%2F70175%20for%20details."
      MESSAGE2="[@eamodio, @jrieken, @kmaetzel, @egamma]. Please review and merge PR to publish @types/vscode."

--- a/build/azure-pipelines/publish-types/update-types.ts
+++ b/build/azure-pipelines/publish-types/update-types.ts
@@ -72,7 +72,7 @@ function getNewFileHeader(tag: string) {
 		`/*---------------------------------------------------------------------------------------------`,
 		` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
 		` *  Licensed under the Source EULA.`,
-		` *  See https://github.com/Microsoft/vscode/blob/master/LICENSE.txt for license information.`,
+		` *  See https://github.com/Microsoft/vscode/blob/main/LICENSE.txt for license information.`,
 		` *--------------------------------------------------------------------------------------------*/`,
 		``,
 		`/**`,
--- a/build/azure-pipelines/release.yml
+++ b/build/azure-pipelines/release.yml
@@ -1,7 +1,7 @@
 steps:
  - task: NodeTool@0
    inputs:
-      versionSpec: "10.x"
+      versionSpec: "14.x"

  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
    inputs:
--- a/build/azure-pipelines/sync-mooncake.yml
+++ b/build/azure-pipelines/sync-mooncake.yml
@@ -1,7 +1,7 @@
 steps:
  - task: NodeTool@0
    inputs:
-      versionSpec: "12.18.3"
+      versionSpec: "14.x"

  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
    inputs:
--- a/build/azure-pipelines/upload-sourcemaps.js
+++ b/build/azure-pipelines/upload-sourcemaps.js
@@ -2,56 +2,54 @@
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
-
 'use strict';
-
-const path = require('path');
-const es = require('event-stream');
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
+const es = require("event-stream");
+const vfs = require("vinyl-fs");
+const util = require("../lib/util");
+// @ts-ignore
+const deps = require("../lib/dependencies");
 const azure = require('gulp-azure-storage');
-const vfs = require('vinyl-fs');
-const util = require('../lib/util');
 const root = path.dirname(path.dirname(__dirname));
 const commit = util.getVersion(root);
-
 // optionally allow to pass in explicit base/maps to upload
 const [, , base, maps] = process.argv;
-
-const fetch = function (base, maps = `${base}/**/*.map`) {
-	return vfs.src(maps, { base })
-		.pipe(es.mapSync(f => {
-			f.path = `${f.base}/core/${f.relative}`;
-			return f;
-		}));
-};
-
-function main() {
-	const sources = [];
-
-	// vscode client maps (default)
-	if (!base) {
-		const vs = fetch('out-vscode-min'); // client source-maps only
-		sources.push(vs);
-
-		const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
-		sources.push(extensionsOut);
-	}
-
-	// specific client base/maps
-	else {
-		sources.push(fetch(base, maps));
-	}
-
-	return es.merge(...sources)
-		.pipe(es.through(function (data) {
-			console.log('Uploading Sourcemap', data.relative); // debug
-			this.emit('data', data);
-		}))
-		.pipe(azure.upload({
-			account: process.env.AZURE_STORAGE_ACCOUNT,
-			key: process.env.AZURE_STORAGE_ACCESS_KEY,
-			container: 'sourcemaps',
-			prefix: commit + '/'
-		}));
+function src(base, maps = `${base}/**/*.map`) {
+    return vfs.src(maps, { base })
+        .pipe(es.mapSync((f) => {
+        f.path = `${f.base}/core/${f.relative}`;
+        return f;
+    }));
+}
+function main() {
+    const sources = [];
+    // vscode client maps (default)
+    if (!base) {
+        const vs = src('out-vscode-min'); // client source-maps only
+        sources.push(vs);
+        const productionDependencies = deps.getProductionDependencies(root);
+        const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => `./${d}/**/*.map`);
+        const nodeModules = vfs.src(productionDependenciesSrc, { base: '.' })
+            .pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore')));
+        sources.push(nodeModules);
+        const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
+        sources.push(extensionsOut);
+    }
+    // specific client base/maps
+    else {
+        sources.push(src(base, maps));
+    }
+    return es.merge(...sources)
+        .pipe(es.through(function (data) {
+        console.log('Uploading Sourcemap', data.relative); // debug
+        this.emit('data', data);
+    }))
+        .pipe(azure.upload({
+        account: process.env.AZURE_STORAGE_ACCOUNT,
+        key: process.env.AZURE_STORAGE_ACCESS_KEY,
+        container: 'sourcemaps',
+        prefix: commit + '/'
+    }));
 }
-
 main();
--- a/build/azure-pipelines/upload-sourcemaps.ts
+++ b/build/azure-pipelines/upload-sourcemaps.ts
@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as path from 'path';
+import * as es from 'event-stream';
+import * as Vinyl from 'vinyl';
+import * as vfs from 'vinyl-fs';
+import * as util from '../lib/util';
+// @ts-ignore
+import * as deps from '../lib/dependencies';
+const azure = require('gulp-azure-storage');
+
+const root = path.dirname(path.dirname(__dirname));
+const commit = util.getVersion(root);
+
+// optionally allow to pass in explicit base/maps to upload
+const [, , base, maps] = process.argv;
+
+function src(base: string, maps = `${base}/**/*.map`) {
+	return vfs.src(maps, { base })
+		.pipe(es.mapSync((f: Vinyl) => {
+			f.path = `${f.base}/core/${f.relative}`;
+			return f;
+		}));
+}
+
+function main() {
+	const sources = [];
+
+	// vscode client maps (default)
+	if (!base) {
+		const vs = src('out-vscode-min'); // client source-maps only
+		sources.push(vs);
+
+		const productionDependencies: { name: string, path: string, version: string }[] = deps.getProductionDependencies(root);
+		const productionDependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => `./${d}/**/*.map`);
+		const nodeModules = vfs.src(productionDependenciesSrc, { base: '.' })
+			.pipe(util.cleanNodeModules(path.join(root, 'build', '.moduleignore')));
+		sources.push(nodeModules);
+
+		const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
+		sources.push(extensionsOut);
+	}
+
+	// specific client base/maps
+	else {
+		sources.push(src(base, maps));
+	}
+
+	return es.merge(...sources)
+		.pipe(es.through(function (data: Vinyl) {
+			console.log('Uploading Sourcemap', data.relative); // debug
+			this.emit('data', data);
+		}))
+		.pipe(azure.upload({
+			account: process.env.AZURE_STORAGE_ACCOUNT,
+			key: process.env.AZURE_STORAGE_ACCESS_KEY,
+			container: 'sourcemaps',
+			prefix: commit + '/'
+		}));
+}
+
+main();
--- a/build/azure-pipelines/web/product-build-web.yml
+++ b/build/azure-pipelines/web/product-build-web.yml
@@ -1,7 +1,7 @@
 steps:
  - task: NodeTool@0
    inputs:
-      versionSpec: "12.18.3"
+      versionSpec: "14.x"

  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
    inputs:
@@ -60,6 +60,7 @@ steps:
    displayName: Extract node_modules cache

  - script: |
+      set -e
      npx https://aka.ms/enablesecurefeed standAlone
    timeoutInMinutes: 5
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -1,7 +1,7 @@
 steps:
  - task: NodeTool@0
    inputs:
-      versionSpec: "12.18.3"
+      versionSpec: "14.x"

  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
    inputs:
@@ -65,8 +65,10 @@ steps:
    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
    displayName: Extract node_modules cache

-  - script: |
-      npx https://aka.ms/enablesecurefeed standAlone
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      exec { npx https://aka.ms/enablesecurefeed standAlone }
    timeoutInMinutes: 5
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
    displayName: Switch to Terrapin packages
@@ -76,6 +78,7 @@ steps:
      . build/azure-pipelines/win32/retry.ps1
      $ErrorActionPreference = "Stop"
      $env:npm_config_arch="$(VSCODE_ARCH)"
+      $env:npm_config_build_from_source="true"
      $env:CHILD_CONCURRENCY="1"
      retry { exec { yarn --frozen-lockfile } }
    env:
@@ -177,7 +180,7 @@ steps:
      $ErrorActionPreference = "Stop"
      exec { $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"; .\resources\server\test\test-web-integration.bat --browser firefox }
    displayName: Run integration tests (Browser)
-    timeoutInMinutes: 7
+    timeoutInMinutes: 10
    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))

  - powershell: |
@@ -320,7 +323,3 @@ steps:
    artifact: vscode-server-win32-$(VSCODE_ARCH)-web
    displayName: Publish web server archive
    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: "Component Detection"
-    continueOnError: true
--- a/build/builtin/main.js
+++ b/build/builtin/main.js
@@ -23,7 +23,17 @@ ipcMain.handle('pickdir', async () => {
 });

 app.once('ready', () => {
-	window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true, enableWebSQL: false, nativeWindowOpen: true } });
+	window = new BrowserWindow({
+		width: 800,
+		height: 600,
+		webPreferences: {
+			nodeIntegration: true,
+			contextIsolation: false,
+			webviewTag: true,
+			enableWebSQL: false,
+			nativeWindowOpen: true
+		}
+	});
 	window.setMenuBarVisibility(false);
 	window.loadURL(url.format({ pathname: path.join(__dirname, 'index.html'), protocol: 'file:', slashes: true }));
 	// window.webContents.openDevTools();
--- a/build/darwin/create-universal-app.js
+++ b/build/darwin/create-universal-app.js
@@ -16,8 +16,8 @@ async function main() {
        throw new Error('$AGENT_BUILDDIRECTORY not set');
    }
    const appName = product.nameLong + '.app';
-    const x64AppPath = path.join(buildDir, 'vscode-x64', appName);
-    const arm64AppPath = path.join(buildDir, 'vscode-arm64', appName);
+    const x64AppPath = path.join(buildDir, 'VSCode-darwin-x64', appName);
+    const arm64AppPath = path.join(buildDir, 'VSCode-darwin-arm64', appName);
    const x64AsarPath = path.join(x64AppPath, 'Contents', 'Resources', 'app', 'node_modules.asar');
    const arm64AsarPath = path.join(arm64AppPath, 'Contents', 'Resources', 'app', 'node_modules.asar');
    const outAppPath = path.join(buildDir, `VSCode-darwin-${arch}`, appName);
@@ -33,6 +33,7 @@ async function main() {
            'Credits.rtf',
            'CodeResources',
            'fsevents.node',
+            'Info.plist', // TODO@deepak1556: regressed with 11.4.2 internal builds
            '.npmrc'
        ],
        outAppPath,
--- a/build/darwin/create-universal-app.ts
+++ b/build/darwin/create-universal-app.ts
@@ -20,8 +20,8 @@ async function main() {
 	}

 	const appName = product.nameLong + '.app';
-	const x64AppPath = path.join(buildDir, 'vscode-x64', appName);
-	const arm64AppPath = path.join(buildDir, 'vscode-arm64', appName);
+	const x64AppPath = path.join(buildDir, 'VSCode-darwin-x64', appName);
+	const arm64AppPath = path.join(buildDir, 'VSCode-darwin-arm64', appName);
 	const x64AsarPath = path.join(x64AppPath, 'Contents', 'Resources', 'app', 'node_modules.asar');
 	const arm64AsarPath = path.join(arm64AppPath, 'Contents', 'Resources', 'app', 'node_modules.asar');
 	const outAppPath = path.join(buildDir, `VSCode-darwin-${arch}`, appName);
@@ -38,6 +38,7 @@ async function main() {
 			'Credits.rtf',
 			'CodeResources',
 			'fsevents.node',
+			'Info.plist', // TODO@deepak1556: regressed with 11.4.2 internal builds
 			'.npmrc'
 		],
 		outAppPath,
--- a/build/darwin/sign.js
+++ b/build/darwin/sign.js
@@ -5,7 +5,9 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const codesign = require("electron-osx-sign");
+const fs = require("fs-extra");
 const path = require("path");
+const plist = require("plist");
 const util = require("../lib/util");
 const product = require("../../product.json");
 async function main() {
@@ -25,6 +27,7 @@ async function main() {
    const helperAppBaseName = product.nameShort;
    const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app';
    const rendererHelperAppName = helperAppBaseName + ' Helper (Renderer).app';
+    const infoPlistPath = path.resolve(appRoot, appName, 'Contents', 'Info.plist');
    const defaultOpts = {
        app: path.join(appRoot, appName),
        platform: 'darwin',
@@ -46,6 +49,14 @@ async function main() {
        } });
    const gpuHelperOpts = Object.assign(Object.assign({}, defaultOpts), { app: path.join(appFrameworkPath, gpuHelperAppName), entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-gpu-entitlements.plist'), 'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-gpu-entitlements.plist') });
    const rendererHelperOpts = Object.assign(Object.assign({}, defaultOpts), { app: path.join(appFrameworkPath, rendererHelperAppName), entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist'), 'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist') });
+    let infoPlistString = await fs.readFile(infoPlistPath, 'utf8');
+    let infoPlistJson = plist.parse(infoPlistString);
+    Object.assign(infoPlistJson, {
+        NSAppleEventsUsageDescription: 'An application in Visual Studio Code wants to use AppleScript.',
+        NSMicrophoneUsageDescription: 'An application in Visual Studio Code wants to use the Microphone.',
+        NSCameraUsageDescription: 'An application in Visual Studio Code wants to use the Camera.'
+    });
+    await fs.writeFile(infoPlistPath, plist.build(infoPlistJson), 'utf8');
    await codesign.signAsync(gpuHelperOpts);
    await codesign.signAsync(rendererHelperOpts);
    await codesign.signAsync(appOpts);
--- a/build/darwin/sign.ts
+++ b/build/darwin/sign.ts
@@ -6,7 +6,9 @@
 'use strict';

 import * as codesign from 'electron-osx-sign';
+import * as fs from 'fs-extra';
 import * as path from 'path';
+import * as plist from 'plist';
 import * as util from '../lib/util';
 import * as product from '../../product.json';

@@ -30,6 +32,7 @@ async function main(): Promise<void> {
 	const helperAppBaseName = product.nameShort;
 	const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app';
 	const rendererHelperAppName = helperAppBaseName + ' Helper (Renderer).app';
+	const infoPlistPath = path.resolve(appRoot, appName, 'Contents', 'Info.plist');

 	const defaultOpts: codesign.SignOptions = {
 		app: path.join(appRoot, appName),
@@ -68,6 +71,15 @@ async function main(): Promise<void> {
 		'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist'),
 	};

+	let infoPlistString = await fs.readFile(infoPlistPath, 'utf8');
+	let infoPlistJson = plist.parse(infoPlistString);
+	Object.assign(infoPlistJson, {
+		NSAppleEventsUsageDescription: 'An application in Visual Studio Code wants to use AppleScript.',
+		NSMicrophoneUsageDescription: 'An application in Visual Studio Code wants to use the Microphone.',
+		NSCameraUsageDescription: 'An application in Visual Studio Code wants to use the Camera.'
+	});
+	await fs.writeFile(infoPlistPath, plist.build(infoPlistJson), 'utf8');
+
 	await codesign.signAsync(gpuHelperOpts);
 	await codesign.signAsync(rendererHelperOpts);
 	await codesign.signAsync(appOpts as any);
--- a/build/filters.js
+++ b/build/filters.js
@@ -51,8 +51,10 @@ module.exports.indentationFilter = [
 	'!test/monaco/out/**',
 	'!test/smoke/out/**',
 	'!extensions/typescript-language-features/test-workspace/**',
+	'!extensions/notebook-markdown-extensions/notebook-out/**',
 	'!extensions/vscode-api-tests/testWorkspace/**',
 	'!extensions/vscode-api-tests/testWorkspace2/**',
+	'!extensions/vscode-custom-editor-tests/test-workspace/**',
 	'!build/monaco/**',
 	'!build/win32/**',

@@ -86,6 +88,8 @@ module.exports.indentationFilter = [
 	'!**/*.Dockerfile',
 	'!**/*.dockerfile',
 	'!extensions/markdown-language-features/media/*.js',
+	'!extensions/markdown-language-features/notebook-out/*.js',
+	'!extensions/notebook-markdown-extensions/notebook-out/*.js',
 	'!extensions/simple-browser/media/*.js',
 ];

@@ -115,6 +119,7 @@ module.exports.copyrightFilter = [
 	'!resources/completions/**',
 	'!extensions/configuration-editing/build/inline-allOf.ts',
 	'!extensions/markdown-language-features/media/highlight.css',
+	'!extensions/notebook-markdown-extensions/notebook-out/**',
 	'!extensions/html-language-features/server/src/modes/typescript/*',
 	'!extensions/*/server/bin/*',
 	'!src/vs/editor/test/node/classification/typescript-test.ts',
--- a/build/gulpfile.extensions.js
+++ b/build/gulpfile.extensions.js
@@ -8,6 +8,7 @@ require('events').EventEmitter.defaultMaxListeners = 100;

 const gulp = require('gulp');
 const path = require('path');
+const child_process = require('child_process');
 const nodeUtil = require('util');
 const es = require('event-stream');
 const filter = require('gulp-filter');
@@ -24,6 +25,7 @@ const ansiColors = require('ansi-colors');
 const ext = require('./lib/extensions');

 const extensionsPath = path.join(path.dirname(__dirname), 'extensions');
+
 // {{SQL CARBON EDIT}}
 const sqlLocalizedExtensions = [
 	'admin-tool-ext-win',
@@ -38,12 +40,50 @@ const sqlLocalizedExtensions = [
 	'sql-assessment',
 	'sql-database-projects'
 ];
-// {{SQL CARBON EDIT}}

+// {{SQL CARBON EDIT}} Not doing this for us right now
+// To save 250ms for each gulp startup, we are caching the result here
 const compilations = glob.sync('**/tsconfig.json', {
 	cwd: extensionsPath,
 	ignore: ['**/out/**', '**/node_modules/**']
 });
+// const compilations = [
+// 	'configuration-editing/build/tsconfig.json',
+// 	'configuration-editing/tsconfig.json',
+// 	'css-language-features/client/tsconfig.json',
+// 	'css-language-features/server/tsconfig.json',
+// 	'debug-auto-launch/tsconfig.json',
+// 	'debug-server-ready/tsconfig.json',
+// 	'emmet/tsconfig.json',
+// 	'extension-editing/tsconfig.json',
+// 	'git/tsconfig.json',
+// 	'github-authentication/tsconfig.json',
+// 	'github/tsconfig.json',
+// 	'grunt/tsconfig.json',
+// 	'gulp/tsconfig.json',
+// 	'html-language-features/client/tsconfig.json',
+// 	'html-language-features/server/tsconfig.json',
+// 	'image-preview/tsconfig.json',
+// 	'jake/tsconfig.json',
+// 	'json-language-features/client/tsconfig.json',
+// 	'json-language-features/server/tsconfig.json',
+// 	'markdown-language-features/preview-src/tsconfig.json',
+// 	'markdown-language-features/tsconfig.json',
+// 	'merge-conflict/tsconfig.json',
+// 	'microsoft-authentication/tsconfig.json',
+// 	'npm/tsconfig.json',
+// 	'php-language-features/tsconfig.json',
+// 	'search-result/tsconfig.json',
+// 	'simple-browser/tsconfig.json',
+// 	'testing-editor-contributions/tsconfig.json',
+// 	'typescript-language-features/test-workspace/tsconfig.json',
+// 	'typescript-language-features/tsconfig.json',
+// 	'vscode-api-tests/tsconfig.json',
+// 	'vscode-colorize-tests/tsconfig.json',
+// 	'vscode-custom-editor-tests/tsconfig.json',
+// 	'vscode-notebook-tests/tsconfig.json',
+// 	'vscode-test-resolver/tsconfig.json'
+// ];

 const getBaseUrl = out => `https://sqlopsbuilds.blob.core.windows.net/sourcemaps/${commit}/${out}`;

@@ -175,7 +215,50 @@ exports.watchExtensionsTask = watchExtensionsTask;
 const compileExtensionsBuildLegacyTask = task.define('compile-extensions-build-legacy', task.parallel(...tasks.map(t => t.compileBuildTask)));
 gulp.task(compileExtensionsBuildLegacyTask);

-// Azure Pipelines
+//#region Extension media
+
+// Additional projects to webpack. These typically build code for webviews
+const webpackMediaConfigFiles = [
+	'markdown-language-features/webpack.config.js',
+	'simple-browser/webpack.config.js',
+];
+
+// Additional projects to run esbuild on. These typically build code for webviews
+const esbuildMediaScripts = [
+	'markdown-language-features/esbuild.js',
+	'notebook-markdown-extensions/esbuild.js',
+];
+
+const compileExtensionMediaTask = task.define('compile-extension-media', () => buildExtensionMedia(false));
+gulp.task(compileExtensionMediaTask);
+exports.compileExtensionMediaTask = compileExtensionMediaTask;
+
+const watchExtensionMedia = task.define('watch-extension-media', () => buildExtensionMedia(true));
+gulp.task(watchExtensionMedia);
+exports.watchExtensionMedia = watchExtensionMedia;
+
+const compileExtensionMediaBuildTask = task.define('compile-extension-media-build', () => buildExtensionMedia(false, '.build/extensions'));
+gulp.task(compileExtensionMediaBuildTask);
+
+async function buildExtensionMedia(isWatch, outputRoot) {
+	const webpackConfigLocations = webpackMediaConfigFiles.map(p => {
+		return {
+			configPath: path.join(extensionsPath, p),
+			outputRoot: outputRoot ? path.join(root, outputRoot, path.dirname(p)) : undefined
+		};
+	});
+	return Promise.all([
+		webpackExtensions('webpacking extension media', isWatch, webpackConfigLocations),
+		esbuildExtensions('esbuilding extension media', isWatch, esbuildMediaScripts.map(p => ({
+			script: path.join(extensionsPath, p),
+			outputRoot: outputRoot ? path.join(root, outputRoot, path.dirname(p)) : undefined
+		}))),
+	]);
+}
+
+//#endregion
+
+//#region Azure Pipelines

 const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimraf('.build/extensions'));
 const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series(
@@ -185,10 +268,12 @@ const compileExtensionsBuildTask = task.define('compile-extensions-build', task.
 ));

 gulp.task(compileExtensionsBuildTask);
-gulp.task(task.define('extensions-ci', task.series(compileExtensionsBuildTask)));
+gulp.task(task.define('extensions-ci', task.series(compileExtensionsBuildTask, compileExtensionMediaBuildTask)));

 exports.compileExtensionsBuildTask = compileExtensionsBuildTask;

+//#endregion
+
 const compileWebExtensionsTask = task.define('compile-web', () => buildWebExtensions(false));
 gulp.task(compileWebExtensionsTask);
 exports.compileWebExtensionsTask = compileWebExtensionsTask;
@@ -198,23 +283,39 @@ gulp.task(watchWebExtensionsTask);
 exports.watchWebExtensionsTask = watchWebExtensionsTask;

 async function buildWebExtensions(isWatch) {
-	const webpack = require('webpack');
-
 	const webpackConfigLocations = await nodeUtil.promisify(glob)(
 		path.join(extensionsPath, '**', 'extension-browser.webpack.config.js'),
 		{ ignore: ['**/node_modules'] }
 	);
+	return webpackExtensions('packaging web extension', isWatch, webpackConfigLocations.map(configPath => ({ configPath })));
+}
+
+/**
+ * @param {string} taskName
+ * @param {boolean} isWatch
+ * @param {{ configPath: string, outputRoot?: boolean}} webpackConfigLocations
+ */
+async function webpackExtensions(taskName, isWatch, webpackConfigLocations) {
+	const webpack = require('webpack');

 	const webpackConfigs = [];

-	for (const webpackConfigPath of webpackConfigLocations) {
-		const configOrFnOrArray = require(webpackConfigPath);
+	for (const { configPath, outputRoot } of webpackConfigLocations) {
+		const configOrFnOrArray = require(configPath);
 		function addConfig(configOrFn) {
+			let config;
 			if (typeof configOrFn === 'function') {
-				webpackConfigs.push(configOrFn({}, {}));
+				config = configOrFn({}, {});
+				webpackConfigs.push(config);
 			} else {
-				webpackConfigs.push(configOrFn);
+				config = configOrFn;
 			}
+
+			if (outputRoot) {
+				config.output.path = path.join(outputRoot, path.relative(path.dirname(configPath), config.output.path));
+			}
+
+			webpackConfigs.push(configOrFn);
 		}
 		addConfig(configOrFnOrArray);
 	}
@@ -225,7 +326,7 @@ async function buildWebExtensions(isWatch) {
 				if (outputPath) {
 					const relativePath = path.relative(extensionsPath, outputPath).replace(/\\/g, '/');
 					const match = relativePath.match(/[^\/]+(\/server|\/client)?/);
-					fancyLog(`Finished ${ansiColors.green('packaging web extension')} ${ansiColors.cyan(match[0])} with ${stats.errors.length} errors.`);
+					fancyLog(`Finished ${ansiColors.green(taskName)} ${ansiColors.cyan(match[0])} with ${stats.errors.length} errors.`);
 				}
 				if (Array.isArray(stats.errors)) {
 					stats.errors.forEach(error => {
@@ -263,4 +364,44 @@ async function buildWebExtensions(isWatch) {
 	});
 }

+/**
+ * @param {string} taskName
+ * @param {boolean} isWatch
+ * @param {{ script: string, outputRoot?: string }}} scripts
+ */
+async function esbuildExtensions(taskName, isWatch, scripts) {
+	function reporter(/** @type {string} */ stdError, /** @type {string} */script) {
+		const matches = (stdError || '').match(/\> (.+): error: (.+)?/g);
+		fancyLog(`Finished ${ansiColors.green(taskName)} ${script} with ${matches ? matches.length : 0} errors.`);
+		for (const match of matches || []) {
+			fancyLog.error(match);
+		}
+	}

+	const tasks = scripts.map(({ script, outputRoot }) => {
+		return new Promise((resolve, reject) => {
+			const args = [script];
+			if (isWatch) {
+				args.push('--watch');
+			}
+			if (outputRoot) {
+				args.push('--outputRoot', outputRoot);
+			}
+			const proc = child_process.execFile(process.argv[0], args, {}, (error, _stdout, stderr) => {
+				if (error) {
+					return reject(error);
+				}
+				reporter(stderr, script);
+				if (stderr) {
+					return reject();
+				}
+				return resolve();
+			});
+
+			proc.stdout.on('data', (data) => {
+				fancyLog(`${ansiColors.green(taskName)}: ${data.toString('utf8')}`);
+			});
+		});
+	});
+	return Promise.all(tasks);
+}
--- a/build/gulpfile.js
+++ b/build/gulpfile.js
@@ -13,7 +13,7 @@ const util = require('./lib/util');
 const task = require('./lib/task');
 const compilation = require('./lib/compilation');
 const { monacoTypecheckTask/* , monacoTypecheckWatchTask */ } = require('./gulpfile.editor');
-const { compileExtensionsTask, watchExtensionsTask } = require('./gulpfile.extensions');
+const { compileExtensionsTask, watchExtensionsTask, compileExtensionMediaTask } = require('./gulpfile.extensions');

 // Fast compile for development time
 const compileClientTask = task.define('compile-client', task.series(util.rimraf('out'), compilation.compileTask('src', 'out', false)));
@@ -23,7 +23,7 @@ const watchClientTask = task.define('watch-client', task.series(util.rimraf('out
 gulp.task(watchClientTask);

 // All
-const compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask));
+const compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask, compileExtensionMediaTask));
 gulp.task(compileTask);

 gulp.task(task.define('watch', task.parallel(/* monacoTypecheckWatchTask, */ watchClientTask, watchExtensionsTask)));
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -51,7 +51,6 @@ const vscodeResources = [
 	'out-build/bootstrap-amd.js',
 	'out-build/bootstrap-node.js',
 	'out-build/bootstrap-window.js',
-	'out-build/paths.js',
 	'out-build/vs/**/*.{svg,png,html,jpg}',
 	'!out-build/vs/code/browser/**/*.html',
 	'!out-build/vs/editor/standalone/**/*.svg',
@@ -60,6 +59,7 @@ const vscodeResources = [
 	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}',
 	'out-build/vs/base/browser/ui/codicons/codicon/**',
 	'out-build/vs/base/parts/sandbox/electron-browser/preload.js',
+	'out-build/vs/platform/environment/node/userDataPath.js',
 	'out-build/vs/workbench/browser/media/*-theme.css',
 	'out-build/vs/workbench/contrib/debug/**/*.json',
 	'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',
@@ -233,10 +233,12 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const productionDependencies = getProductionDependencies(root);
 		const dependenciesSrc = _.flatten(productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]));

-		// {{SQL CARBON EDIT}} - fix runtime module load break
 		const deps = gulp.src(dependenciesSrc, { base: '.', dot: true })
-			.pipe(filter(['**', '!**/package-lock.json']))
+			.pipe(filter(['**', `!**/${config.version}/**`, '!**/bin/darwin-arm64-87/**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map']))
 			.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
+			.pipe(jsFilter)
+			.pipe(util.rewriteSourceMappingURL(sourceMappingURLBase))
+			.pipe(jsFilter.restore)
 			.pipe(createAsar(path.join(process.cwd(), 'node_modules'), ['**/*.node', '**/vscode-ripgrep/bin/*', '**/node-pty/build/Release/*', '**/*.wasm'], 'node_modules.asar'));

 		let all = es.merge(
@@ -271,6 +273,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			.pipe(fileLengthFilter.restore)
 			.pipe(util.skipDirectories())
 			.pipe(util.fixWin32DirectoryPermissions())
+			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
 			.pipe(electron(_.extend({}, config, { platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: true })))
 			.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version'], { dot: true }));

@@ -535,7 +538,7 @@ gulp.task(task.define(

 			if (!shouldSetupSettingsSearch()) {
 				const branch = process.env.BUILD_SOURCEBRANCH;
-				console.log(`Only runs on master and release branches, not ${branch}`);
+				console.log(`Only runs on main and release branches, not ${branch}`);
 				return;
 			}

@@ -561,21 +564,21 @@ gulp.task(task.define(

 function shouldSetupSettingsSearch() {
 	const branch = process.env.BUILD_SOURCEBRANCH;
-	return branch && (/\/master$/.test(branch) || branch.indexOf('/release/') >= 0);
+	return branch && (/\/main$/.test(branch) || branch.indexOf('/release/') >= 0);
 }

 function getSettingsSearchBuildId(packageJson) {
 	try {
 		const branch = process.env.BUILD_SOURCEBRANCH;
 		const branchId = branch.indexOf('/release/') >= 0 ? 0 :
-			/\/master$/.test(branch) ? 1 :
+			/\/main$/.test(branch) ? 1 :
 				2; // Some unexpected branch

 		const out = cp.execSync(`git rev-list HEAD --count`);
 		const count = parseInt(out.toString());

 		// <version number><commit count><branchId (avoid unlikely conflicts)>
-		// 1.25.1, 1,234,567 commits, master = 1250112345671
+		// 1.25.1, 1,234,567 commits, main = 1250112345671
 		return util.versionStringToNumber(packageJson.version) * 1e8 + count * 10 + branchId;
 	} catch (e) {
 		throw new Error('Could not determine build number: ' + e.toString());
--- a/build/lib/builtInExtensions.ts
+++ b/build/lib/builtInExtensions.ts
@@ -17,7 +17,7 @@ import { Stream } from 'stream';

 const mkdirp = require('mkdirp');

-interface IExtensionDefinition {
+export interface IExtensionDefinition {
 	name: string;
 	version: string;
 	repo: string;
--- a/build/lib/builtInExtensionsCG.js
+++ b/build/lib/builtInExtensionsCG.js
@@ -0,0 +1,79 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+const got_1 = require("got");
+const fs = require("fs");
+const path = require("path");
+const url = require("url");
+const ansiColors = require("ansi-colors");
+const root = path.dirname(path.dirname(__dirname));
+const rootCG = path.join(root, 'extensionsCG');
+const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
+const builtInExtensions = productjson.builtInExtensions;
+const webBuiltInExtensions = productjson.webBuiltInExtensions;
+const token = process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || undefined;
+const contentBasePath = 'raw.githubusercontent.com';
+const contentFileNames = ['package.json', 'package-lock.json', 'yarn.lock'];
+async function downloadExtensionDetails(extension) {
+    var _a, _b, _c;
+    const extensionLabel = `${extension.name}@${extension.version}`;
+    const repository = url.parse(extension.repo).path.substr(1);
+    const repositoryContentBaseUrl = `https://${token ? `${token}@` : ''}${contentBasePath}/${repository}/v${extension.version}`;
+    const promises = [];
+    for (const fileName of contentFileNames) {
+        promises.push(new Promise(resolve => {
+            got_1.default(`${repositoryContentBaseUrl}/${fileName}`)
+                .then(response => {
+                resolve({ fileName, body: response.rawBody });
+            })
+                .catch(error => {
+                if (error.response.statusCode === 404) {
+                    resolve({ fileName, body: undefined });
+                }
+                else {
+                    resolve({ fileName, body: null });
+                }
+            });
+        }));
+    }
+    console.log(extensionLabel);
+    const results = await Promise.all(promises);
+    for (const result of results) {
+        if (result.body) {
+            const extensionFolder = path.join(rootCG, extension.name);
+            fs.mkdirSync(extensionFolder, { recursive: true });
+            fs.writeFileSync(path.join(extensionFolder, result.fileName), result.body);
+            console.log(`  - ${result.fileName} ${ansiColors.green('✔︎')}`);
+        }
+        else if (result.body === undefined) {
+            console.log(`  - ${result.fileName} ${ansiColors.yellow('⚠️')}`);
+        }
+        else {
+            console.log(`  - ${result.fileName} ${ansiColors.red('🛑')}`);
+        }
+    }
+    // Validation
+    if (!((_a = results.find(r => r.fileName === 'package.json')) === null || _a === void 0 ? void 0 : _a.body)) {
+        // throw new Error(`The "package.json" file could not be found for the built-in extension - ${extensionLabel}`);
+    }
+    if (!((_b = results.find(r => r.fileName === 'package-lock.json')) === null || _b === void 0 ? void 0 : _b.body) &&
+        !((_c = results.find(r => r.fileName === 'yarn.lock')) === null || _c === void 0 ? void 0 : _c.body)) {
+        // throw new Error(`The "package-lock.json"/"yarn.lock" could not be found for the built-in extension - ${extensionLabel}`);
+    }
+}
+async function main() {
+    for (const extension of [...builtInExtensions, ...webBuiltInExtensions]) {
+        await downloadExtensionDetails(extension);
+    }
+}
+main().then(() => {
+    console.log(`Built-in extensions component data downloaded ${ansiColors.green('✔︎')}`);
+    process.exit(0);
+}, err => {
+    console.log(`Built-in extensions component data could not be downloaded ${ansiColors.red('🛑')}`);
+    console.error(err);
+    process.exit(1);
+});
--- a/build/lib/builtInExtensionsCG.ts
+++ b/build/lib/builtInExtensionsCG.ts
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import got from 'got';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as url from 'url';
+import ansiColors = require('ansi-colors');
+import { IExtensionDefinition } from './builtInExtensions';
+
+const root = path.dirname(path.dirname(__dirname));
+const rootCG = path.join(root, 'extensionsCG');
+const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
+const builtInExtensions = <IExtensionDefinition[]>productjson.builtInExtensions;
+const webBuiltInExtensions = <IExtensionDefinition[]>productjson.webBuiltInExtensions;
+const token = process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || undefined;
+
+const contentBasePath = 'raw.githubusercontent.com';
+const contentFileNames = ['package.json', 'package-lock.json', 'yarn.lock'];
+
+async function downloadExtensionDetails(extension: IExtensionDefinition): Promise<void> {
+	const extensionLabel = `${extension.name}@${extension.version}`;
+	const repository = url.parse(extension.repo).path!.substr(1);
+	const repositoryContentBaseUrl = `https://${token ? `${token}@` : ''}${contentBasePath}/${repository}/v${extension.version}`;
+
+	const promises = [];
+	for (const fileName of contentFileNames) {
+		promises.push(new Promise<{ fileName: string, body: Buffer | undefined | null }>(resolve => {
+			got(`${repositoryContentBaseUrl}/${fileName}`)
+				.then(response => {
+					resolve({ fileName, body: response.rawBody });
+				})
+				.catch(error => {
+					if (error.response.statusCode === 404) {
+						resolve({ fileName, body: undefined });
+					} else {
+						resolve({ fileName, body: null });
+					}
+				});
+		}));
+	}
+
+	console.log(extensionLabel);
+	const results = await Promise.all(promises);
+	for (const result of results) {
+		if (result.body) {
+			const extensionFolder = path.join(rootCG, extension.name);
+			fs.mkdirSync(extensionFolder, { recursive: true });
+			fs.writeFileSync(path.join(extensionFolder, result.fileName), result.body);
+			console.log(`  - ${result.fileName} ${ansiColors.green('✔︎')}`);
+		} else if (result.body === undefined) {
+			console.log(`  - ${result.fileName} ${ansiColors.yellow('⚠️')}`);
+		} else {
+			console.log(`  - ${result.fileName} ${ansiColors.red('🛑')}`);
+		}
+	}
+
+	// Validation
+	if (!results.find(r => r.fileName === 'package.json')?.body) {
+		// throw new Error(`The "package.json" file could not be found for the built-in extension - ${extensionLabel}`);
+	}
+	if (!results.find(r => r.fileName === 'package-lock.json')?.body &&
+		!results.find(r => r.fileName === 'yarn.lock')?.body) {
+		// throw new Error(`The "package-lock.json"/"yarn.lock" could not be found for the built-in extension - ${extensionLabel}`);
+	}
+}
+
+async function main(): Promise<void> {
+	for (const extension of [...builtInExtensions, ...webBuiltInExtensions]) {
+		await downloadExtensionDetails(extension);
+	}
+}
+
+main().then(() => {
+	console.log(`Built-in extensions component data downloaded ${ansiColors.green('✔︎')}`);
+	process.exit(0);
+}, err => {
+	console.log(`Built-in extensions component data could not be downloaded ${ansiColors.red('🛑')}`);
+	console.error(err);
+	process.exit(1);
+});
--- a/build/lib/electron.js
+++ b/build/lib/electron.js
@@ -28,7 +28,7 @@ exports.config = {
    version: util.getElectronVersion(),
    productAppName: product.nameLong,
    companyName: 'Microsoft Corporation',
-    copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
+    copyright: 'Copyright (C) 2021 Microsoft. All rights reserved',
    darwinIcon: 'resources/darwin/code.icns',
    darwinBundleIdentifier: product.darwinBundleIdentifier,
    darwinApplicationCategoryType: 'public.app-category.developer-tools',
--- a/build/lib/electron.ts
+++ b/build/lib/electron.ts
@@ -32,7 +32,7 @@ export const config = {
 	version: util.getElectronVersion(),
 	productAppName: product.nameLong,
 	companyName: 'Microsoft Corporation',
-	copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
+	copyright: 'Copyright (C) 2021 Microsoft. All rights reserved',
 	darwinIcon: 'resources/darwin/code.icns',
 	darwinBundleIdentifier: product.darwinBundleIdentifier,
 	darwinApplicationCategoryType: 'public.app-category.developer-tools',
--- a/build/lib/i18n.js
+++ b/build/lib/i18n.js
@@ -237,14 +237,14 @@ XLF.parse = function (xlfString) {
                        }
                        let val = unit.target[0];
                        if (typeof val !== 'string') {
-                            val = val._;
+                            // We allow empty source values so support them for translations as well.
+                            val = val._ ? val._ : '';
                        }
-                        if (key && val) {
-                            messages[key] = decodeEntities(val);
-                        }
-                        else {
-                            reject(new Error(`XLF parsing error: XLIFF file ${originalFilePath} does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.`));
+                        if (!key) {
+                            reject(new Error(`XLF parsing error: trans-unit ${JSON.stringify(unit, undefined, 0)} defined in file ${originalFilePath} is missing the ID attribute.`));
+                            return;
                        }
+                        messages[key] = decodeEntities(val);
                    });
                    files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() });
                }
--- a/build/lib/i18n.resources.json
+++ b/build/lib/i18n.resources.json
@@ -30,10 +30,6 @@
 			"name": "vs/workbench/api/common",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/contrib/backup",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/contrib/bulkEdit",
 			"project": "vscode-workbench"
@@ -218,6 +214,10 @@
 			"name": "vs/workbench/contrib/webviewPanel",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/workspace",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/workspaces",
 			"project": "vscode-workbench"
@@ -254,6 +254,10 @@
 			"name": "vs/workbench/services/authToken",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/backup",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/bulkEdit",
 			"project": "vscode-workbench"
@@ -294,6 +298,10 @@
 			"name": "vs/workbench/services/files",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/history",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/log",
 			"project": "vscode-workbench"
@@ -389,6 +397,10 @@
 		{
 			"name": "vs/workbench/services/gettingStarted",
 			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/services/host",
+			"project": "vscode-workbench"
 		}
 	]
 }
--- a/build/lib/i18n.ts
+++ b/build/lib/i18n.ts
@@ -339,13 +339,14 @@ export class XLF {

 							let val = unit.target[0];
 							if (typeof val !== 'string') {
-								val = val._;
+								// We allow empty source values so support them for translations as well.
+								val = val._ ? val._ : '';
 							}
-							if (key && val) {
-								messages[key] = decodeEntities(val);
-							} else {
-								reject(new Error(`XLF parsing error: XLIFF file ${originalFilePath} does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.`));
+							if (!key) {
+								reject(new Error(`XLF parsing error: trans-unit ${JSON.stringify(unit, undefined, 0)} defined in file ${originalFilePath} is missing the ID attribute.`));
+								return;
 							}
+							messages[key] = decodeEntities(val);
 						});
 						files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() });
 					}
--- a/build/lib/layersChecker.js
+++ b/build/lib/layersChecker.js
@@ -56,7 +56,9 @@ const CORE_TYPES = [
 const NATIVE_TYPES = [
    'NativeParsedArgs',
    'INativeEnvironmentService',
-    'INativeWindowConfiguration'
+    'AbstractNativeEnvironmentService',
+    'INativeWindowConfiguration',
+    'ICommonNativeHostService'
 ];
 const RULES = [
    // Tests: skip
@@ -79,19 +81,9 @@ const RULES = [
            '@types/node' // no node.js
        ]
    },
-    // Common: vs/platform/environment/common/argv.ts
+    // Common: vs/platform/environment/common/*
    {
-        target: '**/{vs,sql}/platform/environment/common/argv.ts',
-        disallowedTypes: [ /* Ignore native types that are defined from here */],
-        allowedTypes: CORE_TYPES,
-        disallowedDefinitions: [
-            'lib.dom.d.ts',
-            '@types/node' // no node.js
-        ]
-    },
-    // Common: vs/platform/environment/common/environment.ts
-    {
-        target: '**/{vs,sql}/platform/environment/common/environment.ts',
+        target: '**/{vs,sql}/platform/environment/common/*.ts',
        disallowedTypes: [ /* Ignore native types that are defined from here */],
        allowedTypes: CORE_TYPES,
        disallowedDefinitions: [
@@ -109,6 +101,16 @@ const RULES = [
            '@types/node' // no node.js
        ]
    },
+    // Common: vs/platform/native/common/native.ts
+    {
+        target: '**/vs/platform/native/common/native.ts',
+        disallowedTypes: [ /* Ignore native types that are defined from here */],
+        allowedTypes: CORE_TYPES,
+        disallowedDefinitions: [
+            'lib.dom.d.ts',
+            '@types/node' // no node.js
+        ]
+    },
    // Common: vs/workbench/api/common/extHostExtensionService.ts
    {
        target: '**/{vs,sql}/workbench/api/common/extHostExtensionService.ts',
@@ -197,7 +199,7 @@ const RULES = [
        ]
    }
 ];
-const TS_CONFIG_PATH = path_1.join(__dirname, '../../', 'src', 'tsconfig.json');
+const TS_CONFIG_PATH = (0, path_1.join)(__dirname, '../../', 'src', 'tsconfig.json');
 let hasErrors = false;
 function checkFile(program, sourceFile, rule) {
    checkNode(sourceFile);
@@ -248,8 +250,8 @@ function checkFile(program, sourceFile, rule) {
 }
 function createProgram(tsconfigPath) {
    const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
-    const configHostParser = { fileExists: fs_1.existsSync, readDirectory: ts.sys.readDirectory, readFile: file => fs_1.readFileSync(file, 'utf8'), useCaseSensitiveFileNames: process.platform === 'linux' };
-    const tsConfigParsed = ts.parseJsonConfigFileContent(tsConfig.config, configHostParser, path_1.resolve(path_1.dirname(tsconfigPath)), { noEmit: true });
+    const configHostParser = { fileExists: fs_1.existsSync, readDirectory: ts.sys.readDirectory, readFile: file => (0, fs_1.readFileSync)(file, 'utf8'), useCaseSensitiveFileNames: process.platform === 'linux' };
+    const tsConfigParsed = ts.parseJsonConfigFileContent(tsConfig.config, configHostParser, (0, path_1.resolve)((0, path_1.dirname)(tsconfigPath)), { noEmit: true });
    const compilerHost = ts.createCompilerHost(tsConfigParsed.options, true);
    return ts.createProgram(tsConfigParsed.fileNames, tsConfigParsed.options, compilerHost);
 }
@@ -259,7 +261,7 @@ function createProgram(tsconfigPath) {
 const program = createProgram(TS_CONFIG_PATH);
 for (const sourceFile of program.getSourceFiles()) {
    for (const rule of RULES) {
-        if (minimatch_1.match([sourceFile.fileName], rule.target).length > 0) {
+        if ((0, minimatch_1.match)([sourceFile.fileName], rule.target).length > 0) {
            if (!rule.skip) {
                checkFile(program, sourceFile, rule);
            }
--- a/build/lib/layersChecker.ts
+++ b/build/lib/layersChecker.ts
@@ -58,7 +58,9 @@ const CORE_TYPES = [
 const NATIVE_TYPES = [
 	'NativeParsedArgs',
 	'INativeEnvironmentService',
-	'INativeWindowConfiguration'
+	'AbstractNativeEnvironmentService',
+	'INativeWindowConfiguration',
+	'ICommonNativeHostService'
 ];

 const RULES = [
@@ -86,20 +88,9 @@ const RULES = [
 		]
 	},

-	// Common: vs/platform/environment/common/argv.ts
+	// Common: vs/platform/environment/common/*
 	{
-		target: '**/{vs,sql}/platform/environment/common/argv.ts',
-		disallowedTypes: [/* Ignore native types that are defined from here */],
-		allowedTypes: CORE_TYPES,
-		disallowedDefinitions: [
-			'lib.dom.d.ts', // no DOM
-			'@types/node'	// no node.js
-		]
-	},
-
-	// Common: vs/platform/environment/common/environment.ts
-	{
-		target: '**/{vs,sql}/platform/environment/common/environment.ts',
+		target: '**/{vs,sql}/platform/environment/common/*.ts',
 		disallowedTypes: [/* Ignore native types that are defined from here */],
 		allowedTypes: CORE_TYPES,
 		disallowedDefinitions: [
@@ -119,6 +110,17 @@ const RULES = [
 		]
 	},

+	// Common: vs/platform/native/common/native.ts
+	{
+		target: '**/vs/platform/native/common/native.ts',
+		disallowedTypes: [/* Ignore native types that are defined from here */],
+		allowedTypes: CORE_TYPES,
+		disallowedDefinitions: [
+			'lib.dom.d.ts', // no DOM
+			'@types/node'	// no node.js
+		]
+	},
+
 	// Common: vs/workbench/api/common/extHostExtensionService.ts
 	{
 		target: '**/{vs,sql}/workbench/api/common/extHostExtensionService.ts',
--- a/build/lib/rollup.js
+++ b/build/lib/rollup.js
@@ -1,89 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rollupAngular = void 0;
-const fs = require("fs");
-const rollup = require("rollup");
-const path = require("path");
-// getting around stupid import rules
-const nodeResolve = require('rollup-plugin-node-resolve');
-const commonjs = require('rollup-plugin-commonjs');
-async function rollupModule(options) {
-    const moduleName = options.moduleName;
-    try {
-        const inputFile = options.inputFile;
-        const outputDirectory = options.outputDirectory;
-        await fs.promises.mkdir(outputDirectory, {
-            recursive: true
-        });
-        const outputFileName = options.outputFileName;
-        const outputMapName = `${outputFileName}.map`;
-        const external = options.external || [];
-        const outputFilePath = path.resolve(outputDirectory, outputFileName);
-        const outputMapPath = path.resolve(outputDirectory, outputMapName);
-        const bundle = await rollup.rollup({
-            input: inputFile,
-            plugins: [
-                nodeResolve(),
-                commonjs(),
-            ],
-            external,
-        });
-        const generatedBundle = await bundle.generate({
-            name: moduleName,
-            format: 'umd',
-            sourcemap: true
-        });
-        const result = generatedBundle.output[0];
-        result.code = result.code + '\n//# sourceMappingURL=' + path.basename(outputMapName);
-        await fs.promises.writeFile(outputFilePath, result.code);
-        await fs.promises.writeFile(outputMapPath, result.map);
-        return {
-            name: moduleName,
-            result: true
-        };
-    }
-    catch (ex) {
-        return {
-            name: moduleName,
-            result: false,
-            exception: ex
-        };
-    }
-}
-function rollupAngular(root) {
-    return new Promise(async (resolve, reject) => {
-        const modules = ['core', 'animations', 'common', 'compiler', 'forms', 'platform-browser', 'platform-browser-dynamic', 'router'];
-        const tasks = modules.map((module) => {
-            return rollupModule({
-                moduleName: `ng.${module}`,
-                inputFile: path.resolve(root, 'node_modules', '@angular', module, '@angular', `${module}.es5.js`),
-                outputDirectory: path.resolve(root, 'node_modules', '@angular', module, 'bundles'),
-                outputFileName: `${module}.umd.js`,
-                external: modules.map(mn => `@angular/${mn}`)
-            });
-        });
-        // array of booleans
-        const x = await Promise.all(tasks);
-        const result = x.reduce((prev, current) => {
-            if (!current.result) {
-                prev.fails.push(current.name);
-                prev.exceptions.push(current.exception);
-                prev.result = false;
-            }
-            return prev;
-        }, {
-            fails: [],
-            exceptions: [],
-            result: true,
-        });
-        if (!result.result) {
-            return reject(`failures: ${result.fails} - exceptions: ${JSON.stringify(result.exceptions)}`);
-        }
-        resolve();
-    });
-}
-exports.rollupAngular = rollupAngular;
--- a/build/lib/rollup.ts
+++ b/build/lib/rollup.ts
@@ -1,109 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as fs from 'fs';
-import * as rollup from 'rollup';
-import * as path from 'path';
-
-// getting around stupid import rules
-const nodeResolve = require('rollup-plugin-node-resolve');
-const commonjs = require('rollup-plugin-commonjs');
-
-export interface IRollupOptions {
-	moduleName: string;
-	inputFile: string;
-	outputDirectory: string;
-	outputFileName: string;
-	external?: string[];
-}
-
-async function rollupModule(options: IRollupOptions) {
-	const moduleName = options.moduleName;
-	try {
-		const inputFile = options.inputFile;
-		const outputDirectory = options.outputDirectory;
-
-		await fs.promises.mkdir(outputDirectory, {
-			recursive: true
-		});
-
-		const outputFileName = options.outputFileName;
-		const outputMapName = `${outputFileName}.map`;
-		const external = options.external || [];
-
-		const outputFilePath = path.resolve(outputDirectory, outputFileName);
-		const outputMapPath = path.resolve(outputDirectory, outputMapName);
-
-		const bundle = await rollup.rollup({
-			input: inputFile,
-			plugins: [
-				nodeResolve(),
-				commonjs(),
-			],
-			external,
-		});
-
-		const generatedBundle = await bundle.generate({
-			name: moduleName,
-			format: 'umd',
-			sourcemap: true
-		});
-
-		const result = generatedBundle.output[0];
-		result.code = result.code + '\n//# sourceMappingURL=' + path.basename(outputMapName);
-
-		await fs.promises.writeFile(outputFilePath, result.code);
-		await fs.promises.writeFile(outputMapPath, result.map);
-
-		return {
-			name: moduleName,
-			result: true
-		};
-	} catch (ex) {
-		return {
-			name: moduleName,
-			result: false,
-			exception: ex
-		};
-	}
-}
-
-export function rollupAngular(root: string): Promise<void> {
-	return new Promise(async (resolve, reject) => {
-
-		const modules = ['core', 'animations', 'common', 'compiler', 'forms', 'platform-browser', 'platform-browser-dynamic', 'router'];
-		const tasks = modules.map((module) => {
-			return rollupModule({
-				moduleName: `ng.${module}`,
-				inputFile: path.resolve(root, 'node_modules', '@angular', module, '@angular', `${module}.es5.js`),
-				outputDirectory: path.resolve(root, 'node_modules', '@angular', module, 'bundles'),
-				outputFileName: `${module}.umd.js`,
-				external: modules.map(mn => `@angular/${mn}`)
-			});
-		});
-
-		// array of booleans
-		const x = await Promise.all(tasks);
-
-		const result = x.reduce<{ fails: string[]; exceptions: string[]; result: boolean }>((prev, current) => {
-			if (!current.result) {
-				prev.fails.push(current.name);
-				prev.exceptions.push(current.exception);
-				prev.result = false;
-			}
-			return prev;
-		}, {
-			fails: [],
-			exceptions: [],
-			result: true,
-		});
-
-		if (!result.result) {
-			return reject(`failures: ${result.fails} - exceptions: ${JSON.stringify(result.exceptions)}`);
-		}
-		resolve();
-	});
-
-}
--- a/build/lib/test/i18n.test.js
+++ b/build/lib/test/i18n.test.js
@@ -21,20 +21,20 @@ suite('XLF Parser Tests', () => {
    });
    test('XLF to keys & messages conversion', () => {
        i18n.XLF.parse(sampleTranslatedXlf).then(function (resolvedFiles) {
-            assert.deepEqual(resolvedFiles[0].messages, translatedMessages);
+            assert.deepStrictEqual(resolvedFiles[0].messages, translatedMessages);
            assert.strictEqual(resolvedFiles[0].originalFilePath, originalFilePath);
        });
    });
    test('JSON file source path to Transifex resource match', () => {
        const editorProject = 'vscode-editor', workbenchProject = 'vscode-workbench';
        const platform = { name: 'vs/platform', project: editorProject }, editorContrib = { name: 'vs/editor/contrib', project: editorProject }, editor = { name: 'vs/editor', project: editorProject }, base = { name: 'vs/base', project: editorProject }, code = { name: 'vs/code', project: workbenchProject }, workbenchParts = { name: 'vs/workbench/contrib/html', project: workbenchProject }, workbenchServices = { name: 'vs/workbench/services/textfile', project: workbenchProject }, workbench = { name: 'vs/workbench', project: workbenchProject };
-        assert.deepEqual(i18n.getResource('vs/platform/actions/browser/menusExtensionPoint'), platform);
-        assert.deepEqual(i18n.getResource('vs/editor/contrib/clipboard/browser/clipboard'), editorContrib);
-        assert.deepEqual(i18n.getResource('vs/editor/common/modes/modesRegistry'), editor);
-        assert.deepEqual(i18n.getResource('vs/base/common/errorMessage'), base);
-        assert.deepEqual(i18n.getResource('vs/code/electron-main/window'), code);
-        assert.deepEqual(i18n.getResource('vs/workbench/contrib/html/browser/webview'), workbenchParts);
-        assert.deepEqual(i18n.getResource('vs/workbench/services/textfile/node/testFileService'), workbenchServices);
-        assert.deepEqual(i18n.getResource('vs/workbench/browser/parts/panel/panelActions'), workbench);
+        assert.deepStrictEqual(i18n.getResource('vs/platform/actions/browser/menusExtensionPoint'), platform);
+        assert.deepStrictEqual(i18n.getResource('vs/editor/contrib/clipboard/browser/clipboard'), editorContrib);
+        assert.deepStrictEqual(i18n.getResource('vs/editor/common/modes/modesRegistry'), editor);
+        assert.deepStrictEqual(i18n.getResource('vs/base/common/errorMessage'), base);
+        assert.deepStrictEqual(i18n.getResource('vs/code/electron-main/window'), code);
+        assert.deepStrictEqual(i18n.getResource('vs/workbench/contrib/html/browser/webview'), workbenchParts);
+        assert.deepStrictEqual(i18n.getResource('vs/workbench/services/textfile/node/testFileService'), workbenchServices);
+        assert.deepStrictEqual(i18n.getResource('vs/workbench/browser/parts/panel/panelActions'), workbench);
    });
 });
--- a/build/lib/test/i18n.test.ts
+++ b/build/lib/test/i18n.test.ts
@@ -23,8 +23,8 @@ suite('XLF Parser Tests', () => {
 	});

 	test('XLF to keys & messages conversion', () => {
-		i18n.XLF.parse(sampleTranslatedXlf).then(function(resolvedFiles) {
-			assert.deepEqual(resolvedFiles[0].messages, translatedMessages);
+		i18n.XLF.parse(sampleTranslatedXlf).then(function (resolvedFiles) {
+			assert.deepStrictEqual(resolvedFiles[0].messages, translatedMessages);
 			assert.strictEqual(resolvedFiles[0].originalFilePath, originalFilePath);
 		});
 	});
@@ -40,15 +40,15 @@ suite('XLF Parser Tests', () => {
 			code = { name: 'vs/code', project: workbenchProject },
 			workbenchParts = { name: 'vs/workbench/contrib/html', project: workbenchProject },
 			workbenchServices = { name: 'vs/workbench/services/textfile', project: workbenchProject },
-			workbench = { name: 'vs/workbench', project: workbenchProject};
+			workbench = { name: 'vs/workbench', project: workbenchProject };

-		assert.deepEqual(i18n.getResource('vs/platform/actions/browser/menusExtensionPoint'), platform);
-		assert.deepEqual(i18n.getResource('vs/editor/contrib/clipboard/browser/clipboard'), editorContrib);
-		assert.deepEqual(i18n.getResource('vs/editor/common/modes/modesRegistry'), editor);
-		assert.deepEqual(i18n.getResource('vs/base/common/errorMessage'), base);
-		assert.deepEqual(i18n.getResource('vs/code/electron-main/window'), code);
-		assert.deepEqual(i18n.getResource('vs/workbench/contrib/html/browser/webview'), workbenchParts);
-		assert.deepEqual(i18n.getResource('vs/workbench/services/textfile/node/testFileService'), workbenchServices);
-		assert.deepEqual(i18n.getResource('vs/workbench/browser/parts/panel/panelActions'), workbench);
+		assert.deepStrictEqual(i18n.getResource('vs/platform/actions/browser/menusExtensionPoint'), platform);
+		assert.deepStrictEqual(i18n.getResource('vs/editor/contrib/clipboard/browser/clipboard'), editorContrib);
+		assert.deepStrictEqual(i18n.getResource('vs/editor/common/modes/modesRegistry'), editor);
+		assert.deepStrictEqual(i18n.getResource('vs/base/common/errorMessage'), base);
+		assert.deepStrictEqual(i18n.getResource('vs/code/electron-main/window'), code);
+		assert.deepStrictEqual(i18n.getResource('vs/workbench/contrib/html/browser/webview'), workbenchParts);
+		assert.deepStrictEqual(i18n.getResource('vs/workbench/services/textfile/node/testFileService'), workbenchServices);
+		assert.deepStrictEqual(i18n.getResource('vs/workbench/browser/parts/panel/panelActions'), workbench);
 	});
-});
+});
--- a/build/lib/treeshaking.js
+++ b/build/lib/treeshaking.js
@@ -311,7 +311,7 @@ function markNodes(ts, languageService, options) {
            setColor(node, 0 /* White */);
            // add to black queue
            enqueue_black(node);
-            // // move from one queue to the other
+            // move from one queue to the other
            // black_queue.push(node);
            // setColor(node, NodeColor.Black);
            return;
@@ -414,8 +414,8 @@ function markNodes(ts, languageService, options) {
                setColor(symbolImportNode, 2 /* Black */);
            }
            if (symbol && !nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol)) {
-                for (let i = 0, len = symbol.declarations.length; i < len; i++) {
-                    const declaration = symbol.declarations[i];
+                for (let i = 0, len = symbol.declarations.length; i < len; i++) { // {{SQL CARBON EDIT}} Compile fixes
+                    const declaration = symbol.declarations[i]; // {{SQL CARBON EDIT}} Compile fixes
                    if (ts.isSourceFile(declaration)) {
                        // Do not enqueue full source files
                        // (they can be the declaration of a module import)
@@ -474,8 +474,8 @@ function markNodes(ts, languageService, options) {
    }
 }
 function nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol) {
-    for (let i = 0, len = symbol.declarations.length; i < len; i++) {
-        const declaration = symbol.declarations[i];
+    for (let i = 0, len = symbol.declarations.length; i < len; i++) { // {{SQL CARBON EDIT}} Compile fixes
+        const declaration = symbol.declarations[i]; // {{SQL CARBON EDIT}} Compile fixes
        const declarationSourceFile = declaration.getSourceFile();
        if (nodeSourceFile === declarationSourceFile) {
            if (declaration.pos <= node.pos && node.end <= declaration.end) {
@@ -686,11 +686,11 @@ function getRealNodeSymbol(ts, checker, node) {
    // get the aliased symbol instead. This allows for goto def on an import e.g.
    //   import {A, B} from "mod";
    // to jump to the implementation directly.
-    if (symbol && symbol.flags & ts.SymbolFlags.Alias && shouldSkipAlias(node, symbol.declarations[0])) {
+    if (symbol && symbol.flags & ts.SymbolFlags.Alias && shouldSkipAlias(node, symbol.declarations[0])) { // {{SQL CARBON EDIT}} Compile fixes
        const aliased = checker.getAliasedSymbol(symbol);
        if (aliased.declarations) {
            // We should mark the import as visited
-            importNode = symbol.declarations[0];
+            importNode = symbol.declarations[0]; // {{SQL CARBON EDIT}} Compile fixes
            symbol = aliased;
        }
    }
--- a/build/lib/treeshaking.ts
+++ b/build/lib/treeshaking.ts
@@ -410,7 +410,7 @@ function markNodes(ts: typeof import('typescript'), languageService: ts.Language
 			// add to black queue
 			enqueue_black(node);

-			// // move from one queue to the other
+			// move from one queue to the other
 			// black_queue.push(node);
 			// setColor(node, NodeColor.Black);
 			return;
@@ -531,8 +531,8 @@ function markNodes(ts: typeof import('typescript'), languageService: ts.Language
 			}

 			if (symbol && !nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol)) {
-				for (let i = 0, len = symbol.declarations.length; i < len; i++) {
-					const declaration = symbol.declarations[i];
+				for (let i = 0, len = symbol.declarations!.length; i < len; i++) { // {{SQL CARBON EDIT}} Compile fixes
+					const declaration = symbol.declarations![i]; // {{SQL CARBON EDIT}} Compile fixes
 					if (ts.isSourceFile(declaration)) {
 						// Do not enqueue full source files
 						// (they can be the declaration of a module import)
@@ -596,8 +596,8 @@ function markNodes(ts: typeof import('typescript'), languageService: ts.Language
 }

 function nodeIsInItsOwnDeclaration(nodeSourceFile: ts.SourceFile, node: ts.Node, symbol: ts.Symbol): boolean {
-	for (let i = 0, len = symbol.declarations.length; i < len; i++) {
-		const declaration = symbol.declarations[i];
+	for (let i = 0, len = symbol.declarations!.length; i < len; i++) { // {{SQL CARBON EDIT}} Compile fixes
+		const declaration = symbol.declarations![i]; // {{SQL CARBON EDIT}} Compile fixes
 		const declarationSourceFile = declaration.getSourceFile();

 		if (nodeSourceFile === declarationSourceFile) {
@@ -838,11 +838,11 @@ function getRealNodeSymbol(ts: typeof import('typescript'), checker: ts.TypeChec
 	// get the aliased symbol instead. This allows for goto def on an import e.g.
 	//   import {A, B} from "mod";
 	// to jump to the implementation directly.
-	if (symbol && symbol.flags & ts.SymbolFlags.Alias && shouldSkipAlias(node, symbol.declarations[0])) {
+	if (symbol && symbol.flags & ts.SymbolFlags.Alias && shouldSkipAlias(node, symbol.declarations![0])) { // {{SQL CARBON EDIT}} Compile fixes
 		const aliased = checker.getAliasedSymbol(symbol);
 		if (aliased.declarations) {
 			// We should mark the import as visited
-			importNode = symbol.declarations[0];
+			importNode = symbol.declarations![0]; // {{SQL CARBON EDIT}} Compile fixes
 			symbol = aliased;
 		}
 	}
--- a/build/monaco/README-npm.md
+++ b/build/monaco/README-npm.md
@@ -5,10 +5,10 @@ npm module and unless you are doing something special (e.g. authoring a monaco e
 and consumed independently), it is best to consume the [monaco-editor](https://www.npmjs.com/package/monaco-editor) module
 that contains this module and adds languages supports.

-The Monaco Editor is the code editor that powers [VS Code](https://github.com/Microsoft/vscode),
+The Monaco Editor is the code editor that powers [VS Code](https://github.com/microsoft/vscode),
 a good page describing the code editor's features is [here](https://code.visualstudio.com/docs/editor/editingevolved).

-This npm module contains the core editor functionality, as it comes from the [vscode repository](https://github.com/Microsoft/vscode).
+This npm module contains the core editor functionality, as it comes from the [vscode repository](https://github.com/microsoft/vscode).

 ## License
-[MIT](https://github.com/Microsoft/vscode/blob/master/LICENSE.txt)
+[MIT](https://github.com/microsoft/vscode/blob/main/LICENSE.txt)
--- a/build/monaco/monaco.d.ts.recipe
+++ b/build/monaco/monaco.d.ts.recipe
@@ -91,6 +91,7 @@ declare namespace monaco.languages {

 declare namespace monaco.worker {

+#include(vs/editor/common/model/mirrorTextModel): IMirrorTextModel
 #includeAll(vs/editor/common/services/editorSimpleWorker;):

 }
--- a/build/monaco/package.json
+++ b/build/monaco/package.json
@@ -1,7 +1,7 @@
 {
  "name": "monaco-editor-core",
  "private": true,
-  "version": "0.22.0",
+  "version": "0.23.0",
  "description": "A browser based code editor",
  "author": "Microsoft Corporation",
  "license": "MIT",
--- a/build/npm/dirs.js
+++ b/build/npm/dirs.js
@@ -17,7 +17,6 @@ exports.dirs = [
 	'extensions/emmet',
 	'extensions/extension-editing',
 	'extensions/git',
-	'extensions/git-ui',
 	'extensions/github',
 	'extensions/github-authentication',
 	'extensions/grunt',
@@ -31,6 +30,7 @@ exports.dirs = [
 	'extensions/markdown-language-features',
 	'extensions/merge-conflict',
 	'extensions/microsoft-authentication',
+	'extensions/notebook-markdown-extensions',
 	'extensions/npm',
 	'extensions/php-language-features',
 	'extensions/search-result',
--- a/build/npm/preinstall.js
+++ b/build/npm/preinstall.js
@@ -7,8 +7,8 @@ let err = false;

 const majorNodeVersion = parseInt(/^(\d+)\./.exec(process.versions.node)[1]);

-if (majorNodeVersion < 10 || majorNodeVersion >= 16) {
-	console.error('\033[1;31m*** Please use node >=10 and <=16.\033[0;0m');
+if (majorNodeVersion < 10 || majorNodeVersion >= 17) {
+	console.error('\033[1;31m*** Please use node.js versions >=10 and <=17.\033[0;0m');
 	err = true;
 }

--- a/build/package.json
+++ b/build/package.json
@@ -25,7 +25,7 @@
    "@types/minimist": "^1.2.1",
    "@types/mkdirp": "^1.0.1",
    "@types/mocha": "^8.2.0",
-    "@types/node": "^12.19.9",
+    "@types/node": "^14.14.37",
    "@types/p-limit": "^2.2.0",
    "@types/plist": "^3.0.2",
    "@types/pump": "^1.0.1",
@@ -45,16 +45,15 @@
    "esbuild": "^0.8.30",
    "fs-extra": "^9.1.0",
    "documentdb": "1.13.0",
+    "got": "11.8.1",
    "iconv-lite-umd": "0.6.8",
    "jsonc-parser": "^2.3.0",
    "mime": "^1.4.1",
    "mkdirp": "^1.0.4",
    "p-limit": "^3.1.0",
    "plist": "^3.0.1",
-    "rollup": "^1.20.3",
-    "rollup-plugin-commonjs": "^10.1.0",
-    "rollup-plugin-node-resolve": "^5.2.0",
-    "typescript": "4.2.0-dev.20201207",
+    "source-map": "0.6.1",
+    "typescript": "^4.3.0-dev.20210426",
    "vsce": "1.48.0",
    "vscode-universal": "deepak1556/universal#61454d96223b774c53cda10f72c2098c0ce02d58"
  },
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -132,6 +132,18 @@
  resolved "https://registry.yarnpkg.com/@opentelemetry/context-base/-/context-base-0.10.2.tgz#55bea904b2b91aa8a8675df9eaba5961bddb1def"
  integrity sha512-hZNKjKOYsckoOEgBziGMnBcX0M7EtstnCmwz5jZUOUYwlZ+/xxX6z3jPu1XVO2Jivk0eLfuP9GP+vFD49CMetw==

+"@sindresorhus/is@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.0.0.tgz#2ff674e9611b45b528896d820d3d7a812de2f0e4"
+  integrity sha512-FyD2meJpDPjyNQejSjvnhpgI/azsQkA4lGbuu5BQZfjvJ9cbRZXzeWL2HceCekW4lixO9JPesIIQkSoLjeJHNQ==
+
+"@szmarczak/http-timer@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.5.tgz#bfbd50211e9dfa51ba07da58a14cdfd333205152"
+  integrity sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==
+  dependencies:
+    defer-to-connect "^2.0.0"
+
 "@types/ansi-colors@^3.2.0":
  version "3.2.0"
  resolved "https://registry.yarnpkg.com/@types/ansi-colors/-/ansi-colors-3.2.0.tgz#3e4fe85d9131ce1c6994f3040bd0b25306c16a6e"
@@ -151,6 +163,16 @@
  dependencies:
    "@types/node" "*"

+"@types/cacheable-request@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.1.tgz#5d22f3dded1fd3a84c0bbeb5039a7419c2c91976"
+  integrity sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ==
+  dependencies:
+    "@types/http-cache-semantics" "*"
+    "@types/keyv" "*"
+    "@types/node" "*"
+    "@types/responselike" "*"
+
 "@types/caseless@*":
  version "0.12.1"
  resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.1.tgz#9794c69c8385d0192acc471a540d1f8e0d16218a"
@@ -294,6 +316,11 @@
    "@types/undertaker" "*"
    "@types/vinyl-fs" "*"

+"@types/http-cache-semantics@*":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz#9140779736aa2655635ee756e2467d787cfe8a2a"
+  integrity sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==
+
 "@types/js-beautify@*":
  version "1.8.0"
  resolved "https://registry.yarnpkg.com/@types/js-beautify/-/js-beautify-1.8.0.tgz#0369d3d0e1f35a6aec07cb4da2ee2bcda111367c"
@@ -309,6 +336,13 @@
  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==

+"@types/keyv@*":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.1.tgz#e45a45324fca9dab716ab1230ee249c9fb52cfa7"
+  integrity sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==
+  dependencies:
+    "@types/node" "*"
+
 "@types/mime@0.0.29":
  version "0.0.29"
  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-0.0.29.tgz#fbcfd330573b912ef59eeee14602bface630754b"
@@ -349,16 +383,16 @@
  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.51.tgz#b31d716fb8d58eeb95c068a039b9b6292817d5fb"
  integrity sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ==

-"@types/node@^12.19.9":
-  version "12.20.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.1.tgz#63d36c10e162666f0107f247cdca76542c3c7472"
-  integrity sha512-tCkE96/ZTO+cWbln2xfyvd6ngHLanvVlJ3e5BeirJ3BYI5GbAyubIrmV4JjjugDly5D9fHjOL5MNsqsCnqwW6g==
-
 "@types/node@^14.14.21":
  version "14.14.31"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.31.tgz#72286bd33d137aa0d152d47ec7c1762563d34055"
  integrity sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==

+"@types/node@^14.14.37":
+  version "14.14.37"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e"
+  integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==
+
 "@types/p-limit@^2.2.0":
  version "2.2.0"
  resolved "https://registry.yarnpkg.com/@types/p-limit/-/p-limit-2.2.0.tgz#94a608e9b258a6c6156a13d1a14fd720dba70b97"
@@ -391,10 +425,10 @@
    "@types/node" "*"
    "@types/tough-cookie" "*"

-"@types/resolve@0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
-  integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
+"@types/responselike@*", "@types/responselike@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
+  integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
  dependencies:
    "@types/node" "*"

@@ -542,11 +576,6 @@
  dependencies:
    eslint-visitor-keys "^1.1.0"

-acorn@^7.1.0:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
 ajv@^6.12.3:
  version "6.12.6"
  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
@@ -707,16 +736,29 @@ buffer-fill@^1.0.0:
  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=

-builtin-modules@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887"
-  integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
-
 byline@^5.0.0:
  version "5.0.0"
  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
  integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=

+cacheable-lookup@^5.0.3:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
+  integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
+
+cacheable-request@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.1.tgz#062031c2856232782ed694a257fa35da93942a58"
+  integrity sha512-lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw==
+  dependencies:
+    clone-response "^1.0.2"
+    get-stream "^5.1.0"
+    http-cache-semantics "^4.0.0"
+    keyv "^4.0.0"
+    lowercase-keys "^2.0.0"
+    normalize-url "^4.1.0"
+    responselike "^2.0.0"
+
 caseless@~0.12.0:
  version "0.12.0"
  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -751,6 +793,13 @@ chromium-pickle-js@^0.2.0:
  resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"
  integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=

+clone-response@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+  dependencies:
+    mimic-response "^1.0.0"
+
 colors@1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
@@ -846,6 +895,18 @@ debug@^4.1.1, debug@^4.3.1:
  dependencies:
    ms "2.1.2"

+decompress-response@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
+  integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
+  dependencies:
+    mimic-response "^3.1.0"
+
+defer-to-connect@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.0.tgz#83d6b199db041593ac84d781b5222308ccf4c2c1"
+  integrity sha512-bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg==
+
 delayed-stream@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -938,6 +999,13 @@ electron-osx-sign@^0.4.16:
    minimist "^1.2.0"
    plist "^3.0.1"

+end-of-stream@^1.1.0:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
 entities@^2.0.0:
  version "2.2.0"
  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
@@ -995,11 +1063,6 @@ estraverse@^5.2.0:
  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==

-estree-walker@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
-  integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
-
 events@^3.0.0:
  version "3.2.0"
  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
@@ -1075,10 +1138,12 @@ fs.realpath@^1.0.0:
  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=

-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+get-stream@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"

 getpass@^0.1.1:
  version "0.1.7"
@@ -1099,6 +1164,23 @@ glob@^7.0.6, glob@^7.1.6:
    once "^1.3.0"
    path-is-absolute "^1.0.0"

+got@11.8.1:
+  version "11.8.1"
+  resolved "https://registry.yarnpkg.com/got/-/got-11.8.1.tgz#df04adfaf2e782babb3daabc79139feec2f7e85d"
+  integrity sha512-9aYdZL+6nHmvJwHALLwKSUZ0hMwGaJGYv3hoPLPgnT8BoBXm1SjnZeky+91tfwJaDzun2s4RsBRy48IEYv2q2Q==
+  dependencies:
+    "@sindresorhus/is" "^4.0.0"
+    "@szmarczak/http-timer" "^4.0.5"
+    "@types/cacheable-request" "^6.0.1"
+    "@types/responselike" "^1.0.0"
+    cacheable-lookup "^5.0.3"
+    cacheable-request "^7.0.1"
+    decompress-response "^6.0.0"
+    http2-wrapper "^1.0.0-beta.5.2"
+    lowercase-keys "^2.0.0"
+    p-cancelable "^2.0.0"
+    responselike "^2.0.0"
+
 graceful-fs@^4.1.6, graceful-fs@^4.2.0:
  version "4.2.6"
  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
@@ -1122,13 +1204,6 @@ har-validator@~5.1.3:
    ajv "^6.12.3"
    har-schema "^2.0.0"

-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
 hash-base@^3.0.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
@@ -1148,6 +1223,11 @@ htmlparser2@^6.0.0:
    domutils "^2.4.4"
    entities "^2.0.0"

+http-cache-semantics@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
+  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+
 http-signature@~1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -1157,6 +1237,14 @@ http-signature@~1.2.0:
    jsprim "^1.2.2"
    sshpk "^1.7.0"

+http2-wrapper@^1.0.0-beta.5.2:
+  version "1.0.0-beta.5.2"
+  resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.0-beta.5.2.tgz#8b923deb90144aea65cf834b016a340fc98556f3"
+  integrity sha512-xYz9goEyBnC8XwXDTuC/MZ6t+MrKVQZOk4s7+PaDkwIsQd8IwqvM+0M6bA/2lvG8GHXcPdf+MejTUeO2LCPCeQ==
+  dependencies:
+    quick-lru "^5.1.1"
+    resolve-alpn "^1.0.0"
+
 iconv-lite-umd@0.6.8:
  version "0.6.8"
  resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.8.tgz#5ad310ec126b260621471a2d586f7f37b9958ec0"
@@ -1175,13 +1263,6 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1:
  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==

-is-core-module@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
-  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
-  dependencies:
-    has "^1.0.3"
-
 is-extglob@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -1194,18 +1275,6 @@ is-glob@^4.0.1:
  dependencies:
    is-extglob "^2.1.1"

-is-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
-  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
-
-is-reference@^1.1.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
-  integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
-  dependencies:
-    "@types/estree" "*"
-
 is-typedarray@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -1243,6 +1312,11 @@ jsbn@~0.1.0:
  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=

+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
 json-edm-parser@0.1.2:
  version "0.1.2"
  resolved "https://registry.yarnpkg.com/json-edm-parser/-/json-edm-parser-0.1.2.tgz#1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"
@@ -1294,6 +1368,13 @@ jsprim@^1.2.2:
    json-schema "0.2.3"
    verror "1.10.0"

+keyv@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.0.3.tgz#4f3aa98de254803cafcd2896734108daa35e4254"
+  integrity sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==
+  dependencies:
+    json-buffer "3.0.1"
+
 linkify-it@^2.0.0:
  version "2.2.0"
  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
@@ -1311,6 +1392,11 @@ lodash@^4.17.10, lodash@^4.17.15:
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==

+lowercase-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
+  integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
+
 lru-cache@^6.0.0:
  version "6.0.0"
  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -1318,13 +1404,6 @@ lru-cache@^6.0.0:
  dependencies:
    yallist "^4.0.0"

-magic-string@^0.25.2:
-  version "0.25.7"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
-  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
-  dependencies:
-    sourcemap-codec "^1.4.4"
-
 markdown-it@^8.3.1:
  version "8.4.2"
  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
@@ -1366,6 +1445,16 @@ mime@^1.3.4, mime@^1.4.1:
  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==

+mimic-response@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+
+mimic-response@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
+  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
+
 minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4:
  version "3.0.4"
  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -1408,6 +1497,11 @@ node-fetch@^2.6.0:
  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==

+normalize-url@^4.1.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
+  integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
+
 nth-check@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125"
@@ -1420,7 +1514,7 @@ oauth-sign@~0.9.0:
  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==

-once@^1.3.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -1445,6 +1539,11 @@ osenv@^0.1.3:
    os-homedir "^1.0.0"
    os-tmpdir "^1.0.0"

+p-cancelable@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.0.0.tgz#4a3740f5bdaf5ed5d7c3e34882c6fb5d6b266a6e"
+  integrity sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg==
+
 p-limit@*, p-limit@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
@@ -1481,11 +1580,6 @@ path-key@^3.1.0:
  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==

-path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
-
 pend@~1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
@@ -1525,6 +1619,14 @@ psl@^1.1.28, psl@^1.1.33:
  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==

+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
 punycode@^2.1.0, punycode@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
@@ -1540,6 +1642,11 @@ qs@~6.5.2:
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==

+quick-lru@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
+  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
+
 read@^1.0.7:
  version "1.0.7"
  resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
@@ -1594,51 +1701,17 @@ request@^2.86.0:
    tunnel-agent "^0.6.0"
    uuid "^3.3.2"

-resolve@^1.11.0, resolve@^1.11.1:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
-  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
-  dependencies:
-    is-core-module "^2.1.0"
-    path-parse "^1.0.6"
+resolve-alpn@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.0.0.tgz#745ad60b3d6aff4b4a48e01b8c0bdc70959e0e8c"
+  integrity sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA==

-rollup-plugin-commonjs@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz#417af3b54503878e084d127adf4d1caf8beb86fb"
-  integrity sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==
+responselike@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.0.tgz#26391bcc3174f750f9a79eacc40a12a5c42d7723"
+  integrity sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==
  dependencies:
-    estree-walker "^0.6.1"
-    is-reference "^1.1.2"
-    magic-string "^0.25.2"
-    resolve "^1.11.0"
-    rollup-pluginutils "^2.8.1"
-
-rollup-plugin-node-resolve@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz#730f93d10ed202473b1fb54a5997a7db8c6d8523"
-  integrity sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==
-  dependencies:
-    "@types/resolve" "0.0.8"
-    builtin-modules "^3.1.0"
-    is-module "^1.0.0"
-    resolve "^1.11.1"
-    rollup-pluginutils "^2.8.1"
-
-rollup-pluginutils@^2.8.1:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
-  integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
-  dependencies:
-    estree-walker "^0.6.1"
-
-rollup@^1.20.3:
-  version "1.32.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.32.1.tgz#4480e52d9d9e2ae4b46ba0d9ddeaf3163940f9c4"
-  integrity sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==
-  dependencies:
-    "@types/estree" "*"
-    "@types/node" "*"
-    acorn "^7.1.0"
+    lowercase-keys "^2.0.0"

 safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
  version "5.2.1"
@@ -1699,10 +1772,10 @@ shebang-regex@^3.0.0:
  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==

-sourcemap-codec@^1.4.4:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
-  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+source-map@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==

 sprintf-js@~1.0.2:
  version "1.0.3"
@@ -1807,16 +1880,16 @@ typed-rest-client@^0.9.0:
    tunnel "0.0.4"
    underscore "1.8.3"

-typescript@4.2.0-dev.20201207:
-  version "4.2.0-dev.20201207"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.0-dev.20201207.tgz#19a34bc7d2d42a7467c512c63f135587ac848807"
-  integrity sha512-fPHBDi/fgdX4WiRC7cFVv/aL069PgUaDWuLYUSHatWZujz/Lkc9bkf/zL3rKdNSCxlNKAMs3fhJv/yompOphZA==
-
 typescript@^4.1.3:
  version "4.1.5"
  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72"
  integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==

+typescript@^4.3.0-dev.20210426:
+  version "4.3.0-dev.20210426"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-dev.20210426.tgz#00198cb8828f6a04b4e0ae32554a486bf7137a53"
+  integrity sha512-8YTqlzf3w8O8XwnnRlwRV2rswu7V7WEPUnAnH1BPPMrr06thNByMjIadA5SDW3tUJc1MG8Uj3NgZYocU5fWTVg==
+
 uc.micro@^1.0.1, uc.micro@^1.0.5:
  version "1.0.6"
  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"