Merge branch 'main' into remove-typescript-classes

# Conflicts: # CHANGELOG.md # javascript/package-lock.json # javascript/package.json
cucumber · Feb 7, 2025 · 2def03c · 2def03c
2 parents 85c1f78 + bdf9692
commit 2def03c
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,15 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Changed
-- [JavaScript] BREAKING CHANGE: Emit types instead of classes ([#287](https://github.com/cucumber/messages/pull/287)) 
+- [JavaScript] BREAKING CHANGE: Emit types instead of classes ([#287](https://github.com/cucumber/messages/pull/287))
 
 ### Fixed
 - [python] Add a LICENSE file for Python ([#278](https://github.com/cucumber/messages/pull/278))
 - [.NET] Fix NuGet package generation
 
-### Removed
-- [JavaScript] Remove dependency on `uuid` package ([#284](https://github.com/cucumber/messages/pull/284)
-
 ## [27.2.0] - 2025-01-31
 ### Added
 - [python] Added Python implementation ([#165](https://github.com/cucumber/messages/pull/165))

diff --git a/dotnet/Cucumber.Messages.Specs/Cucumber.Messages.Specs.csproj b/dotnet/Cucumber.Messages.Specs/Cucumber.Messages.Specs.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/javascript/package-lock.json b/javascript/package-lock.json
diff --git a/javascript/package.json b/javascript/package.json
@@ -35,10 +35,13 @@
     "version": "shx echo \"// This file is automatically generated using npm scripts\" > src/version.ts && echo \"export const version = '${npm_package_version}'\" >> src/version.ts",
     "prepublishOnly": "npm run build && npm run copy-schemas"
   },
-  "dependencies": {},
+  "dependencies": {
+    "uuid": "11.0.5"
+  },
   "devDependencies": {
     "@types/mocha": "10.0.10",
     "@types/node": "22.13.1",
+    "@types/uuid": "10.0.0",
     "copyfiles": "2.4.1",
     "mocha": "11.1.0",
     "shx": "^0.3.4",

diff --git a/javascript/src/IdGenerator.ts b/javascript/src/IdGenerator.ts
@@ -1,7 +1,9 @@
+import { v4 as uuidv4 } from 'uuid'
+
 export type NewId = () => string
 
 export function uuid(): NewId {
-  return () => crypto.randomUUID()
+  return () => uuidv4()
 }
 
 export function incrementing(): NewId {