Merge pull request #968 from gjsjohnmurray/fix-macOS-build

Fix macOS build error

Author: gjsjohnmurray

package-lock.json

@@ -1442,6 +1442,7 @@
     "@types/xmldom": "^0.1.29",
     "@typescript-eslint/eslint-plugin": "^4.32.0",
     "@typescript-eslint/parser": "^4.32.0",
+    "@vscode/test-electron": "^2.1.5",
     "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-prettier": "^6.11.0",
@@ -1457,7 +1458,6 @@
     "typescript": "^4.4.3",
     "vscode-debugadapter-testsupport": "^1.41.0",
     "vscode-dts": "^0.3.2",
-    "vscode-test": "^1.4.0",
     "webpack": "^5.27.1",
     "webpack-cli": "^4.5.0"
   },

package.json

@@ -1,7 +1,7 @@
 import * as cp from "child_process";
 import * as path from "path";
 
-import { downloadAndUnzipVSCode, resolveCliPathFromVSCodeExecutablePath, runTests } from "vscode-test";
+import { downloadAndUnzipVSCode, resolveCliArgsFromVSCodeExecutablePath, runTests } from "@vscode/test-electron";
 
 async function main() {
   try {
@@ -17,10 +17,10 @@ async function main() {
     const workspace = path.resolve("test-fixtures", "test.code-workspace");
 
     const vscodeExecutablePath = await downloadAndUnzipVSCode("stable");
-    const cliPath = resolveCliPathFromVSCodeExecutablePath(vscodeExecutablePath);
+    const [cli, ...args] = resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath);
 
     const installExtension = (extId) =>
-      cp.spawnSync(cliPath, ["--install-extension", extId], {
+      cp.spawnSync(cli, [...args, "--install-extension", extId], {
         encoding: "utf-8",
         stdio: "inherit",
       });