From cb598f1872c486420d9a4beba0865ce74ea82c0c Mon Sep 17 00:00:00 2001 From: David Goss Date: Wed, 4 Nov 2026 13:14:24 +0000 Subject: [PATCH 1/4] Switch to ESM --- .github/workflows/test-javascript.yaml | 2 +- .mocharc.json | 2 +- bin/cucumber-language-server.cjs | 16 ----------- bin/cucumber-language-server.js | 18 +++++++++++++ node/package.json | 5 ++-- package.cjs.json | 1 - package.json | 37 +++++++++++--------------- src/wasm/startEmbeddedServer.ts | 2 +- src/wasm/startStandaloneServer.ts | 6 ++--- test/CucumberLanguageServer.test.ts | 6 ++--- test/standalone.test.ts | 4 +-- tsconfig.build-cjs.json | 8 ------ tsconfig.build-esm.json | 8 ------ tsconfig.build.json | 1 + tsconfig.json | 4 +-- wasm/package.json | 5 ++-- 16 files changed, 52 insertions(+), 73 deletions(-) delete mode 100755 bin/cucumber-language-server.cjs create mode 100755 bin/cucumber-language-server.js delete mode 100644 package.cjs.json delete mode 100644 tsconfig.build-cjs.json delete mode 100644 tsconfig.build-esm.json diff --git a/.github/workflows/test-javascript.yaml b/.github/workflows/test-javascript.yaml index 80dcd8c5..9ac1bec0 100644 --- a/.github/workflows/test-javascript.yaml +++ b/.github/workflows/test-javascript.yaml @@ -49,7 +49,7 @@ jobs: persist-credentials: false - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0 with: - node-version: 26.x + node-version: 22.x cache: "npm" cache-dependency-path: package-lock.json - run: npm ci diff --git a/.mocharc.json b/.mocharc.json index 73d3f0da..b5b71708 100644 --- a/.mocharc.json +++ b/.mocharc.json @@ -1,5 +1,5 @@ { - "loader": "ts-node/esm", + "node-option": ["loader=ts-node/esm"], "extension": ["ts"], "recursive": true } diff --git a/bin/cucumber-language-server.cjs b/bin/cucumber-language-server.cjs deleted file mode 100755 index 818eb6cd..00000000 --- a/bin/cucumber-language-server.cjs +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env node -require('source-map-support').install() -const { startStandaloneServer } = require('../dist/cjs/src/wasm/startStandaloneServer') -const { NodeFiles } = require('../dist/cjs/src/node/NodeFiles') -const path = require('node:path') -const { version } = require('../dist/cjs/src/version') - -const wasmBasePath = path.resolve(`${__dirname}/../node_modules/@cucumber/language-service/dist`) -const { connection } = startStandaloneServer(wasmBasePath, (rootUri) => new NodeFiles(rootUri)) - -// Don't die on unhandled Promise rejections -process.on('unhandledRejection', (reason, p) => { - connection.console.error( - `Cucumber Language Server ${version}: Unhandled Rejection at promise: ${p}, reason: ${reason}` - ) -}) diff --git a/bin/cucumber-language-server.js b/bin/cucumber-language-server.js new file mode 100755 index 00000000..8932d1ba --- /dev/null +++ b/bin/cucumber-language-server.js @@ -0,0 +1,18 @@ +#!/usr/bin/env node +import 'source-map-support/register.js' +import path from 'node:path' +import { NodeFiles } from '../dist/src/node/NodeFiles.js' +import { version } from '../dist/src/version.js' +import { startStandaloneServer } from '../dist/src/wasm/startStandaloneServer.js' + +const wasmBasePath = path.resolve( + `${import.meta.dirname}/../node_modules/@cucumber/language-service/dist` +) +const { connection } = startStandaloneServer(wasmBasePath, (rootUri) => new NodeFiles(rootUri)) + +// Don't die on unhandled Promise rejections +process.on('unhandledRejection', (reason, p) => { + connection.console.error( + `Cucumber Language Server ${version}: Unhandled Rejection at promise: ${p}, reason: ${reason}` + ) +}) diff --git a/node/package.json b/node/package.json index 132eecad..27e5f726 100644 --- a/node/package.json +++ b/node/package.json @@ -1,7 +1,6 @@ { "name": "wasm", "description": "Cucumber Language server using tree-sitter node bindings", - "main": "../dist/cjs/src/node/index.js", - "module": "../dist/esm/src/node/index.js", - "types": "../dist/esm/src/node/index.d.ts" + "main": "../dist/src/node/index.js", + "types": "../dist/src/node/index.d.ts" } diff --git a/package.cjs.json b/package.cjs.json deleted file mode 100644 index a3c15a7a..00000000 --- a/package.cjs.json +++ /dev/null @@ -1 +0,0 @@ -{ "type": "commonjs" } diff --git a/package.json b/package.json index 1498caa8..aae1d919 100644 --- a/package.json +++ b/package.json @@ -6,45 +6,40 @@ "node": "^22 || ^24 || >=26" }, "type": "module", - "main": "dist/cjs/src/index.js", - "module": "dist/esm/src/index.js", - "types": "dist/esm/src/index.d.ts", + "main": "dist/src/index.js", + "types": "dist/src/index.d.ts", "exports": { ".": { - "import": "./dist/esm/src/index.js", - "require": "./dist/cjs/src/index.js" + "types": "./dist/src/index.d.ts", + "default": "./dist/src/index.js" }, "./node": { - "import": "./dist/esm/src/node/index.js", - "require": "./dist/cjs/src/node/index.js" + "types": "./dist/src/node/index.d.ts", + "default": "./dist/src/node/index.js" }, "./wasm": { - "import": "./dist/esm/src/wasm/index.js", - "require": "./dist/cjs/src/wasm/index.js" + "types": "./dist/src/wasm/index.d.ts", + "default": "./dist/src/wasm/index.js" } }, "files": [ - "dist/cjs/src", - "dist/cjs/package.json", - "dist/esm/src", + "dist/src", "node", "wasm" ], "bin": { - "cucumber-language-server": "bin/cucumber-language-server.cjs" + "cucumber-language-server": "bin/cucumber-language-server.js" }, "scripts": { - "build:cjs": "tsc --build tsconfig.build-cjs.json && cp package.cjs.json dist/cjs/package.json", - "build:esm": "tsc --build tsconfig.build-esm.json", + "build": "npm run build:version && tsc --build tsconfig.build.json", "build:version": "node --eval \"console.log('export const version = \\'' + require('./package.json').version + '\\'')\" > src/version.ts", - "build": "npm run build:version && npm run build:cjs && npm run build:esm", - "test": "npm run test:cjs", - "test:cjs": "npm run build:cjs && mocha --no-config --recursive dist/cjs/test", - "pretest": "npm run build:version", - "prepublishOnly": "npm run build", "fix": "biome check --fix --error-on-warnings", "lint": "biome check --error-on-warnings", - "prepare": "husky" + "postbuild": "node -e \"require('.')\"", + "prepare": "husky", + "prepublishOnly": "npm run build", + "pretest": "npm run build", + "test": "mocha" }, "repository": { "type": "git", diff --git a/src/wasm/startEmbeddedServer.ts b/src/wasm/startEmbeddedServer.ts index 88bd3305..5bfeb52c 100644 --- a/src/wasm/startEmbeddedServer.ts +++ b/src/wasm/startEmbeddedServer.ts @@ -2,7 +2,7 @@ import { PassThrough } from 'node:stream' import type { CucumberExpressions, ParserAdapter, Suggestion } from '@cucumber/language-service' import { WasmParserAdapter } from '@cucumber/language-service/wasm' import { type Connection, TextDocuments } from 'vscode-languageserver' -import { createConnection } from 'vscode-languageserver/node' +import { createConnection } from 'vscode-languageserver/node.js' import { TextDocument } from 'vscode-languageserver-textdocument' import { CucumberLanguageServer } from '../CucumberLanguageServer.js' diff --git a/src/wasm/startStandaloneServer.ts b/src/wasm/startStandaloneServer.ts index f62ea48e..34b9e6c3 100644 --- a/src/wasm/startStandaloneServer.ts +++ b/src/wasm/startStandaloneServer.ts @@ -1,10 +1,10 @@ import { WasmParserAdapter } from '@cucumber/language-service/wasm' import { TextDocuments } from 'vscode-languageserver' -import { createConnection, ProposedFeatures } from 'vscode-languageserver/node' +import { createConnection, ProposedFeatures } from 'vscode-languageserver/node.js' import { TextDocument } from 'vscode-languageserver-textdocument' -import { CucumberLanguageServer } from '../CucumberLanguageServer' -import type { Files } from '../Files' +import { CucumberLanguageServer } from '../CucumberLanguageServer.js' +import type { Files } from '../Files.js' export function startStandaloneServer(wasmBaseUrl: string, makeFiles: (rootUri: string) => Files) { const adapter = new WasmParserAdapter(wasmBaseUrl) diff --git a/test/CucumberLanguageServer.test.ts b/test/CucumberLanguageServer.test.ts index c02486f5..ba9cba87 100644 --- a/test/CucumberLanguageServer.test.ts +++ b/test/CucumberLanguageServer.test.ts @@ -1,7 +1,7 @@ import assert from 'node:assert' import { Duplex } from 'node:stream' import { WasmParserAdapter } from '@cucumber/language-service/wasm' -import { NullLogger, StreamMessageReader, StreamMessageWriter } from 'vscode-jsonrpc/node' +import { NullLogger, StreamMessageReader, StreamMessageWriter } from 'vscode-jsonrpc/node.js' import { type Connection, createProtocolConnection, @@ -15,11 +15,11 @@ import { type ProtocolConnection, TextDocuments, } from 'vscode-languageserver' -import { createConnection } from 'vscode-languageserver/node' +import { createConnection } from 'vscode-languageserver/node.js' import { type CompletionParams, CompletionRequest, -} from 'vscode-languageserver-protocol/lib/common/protocol' +} from 'vscode-languageserver-protocol/lib/common/protocol.js' import { TextDocument } from 'vscode-languageserver-textdocument' import { type CompletionItem, CompletionItemKind } from 'vscode-languageserver-types' diff --git a/test/standalone.test.ts b/test/standalone.test.ts index aac36a3b..7f6ff2af 100644 --- a/test/standalone.test.ts +++ b/test/standalone.test.ts @@ -1,7 +1,7 @@ import assert from 'node:assert' import { type ChildProcess, fork } from 'node:child_process' import type { Duplex } from 'node:stream' -import { NullLogger, StreamMessageReader, StreamMessageWriter } from 'vscode-jsonrpc/node' +import { NullLogger, StreamMessageReader, StreamMessageWriter } from 'vscode-jsonrpc/node.js' import { createProtocolConnection, DidChangeConfigurationNotification, @@ -22,7 +22,7 @@ describe('Standalone', () => { beforeEach(async () => { logMessages = [] - serverFork = fork('./bin/cucumber-language-server.cjs', ['--stdio'], { + serverFork = fork('./bin/cucumber-language-server.js', ['--stdio'], { silent: true, }) diff --git a/tsconfig.build-cjs.json b/tsconfig.build-cjs.json deleted file mode 100644 index 71f03f2d..00000000 --- a/tsconfig.build-cjs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.build.json", - "compilerOptions": { - "target": "ES6", - "module": "CommonJS", - "outDir": "dist/cjs" - } -} diff --git a/tsconfig.build-esm.json b/tsconfig.build-esm.json deleted file mode 100644 index ba3f0385..00000000 --- a/tsconfig.build-esm.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.build.json", - "compilerOptions": { - "target": "ES6", - "module": "ES6", - "outDir": "dist/esm" - } -} diff --git a/tsconfig.build.json b/tsconfig.build.json index 50305f38..553a3203 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -7,6 +7,7 @@ "sourceMap": true, "rootDir": ".", "noEmit": false, + "outDir": "dist", "lib": ["ES2019"] }, "include": ["src", "test"] diff --git a/tsconfig.json b/tsconfig.json index 005c7efa..2d884b35 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,10 +11,10 @@ "skipLibCheck": true, "strictNullChecks": true, "experimentalDecorators": true, - "module": "ESNext", "lib": ["ES6", "dom"], "target": "ES6", - "moduleResolution": "node", + "module": "NodeNext", + "moduleResolution": "NodeNext", "allowSyntheticDefaultImports": true, "noEmit": true } diff --git a/wasm/package.json b/wasm/package.json index 248c3920..b3c8b984 100644 --- a/wasm/package.json +++ b/wasm/package.json @@ -1,7 +1,6 @@ { "name": "wasm", "description": "Cucumber Language server using tree-sitter wasm bindings", - "main": "../dist/cjs/src/wasm/index.js", - "module": "../dist/esm/src/wasm/index.js", - "types": "../dist/esm/src/wasm/index.d.ts" + "main": "../dist/src/wasm/index.js", + "types": "../dist/src/wasm/index.d.ts" } From 688778f6776ff7eb9c233a8366a00ebca1a5b9fc Mon Sep 17 00:00:00 2001 From: David Goss Date: Wed, 4 Nov 2026 13:14:49 +0000 Subject: [PATCH 2/4] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc1cf368..d5f23e71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,14 +6,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] -### Removed -- Dropped support for end-of-life Node versions 16, 18 and 20 +### Changed +- BREAKING CHANGE: Switch to ESM ([#155](https://github.com/cucumber/language-server/pull/155)) ### Fixed - User's `snippetTemplates` config is ignored - Default `glue` globs miss `.cjs`, `.mjs`, `.cts` and `.mts` files - Glue and feature files not found when root is not the current directory +### Removed +- Dropped support for end-of-life Node versions 16, 18 and 20 + ## [1.7.0] - 2025-05-18 ### Changed - Update dependency @cucumber/language-service to 1.7.0 From 3bf863ee64b8ebe4c8ae4bef3267d7d4b85b4931 Mon Sep 17 00:00:00 2001 From: David Goss Date: Wed, 4 Nov 2026 13:25:47 +0000 Subject: [PATCH 3/4] Compile only src so dist has a flat layout --- bin/cucumber-language-server.js | 6 +++--- node/package.json | 4 ++-- package.json | 20 ++++++++++---------- tsconfig.build.json | 5 ++--- wasm/package.json | 4 ++-- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/bin/cucumber-language-server.js b/bin/cucumber-language-server.js index 8932d1ba..f5ab62e2 100755 --- a/bin/cucumber-language-server.js +++ b/bin/cucumber-language-server.js @@ -1,9 +1,9 @@ #!/usr/bin/env node import 'source-map-support/register.js' import path from 'node:path' -import { NodeFiles } from '../dist/src/node/NodeFiles.js' -import { version } from '../dist/src/version.js' -import { startStandaloneServer } from '../dist/src/wasm/startStandaloneServer.js' +import { NodeFiles } from '../dist/node/NodeFiles.js' +import { version } from '../dist/version.js' +import { startStandaloneServer } from '../dist/wasm/startStandaloneServer.js' const wasmBasePath = path.resolve( `${import.meta.dirname}/../node_modules/@cucumber/language-service/dist` diff --git a/node/package.json b/node/package.json index 27e5f726..97a26ba9 100644 --- a/node/package.json +++ b/node/package.json @@ -1,6 +1,6 @@ { "name": "wasm", "description": "Cucumber Language server using tree-sitter node bindings", - "main": "../dist/src/node/index.js", - "types": "../dist/src/node/index.d.ts" + "main": "../dist/node/index.js", + "types": "../dist/node/index.d.ts" } diff --git a/package.json b/package.json index aae1d919..05e08d6c 100644 --- a/package.json +++ b/package.json @@ -6,24 +6,24 @@ "node": "^22 || ^24 || >=26" }, "type": "module", - "main": "dist/src/index.js", - "types": "dist/src/index.d.ts", + "main": "dist/index.js", + "types": "dist/index.d.ts", "exports": { ".": { - "types": "./dist/src/index.d.ts", - "default": "./dist/src/index.js" + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "./node": { - "types": "./dist/src/node/index.d.ts", - "default": "./dist/src/node/index.js" + "types": "./dist/node/index.d.ts", + "default": "./dist/node/index.js" }, "./wasm": { - "types": "./dist/src/wasm/index.d.ts", - "default": "./dist/src/wasm/index.js" + "types": "./dist/wasm/index.d.ts", + "default": "./dist/wasm/index.js" } }, "files": [ - "dist/src", + "dist", "node", "wasm" ], @@ -31,7 +31,7 @@ "cucumber-language-server": "bin/cucumber-language-server.js" }, "scripts": { - "build": "npm run build:version && tsc --build tsconfig.build.json", + "build": "npm run build:version && tsc --project tsconfig.build.json", "build:version": "node --eval \"console.log('export const version = \\'' + require('./package.json').version + '\\'')\" > src/version.ts", "fix": "biome check --fix --error-on-warnings", "lint": "biome check --error-on-warnings", diff --git a/tsconfig.build.json b/tsconfig.build.json index 553a3203..855b717c 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -1,14 +1,13 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "composite": true, "declaration": true, "declarationMap": true, "sourceMap": true, - "rootDir": ".", + "rootDir": "src", "noEmit": false, "outDir": "dist", "lib": ["ES2019"] }, - "include": ["src", "test"] + "include": ["src"] } diff --git a/wasm/package.json b/wasm/package.json index b3c8b984..a74544e8 100644 --- a/wasm/package.json +++ b/wasm/package.json @@ -1,6 +1,6 @@ { "name": "wasm", "description": "Cucumber Language server using tree-sitter wasm bindings", - "main": "../dist/src/wasm/index.js", - "types": "../dist/src/wasm/index.d.ts" + "main": "../dist/wasm/index.js", + "types": "../dist/wasm/index.d.ts" } From 27f98adc382317e25885e900dcef89f1e2a5c8e3 Mon Sep 17 00:00:00 2001 From: David Goss Date: Wed, 4 Nov 2026 13:29:26 +0000 Subject: [PATCH 4/4] Revert lint job Node.js version to 26.x --- .github/workflows/test-javascript.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-javascript.yaml b/.github/workflows/test-javascript.yaml index 9ac1bec0..80dcd8c5 100644 --- a/.github/workflows/test-javascript.yaml +++ b/.github/workflows/test-javascript.yaml @@ -49,7 +49,7 @@ jobs: persist-credentials: false - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0 with: - node-version: 22.x + node-version: 26.x cache: "npm" cache-dependency-path: package-lock.json - run: npm ci