Merge pull request #86 from hildjj/update-dependencies

Update dependencies

Author: hildjj

.github/workflows/main.yaml

@@ -10,15 +10,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
         with:
-          node-version: 22
-          cache: pnpm
+          node-version: 24
+          cache: npm
 
       - name: Install
-        run: pnpm install
+        run: npm install
 
       - name: Install XVFB for testing with VS Code
         run: |
@@ -49,4 +48,4 @@ jobs:
           xvfb-run -a npm run test
 
       - name: Package
-        run: pnpm run package
+        run: npm run package

client/client.ts

@@ -8,7 +8,7 @@ import {
 } from "vscode-languageclient/node";
 import { ExtensionContext } from "vscode";
 
-let client: LanguageClient = undefined;
+let client: LanguageClient | undefined = undefined;
 
 export function activate(context: ExtensionContext): void {
   // The server is implemented in node
@@ -50,9 +50,8 @@ export function activate(context: ExtensionContext): void {
   client.start();
 }
 
-export function deactivate(): Promise<void> {
+export async function deactivate(): Promise<void> {
   if (client) {
-    return client.stop();
+    await client.stop();
   }
-  return undefined;
 }

client/preview.ts

@@ -236,13 +236,13 @@ export function activate(context: ExtensionContext): void {
   });
 
   const initialConfig = workspace.getConfiguration(ID);
-  debounceExecution.wait = initialConfig.get("debounceMS");
-  filePattern = initialConfig.get("filePattern");
+  debounceExecution.wait = initialConfig.get("debounceMS") ?? 200;
+  filePattern = initialConfig.get("filePattern") ?? "%s/%s.js";
   const configChanged = workspace.onDidChangeConfiguration(e => {
     if (e.affectsConfiguration(ID)) {
       const config = workspace.getConfiguration(ID);
-      debounceExecution.wait = config.get("debounceMS");
-      filePattern = config.get("filePattern");
+      debounceExecution.wait = config.get("debounceMS") ?? 200;
+      filePattern = config.get("filePattern") ?? "%s/%s.js";
     }
   });
 
@@ -264,7 +264,7 @@ export function activate(context: ExtensionContext): void {
         /[\p{ID_Start}][\p{ID_Continue}]*/u
       );
 
-      if (word_range !== null) {
+      if (word_range) {
         editor.selection = new Selection(word_range.start, word_range.end);
         const rule_name = editor.document.getText(word_range);
         const grammar_config = await trackGrammar(

common/debounce.ts

@@ -18,7 +18,7 @@ export function debouncePromise<T extends AnyAsyncFunction>(
   fn: T,
   wait: number
 ): DebouncedWait<T> {
-  let timeout: NodeJS.Timeout = undefined;
+  let timeout: NodeJS.Timeout | undefined = undefined;
   let resolvers: PromiseWithResolvers<Awaited<ReturnType<T>>> | undefined
     = undefined;
 
@@ -32,9 +32,9 @@ export function debouncePromise<T extends AnyAsyncFunction>(
       timeout = undefined;
       try {
         const result = await fn(...args);
-        r.resolve(result);
+        r?.resolve(result);
       } catch (e) {
-        r.reject(e);
+        r?.reject(e);
       }
     }, wrapper.wait);
     if (!resolvers) {

eslint.config.mjs

@@ -17,4 +17,10 @@ export default [
   ...modern,
   ...mocha,
   ...ts,
+  {
+    files: ["**/*.ts"],
+    rules: {
+      "@typescript-eslint/strict-void-return": "off",
+    },
+  },
 ];