Skip to content

Commit 8559082

Browse files
aslakhellesoyaslakhellesoy
authored
Merge branch 'master' into master
2 parents dc633e3 + 0a37af1 commit 8559082

File tree

23 files changed

+3333
-10693
lines changed

23 files changed

+3333
-10693
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ executors:
1212
# the build nodes (faster builds).
1313
docker-cucumber-build:
1414
docker:
15-
- image: cucumber/cucumber-build:latest
15+
- image: cucumber/cucumber-build:0.1.0
1616
working_directory: ~/cucumber
1717
environment:
1818
# nvm, node and npm are installed locally rather globally.
@@ -159,7 +159,7 @@ jobs:
159159
make
160160
161161
json-formatter-go:
162-
executor: docker-circleci-golang
162+
executor: docker-cucumber-build
163163
steps:
164164
- attach_workspace:
165165
at: "~/cucumber"

‎Makefile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,23 +62,23 @@ push_subrepos:
6262
touch $@
6363

6464
docker-run:
65-
docker pull cucumber/cucumber-build:latest
6665
[ -d "${HOME}/.m2/repository" ] || mkdir -p "${HOME}/.m2/repository"
6766
docker run \
6867
--publish "6006:6006" \
6968
--volume "${shell pwd}":/app \
7069
--volume "${HOME}/.m2/repository":/home/cukebot/.m2/repository \
7170
--user 1000 \
7271
--rm \
73-
-it cucumber/cucumber-build:latest \
72+
--interactive \
73+
--tty \
74+
cucumber/cucumber-build:0.1.0 \
7475
bash
7576
.PHONY:
7677

7778
docker-run-with-secrets:
7879
[ -d '../secrets' ] || git clone keybase://team/cucumberbdd/secrets ../secrets
7980
git -C ../secrets pull
8081
../secrets/update_permissions
81-
docker pull cucumber/cucumber-build:latest
8282
[ -d "${HOME}/.m2/repository" ] || mkdir -p "${HOME}/.m2/repository"
8383
docker run \
8484
--publish "6006:6006" \
@@ -94,5 +94,7 @@ docker-run-with-secrets:
9494
--env-file ../secrets/secrets.list \
9595
--user 1000 \
9696
--rm \
97-
-it cucumber/cucumber-build:latest \
97+
--interactive \
98+
--tty \
99+
cucumber/cucumber-build:0.1.0 \
98100
bash

‎compatibility-kit/javascript/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "@cucumber/compatibility-kit",
33
"version": "4.0.0",
4-
"private": true,
54
"description": "Test data used to validate a Cucumber implementation",
65
"repository": {
76
"type": "git",

‎cucumber-expressions/javascript/package.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,12 @@
2727
"devDependencies": {
2828
"@types/js-yaml": "^4.0.0",
2929
"@types/mocha": "^8.2.2",
30-
"@types/node": "^14.14.35",
30+
"@types/node": "^14.14.37",
3131
"js-yaml": "^4.0.0",
3232
"mocha": "^8.3.2",
3333
"ts-node": "^9.1.1",
3434
"typescript": "^4.2.3"
3535
},
36-
"files": [
37-
"*"
38-
],
3936
"dependencies": {
4037
"becke-ch--regex--s0-0-v1--base--pl--lib": "^1.4.0"
4138
},

‎demo-formatter/go/go.sum‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
1-
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
1+
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
22
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
4-
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
53
github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
64
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
5+
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
76
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
87
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
8+
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
99
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
1010
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
11-
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
12-
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
13-
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
14-
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
15-
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
16-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
17-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
1811
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1912
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
2013
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -40,6 +33,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
4033
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
4134
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
4235
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
36+
golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
4337
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
4438
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
4539
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
@@ -48,7 +42,5 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
4842
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
4943
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
5044
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
51-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
52-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5345
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
5446
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎gherkin-streams/javascript/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"devDependencies": {
2929
"@types/mocha": "^8.2.2",
30-
"@types/node": "^14.14.35",
30+
"@types/node": "^14.14.37",
3131
"mocha": "^8.3.2",
3232
"nyc": "^15.1.0",
3333
"typescript": "^4.2.3"

‎gherkin-utils/javascript/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"@types/glob": "^7.1.3",
2929
"@types/mocha": "^8.2.2",
3030
"@types/node": "^14.14.37",
31-
"@typescript-eslint/eslint-plugin": "^4.19.0",
32-
"@typescript-eslint/parser": "^4.19.0",
31+
"@typescript-eslint/eslint-plugin": "^4.20.0",
32+
"@typescript-eslint/parser": "^4.20.0",
3333
"glob": "^7.1.6",
3434
"mocha": "^8.3.2",
3535
"nyc": "^15.1.0",

‎gherkin/go/go.sum‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
2-
github.com/cucumber/messages-go/v15 v15.0.0 h1:FWnfzl/uIoM7/v3gWzlIghyJYlZXD0kSNrmTKR013Go=
3-
github.com/cucumber/messages-go/v15 v15.0.0/go.mod h1:ITauhCZLMujWV1dC84C9Zei3biHD2EOiOmF1/vB5D2I=
1+
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
42
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
6-
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
73
github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
84
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
95
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
@@ -12,12 +8,6 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69
128
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
139
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
1410
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
15-
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
16-
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
17-
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
18-
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
19-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
20-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
2111
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2212
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
2313
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -52,7 +42,5 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
5242
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
5343
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
5444
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
55-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
56-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5745
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
5846
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎gherkin/javascript/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"homepage": "https://github.com/cucumber/gherkin-javascript",
2525
"devDependencies": {
2626
"@types/mocha": "^8.2.2",
27-
"@types/node": "^14.14.35",
28-
"core-js": "^3.9.1",
27+
"@types/node": "^14.14.37",
28+
"core-js": "^3.10.0",
2929
"mocha": "^8.3.2",
3030
"ts-node": "^9.1.1",
3131
"typescript": "^4.2.3"

‎html-formatter/javascript/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,26 @@
2323
"source-map-support": "^0.5.19"
2424
},
2525
"devDependencies": {
26-
"@babel/core": "^7.13.10",
26+
"@babel/core": "^7.13.14",
2727
"@cucumber/gherkin-utils": "^4.0.0",
2828
"@cucumber/query": "^9.0.1",
2929
"@cucumber/react": "^12.0.0",
3030
"@cucumber/gherkin-streams": "^1.0.0",
3131
"@cucumber/message-streams": "^1.0.0",
3232
"@types/mocha": "^8.2.2",
33-
"@types/node": "^14.14.35",
33+
"@types/node": "^14.14.37",
3434
"@types/react": "^17.0.3",
3535
"@types/react-dom": "^17.0.3",
3636
"babel-loader": "^8.2.2",
3737
"mocha": "^8.3.2",
3838
"puppeteer": "^8.0.0",
3939
"react": "^17.0.2",
4040
"react-dom": "^17.0.2",
41-
"ts-loader": "^8.0.18",
41+
"ts-loader": "^8.1.0",
4242
"ts-node": "^9.1.1",
4343
"typescript": "^4.2.3",
44-
"webpack": "^5.27.2",
45-
"webpack-cli": "^4.5.0"
44+
"webpack": "^5.30.0",
45+
"webpack-cli": "^4.6.0"
4646
},
4747
"bugs": {
4848
"url": "https://github.com/cucumber/cucumber/issues"

0 commit comments

Comments
 (0)