Update dev package dependencies

.vscode/launch.json

@@ -5,6 +5,18 @@
 {
     "version": "0.2.0",
     "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Debug current .ts file",
+            "runtimeArgs": [
+                "-r",
+                "ts-node/register"
+            ],
+            "args": [
+                "${file}"
+            ],
+        },
         {
             "name": "Run Extension",
             "type": "extensionHost",

package.json

@@ -15,8 +15,7 @@
         "url": "https://github.com/microsoft/vscode-powerquery-sdk/issues"
     },
     "engines": {
-        "node": ">=16.13.2 <17",
-        "npm": ">=8.5.0",
+        "node": ">=18.0.0",
         "vscode": "^1.62.0"
     },
     "capabilities": {
@@ -391,35 +390,35 @@
         "@types/glob": "^8.0.0",
         "@types/gulp": "^4.0.9",
         "@types/mocha": "^9.1.1",
+        "@types/node": "^18.19.9",
         "@types/sinon": "^10.0.13",
-        "@types/node": "^16.11.65",
         "@types/vscode": "^1.62.0",
         "@typescript-eslint/eslint-plugin": "^5.40.0",
         "@typescript-eslint/parser": "^5.40.0",
         "@vscode/debugadapter": "^1.57.0",
         "@vscode/debugadapter-testsupport": "^1.57.0",
         "@vscode/test-electron": "^1.6.2",
+        "@vscode/vsce": "^2.22.0",
         "chai": "^4.3.6",
-        "sinon": "^14.0.0",
         "eslint": "^8.25.0",
         "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-license-header": "^0.4.0",
         "eslint-plugin-prettier": "^4.2.1",
         "eslint-plugin-security": "^1.5.0",
         "glob": "^8.0.3",
-        "gulp": "^4.0.2",
         "husky": "^8.0.1",
         "lint-staged": "^13.2.1",
         "mocha": "^9.2.2",
         "prettier": "^2.7.1",
         "rimraf": "^3.0.2",
+        "sinon": "^14.0.0",
         "ts-loader": "^9.4.1",
         "ts-node": "^10.9.1",
         "tsconfig-paths-webpack-plugin": "^3.5.2",
         "typescript": "^4.8.4",
-        "vsce": "^2.11.0",
+        "vinyl-fs": "^4.0.0",
         "vscode-extension-tester": "^5.0.0",
-        "vscode-nls-dev": "^4.0.3",
+        "vscode-nls-dev": "^4.0.4",
         "webpack": "^5.76.0",
         "webpack-cli": "^4.10.0"
     },

scripts/addI18n.ts

@@ -6,10 +6,11 @@
  */
 
 import * as fs from "fs";
-import * as gulp from "gulp";
+// import * as gulp from "gulp";
 import * as nls from "vscode-nls-dev";
 import * as path from "path";
 import * as process from "process";
+import * as vfs from "vinyl-fs";
 
 const projectDirectory: string = process.cwd();
 const i18nDirectory: string = path.join(projectDirectory, "localize", "i18n");
@@ -65,8 +66,6 @@ for (const oneLangId of allLangDirectories) {
 
 const supportedLanguages: nls.Language[] = allLangDirectories.map((id: string) => ({ id, folderName: id }));
 
-gulp.src(["package.nls.json"], {
-    cwd: projectDirectory,
-})
+vfs.src(["package.nls.json"], { cwd: projectDirectory })
     .pipe(nls.createAdditionalLanguageFiles(supportedLanguages, path.join("localize", "i18nDist"), "."))
-    .pipe(gulp.dest(".", { cwd: projectDirectory }));
+    .pipe(vfs.dest(".", { cwd: projectDirectory }))

src/GlobalEventBus.ts

@@ -56,7 +56,7 @@ export class GlobalEventBus extends DisposableEventEmitter<GlobalEventTypes> imp
 
             this.firstWorkspaceRootFilesWatcher = fs.watch(
                 firstWorkspace.uri.fsPath,
-                (_event: WatchEventType, _filename: string) => {
+                (_event: WatchEventType, _filename: string | null) => {
                     this.emit(GlobalEvents.workspaces.filesChangedAtWorkspace);
                 },
             );

src/common/promises/CancellationToken.ts

@@ -52,14 +52,20 @@ export class CancellationToken implements IVscCancellationToken {
         );
     }
 
-    static from(value: { [index: string | symbol]: unknown } | AbortSignal): CancellationToken {
+    // TODO: Review from and fromAbortSignal logic.
+
+    static from(value: { [index: string | symbol]: unknown } | CancellationToken): CancellationToken {
         if (this.isCancellationToken(value as { [index: string | symbol]: unknown })) {
             return value as CancellationToken;
         }
 
+        return CancellationToken.none;
+    }
+
+    static fromAbortSignal(signal: AbortSignal): CancellationToken {
         // todo what!!!, nodeJs.AbortSignal missed onabort ??!! add it to global.d.ts
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const abortSignal: any = value as any;
+        const abortSignal: any = signal as any;
         // const abortSignal: AbortSignal = value as AbortSignal;
 
         const token: CancellationToken = new CancellationToken(InternalActionGetter);

src/pqTestConnector/PqServiceHostClient.ts

@@ -21,7 +21,7 @@ import { ValueEventEmitter } from "../common/ValueEventEmitter";
 export * from "./PqServiceHostClientLite";
 
 export class PqServiceHostClient extends PqServiceHostClientLite implements IPQTestService, IDisposable {
-    private pingTimer: NodeJS.Timer | undefined = undefined;
+    private pingTimer: NodeJS.Timeout | undefined = undefined;
 
     public override get pqServiceHostConnected(): boolean {
         return Boolean(this.pingTimer);

src/pqTestConnector/PqTestExecutableTaskQueue.ts

@@ -431,7 +431,7 @@ export class PqTestExecutableTaskQueue implements IPQTestService, IDisposable {
         }
     }
 
-    protected onPQTestExecutablePidChanged(event: WatchEventType, _filename: string): void {
+    protected onPQTestExecutablePidChanged(event: WatchEventType, _filename: string | Buffer | null): void {
         if (event === "change") {
             // it might be the pid changed
             // if no running pid found, dequeue and execute one pending tasks if any

src/test/.eslintrc.js

@@ -7,6 +7,5 @@ module.exports = {
         "@typescript-eslint/prefer-namespace-keyword": "off",
         "@typescript-eslint/no-non-null-assertion": "off",
         "@typescript-eslint/no-namespace": "off",
-        "license-header/header": ["error", "../../resources/license-header.js"],
     },
 };

unit-tests/.eslintrc

@@ -9,7 +9,6 @@
   "rules": {
     "@typescript-eslint/ban-ts-comment": 0,
     "@typescript-eslint/typedef": 0,
-    "license-header/header": ["error", "../resources/license-header.js"],
     "prefer-const": 0
   }
 }

unit-tests/common/promises/cancellationToken.spec.ts

@@ -32,7 +32,7 @@ describe("Promises::CancellationTokenModule", () => {
 
         it("return the abortController", () => {
             const controller = new AbortController();
-            const token = CancellationToken.from(controller.signal);
+            const token = CancellationToken.fromAbortSignal(controller.signal);
 
             expect(token).instanceof(CancellationToken);
             expect(token.requested).false;

webviews/pq-test-result-view/.eslintrc.json

@@ -1,11 +1,9 @@
 {
-  "plugins": ["license-header"],
   "extends": [
     "react-app",
     "react-app/jest"
   ],
   "rules": {
-    "license-header/header": ["error", "../../resources/license-header.js"],
     "no-console": "warn"
   }
 }