Merge pull request #2539 from cdr/callback-html

Author: code-asher

ci/build/build-release.sh

@@ -83,8 +83,9 @@ bundle_vscode() {
   rsync "$VSCODE_SRC_PATH/extensions/yarn.lock" "$VSCODE_OUT_PATH/extensions"
   rsync "$VSCODE_SRC_PATH/extensions/postinstall.js" "$VSCODE_OUT_PATH/extensions"
 
-  mkdir -p "$VSCODE_OUT_PATH/resources/linux"
+  mkdir -p "$VSCODE_OUT_PATH/resources/"{linux,web}
   rsync "$VSCODE_SRC_PATH/resources/linux/code.png" "$VSCODE_OUT_PATH/resources/linux/code.png"
+  rsync "$VSCODE_SRC_PATH/resources/web/callback.html" "$VSCODE_OUT_PATH/resources/web/callback.html"
 
   # Adds the commit and date to product.json
   jq --slurp '.[0] * .[1]' "$VSCODE_SRC_PATH/product.json" <(

ci/lib.sh

@@ -103,7 +103,7 @@ RELEASE_PATH="${RELEASE_PATH-release}"
 # Code itself but also extensions will look specifically in this directory for
 # files (like the ripgrep binary or the oniguruma wasm).
 symlink_asar() {
-  if [ ! -e node_modules.asar ]; then
+  if [ ! -L node_modules.asar ]; then
     if [ "${WINDIR-}" ]; then
       # mklink takes the link name first.
       mklink /J node_modules.asar node_modules