Merge vscode source through 1.62 release (#19981)

* Build breaks 1

* Build breaks

* Build breaks

* Build breaks

* More build breaks

* Build breaks (#2512)

* Runtime breaks

* Build breaks

* Fix dialog location break

* Update typescript

* Fix ASAR break issue

* Unit test breaks

* Update distro

* Fix breaks in ADO builds (#2513)

* Bump to node 16

* Fix hygiene errors

* Bump distro

* Remove reference to node type

* Delete vscode specific extension

* Bump to node 16 in CI yaml

* Skip integration tests in CI builds (while fixing)

* yarn.lock update

* Bump moment dependency in remote yarn

* Fix drop-down chevron style

* Bump to node 16

* Remove playwrite from ci.yaml

* Skip building build scripts in hygine check

.devcontainer/cache/before-cache.sh

@@ -1,11 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-# This file establishes a basline for the reposuitory before any steps in the "prepare.sh"
+# This file establishes a basline for the repository before any steps in the "prepare.sh"
 # are run. Its just a find command that filters out a few things we don't need to watch.
 
 set -e
 
-SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)"
+SCRIPT_PATH="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
 SOURCE_FOLDER="${1:-"."}"
 
 cd "${SOURCE_FOLDER}"

.devcontainer/cache/build-cache-image.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# This file simply wraps the dockeer build command used to build the image with the
-# cached result of the commands from "prepare.sh" and pushes it to the specified
-# container image registry.
+# This file simply wraps the docker build command to build an image that includes
+# a cache.tar file with the result of "prepare.sh" inside of it. See cache.Dockerfile
+# for the steps that are actually taken to do this.
 
 set -e
 
-SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)"
+SCRIPT_PATH="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
 CONTAINER_IMAGE_REPOSITORY="$1"
 BRANCH="${2:-"main"}"
 

.devcontainer/cache/cache-diff.sh

@@ -1,12 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This file is used to archive off a copy of any differences in the source tree into another location
-# in the image. Once the codespace is up, this will be restored into its proper location (which is
-# quick and happens parallel to other startup activities)
+# in the image. Once the codespace / container is up, this will be restored into its proper location.
 
 set -e
 
-SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)"
+SCRIPT_PATH="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
 SOURCE_FOLDER="${1:-"."}"
 CACHE_FOLDER="${2:-"/usr/local/etc/devcontainer-cache"}"
 

.devcontainer/cache/cache.Dockerfile

@@ -1,7 +1,8 @@
-# This dockerfile is used to build up from a base image to create an image with cached results of running "prepare.sh".
+# This dockerfile is used to build up from a base image to create an image a cache.tar file containing the results of running "prepare.sh".
 # Other image contents: https://github.com/microsoft/vscode-dev-containers/blob/master/repository-containers/images/github.com/microsoft/vscode/.devcontainer/base.Dockerfile
-FROM mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:dev
 
+# This first stage generates cache.tar
+FROM mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:dev as cache
 ARG USERNAME=node
 COPY --chown=${USERNAME}:${USERNAME} . /repo-source-tmp/
 RUN mkdir /usr/local/etc/devcontainer-cache \
@@ -10,5 +11,12 @@ RUN mkdir /usr/local/etc/devcontainer-cache \
 		cd /repo-source-tmp \
 		&& .devcontainer/cache/before-cache.sh \
 		&& .devcontainer/prepare.sh \
-		&& .devcontainer/cache/cache-diff.sh" \
-	&& rm -rf /repo-source-tmp
+		&& .devcontainer/cache/cache-diff.sh"
+
+# This second stage starts fresh and just copies in cache.tar from the previous stage. The related
+# devcontainer.json file is then setup to have postCreateCommand fire restore-diff.sh to expand it.
+FROM mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:dev as dev-container
+ARG USERNAME=node
+ARG CACHE_FOLDER="/usr/local/etc/devcontainer-cache"
+RUN mkdir -p "${CACHE_FOLDER}" && chown "${USERNAME}:${USERNAME}" "${CACHE_FOLDER}"
+COPY --from=cache ${CACHE_FOLDER}/cache.tar ${CACHE_FOLDER}/

.devcontainer/cache/restore-diff.sh

@@ -1,9 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-# This file restores the results of the "prepare.sh" into their proper locations
-# once the container has been created. It runs as a postCreateCommand which
-# in GitHub Codespaces occurs parallel to other startup activities and does not
-# really add to the overal startup time given how quick the operation ends up being.
+# This file expands the cache.tar file in the image that contains the results of "prepare.sh"
+# on top of the source tree. It runs as a postCreateCommand which runs after the container/codespace
+# is already up where you would typically run a command like "yarn install".
 
 set -e
 

.devcontainer/prepare.sh

@@ -1,10 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-# This file contains the steps that should be run when creating the intermediary image that contains
-# contents for that should be in the image by default. It will be used to build up from the base image
-# to create an image that speeds up first time use of the dev container by "caching" the results
-# of these commands. Developers can still run these commands without an issue once the container is
-# up, but only differences will be processed which also speeds up the first time these operations occur.
+# This file contains the steps that should be run when building a "cache" image with contents that should be
+# layered directly **on top of the source tree** once a dev container is created. This avoids having to run long
+# running commands like "yarn install" from the ground up. Developers (and should) still run these commands
+# after the actual dev container is created, but only differences will be processed.
 
 yarn install
 yarn electron