Readd linter, symlinking in prod, clarify usage.

Author: GirlBossRush

.gitignore

@@ -9,7 +9,6 @@ release-gcp/
 release-images/
 node_modules
 vendor/modules
-/node_modules.asar
 node-*
 /plugins
 /lib/coder-cloud-agent

ci/build/build-release.sh

@@ -99,6 +99,10 @@ EOF
   # yarn to fetch node_modules if necessary without build scripts running.
   # We cannot use --no-scripts because we still want dependent package scripts to run.
   jq 'del(.scripts)' < "$VSCODE_SRC_PATH/package.json" > "$VSCODE_OUT_PATH/package.json"
+
+  pushd "$VSCODE_OUT_PATH"
+  symlink_asar
+  popd
 }
 
 main "$@"

ci/build/npm-postinstall.sh

@@ -76,13 +76,26 @@ main() {
   fi
 }
 
+# This is a copy of symlink_asar in ../lib.sh. Look there for details.
+symlink_asar() {
+  rm -rf node_modules.asar
+  if [ "${WINDIR-}" ]; then
+    mklink /J node_modules.asar node_modules
+  else
+    ln -s node_modules node_modules.asar
+  fi
+}
+
 vscode_yarn() {
   echo 'Installing vendor dependencies...'
   cd vendor/modules/code-oss-dev
   yarn --production --frozen-lockfile
 
+  symlink_asar
+
   cd extensions
   yarn --production --frozen-lockfile
+
   for ext in */; do
     ext="${ext%/}"
     echo "extensions/$ext: installing dependencies"

ci/dev/fmt.sh

@@ -32,14 +32,14 @@ main() {
   doctoc --title '# iPad' docs/ipad.md > /dev/null
   doctoc --title '# Termux' docs/termux.md > /dev/null
 
-  ## TODO: replace with a method that generates fewer false positives.
-  # if [[ ${CI-} && $(git ls-files --other --modified --exclude-standard) ]]; then
-  #   echo "Files need generation or are formatted incorrectly:"
-  #   git -c color.ui=always status | grep --color=no '\[31m'
-  #   echo "Please run the following locally:"
-  #   echo "  yarn fmt"
-  #   exit 1
-  # fi
+  # TODO: replace with a method that generates fewer false positives.
+  if [[ ${CI-} && $(git ls-files --other --modified --exclude-standard) ]]; then
+    echo "Files need generation or are formatted incorrectly:"
+    git -c color.ui=always status | grep --color=no '\[31m'
+    echo "Please run the following locally:"
+    echo "  yarn fmt"
+    exit 1
+  fi
 }
 
 main "$@"

ci/dev/postinstall.sh

@@ -13,8 +13,17 @@ main() {
   cd vendor
   echo 'Installing vendor dependencies...'
 
-  # Ignore scripts to prevent partial install which omits development dependencies.
-  yarn install --modules-folder modules --ignore-scripts
+  # * We install in 'modules' instead of 'node_modules' because VS Code's extensions
+  # use a webpack config which cannot differentiate between its own node_modules
+  # and itself being in a directory with the same name.
+  #
+  # * We ignore scripts because NPM/Yarn's default behavior is to assume that
+  # devDependencies are not needed, and that even git repo based packages are
+  # assumed to be compiled. Because the default behavior for VS Code's `postinstall`
+  # assumes we're also compiled, this needs to be ignored.
+  yarn install --modules-folder modules --ignore-scripts --frozen-lockfile
+
+  # Finally, run the vendor `postinstall`
   yarn run postinstall
 }
 

ci/lib.sh

@@ -104,3 +104,21 @@ export OS
 # RELEASE_PATH is the destination directory for the release from the root.
 # Defaults to release
 RELEASE_PATH="${RELEASE_PATH-release}"
+
+# VS Code bundles some modules into an asar which is an archive format that
+# works like tar. It then seems to get unpacked into node_modules.asar.
+#
+# I don't know why they do this but all the dependencies they bundle already
+# exist in node_modules so just symlink it. We have to do this since not only VS
+# Code itself but also extensions will look specifically in this directory for
+# files (like the ripgrep binary or the oniguruma wasm).
+symlink_asar() {
+  rm -rf node_modules.asar
+  if [ "${WINDIR-}" ]; then
+    # mklink takes the link name first.
+    mklink /J node_modules.asar node_modules
+  else
+    # ln takes the link name second.
+    ln -s node_modules node_modules.asar
+  fi
+}

vendor/yarn.lock

@@ -250,9 +250,9 @@ [email protected]:
     commander "2.11.x"
     ws "^7.2.0"
 
-code-oss-dev@cdr/vscode#50f8fff79d612104eed6eb067daf596031fe9f83:
+code-oss-dev@cdr/vscode#96a09a7846538c3bbedb6a2aeca729537bb8202b:
   version "1.60.0"
-  resolved "https://codeload.github.com/cdr/vscode/tar.gz/50f8fff79d612104eed6eb067daf596031fe9f83"
+  resolved "https://codeload.github.com/cdr/vscode/tar.gz/96a09a7846538c3bbedb6a2aeca729537bb8202b"
   dependencies:
     "@coder/logger" "^1.1.16"
     "@microsoft/applicationinsights-web" "^2.6.4"