From d5e1bdb18c6f2d008c7ae146704ca04a978f8ea4 Mon Sep 17 00:00:00 2001 From: David Goss Date: Thu, 5 Nov 2026 10:41:53 +0000 Subject: [PATCH 1/3] Bump typescript to 6 --- package-lock.json | 15 ++++++++------- package.json | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 19835e49..6d9787ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "husky": "9.1.7", "lint-staged": "17.6.0", "mocha": "12.0.3", - "typescript": "5.9.3" + "typescript": "^6.0.3" }, "engines": { "vscode": "^1.101.0" @@ -5315,10 +5315,11 @@ } }, "node_modules/typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", + "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -9163,9 +9164,9 @@ } }, "typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", + "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", "dev": true }, "uc.micro": { diff --git a/package.json b/package.json index a4b5d926..b54e43ff 100644 --- a/package.json +++ b/package.json @@ -131,6 +131,6 @@ "husky": "9.1.7", "lint-staged": "17.6.0", "mocha": "12.0.3", - "typescript": "5.9.3" + "typescript": "^6.0.3" } } From e909587db11e76af535497896fb1d5007c3624e6 Mon Sep 17 00:00:00 2001 From: David Goss Date: Thu, 5 Nov 2026 10:41:55 +0000 Subject: [PATCH 2/3] Add @tsconfig/recommended and pin @types/node to 22 --- package-lock.json | 51 +++++++++++++++++++++++++++++++++++++++-------- package.json | 2 ++ 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6d9787ff..7f5d0f1d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,8 +14,10 @@ "devDependencies": { "@biomejs/biome": "2.6.4", "@cucumber/biome-config": "github:cucumber/biome-config#v0.6.0", + "@tsconfig/recommended": "^1.0.13", "@types/glob": "8.1.0", "@types/mocha": "10.0.10", + "@types/node": "^22.20.5", "@types/vscode": "1.101.0", "@vscode/test-electron": "2.5.2", "@vscode/vsce": "3.9.2", @@ -1395,6 +1397,13 @@ "@textlint/ast-node-types": "15.2.2" } }, + "node_modules/@tsconfig/recommended": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@tsconfig/recommended/-/recommended-1.0.13.tgz", + "integrity": "sha512-sySRuBfMKyKO/j2ZAhR8kSembhjuPEV4Ra3AHtmWLq51+iGaudr45crPSzNC5b7/Ctrh9dfUpBuTlYrH6rM58Q==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/glob": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.1.0.tgz", @@ -1428,10 +1437,14 @@ "integrity": "sha512-t+8/QWTAhOFlrF1IVZqKnMRJi84EgkIK5Kh0p2JV4OLywUvCwJPFxbJAl7XAow7DVIHsF+xW9f1MVzg0L6Szjw==" }, "node_modules/@types/node": { - "version": "20.6.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.3.tgz", - "integrity": "sha512-HksnYH4Ljr4VQgEy2lTStbCKv/P590tmPe5HqOnv9Gprffgv5WXAY+Y5Gqniu0GGqeTCUdBnzC3QSrzPkBkAMA==", - "dev": true + "version": "22.20.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.20.5.tgz", + "integrity": "sha512-U2+DNr+wSjpsTS/wZGYHq7GcwfuSmKiKvoPvK22zwTlRhU91yOniN4qRR5KhIjvif7ysw/dz/hKmfDH0Ris4aA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.21.0" + } }, "node_modules/@types/normalize-package-data": { "version": "2.4.4", @@ -5340,6 +5353,13 @@ "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==", "dev": true }, + "node_modules/undici-types": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "dev": true, + "license": "MIT" + }, "node_modules/unicorn-magic": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz", @@ -6445,6 +6465,12 @@ "@textlint/ast-node-types": "15.2.2" } }, + "@tsconfig/recommended": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@tsconfig/recommended/-/recommended-1.0.13.tgz", + "integrity": "sha512-sySRuBfMKyKO/j2ZAhR8kSembhjuPEV4Ra3AHtmWLq51+iGaudr45crPSzNC5b7/Ctrh9dfUpBuTlYrH6rM58Q==", + "dev": true + }, "@types/glob": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.1.0.tgz", @@ -6478,10 +6504,13 @@ "integrity": "sha512-t+8/QWTAhOFlrF1IVZqKnMRJi84EgkIK5Kh0p2JV4OLywUvCwJPFxbJAl7XAow7DVIHsF+xW9f1MVzg0L6Szjw==" }, "@types/node": { - "version": "20.6.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.3.tgz", - "integrity": "sha512-HksnYH4Ljr4VQgEy2lTStbCKv/P590tmPe5HqOnv9Gprffgv5WXAY+Y5Gqniu0GGqeTCUdBnzC3QSrzPkBkAMA==", - "dev": true + "version": "22.20.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.20.5.tgz", + "integrity": "sha512-U2+DNr+wSjpsTS/wZGYHq7GcwfuSmKiKvoPvK22zwTlRhU91yOniN4qRR5KhIjvif7ysw/dz/hKmfDH0Ris4aA==", + "dev": true, + "requires": { + "undici-types": "~6.21.0" + } }, "@types/normalize-package-data": { "version": "2.4.4", @@ -9181,6 +9210,12 @@ "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==", "dev": true }, + "undici-types": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "dev": true + }, "unicorn-magic": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz", diff --git a/package.json b/package.json index b54e43ff..d8451fed 100644 --- a/package.json +++ b/package.json @@ -121,8 +121,10 @@ "devDependencies": { "@biomejs/biome": "2.6.4", "@cucumber/biome-config": "github:cucumber/biome-config#v0.6.0", + "@tsconfig/recommended": "^1.0.13", "@types/glob": "8.1.0", "@types/mocha": "10.0.10", + "@types/node": "^22.20.5", "@types/vscode": "1.101.0", "@vscode/test-electron": "2.5.2", "@vscode/vsce": "3.9.2", From 8b62265ae95f7d7434298b6fc01fd633d2fa4fac Mon Sep 17 00:00:00 2001 From: David Goss Date: Thu, 5 Nov 2026 10:42:43 +0000 Subject: [PATCH 3/3] Adopt shared tsconfig and emit tests to dist/test --- .vscode/launch.json | 4 ++-- package.json | 4 ++-- tsconfig.build.json | 8 ++++++++ tsconfig.json | 29 ++++++++++------------------- 4 files changed, 22 insertions(+), 23 deletions(-) create mode 100644 tsconfig.build.json diff --git a/.vscode/launch.json b/.vscode/launch.json index dd501710..ce5aeab3 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -19,9 +19,9 @@ "request": "launch", "args": [ "--extensionDevelopmentPath=${workspaceFolder}", - "--extensionTestsPath=${workspaceFolder}/dist/src/test/suite/index" + "--extensionTestsPath=${workspaceFolder}/dist/test/suite/index" ], - "outFiles": ["${workspaceFolder}/dist/src/test/**/*.js"], + "outFiles": ["${workspaceFolder}/dist/test/**/*.js"], "preLaunchTask": "${defaultBuildTask}" } ] diff --git a/package.json b/package.json index d8451fed..11daf0c9 100644 --- a/package.json +++ b/package.json @@ -97,13 +97,13 @@ "vscode:prepublish": "npm run build", "esbuild-extension": "esbuild ./src/extension.ts --external:vscode --bundle --outfile=out/extension.js --format=cjs --platform=node --minify --sourcemap", "build": "npm run esbuild-extension", - "compile": "tsc --build", + "compile": "tsc --project tsconfig.build.json", "prepare": "husky && npm run copy-wasms", "copy-wasms": "mkdir -p out && cp node_modules/@cucumber/language-service/dist/*.wasm out", "pretest": "npm run compile", "fix": "biome check --fix --error-on-warnings", "lint": "biome check --error-on-warnings", - "test": "node ./dist/src/test/runTest.js", + "test": "node ./dist/test/runTest.js", "prepublishOnly": "npm run update-settings-docs", "update-settings-docs": "./scripts/update-settings-docs.sh", "vscode-types-compatible": "./scripts/vscode-types-compatible.sh", diff --git a/tsconfig.build.json b/tsconfig.build.json new file mode 100644 index 00000000..20eb686d --- /dev/null +++ b/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "include": ["src"], + "compilerOptions": { + "rootDir": "src", + "outDir": "dist" + } +} diff --git a/tsconfig.json b/tsconfig.json index 8fe0ec42..326ec712 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,23 +1,14 @@ { + "extends": "@tsconfig/recommended/tsconfig.json", + "include": ["src"], "compilerOptions": { - "baseUrl": ".", - "outDir": "dist", + "lib": ["es2024"], + "target": "es2024", + "module": "NodeNext", + "moduleResolution": "NodeNext", + "types": ["node", "mocha", "vscode"], "declaration": true, - "sourceMap": true, - "allowJs": false, - "resolveJsonModule": true, - "esModuleInterop": true, - "noImplicitAny": true, - "downlevelIteration": true, - "skipLibCheck": true, - "strictNullChecks": true, - "experimentalDecorators": true, - "module": "CommonJS", - "lib": ["ES6", "dom"], - "target": "ES6", - "moduleResolution": "node", - "allowSyntheticDefaultImports": true, - "jsx": "react" - }, - "include": ["package.json", "src", "test"] + "inlineSourceMap": true, + "inlineSources": true + } }