Revert "chore: update [email protected] (#262877)"

This reverts commit ad0b5d2.

Author: rzhao271

.github/workflows/pr-win32-test.yml

@@ -121,7 +121,7 @@ jobs:
         run: |
           for ($i = 1; $i -le 3; $i++) {
             try {
-              npm exec -- npm-run-all -lp "electron ${{ env.VSCODE_ARCH }}" "playwright-install"
+              npm exec -- -- npm-run-all -lp "electron ${{ env.VSCODE_ARCH }}" "playwright-install"
               break
             }
             catch {
@@ -230,19 +230,19 @@ jobs:
         if: ${{ inputs.electron_tests }}
         timeout-minutes: 20
         shell: pwsh
-        run: npm run smoketest-no-compile -- --tracing
+        run: npm run smoketest-no-compile -- -- --tracing
 
       - name: 🧪 Run smoke tests (Browser, Chromium)
         if: ${{ inputs.browser_tests }}
         timeout-minutes: 20
         shell: pwsh
-        run: npm run smoketest-no-compile -- --web --tracing --headless
+        run: npm run smoketest-no-compile -- -- --web --tracing --headless
 
       - name: 🧪 Run smoke tests (Remote)
         if: ${{ inputs.remote_tests }}
         timeout-minutes: 20
         shell: pwsh
-        run: npm run smoketest-no-compile -- --remote --tracing
+        run: npm run smoketest-no-compile -- -- --remote --tracing
 
       - name: Diagnostics after smoke test run
         shell: pwsh

.npmrc

@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
-target="37.3.1"
-ms_build_id="12259562"
+target="37.2.3"
+ms_build_id="12035395"
 runtime="electron"
 build_from_source="true"
 legacy-peer-deps="true"

.nvmrc

@@ -1 +1 @@
-22.18.0
+22.17.0

build/azure-pipelines/linux/setup-env.sh

@@ -25,7 +25,7 @@ fi
 
 if [ "$npm_config_arch" == "x64" ]; then
   # Download clang based on chromium revision used by vscode
-  curl -s https://raw.githubusercontent.com/chromium/chromium/138.0.7204.235/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
+  curl -s https://raw.githubusercontent.com/chromium/chromium/138.0.7204.100/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
 
   # Download libcxx headers and objects from upstream electron releases
   DEBUG=libcxx-fetcher \
@@ -37,9 +37,9 @@ if [ "$npm_config_arch" == "x64" ]; then
 
   # Set compiler toolchain
   # Flags for the client build are based on
-  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.235:build/config/arm.gni
-  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.235:build/config/compiler/BUILD.gn
-  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.235:build/config/c++/BUILD.gn
+  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.100:build/config/arm.gni
+  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.100:build/config/compiler/BUILD.gn
+  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.100:build/config/c++/BUILD.gn
   export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_CLIENT_SYSROOT_DIR/x86_64-linux-gnu"
   export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_CLIENT_SYSROOT_DIR/x86_64-linux-gnu"
   export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -DSPDLOG_USE_STD_FORMAT -I$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit -D_LIBCPP_ABI_NAMESPACE=Cr -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE --sysroot=$VSCODE_CLIENT_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"

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

@@ -11,7 +11,8 @@ parameters:
     type: string
 
 steps:
-  - powershell: npm exec -- npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
+  # Additional "--" needed to workaround https://github.com/npm/cli/issues/7375
+  - powershell: npm exec -- -- npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Download Electron and Playwright
@@ -21,12 +22,14 @@ steps:
     - powershell: .\scripts\test.bat --build --tfs "Unit Tests"
       displayName: 🧪 Run unit tests (Electron)
       timeoutInMinutes: 15
-    - powershell: npm run test-node -- --build
+    # Additional "--" needed to workaround https://github.com/npm/cli/issues/7375
+    - powershell: npm run test-node -- -- --build
       displayName: 🧪 Run unit tests (node.js)
       timeoutInMinutes: 15
 
   - ${{ if eq(parameters.VSCODE_RUN_BROWSER_TESTS, true) }}:
-    - powershell: npm run test-browser-no-install -- --build --browser chromium --tfs "Browser Unit Tests"
+    # Additional "--" needed to workaround https://github.com/npm/cli/issues/7375
+    - powershell: npm run test-browser-no-install -- -- --build --browser chromium --tfs "Browser Unit Tests"
       displayName: 🧪 Run unit tests (Browser, Chromium)
       timeoutInMinutes: 20
 
@@ -119,19 +122,22 @@ steps:
     condition: succeededOrFailed()
 
   - ${{ if eq(parameters.VSCODE_RUN_ELECTRON_TESTS, true) }}:
-    - powershell: npm run smoketest-no-compile -- --tracing --build "$(agent.builddirectory)\test\VSCode-win32-$(VSCODE_ARCH)"
+    # Additional "--" needed to workaround https://github.com/npm/cli/issues/7375
+    - powershell: npm run smoketest-no-compile -- -- --tracing --build "$(agent.builddirectory)\test\VSCode-win32-$(VSCODE_ARCH)"
       displayName: 🧪 Run smoke tests (Electron)
       timeoutInMinutes: 20
 
   - ${{ if eq(parameters.VSCODE_RUN_BROWSER_TESTS, true) }}:
-    - powershell: npm run smoketest-no-compile -- --web --tracing --headless
+    # Additional "--" needed to workaround https://github.com/npm/cli/issues/7375
+    - powershell: npm run smoketest-no-compile -- -- --web --tracing --headless
       env:
         VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)\test\vscode-server-win32-$(VSCODE_ARCH)-web
       displayName: 🧪 Run smoke tests (Browser, Chromium)
       timeoutInMinutes: 20
 
   - ${{ if eq(parameters.VSCODE_RUN_REMOTE_TESTS, true) }}:
-    - powershell: npm run smoketest-no-compile -- --tracing --remote --build "$(agent.builddirectory)\test\VSCode-win32-$(VSCODE_ARCH)"
+    # Additional "--" needed to workaround https://github.com/npm/cli/issues/7375
+    - powershell: npm run smoketest-no-compile -- -- --tracing --remote --build "$(agent.builddirectory)\test\VSCode-win32-$(VSCODE_ARCH)"
       env:
         VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)\test\vscode-server-win32-$(VSCODE_ARCH)
       displayName: 🧪 Run smoke tests (Remote)

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

@@ -256,11 +256,12 @@ steps:
         echo "##vso[task.setvariable variable=EsrpCliDllPath]$Version\net6.0\esrpcli.dll"
       displayName: Find ESRP CLI
 
+    # Additional "--" needed to workaround https://github.com/npm/cli/issues/7375
     - powershell: |
         . build/azure-pipelines/win32/exec.ps1
         $ErrorActionPreference = "Stop"
         mkdir -Force .build/node-cpuprofile
-        exec { npx deemon --detach --wait -- npx zx build/azure-pipelines/win32/codesign.js }
+        exec { npx deemon --detach --wait -- -- npx zx build/azure-pipelines/win32/codesign.js }
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
         NODE_DEBUG: "net,child_process"
@@ -277,10 +278,11 @@ steps:
         VSCODE_TEST_ARTIFACT_NAME: ${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}
 
   - ${{ if ne(parameters.VSCODE_CIBUILD, true) }}:
+    # Additional "--" needed to workaround https://github.com/npm/cli/issues/7375
     - powershell: |
         . build/azure-pipelines/win32/exec.ps1
         $ErrorActionPreference = "Stop"
-        exec { npx deemon --attach -- npx zx build/azure-pipelines/win32/codesign.js }
+        exec { npx deemon --attach -- -- npx zx build/azure-pipelines/win32/codesign.js }
       condition: succeededOrFailed()
       env:
         NODE_DEBUG: "net,child_process"