refresh cucumber core dependencies (#1637)

* bump existing cucumber dependencies

* add gherkin streams

* import gherkinstreams from own package

* fix the other streams imports

* update create-meta

* tell renovate to update monorepo packages together

* add scenario to prove tagged rules work

* add changelog entry for tagged rules

* bring in fixed version of query

* bump libs again

* updte html-formatter

CHANGELOG.md

@@ -12,6 +12,7 @@ Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CO
 ### Added
 
 - Support attachments that are already base64-encoded via a prefix on the MIME type e.g. `this.attach(base64String, 'base64:image/png')` ([#1552](https://github.com/cucumber/cucumber-js/pull/1552))
+- Support tagged rules (see <https://github.com/cucumber/cucumber/issues/1123>)
 
 ### Changed
 

features/rule.feature

@@ -135,3 +135,31 @@ Feature: Rule keyword
     8 steps (1 failed, 1 skipped, 6 passed)
     <duration-stat>
     """
+
+  Scenario: Tags on Rules are honoured
+    Given a file named "features/highlander.feature" with:
+      """
+      Feature: a feature
+
+        @mytag
+        Rule: a rule
+
+          Example: a scenario
+            Given a step
+      """
+    And a file named "features/step_definitions/cucumber_steps.js" with:
+      """
+      const {Given} = require('@cucumber/cucumber')
+
+      Given('a step', function() {})
+      """
+    When I run cucumber-js with arguments `--tags @mytag` and env ``
+    Then it passes
+    And it outputs the text:
+    """
+    .
+
+    1 scenario (1 passed)
+    1 step (1 passed)
+    <duration-stat>
+    """

package.json

@@ -168,12 +168,13 @@
     "node": ">=10"
   },
   "dependencies": {
-    "@cucumber/create-meta": "3.0.0",
-    "@cucumber/cucumber-expressions": "12.0.0",
-    "@cucumber/gherkin": "17.0.2",
-    "@cucumber/html-formatter": "12.0.0",
-    "@cucumber/messages": "14.0.1",
-    "@cucumber/query": "8.0.0",
+    "@cucumber/create-meta": "4.0.0",
+    "@cucumber/cucumber-expressions": "12.0.1",
+    "@cucumber/gherkin": "18.0.0",
+    "@cucumber/gherkin-streams": "1.0.0",
+    "@cucumber/html-formatter": "13.0.0",
+    "@cucumber/messages": "15.0.0",
+    "@cucumber/query": "9.0.2",
     "@cucumber/tag-expressions": "3.0.1",
     "assertion-error-formatter": "3.0.0",
     "bluebird": "^3.7.2",
@@ -203,7 +204,7 @@
     "verror": "^1.10.0"
   },
   "devDependencies": {
-    "@cucumber/compatibility-kit": "3.0.0",
+    "@cucumber/compatibility-kit": "4.0.1",
     "@sinonjs/fake-timers": "7.0.2",
     "@types/bluebird": "3.5.33",
     "@types/chai": "4.2.15",

renovate.json

@@ -14,6 +14,10 @@
     {
       "packagePatterns": ["mocha", "chai", "sinon"],
       "groupName": "unit test packages"
+    },
+    {
+      "packagePatterns": ["@cucumber"],
+      "groupName": "cucumber packages"
     }
   ],
   "schedule": [

src/cli/helpers_spec.ts

@@ -9,7 +9,7 @@ import { EventEmitter } from 'events'
 import PickleFilter from '../pickle_filter'
 import { messages, IdGenerator } from '@cucumber/messages'
 import { EventDataCollector } from '../formatter/helpers'
-import GherkinStreams from '@cucumber/gherkin/dist/src/stream/GherkinStreams'
+import { GherkinStreams } from '@cucumber/gherkin-streams'
 import { Readable } from 'stream'
 import StepDefinition from '../models/step_definition'
 import {

src/cli/index.ts

@@ -24,7 +24,7 @@ import { IdGenerator } from '@cucumber/messages'
 import { IFormatterStream } from '../formatter'
 import { WriteStream as TtyWriteStream } from 'tty'
 import { doesNotHaveValue } from '../value_checker'
-import GherkinStreams from '@cucumber/gherkin/dist/src/stream/GherkinStreams'
+import { GherkinStreams } from '@cucumber/gherkin-streams'
 import { ISupportCodeLibrary } from '../support_code_library_builder/types'
 import { IParsedArgvFormatOptions } from './argv_parser'
 import HttpStream from '../formatter/http_stream'

test/gherkin_helpers.ts

@@ -1,7 +1,7 @@
 import { messages } from '@cucumber/messages'
 import { doesHaveValue } from '../src/value_checker'
 import { IGherkinOptions } from '@cucumber/gherkin'
-import GherkinStreams from '@cucumber/gherkin/dist/src/stream/GherkinStreams'
+import { GherkinStreams } from '@cucumber/gherkin-streams'
 import { EventEmitter } from 'events'
 
 export interface IParsedSource {

yarn.lock

@@ -191,59 +191,77 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@cucumber/compatibility-kit@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@cucumber/compatibility-kit/-/compatibility-kit-3.0.0.tgz#adc7521d188e550806ee3a8fddd51dc392989e83"
-  integrity sha512-WEwQv58ZKXw6rtYqTN9b0+vIIGb1c/fkw8H6lm/z+gO/x1WuqKMJkbMc1iImuQJ7NwsnXfiuvTGl/Fn5N0mnjQ==
+"@cucumber/compatibility-kit@4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@cucumber/compatibility-kit/-/compatibility-kit-4.0.1.tgz#566f95f2b1ca9f9b8c10ef463e9558ee03a393a4"
+  integrity sha512-M6UPb4wnrk8Ue2tb0rH89kddFPO0Ccsp7Gkz1ruytQaFvIWqnlyjpadY3YdXjH3bkIisbGXK+djSh3PfwRZ8ew==
 
-"@cucumber/create-meta@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@cucumber/create-meta/-/create-meta-3.0.0.tgz#febc8933eea23cd1ffe2dfb3345708d0db27fb82"
-  integrity sha512-DFi+mILvIOQL71Itel1A7EliUTbu7jZ/i7Zqa8cziuf7YrLi0xz8Afb5VxZ6YOBzRzVg/T6N3K/wytRkMToAeA==
+"@cucumber/create-meta@4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@cucumber/create-meta/-/create-meta-4.0.0.tgz#ef97070640475e6e1480be93dc1042d361516ea6"
+  integrity sha512-I2GWC9PoIGmpc0w/vz2YYeGl/eog1oFogYKUjgflDjhECo1mpD/WQjMRPNOsZnd859S8fPgVByKzGQAWjfjGyQ==
   dependencies:
-    "@cucumber/messages" "^14.0.1"
-    ts-node "^9.1.1"
-    typescript "^4.1.3"
+    "@cucumber/messages" "^15.0.0"
 
-"@cucumber/cucumber-expressions@12.0.0":
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/@cucumber/cucumber-expressions/-/cucumber-expressions-12.0.0.tgz#f63a576b828b99ffed6133e6c3b0deaf138eb00e"
-  integrity sha512-FxegCKKW2w1k9OS1Lpt3IhUrLmVKYjroQY8DiRd2e/r0Ygal6WCpljgMiRSh56P2hYkAtrkgFHgDwleNAYjs1Q==
+"@cucumber/cucumber-expressions@12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@cucumber/cucumber-expressions/-/cucumber-expressions-12.0.1.tgz#7ab8936adb82d2bb45b86baa494e4e6e3dc9839f"
+  integrity sha512-ANzu80Mw9GzTQ5ImuLdBtHnQfG8MghVvvtud4GHBvlQ4Wzu1SvkUj3RsdtW9w3p7mATSw8SiSFj6Jel3cEWN6Q==
   dependencies:
     becke-ch--regex--s0-0-v1--base--pl--lib "^1.4.0"
 
-"@cucumber/gherkin@17.0.2":
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/@cucumber/gherkin/-/gherkin-17.0.2.tgz#c6644ecb5c2c4671360d9e5affa2a00e7897ab78"
-  integrity sha512-U8ZxbYVLEXqUy4Fx9BJ5ncIzXz/eVg+fKV2F8B1t5f6eDMgPQ2Aq3M8gy3yE422OAuJ+RFRuezNtuEbpmf2r4g==
+"@cucumber/gherkin-streams@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@cucumber/gherkin-streams/-/gherkin-streams-1.0.0.tgz#e4938ba130fceec8ebc641298557c2a21dcabd5f"
+  integrity sha512-ZGUvkwj8DnMozii+8YqWtiWuKqU+Opt50dWVeJzv2e+4GDh0P1Nc04RGMZkFf8WTl2sgBJq5waPUKCQVPaw6iQ==
   dependencies:
-    "@cucumber/messages" "^14.0.1"
-    commander "^7.1.0"
+    "@cucumber/gherkin" "^18.0.0"
+    "@cucumber/message-streams" "^1.0.0"
+    "@cucumber/messages" "^15.0.0"
+    commander "^7.2.0"
+    protobufjs "^6.10.2"
     source-map-support "^0.5.19"
 
-"@cucumber/html-formatter@12.0.0":
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/@cucumber/html-formatter/-/html-formatter-12.0.0.tgz#a5a0bab1ddc1a391043083fbab1683b520ba8c39"
-  integrity sha512-OdENyDmYiNUQ/+gRPfTGJB6L9KAKx+f9KRyt56FkQaPQCaJKi3KI5PB3SIp1GAP4juha85xq6cF6hPTx9eXPgg==
+"@cucumber/gherkin@18.0.0", "@cucumber/gherkin@^18.0.0":
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/@cucumber/gherkin/-/gherkin-18.0.0.tgz#af51ca7173aa7818ed1aa50e3477d9bbe9d1c954"
+  integrity sha512-Az+VD2NyOM2ZjzuVGrpJTl1VDv1j50graLtjUp7GfGYN+wMMV+jPgKV5fGYQeocjDnJYYlKymiUZzxcxvStJmg==
   dependencies:
-    "@cucumber/messages" "^14.0.1"
-    commander "^7.0.0"
+    "@cucumber/message-streams" "^1.0.0"
+    "@cucumber/messages" "^15.0.0"
 
-"@cucumber/messages@14.0.1", "@cucumber/messages@^14.0.0", "@cucumber/messages@^14.0.1":
-  version "14.0.1"
-  resolved "https://registry.yarnpkg.com/@cucumber/messages/-/messages-14.0.1.tgz#cb2abaa64bd9b4a3ddf0913ff17cafe5b901051c"
-  integrity sha512-uCD/yP7P5em0KP1r59x6JayAxH7n8QXU9FbC3H8XMosZuM9z4PVLeU5pdJRkkCLFXqjpAZ3LJw65hlYDrBujEQ==
+"@cucumber/html-formatter@13.0.0":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@cucumber/html-formatter/-/html-formatter-13.0.0.tgz#ac6abe30813e455efe5e19e01daa00cf2d9fe32b"
+  integrity sha512-+gNLbgeti/5UXm2bVYvtjgdlEiY6r1WsNWChezXE6LJsviy7HrA6WWbwFWFSxs3CLgee5Us5Pe8JonQAnFEiBw==
+  dependencies:
+    "@cucumber/messages" "^15.0.0"
+    commander "^7.2.0"
+    source-map-support "^0.5.19"
+
+"@cucumber/message-streams@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@cucumber/message-streams/-/message-streams-1.0.0.tgz#5162e65df51eb51e0aa484ef0ed46200b19a699a"
+  integrity sha512-i1Jx0EDnE+3Na82UxJ2VqE6aWWJJ+1H+3ax+SYgHmCmlUDJiJzx9dHxAAO3GISrM/RYUAuqMGHNAMnIcxkL3Pw==
+  dependencies:
+    "@cucumber/messages" "^15.0.0"
+    protobufjs "^6.10.2"
+
+"@cucumber/messages@15.0.0", "@cucumber/messages@^15.0.0":
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/@cucumber/messages/-/messages-15.0.0.tgz#58e6541a6c21c4f0d3d4a82c24bbbfe72a6ff94c"
+  integrity sha512-LtxzSCRmYZTAKO6ucAcMflz0u90l2fev539OG+EioJ26F14KmmtxZwGabfjTxLf8NgyKeWsO8TGI2G3z4Kjr+A==
   dependencies:
     "@types/uuid" "^8.3.0"
     protobufjs "^6.10.2"
     uuid "^8.3.2"
 
-"@cucumber/query@8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@cucumber/query/-/query-8.0.0.tgz#58e2bf98a2025a2bb3fa79ae56d27496c092eb5e"
-  integrity sha512-dCe3OiurIQZa1rppq/g0kweT6y0c6+XxtsCuNvL0qvqICYz9ZyoXX9wKOMt0s6HD9mNVLm00XI078sHPqgylUw==
+"@cucumber/query@9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@cucumber/query/-/query-9.0.2.tgz#2b7ef65df4bba58f14d9415b5eb167fde10e670e"
+  integrity sha512-YrOSZQzWWVle+8B57zaSFfQt9jYTPDamBnwdc1EGKI1sXyALjHnGgCLXUFH/HjDieQkXIh2y+MHJ51t2u9ys1A==
   dependencies:
-    "@cucumber/messages" "^14.0.0"
+    "@cucumber/messages" "^15.0.0"
     "@teppeis/multimaps" "^2.0.0"
 
 "@cucumber/tag-expressions@3.0.1":
@@ -1270,10 +1288,10 @@ commander@^7.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2"
   integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==
 
-commander@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff"
-  integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==
+commander@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
 commondir@^1.0.1:
   version "1.0.1"
@@ -4210,7 +4228,7 @@ trim-newlines@^3.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30"
   integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==
 
-ts-node@9.1.1, ts-node@^9.1.1:
+ts-node@9.1.1:
   version "9.1.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d"
   integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==
@@ -4328,11 +4346,6 @@ typescript@4.2.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3"
   integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==
 
-typescript@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
-  integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
-
 unique-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"