From 97575dd00dc3b2c2cad6abf1e40b22f946f68fc7 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 1 Apr 2022 11:00:05 +0200
Subject: [PATCH] vscode: update to 1.66.0.

---
 srcpkgs/vscode/patches/product.patch | 12 +++---------
 srcpkgs/vscode/patches/ripgrep.patch | 14 +++++++-------
 srcpkgs/vscode/template              | 10 +++++++---
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index a7e2b79925bf..624ca63afcbe 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,21 +1,15 @@
 diff --git a/product.json b/product.json
-index 9d630f23cd7..eea95dce319 100644
+index df18127dcc67..d3006752bd98 100644
 --- a/product.json
 +++ b/product.json
-@@ -27,6 +27,9 @@
+@@ -27,7 +27,15 @@
  	"licenseFileName": "LICENSE.txt",
  	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
  	"urlProtocol": "code-oss",
 +	"quality": "stable",
 +	"documentationUrl": "https://github.com/microsoft/vscode-docs",
 +	"requestFeatureUrl": "https://github.com/Microsoft/vscode/issues",
- 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/out/vs/workbench/contrib/webview/browser/pre/",
- 	"extensionAllowedProposedApi": [
- 		"ms-vscode.vscode-js-profile-flame",
-@@ -34,6 +37,11 @@
- 		"GitHub.remotehub",
- 		"GitHub.remotehub-insiders"
- 	],
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/",
 +	"extensionsGallery": {
 +		"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
 +		"cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index ff0dfc233e41..3fdc568a9e54 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -5,27 +5,27 @@ during build, which unbreaks build on platforms where MS deos not
 ship a prebuilt ripgrep.
 
 diff --git a/package.json b/package.json
-index 5d6022a2a40..f66ee44eef0 100644
+index de2cf9e04a9b..1995e3bb9a7e 100644
 --- a/package.json
 +++ b/package.json
-@@ -63,7 +63,7 @@
+@@ -62,7 +62,7 @@
+     "@microsoft/applicationinsights-web": "^2.6.4",
      "@parcel/watcher": "2.0.5",
-     "@vscode/debugprotocol": "1.51.0",
      "@vscode/iconv-lite-umd": "0.7.0",
--    "@vscode/ripgrep": "^1.14.1",
+-    "@vscode/ripgrep": "^1.14.2",
 +    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
-     "@vscode/sqlite3": "4.0.12",
+     "@vscode/sqlite3": "5.0.7",
      "@vscode/sudo-prompt": "9.3.1",
      "@vscode/vscode-languagedetection": "1.0.21",
 diff --git a/remote/package.json b/remote/package.json
-index 4bc40998093..9d22d408c02 100644
+index c7fc7a2e931f..8842b784df2c 100644
 --- a/remote/package.json
 +++ b/remote/package.json
 @@ -6,7 +6,7 @@
      "@microsoft/applicationinsights-web": "^2.6.4",
      "@parcel/watcher": "2.0.5",
      "@vscode/iconv-lite-umd": "0.7.0",
--    "@vscode/ripgrep": "^1.14.1",
+-    "@vscode/ripgrep": "^1.14.2",
 +    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
      "@vscode/vscode-languagedetection": "1.0.21",
      "applicationinsights": "1.4.2",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 620c9a6928aa..0b9efda224d0 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,8 +1,9 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.65.2
+version=1.66.0
 revision=1
 _electronver=13.6.7
+_npmver=8.6.0
 hostmakedepends="pkg-config python3 nodejs yarn tar git ripgrep"
 makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron13"
 depends="libXtst ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13"
@@ -11,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e
+checksum=1c93918ebd00b8e9fc0d8fea13cbe2947f5b83d2d8f5c8d1b00bde885bb925d7
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
@@ -46,7 +47,10 @@ do_build() {
 	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
 	--target=$_electronver \
 	--tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz
-	yarn install --ignore-engines --arch=x64
+
+	npm install -g npm@${_npmver} && \
+		yarn install --ignore-engines --arch=x64
+
 	export CFLAGS="$CFLAGS -I/usr/include/node"
 	yarn run gulp vscode-linux-x64-min
 }