Merge branch 'main' into renovate/read-pkg-up-replacement

# Conflicts:
#	package-lock.json
#	src/configuration/from_file.ts

Author: davidjgoss

CHANGELOG.md

@@ -8,6 +8,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 Please see [CONTRIBUTING.md](./CONTRIBUTING.md) on how to contribute to Cucumber.
 
 ## [Unreleased]
+### Added
+- `junit` formatter now includes `timestamp` attribute ([junit-xml-formatter#45](https://github.com/cucumber/junit-xml-formatter/pull/45))
+- `Hook` message now includes `type` ([#2463](https://github.com/cucumber/cucumber-js/pull/2463))
+- `TestRunStarted` message now includes `id`; `TestCase` and `TestRunFinished` messages reference it in `testRunStartedId` ([#2463](https://github.com/cucumber/cucumber-js/pull/2463))
+
+## [11.1.1] - 2024-12-11
+### Fixed
+- Correctly report error in publish plugin ([#2454](https://github.com/cucumber/cucumber-js/pull/2454))
+- Reverse AfterAll execution order ([#2456](https://github.com/cucumber/cucumber-js/pull/2456))
 
 ## [11.1.0] - 2024-11-17
 ### Added
@@ -1649,7 +1658,8 @@ this.Given(), this.When(), this.Then() and this.defineStep() ([#2](https://githu
 
 ## 0.0.1
 
-[Unreleased]: https://github.com/cucumber/cucumber-js/compare/v11.1.0...HEAD
+[Unreleased]: https://github.com/cucumber/cucumber-js/compare/v11.1.1...HEAD
+[11.1.1]: https://github.com/cucumber/cucumber-js/compare/v11.1.0...v11.1.1
 [11.1.0]: https://github.com/cucumber/cucumber-js/compare/v11.0.1...v11.1.0
 [11.0.1]: https://github.com/cucumber/cucumber-js/compare/v11.0.0...v11.0.1
 [11.0.0]: https://github.com/cucumber/cucumber-js/compare/v10.9.0...v11.0.0

README.md

@@ -1,18 +1,20 @@
 <h1 align="center">
-  <img src="./docs/images/logo.svg" alt="">
+  <img src="./docs/images/logo.svg" alt="" width="75">
   <br>
   Cucumber
 </h1>
 <p align="center">
   <b>Automated tests in plain language, for Node.js</b>
 </p>
 
-[![#StandWithUkraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/badges/StandWithUkraine.svg)](https://vshymanskyy.github.io/StandWithUkraine)
-[![npm](https://img.shields.io/npm/v/@cucumber/cucumber.svg)](https://www.npmjs.com/package/@cucumber/cucumber)
-[![build](https://github.com/cucumber/cucumber-js/actions/workflows/build.yaml/badge.svg)](https://github.com/cucumber/cucumber-js/actions)
-[![coverage](https://coveralls.io/repos/github/cucumber/cucumber-js/badge.svg?branch=main)](https://coveralls.io/github/cucumber/cucumber-js?branch=master)
-[![backers](https://opencollective.com/cucumber/backers/badge.svg)](https://opencollective.com/cucumber)
-[![sponsors](https://opencollective.com/cucumber/sponsors/badge.svg)](https://opencollective.com/cucumber)
+<p align="center">
+  <a href="https://www.npmjs.com/package/@cucumber/cucumber" style="text-decoration: none"><img src="https://img.shields.io/npm/v/@cucumber/cucumber?style=flat&color=dark-green" alt="Latest version on npm"></a>
+  <a href="https://github.com/cucumber/cucumber-js/actions" style="text-decoration: none"><img src="https://github.com/cucumber/cucumber-js/actions/workflows/build.yaml/badge.svg" alt="Build status"></a>
+  <a href="https://coveralls.io/github/cucumber/cucumber-js?branch=master" style="text-decoration: none"><img src="https://coveralls.io/repos/github/cucumber/cucumber-js/badge.svg?branch=main" alt="Coverage"></a>
+  <a href="https://opencollective.com/cucumber"><img src="https://opencollective.com/cucumber/backers/badge.svg" alt="Backers"></a>
+  <a href="https://opencollective.com/cucumber"><img src="https://opencollective.com/cucumber/sponsors/badge.svg" alt="Sponsors"></a>
+  <a href="https://vshymanskyy.github.io/StandWithUkraine"><img src="https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/badges/StandWithUkraine.svg" alt="Ukraine solidarity"></a>
+</p>
 
 [Cucumber](https://github.com/cucumber) is a tool for running automated tests written in plain language. Because they're
 written in plain language, they can be read by anyone on your team. Because they can be

compatibility/features/attachments/attachments.ts

@@ -1,8 +1,6 @@
 import fs from 'node:fs'
 import path from 'node:path'
-import { Before, When } from '../../../src'
-
-Before(() => undefined)
+import { When } from '../../../src'
 
 When(
   'the string {string} is attached as {string}',
@@ -90,3 +88,7 @@ When('a PDF document is attached and renamed', async function () {
     }
   )
 })
+
+When('a link to {string} is attached', async function (uri: string) {
+  this.link(uri)
+})

compatibility/features/examples-tables/examples-tables.ts

@@ -1,24 +1,23 @@
 import assert from 'node:assert'
 import { Given, When, Then } from '../../../src'
 
-type World = {
-  count: number
-}
+Given('there are {int} cucumbers', function (initialCount: number) {
+  this.count = initialCount
+})
 
-Given(
-  'there are {int} cucumbers',
-  function (this: World, initialCount: number) {
-    this.count = initialCount
-  }
-)
+Given('there are {int} friends', function (initialFriends: number) {
+  this.friends = initialFriends
+})
 
-When('I eat {int} cucumbers', function (this: World, eatCount: number) {
+When('I eat {int} cucumbers', function (eatCount: number) {
   this.count -= eatCount
 })
 
-Then(
-  'I should have {int} cucumbers',
-  function (this: World, expectedCount: number) {
-    assert.strictEqual(this.count, expectedCount)
-  }
-)
+Then('I should have {int} cucumbers', function (expectedCount: number) {
+  assert.strictEqual(this.count, expectedCount)
+})
+
+Then('each person can eat {int} cucumbers', function (expectedShare) {
+  const share = Math.floor(this.count / (1 + this.friends))
+  assert.strictEqual(share, expectedShare)
+})

docs/images/logo.svg

@@ -101,7 +101,7 @@ export interface IRunConfiguration {
 export interface IRunEnvironment {
     cwd?: string;
     debug?: boolean;
-    env?: NodeJS.ProcessEnv;
+    env?: Record<string, string | undefined>;
     stderr?: Writable;
     stdout?: Writable;
 }

exports/api/report.api.md

@@ -15,6 +15,10 @@ Feature: Environment Hooks
       """
 
   Scenario: before all / after all hooks
+
+    BeforeAll hooks run once each before any scenarios, in declaration order
+    AfterAll hooks run once each after all scenarios, in reverse declaration order
+
     Given a file named "features/support/hooks.js" with:
       """
       const {AfterAll, BeforeAll, Given} = require('@cucumber/cucumber')
@@ -27,20 +31,30 @@ Feature: Environment Hooks
         counter += counter
       })
 
-      Given('first step', function() {
+      BeforeAll(function() {
         expect(counter).to.eql(2)
         counter += counter
       })
 
-      Given('second step', function() {
+      Given('first step', function() {
         expect(counter).to.eql(4)
         counter += counter
       })
 
-      AfterAll(function() {
+      Given('second step', function() {
         expect(counter).to.eql(8)
         counter += counter
       })
+
+      AfterAll(function() {
+        expect(counter).to.eql(32)
+        counter += counter
+      })
+
+      AfterAll(function() {
+        expect(counter).to.eql(16)
+        counter += counter
+      })
       """
     When I run cucumber-js
     Then it passes

features/before_after_all_hooks.feature

@@ -110,6 +110,7 @@ export const ignorableKeys = [
   'pickleId',
   'pickleStepId',
   'stepDefinitionIds',
+  'testRunStartedId',
   'testCaseId',
   'testCaseStartedId',
   'testStepId',