chore: bump [email protected] (microsoft#111931)

* chore: bump [email protected]

This reverts commit 155691d.

* chore: bump x64 build image

* chore: rebuild remote with older gcc toolchain

* chore: bump [email protected]

* ci: remove condition for remote step

* chore: disable an integration test

.yarnrc

@@ -1,3 +1,3 @@
 disturl "https://electronjs.org/headers"
-target "9.3.5"
+target "11.0.3"
 runtime "electron"

build/azure-pipelines/darwin/continuous-build-darwin.yml

@@ -1,7 +1,7 @@
 steps:
  - task: NodeTool@0
  inputs:
- versionSpec: "12.14.1"
+ versionSpec: "12.18.3"
 
  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -22,7 +22,7 @@ steps:
 
  - task: NodeTool@0
  inputs:
- versionSpec: "12.14.1"
+ versionSpec: "12.18.3"
 
  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:
@@ -78,7 +78,7 @@ steps:
 
  - script: |
  set -e
- npm install -g node-gyp@7.1.0
+ npm install -g node-gyp@latest
  node-gyp --version
  displayName: Update node-gyp
  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))

build/azure-pipelines/distro-build.yml

@@ -8,7 +8,7 @@ pr:
 steps:
  - task: NodeTool@0
  inputs:
- versionSpec: "12.14.1"
+ versionSpec: "12.18.3"
 
  - task: AzureKeyVault@1
  displayName: "Azure Key Vault: Get Secrets"

build/azure-pipelines/exploration-build.yml

@@ -6,7 +6,7 @@ trigger: none
 steps:
  - task: NodeTool@0
  inputs:
- versionSpec: "12.14.1"
+ versionSpec: "12.18.3"
 
  - task: AzureKeyVault@1
  displayName: "Azure Key Vault: Get Secrets"

build/azure-pipelines/linux/continuous-build-linux.yml

@@ -10,7 +10,7 @@ steps:
 
  - task: NodeTool@0
  inputs:
- versionSpec: "12.14.1"
+ versionSpec: "12.18.3"
 
  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:

build/azure-pipelines/linux/product-build-alpine.yml

@@ -22,7 +22,7 @@ steps:
 
  - task: NodeTool@0
  inputs:
- versionSpec: "12.14.1"
+ versionSpec: "12.18.3"
 
  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:

build/azure-pipelines/linux/product-build-linux.yml

@@ -22,7 +22,7 @@ steps:
 
  - task: NodeTool@0
  inputs:
- versionSpec: "12.14.1"
+ versionSpec: "12.18.3"
 
  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:
@@ -69,6 +69,13 @@ steps:
  targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
  vstsFeed: "npm-vscode"
 
+ - script: |
+ set -e
+ npm install -g node-gyp@latest
+ node-gyp --version
+ displayName: Update node-gyp
+ condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
  - script: |
  set -e
  export npm_config_arch=$(NPM_ARCH)
@@ -97,6 +104,14 @@ steps:
  displayName: Run postinstall scripts
  condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
 
+ - script: |
+ set -e
+ export CC=$(which gcc-4.8)
+ export CXX=$(which g++-4.8)
+ cd remote
+ node-gyp rebuild
+ displayName: Rebuild remote modules with gcc-4.8
+
  - script: |
  set -e
  node build/azure-pipelines/mixin
@@ -112,12 +127,6 @@ steps:
  yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
  displayName: Build
 
- - script: |
- set -e
- service xvfb start
- displayName: Start xvfb
- condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
  - script: |
  set -e
  DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"

build/azure-pipelines/linux/snap-build-linux.yml

@@ -1,7 +1,7 @@
 steps:
  - task: NodeTool@0
  inputs:
- versionSpec: "12.14.1"
+ versionSpec: "12.18.3"
 
  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:

build/azure-pipelines/product-build.yml

@@ -11,8 +11,9 @@ schedules:
 resources:
  containers:
  - container: vscode-x64
- image: vscodehub.azurecr.io/vscode-linux-build-agent:x64
+ image: vscodehub.azurecr.io/vscode-linux-build-agent:bionic-x64
  endpoint: VSCodeHub
+ options: --user 0:0
  - container: vscode-arm64
  image: vscodehub.azurecr.io/vscode-linux-build-agent:stretch-arm64
  endpoint: VSCodeHub
@@ -27,7 +28,7 @@ stages:
  jobs:
  - job: Compile
  pool:
- vmImage: "Ubuntu-16.04"
+ vmImage: "Ubuntu-18.04"
  container: vscode-x64
  variables:
  VSCODE_ARCH: x64
@@ -70,7 +71,7 @@ stages:
  - Compile
  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
  pool:
- vmImage: "Ubuntu-16.04"
+ vmImage: "Ubuntu-18.04"
  jobs:
  - job: Linux
  condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
@@ -179,7 +180,7 @@ stages:
  - macOSARM64
  condition: and(succeededOrFailed(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
  pool:
- vmImage: "Ubuntu-16.04"
+ vmImage: "Ubuntu-18.04"
  jobs:
  - job: SyncMooncake
  displayName: Sync Mooncake
@@ -194,7 +195,7 @@ stages:
  - macOSARM64
  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), or(eq(variables['VSCODE_RELEASE'], 'true'), and(or(eq(variables['VSCODE_QUALITY'], 'insider'), eq(variables['VSCODE_QUALITY'], 'exploration')), eq(variables['Build.Reason'], 'Schedule'))))
  pool:
- vmImage: "Ubuntu-16.04"
+ vmImage: "Ubuntu-18.04"
  jobs:
  - job: BuildService
  displayName: Build Service

build/azure-pipelines/product-compile.yml

@@ -17,7 +17,7 @@ steps:
 
  - task: NodeTool@0
  inputs:
- versionSpec: "12.14.1"
+ versionSpec: "12.18.3"
  condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
 
  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2

build/azure-pipelines/publish-types/publish-types.yml

@@ -9,7 +9,7 @@ pr: none
 steps:
  - task: NodeTool@0
  inputs:
- versionSpec: "12.14.1"
+ versionSpec: "12.18.3"
 
  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:

build/azure-pipelines/sync-mooncake.yml

@@ -1,7 +1,7 @@
 steps:
  - task: NodeTool@0
  inputs:
- versionSpec: "12.14.1"
+ versionSpec: "12.18.3"
 
  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:

build/azure-pipelines/web/product-build-web.yml

@@ -22,7 +22,7 @@ steps:
 
  - task: NodeTool@0
  inputs:
- versionSpec: "12.14.1"
+ versionSpec: "12.18.3"
 
  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:

build/azure-pipelines/win32/continuous-build-win32.yml

@@ -1,7 +1,7 @@
 steps:
  - task: NodeTool@0
  inputs:
- versionSpec: "12.14.1"
+ versionSpec: "12.18.3"
 
  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:

build/azure-pipelines/win32/product-build-win32.yml

@@ -22,7 +22,7 @@ steps:
 
  - task: NodeTool@0
  inputs:
- versionSpec: "12.14.1"
+ versionSpec: "12.18.3"
 
  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
  inputs:

build/darwin/sign.ts

@@ -29,7 +29,6 @@ async function main(): Promise<void> {
  const appFrameworkPath = path.join(appRoot, appName, 'Contents', 'Frameworks');
  const helperAppBaseName = product.nameShort;
  const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app';
- const pluginHelperAppName = helperAppBaseName + ' Helper (Plugin).app';
  const rendererHelperAppName = helperAppBaseName + ' Helper (Renderer).app';
 
  const defaultOpts: codesign.SignOptions = {
@@ -51,7 +50,6 @@ async function main(): Promise<void> {
  // TODO(deepak1556): Incorrectly declared type in electron-osx-sign
  ignore: (filePath: string) => {
  return filePath.includes(gpuHelperAppName) ||
- filePath.includes(pluginHelperAppName) ||
  filePath.includes(rendererHelperAppName);
  }
  };
@@ -63,13 +61,6 @@ async function main(): Promise<void> {
  'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-gpu-entitlements.plist'),
  };
 
- const pluginHelperOpts: codesign.SignOptions = {
- ...defaultOpts,
- app: path.join(appFrameworkPath, pluginHelperAppName),
- entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'),
- 'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'),
- };
-
  const rendererHelperOpts: codesign.SignOptions = {
  ...defaultOpts,
  app: path.join(appFrameworkPath, rendererHelperAppName),
@@ -78,7 +69,6 @@ async function main(): Promise<void> {
  };
 
  await codesign.signAsync(gpuHelperOpts);
- await codesign.signAsync(pluginHelperOpts);
  await codesign.signAsync(rendererHelperOpts);
  await codesign.signAsync(appOpts as any);
 }

cgmanifest.json

@@ -6,7 +6,7 @@
  "git": {
  "name": "chromium",
  "repositoryUrl": "https://chromium.googlesource.com/chromium/src",
- "commitHash": "894fb9eb56c6cbda65e3c3ae9ada6d4cb5850cc9"
+ "commitHash": "0387c513f0319231a8ca6dd0a265102af3d4455e"
  }
  },
  "licenseDetail": [
@@ -40,32 +40,32 @@
  "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
  ],
  "isOnlyProductionDependency": true,
- "version": "83.0.4103.122"
+ "version": "87.0.4280.67"
  },
  {
  "component": {
  "type": "git",
  "git": {
  "name": "nodejs",
  "repositoryUrl": "https://github.com/nodejs/node",
- "commitHash": "9622fed3fb2cffcea9efff6c8cb4cc2def99d75d"
+ "commitHash": "e3e0927bb93ed92bcdfe81e7ad9af3d78ccc74fb"
  }
  },
  "isOnlyProductionDependency": true,
- "version": "12.14.1"
+ "version": "12.18.3"
  },
  {
  "component": {
  "type": "git",
  "git": {
  "name": "electron",
  "repositoryUrl": "https://github.com/electron/electron",
- "commitHash": "415c1f9e9b35d9599b1a8ad1200476afa47a3323"
+ "commitHash": "b0862a6e63173c4c919bd5ed27d257235bbfe7d2"
  }
  },
  "isOnlyProductionDependency": true,
  "license": "MIT",
- "version": "9.3.5"
+ "version": "11.0.3"
  },
  {
  "component": {

package.json

@@ -45,7 +45,7 @@
  "compile-web": "gulp compile-web --max_old_space_size=4095",
  "watch-web": "gulp watch-web --max_old_space_size=4095",
  "eslint": "eslint -c .eslintrc.json --rulesdir ./build/lib/eslint --ext .ts --ext .js ./src/vs ./extensions",
- "electron-rebuild": "electron-rebuild --arch=arm64 --force --version=11.0.2"
+ "electron-rebuild": "electron-rebuild --arch=arm64 --force --version=11.0.3"
  },
  "dependencies": {
  "applicationinsights": "1.0.8",
@@ -60,7 +60,7 @@
  "native-is-elevated": "0.4.1",
  "native-keymap": "2.2.1",
  "native-watchdog": "1.3.0",
- "node-pty": "0.10.0-beta17",
+ "node-pty": "0.10.0-beta18",
  "spdlog": "^0.11.1",
  "sudo-prompt": "9.1.1",
  "tas-client-umd": "0.1.2",
@@ -112,7 +112,7 @@
  "css-loader": "^3.2.0",
  "debounce": "^1.0.0",
  "deemon": "^1.4.0",
- "electron": "9.3.5",
+ "electron": "11.0.3",
  "electron-rebuild": "2.0.3",
  "eslint": "6.8.0",
  "eslint-plugin-jsdoc": "^19.1.0",
@@ -191,10 +191,10 @@
  "url": "https://github.com/microsoft/vscode/issues"
  },
  "optionalDependencies": {
- "vscode-windows-ca-certs": "0.2.0",
+ "vscode-windows-ca-certs": "^0.3.0",
  "vscode-windows-registry": "1.0.3",
  "windows-foreground-love": "0.2.0",
  "windows-mutex": "0.3.0",
  "windows-process-tree": "0.2.4"
  }
-}
+}

remote/.yarnrc

@@ -1,3 +1,3 @@
 disturl "http:https://nodejs.org/dist"
-target "12.14.1"
+target "12.18.3"
 runtime "node"

remote/package.json

@@ -12,15 +12,15 @@
  "jschardet": "2.2.1",
  "minimist": "^1.2.5",
  "native-watchdog": "1.3.0",
- "node-pty": "0.10.0-beta17",
+ "node-pty": "0.10.0-beta18",
  "spdlog": "^0.11.1",
  "tas-client-umd": "0.1.2",
  "vscode-nsfw": "1.2.9",
  "vscode-oniguruma": "1.3.1",
  "vscode-proxy-agent": "^0.5.2",
+ "vscode-regexpp": "^3.1.0",
  "vscode-ripgrep": "^1.11.1",
  "vscode-textmate": "5.2.0",
- "vscode-regexpp": "^3.1.0",
  "xterm": "4.10.0-beta.4",
  "xterm-addon-search": "0.8.0-beta.3",
  "xterm-addon-unicode11": "0.3.0-beta.3",
@@ -29,7 +29,7 @@
  "yazl": "^2.4.3"
  },
  "optionalDependencies": {
- "vscode-windows-ca-certs": "0.2.0",
+ "vscode-windows-ca-certs": "0.3.0",
  "vscode-windows-registry": "1.0.2"
  }
 }