From 8f7aa61e8f25fbb42bc358b04dbcb5592889db53 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 13 Sep 2021 09:51:24 +0000 Subject: [PATCH 1/5] chore(deps): update cucumber packages --- package-lock.json | 178 ++++++++++++++++++++++++++++++++-------------- package.json | 10 +-- 2 files changed, 130 insertions(+), 58 deletions(-) diff --git a/package-lock.json b/package-lock.json index 487ae9e68..0f3229ac7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,11 +11,11 @@ "dependencies": { "@cucumber/create-meta": "6.0.1", "@cucumber/cucumber-expressions": "12.1.2", - "@cucumber/gherkin": "20.0.1", - "@cucumber/gherkin-streams": "3.0.0", - "@cucumber/html-formatter": "16.0.1", + "@cucumber/gherkin": "21.0.0", + "@cucumber/gherkin-streams": "4.0.0", + "@cucumber/html-formatter": "17.0.0", "@cucumber/messages": "17.0.1", - "@cucumber/tag-expressions": "3.0.1", + "@cucumber/tag-expressions": "4.0.2", "assertion-error-formatter": "^3.0.0", "capital-case": "^1.0.4", "cli-table3": "^0.6.0", @@ -43,7 +43,7 @@ "cucumber-js": "bin/cucumber-js" }, "devDependencies": { - "@cucumber/compatibility-kit": "7.1.0", + "@cucumber/compatibility-kit": "8.0.0", "@cucumber/message-streams": "3.0.0", "@cucumber/query": "11.0.0", "@sinonjs/fake-timers": "7.1.2", @@ -533,9 +533,9 @@ } }, "node_modules/@cucumber/compatibility-kit": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@cucumber/compatibility-kit/-/compatibility-kit-7.1.0.tgz", - "integrity": "sha512-9XK8Fbbkg6Dpbvb96KpRozGtMXbfy266jV+bh95/X697eXDoOlTe5OBcZjzpti3l40Ksu2NpF0fE0YvXMPixVw==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/compatibility-kit/-/compatibility-kit-8.0.0.tgz", + "integrity": "sha512-jLMZgL3+LMtIQYBPQ/hQUT8TBkPDX1tnJ99iKmRnDpU5pPydWLLdcLTDD5ZDj3Wx4sE/ApNIxE+3+fedvgOsJA==", "dev": true }, "node_modules/@cucumber/create-meta": { @@ -555,42 +555,75 @@ } }, "node_modules/@cucumber/gherkin": { - "version": "20.0.1", - "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-20.0.1.tgz", - "integrity": "sha512-1vXZETZYF3A9egC+N1EIeMobLQQ6VcQoGQ0NvHhkZ/NYXjJB+rPwMbZmhnDfqexhzJbWlA2CVNKc+VHrUobyyg==", + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-21.0.0.tgz", + "integrity": "sha512-S6YFmTg56iEn563ReePL6Sygb77vwYrGHEr7NwuLIgg20Hi1pp7P80BAYVYNRgU7nK9vG2II9O6kaZbiOXF/5g==", "dependencies": { "@cucumber/message-streams": "^3.0.0", - "@cucumber/messages": "^17.0.1" + "@cucumber/messages": "^17.1.0" } }, "node_modules/@cucumber/gherkin-streams": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@cucumber/gherkin-streams/-/gherkin-streams-3.0.0.tgz", - "integrity": "sha512-vdTfSJx4z3Ju2vtresEM930chq3DVxnuQ1FFCI69m2Q83sa2mL8VEFvJ5fwlF7fY/fqLwop04W6B7lCkSZq7fg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/gherkin-streams/-/gherkin-streams-4.0.0.tgz", + "integrity": "sha512-b/guGNeuxr3ghoJOK47QpLhwa2BOdRq+cs2hBYulMLPTiVfwvRBiZlq7P6xdjR9dIpUKBSpzYR6NwaLMgV5DTg==", "dependencies": { - "@cucumber/gherkin": "^20.0.0", + "@cucumber/gherkin": "^21.0.0", "@cucumber/message-streams": "^3.0.0", - "@cucumber/messages": "^17.0.0", - "commander": "8.0.0", + "@cucumber/messages": "^17.1.0", + "commander": "8.1.0", "source-map-support": "0.5.19" }, "bin": { "gherkin-javascript": "bin/gherkin" } }, + "node_modules/@cucumber/gherkin-streams/node_modules/@cucumber/messages": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-17.1.0.tgz", + "integrity": "sha512-OA1uQDX16PjOpeTmMvAiCSjJbomgHYJ4HTVuekF4M8Ykh6mK+5oKn6uZaJTZ/xblEDKGqCfHalrg9yg8/nW41g==", + "dependencies": { + "@types/uuid": "8.3.1", + "class-transformer": "0.4.0", + "reflect-metadata": "0.1.13", + "uuid": "8.3.2" + } + }, + "node_modules/@cucumber/gherkin/node_modules/@cucumber/messages": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-17.1.0.tgz", + "integrity": "sha512-OA1uQDX16PjOpeTmMvAiCSjJbomgHYJ4HTVuekF4M8Ykh6mK+5oKn6uZaJTZ/xblEDKGqCfHalrg9yg8/nW41g==", + "dependencies": { + "@types/uuid": "8.3.1", + "class-transformer": "0.4.0", + "reflect-metadata": "0.1.13", + "uuid": "8.3.2" + } + }, "node_modules/@cucumber/html-formatter": { - "version": "16.0.1", - "resolved": "https://registry.npmjs.org/@cucumber/html-formatter/-/html-formatter-16.0.1.tgz", - "integrity": "sha512-a/FPKreNILJWwjc/jXikqyLQRyGD6qY9XMSn5NdtJCXflzmPg3ihe9LMrR6DQTS1tr32kjuvsBdkv5lU80Xz6A==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/html-formatter/-/html-formatter-17.0.0.tgz", + "integrity": "sha512-yegA8LY1HYUONyMtTvAYj+aG4zc/6WRtKQxqJahjcdmjgXWcL1BTe8y0lw4BFVqFjaZNI9onOM5KDnMHDm3J/w==", "dependencies": { - "@cucumber/messages": "^17.0.1", - "commander": "8.0.0", + "@cucumber/messages": "^17.1.0", + "commander": "8.1.0", "source-map-support": "0.5.19" }, "bin": { "cucumber-html-formatter": "bin/cucumber-html-formatter.js" } }, + "node_modules/@cucumber/html-formatter/node_modules/@cucumber/messages": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-17.1.0.tgz", + "integrity": "sha512-OA1uQDX16PjOpeTmMvAiCSjJbomgHYJ4HTVuekF4M8Ykh6mK+5oKn6uZaJTZ/xblEDKGqCfHalrg9yg8/nW41g==", + "dependencies": { + "@types/uuid": "8.3.1", + "class-transformer": "0.4.0", + "reflect-metadata": "0.1.13", + "uuid": "8.3.2" + } + }, "node_modules/@cucumber/message-streams": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@cucumber/message-streams/-/message-streams-3.0.0.tgz", @@ -621,9 +654,9 @@ } }, "node_modules/@cucumber/tag-expressions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@cucumber/tag-expressions/-/tag-expressions-3.0.1.tgz", - "integrity": "sha512-OGCXaJ1BQXmQ5b9pw+JYsBGumK2/LPZiLmbj1o1JFVeSNs2PY8WPQFSyXrskhrHz5Nd/6lYg7lvGMtFHOncC4w==" + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@cucumber/tag-expressions/-/tag-expressions-4.0.2.tgz", + "integrity": "sha512-8Y7RmSFZAdfBHMR3VdG9ftXE7VNNZD09wJZ2toskjbiPTFT0qJyADODj8nLG44uExdoas3GcRmGstUklpOlsIg==" }, "node_modules/@eslint/eslintrc": { "version": "0.4.3", @@ -2018,9 +2051,9 @@ } }, "node_modules/commander": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.0.0.tgz", - "integrity": "sha512-Xvf85aAtu6v22+E5hfVoLHqyul/jyxh91zvqk/ioJTQuJR7Z78n7H558vMPKanPSRgIEeZemT92I2g9Y8LPbSQ==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-8.1.0.tgz", + "integrity": "sha512-mf45ldcuHSYShkplHHGKWb4TrmwQadxOn7v4WuhDJy0ZVoY5JFajaRDKD0PNe5qXzBX0rhovjTnP6Kz9LETcuA==", "engines": { "node": ">= 12" } @@ -7540,9 +7573,9 @@ } }, "@cucumber/compatibility-kit": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@cucumber/compatibility-kit/-/compatibility-kit-7.1.0.tgz", - "integrity": "sha512-9XK8Fbbkg6Dpbvb96KpRozGtMXbfy266jV+bh95/X697eXDoOlTe5OBcZjzpti3l40Ksu2NpF0fE0YvXMPixVw==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/compatibility-kit/-/compatibility-kit-8.0.0.tgz", + "integrity": "sha512-jLMZgL3+LMtIQYBPQ/hQUT8TBkPDX1tnJ99iKmRnDpU5pPydWLLdcLTDD5ZDj3Wx4sE/ApNIxE+3+fedvgOsJA==", "dev": true }, "@cucumber/create-meta": { @@ -7562,34 +7595,73 @@ } }, "@cucumber/gherkin": { - "version": "20.0.1", - "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-20.0.1.tgz", - "integrity": "sha512-1vXZETZYF3A9egC+N1EIeMobLQQ6VcQoGQ0NvHhkZ/NYXjJB+rPwMbZmhnDfqexhzJbWlA2CVNKc+VHrUobyyg==", + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-21.0.0.tgz", + "integrity": "sha512-S6YFmTg56iEn563ReePL6Sygb77vwYrGHEr7NwuLIgg20Hi1pp7P80BAYVYNRgU7nK9vG2II9O6kaZbiOXF/5g==", "requires": { "@cucumber/message-streams": "^3.0.0", - "@cucumber/messages": "^17.0.1" + "@cucumber/messages": "^17.1.0" + }, + "dependencies": { + "@cucumber/messages": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-17.1.0.tgz", + "integrity": "sha512-OA1uQDX16PjOpeTmMvAiCSjJbomgHYJ4HTVuekF4M8Ykh6mK+5oKn6uZaJTZ/xblEDKGqCfHalrg9yg8/nW41g==", + "requires": { + "@types/uuid": "8.3.1", + "class-transformer": "0.4.0", + "reflect-metadata": "0.1.13", + "uuid": "8.3.2" + } + } } }, "@cucumber/gherkin-streams": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@cucumber/gherkin-streams/-/gherkin-streams-3.0.0.tgz", - "integrity": "sha512-vdTfSJx4z3Ju2vtresEM930chq3DVxnuQ1FFCI69m2Q83sa2mL8VEFvJ5fwlF7fY/fqLwop04W6B7lCkSZq7fg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/gherkin-streams/-/gherkin-streams-4.0.0.tgz", + "integrity": "sha512-b/guGNeuxr3ghoJOK47QpLhwa2BOdRq+cs2hBYulMLPTiVfwvRBiZlq7P6xdjR9dIpUKBSpzYR6NwaLMgV5DTg==", "requires": { - "@cucumber/gherkin": "^20.0.0", + "@cucumber/gherkin": "^21.0.0", "@cucumber/message-streams": "^3.0.0", - "@cucumber/messages": "^17.0.0", - "commander": "8.0.0", + "@cucumber/messages": "^17.1.0", + "commander": "8.1.0", "source-map-support": "0.5.19" + }, + "dependencies": { + "@cucumber/messages": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-17.1.0.tgz", + "integrity": "sha512-OA1uQDX16PjOpeTmMvAiCSjJbomgHYJ4HTVuekF4M8Ykh6mK+5oKn6uZaJTZ/xblEDKGqCfHalrg9yg8/nW41g==", + "requires": { + "@types/uuid": "8.3.1", + "class-transformer": "0.4.0", + "reflect-metadata": "0.1.13", + "uuid": "8.3.2" + } + } } }, "@cucumber/html-formatter": { - "version": "16.0.1", - "resolved": "https://registry.npmjs.org/@cucumber/html-formatter/-/html-formatter-16.0.1.tgz", - "integrity": "sha512-a/FPKreNILJWwjc/jXikqyLQRyGD6qY9XMSn5NdtJCXflzmPg3ihe9LMrR6DQTS1tr32kjuvsBdkv5lU80Xz6A==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/html-formatter/-/html-formatter-17.0.0.tgz", + "integrity": "sha512-yegA8LY1HYUONyMtTvAYj+aG4zc/6WRtKQxqJahjcdmjgXWcL1BTe8y0lw4BFVqFjaZNI9onOM5KDnMHDm3J/w==", "requires": { - "@cucumber/messages": "^17.0.1", - "commander": "8.0.0", + "@cucumber/messages": "^17.1.0", + "commander": "8.1.0", "source-map-support": "0.5.19" + }, + "dependencies": { + "@cucumber/messages": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-17.1.0.tgz", + "integrity": "sha512-OA1uQDX16PjOpeTmMvAiCSjJbomgHYJ4HTVuekF4M8Ykh6mK+5oKn6uZaJTZ/xblEDKGqCfHalrg9yg8/nW41g==", + "requires": { + "@types/uuid": "8.3.1", + "class-transformer": "0.4.0", + "reflect-metadata": "0.1.13", + "uuid": "8.3.2" + } + } } }, "@cucumber/message-streams": { @@ -7622,9 +7694,9 @@ } }, "@cucumber/tag-expressions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@cucumber/tag-expressions/-/tag-expressions-3.0.1.tgz", - "integrity": "sha512-OGCXaJ1BQXmQ5b9pw+JYsBGumK2/LPZiLmbj1o1JFVeSNs2PY8WPQFSyXrskhrHz5Nd/6lYg7lvGMtFHOncC4w==" + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@cucumber/tag-expressions/-/tag-expressions-4.0.2.tgz", + "integrity": "sha512-8Y7RmSFZAdfBHMR3VdG9ftXE7VNNZD09wJZ2toskjbiPTFT0qJyADODj8nLG44uExdoas3GcRmGstUklpOlsIg==" }, "@eslint/eslintrc": { "version": "0.4.3", @@ -8766,9 +8838,9 @@ "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" }, "commander": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.0.0.tgz", - "integrity": "sha512-Xvf85aAtu6v22+E5hfVoLHqyul/jyxh91zvqk/ioJTQuJR7Z78n7H558vMPKanPSRgIEeZemT92I2g9Y8LPbSQ==" + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-8.1.0.tgz", + "integrity": "sha512-mf45ldcuHSYShkplHHGKWb4TrmwQadxOn7v4WuhDJy0ZVoY5JFajaRDKD0PNe5qXzBX0rhovjTnP6Kz9LETcuA==" }, "commondir": { "version": "1.0.1", diff --git a/package.json b/package.json index a1c574820..771b49511 100644 --- a/package.json +++ b/package.json @@ -170,11 +170,11 @@ "dependencies": { "@cucumber/create-meta": "6.0.1", "@cucumber/cucumber-expressions": "12.1.2", - "@cucumber/gherkin": "20.0.1", - "@cucumber/gherkin-streams": "3.0.0", - "@cucumber/html-formatter": "16.0.1", + "@cucumber/gherkin": "21.0.0", + "@cucumber/gherkin-streams": "4.0.0", + "@cucumber/html-formatter": "17.0.0", "@cucumber/messages": "17.0.1", - "@cucumber/tag-expressions": "3.0.1", + "@cucumber/tag-expressions": "4.0.2", "assertion-error-formatter": "^3.0.0", "capital-case": "^1.0.4", "cli-table3": "^0.6.0", @@ -199,7 +199,7 @@ "verror": "^1.10.0" }, "devDependencies": { - "@cucumber/compatibility-kit": "7.1.0", + "@cucumber/compatibility-kit": "8.0.0", "@cucumber/message-streams": "3.0.0", "@cucumber/query": "11.0.0", "@sinonjs/fake-timers": "7.1.2", From eb9a0ad9f10f17992ef841cebed7da4bf6188b4a Mon Sep 17 00:00:00 2001 From: aurelien-reeves Date: Mon, 13 Sep 2021 14:53:41 +0200 Subject: [PATCH 2/5] Implement new CCK tests from CCK 8.0.0 --- compatibility/features/pending/pending.ts | 13 +++++++++++++ compatibility/features/skipped/skipped.ts | 17 +++++++++++++++++ compatibility/features/undefined/undefined.ts | 9 +++++++++ 3 files changed, 39 insertions(+) create mode 100644 compatibility/features/pending/pending.ts create mode 100644 compatibility/features/skipped/skipped.ts create mode 100644 compatibility/features/undefined/undefined.ts diff --git a/compatibility/features/pending/pending.ts b/compatibility/features/pending/pending.ts new file mode 100644 index 000000000..c0e4fc84d --- /dev/null +++ b/compatibility/features/pending/pending.ts @@ -0,0 +1,13 @@ +import { Given } from '../../../src' + +Given('an implemented step', function () { + // no-op +}) + +Given('a step that isnt implemented yet', function () { + return 'pending' +}) + +Given('a step that we expect to be skipped', function () { + // no-op +}) diff --git a/compatibility/features/skipped/skipped.ts b/compatibility/features/skipped/skipped.ts new file mode 100644 index 000000000..4f9885d67 --- /dev/null +++ b/compatibility/features/skipped/skipped.ts @@ -0,0 +1,17 @@ +import { Before, Given } from '../../../src' + +Before('@skip', function () { + return 'skipped' +}) + +Given('an implemented step', function () { + // no-op +}) + +Given('a step that we expect to be skipped', function () { + // no-op +}) + +Given('a step that skips', function () { + return 'skipped' +}) diff --git a/compatibility/features/undefined/undefined.ts b/compatibility/features/undefined/undefined.ts new file mode 100644 index 000000000..245813d63 --- /dev/null +++ b/compatibility/features/undefined/undefined.ts @@ -0,0 +1,9 @@ +import { Given } from '../../../src' + +Given('an implemented step', function () { + // no-op +}) + +Given('a step that we expect to be skipped', function () { + // no-op +}) From fc3183a23f243c1fab9083b6d89aed6f28b2ba20 Mon Sep 17 00:00:00 2001 From: aurelien-reeves Date: Fri, 1 Oct 2021 11:47:15 +0200 Subject: [PATCH 3/5] Bump compatibility-kit to v9.0.0 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index ccb312aad..776401454 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "cucumber-js": "bin/cucumber-js" }, "devDependencies": { - "@cucumber/compatibility-kit": "8.0.0", + "@cucumber/compatibility-kit": "9.0.0", "@cucumber/message-streams": "3.0.0", "@cucumber/query": "11.0.0", "@sinonjs/fake-timers": "7.1.2", @@ -532,9 +532,9 @@ } }, "node_modules/@cucumber/compatibility-kit": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@cucumber/compatibility-kit/-/compatibility-kit-8.0.0.tgz", - "integrity": "sha512-jLMZgL3+LMtIQYBPQ/hQUT8TBkPDX1tnJ99iKmRnDpU5pPydWLLdcLTDD5ZDj3Wx4sE/ApNIxE+3+fedvgOsJA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/compatibility-kit/-/compatibility-kit-9.0.0.tgz", + "integrity": "sha512-Gpq6gBTlZF7ukxsuLp4zsZ1bD7/fXVmOc8aD7FFC9jY8oiNDS4stSK7kw9X/H4ROoI+93aPr6zzMxZS5u38n5Q==", "dev": true }, "node_modules/@cucumber/create-meta": { @@ -7573,9 +7573,9 @@ } }, "@cucumber/compatibility-kit": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@cucumber/compatibility-kit/-/compatibility-kit-8.0.0.tgz", - "integrity": "sha512-jLMZgL3+LMtIQYBPQ/hQUT8TBkPDX1tnJ99iKmRnDpU5pPydWLLdcLTDD5ZDj3Wx4sE/ApNIxE+3+fedvgOsJA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/compatibility-kit/-/compatibility-kit-9.0.0.tgz", + "integrity": "sha512-Gpq6gBTlZF7ukxsuLp4zsZ1bD7/fXVmOc8aD7FFC9jY8oiNDS4stSK7kw9X/H4ROoI+93aPr6zzMxZS5u38n5Q==", "dev": true }, "@cucumber/create-meta": { diff --git a/package.json b/package.json index 9d4c1df14..ada9e0866 100644 --- a/package.json +++ b/package.json @@ -207,7 +207,7 @@ "verror": "^1.10.0" }, "devDependencies": { - "@cucumber/compatibility-kit": "8.0.0", + "@cucumber/compatibility-kit": "9.0.0", "@cucumber/message-streams": "3.0.0", "@cucumber/query": "11.0.0", "@sinonjs/fake-timers": "7.1.2", From bbe7764401036cbed679fc79b3e2c14c99966699 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 1 Oct 2021 09:57:38 +0000 Subject: [PATCH 4/5] fix(deps): update cucumber packages --- package-lock.json | 52 ++++++++++++++++++++++++++++++++--------------- package.json | 4 ++-- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index ea17efb13..1c0fb5151 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,8 @@ "license": "MIT", "dependencies": { "@cucumber/create-meta": "6.0.1", - "@cucumber/cucumber-expressions": "12.1.3", - "@cucumber/gherkin": "21.0.0", + "@cucumber/cucumber-expressions": "13.1.3", + "@cucumber/gherkin": "22.0.0", "@cucumber/gherkin-streams": "4.0.0", "@cucumber/html-formatter": "17.0.0", "@cucumber/messages": "17.1.1", @@ -546,20 +546,20 @@ } }, "node_modules/@cucumber/cucumber-expressions": { - "version": "12.1.3", - "resolved": "https://registry.npmjs.org/@cucumber/cucumber-expressions/-/cucumber-expressions-12.1.3.tgz", - "integrity": "sha512-LB8MAzE4F/t2KIgsDEz4gZH0xSI4aG0/LmYUPyISPPjUS1pI/yGWWyeX2WsiUQxpSs765WcNIq5Bggt7gGGO3Q==", + "version": "13.1.3", + "resolved": "https://registry.npmjs.org/@cucumber/cucumber-expressions/-/cucumber-expressions-13.1.3.tgz", + "integrity": "sha512-2TLN3Q7Hatcx5sOVU/JSCNv80yD2pphPLN9BVIY3+cDkyY80Z9+LxhNFayDFRs+SfMuAmu6VfQVuzHJ6ahrc9w==", "dependencies": { "regexp-match-indices": "1.0.2" } }, "node_modules/@cucumber/gherkin": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-21.0.0.tgz", - "integrity": "sha512-S6YFmTg56iEn563ReePL6Sygb77vwYrGHEr7NwuLIgg20Hi1pp7P80BAYVYNRgU7nK9vG2II9O6kaZbiOXF/5g==", + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-22.0.0.tgz", + "integrity": "sha512-D5OghXE8kkZm7pcwo8TvQMgrrXGMXEjERdKLU0T7dQIbc6k0BmMX8dTRh2cwAjH8c7vhwdd0qLU8FPQgGGj+bg==", "dependencies": { "@cucumber/message-streams": "^3.0.0", - "@cucumber/messages": "^17.1.0" + "@cucumber/messages": "^17.1.1" } }, "node_modules/@cucumber/gherkin-streams": { @@ -577,6 +577,15 @@ "gherkin-javascript": "bin/gherkin" } }, + "node_modules/@cucumber/gherkin-streams/node_modules/@cucumber/gherkin": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-21.0.0.tgz", + "integrity": "sha512-S6YFmTg56iEn563ReePL6Sygb77vwYrGHEr7NwuLIgg20Hi1pp7P80BAYVYNRgU7nK9vG2II9O6kaZbiOXF/5g==", + "dependencies": { + "@cucumber/message-streams": "^3.0.0", + "@cucumber/messages": "^17.1.0" + } + }, "node_modules/@cucumber/html-formatter": { "version": "17.0.0", "resolved": "https://registry.npmjs.org/@cucumber/html-formatter/-/html-formatter-17.0.0.tgz", @@ -7526,20 +7535,20 @@ } }, "@cucumber/cucumber-expressions": { - "version": "12.1.3", - "resolved": "https://registry.npmjs.org/@cucumber/cucumber-expressions/-/cucumber-expressions-12.1.3.tgz", - "integrity": "sha512-LB8MAzE4F/t2KIgsDEz4gZH0xSI4aG0/LmYUPyISPPjUS1pI/yGWWyeX2WsiUQxpSs765WcNIq5Bggt7gGGO3Q==", + "version": "13.1.3", + "resolved": "https://registry.npmjs.org/@cucumber/cucumber-expressions/-/cucumber-expressions-13.1.3.tgz", + "integrity": "sha512-2TLN3Q7Hatcx5sOVU/JSCNv80yD2pphPLN9BVIY3+cDkyY80Z9+LxhNFayDFRs+SfMuAmu6VfQVuzHJ6ahrc9w==", "requires": { "regexp-match-indices": "1.0.2" } }, "@cucumber/gherkin": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-21.0.0.tgz", - "integrity": "sha512-S6YFmTg56iEn563ReePL6Sygb77vwYrGHEr7NwuLIgg20Hi1pp7P80BAYVYNRgU7nK9vG2II9O6kaZbiOXF/5g==", + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-22.0.0.tgz", + "integrity": "sha512-D5OghXE8kkZm7pcwo8TvQMgrrXGMXEjERdKLU0T7dQIbc6k0BmMX8dTRh2cwAjH8c7vhwdd0qLU8FPQgGGj+bg==", "requires": { "@cucumber/message-streams": "^3.0.0", - "@cucumber/messages": "^17.1.0" + "@cucumber/messages": "^17.1.1" } }, "@cucumber/gherkin-streams": { @@ -7552,6 +7561,17 @@ "@cucumber/messages": "^17.1.0", "commander": "8.1.0", "source-map-support": "0.5.19" + }, + "dependencies": { + "@cucumber/gherkin": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-21.0.0.tgz", + "integrity": "sha512-S6YFmTg56iEn563ReePL6Sygb77vwYrGHEr7NwuLIgg20Hi1pp7P80BAYVYNRgU7nK9vG2II9O6kaZbiOXF/5g==", + "requires": { + "@cucumber/message-streams": "^3.0.0", + "@cucumber/messages": "^17.1.0" + } + } } }, "@cucumber/html-formatter": { diff --git a/package.json b/package.json index 371b388c0..0d9ed67fa 100644 --- a/package.json +++ b/package.json @@ -178,8 +178,8 @@ }, "dependencies": { "@cucumber/create-meta": "6.0.1", - "@cucumber/cucumber-expressions": "12.1.3", - "@cucumber/gherkin": "21.0.0", + "@cucumber/cucumber-expressions": "13.1.3", + "@cucumber/gherkin": "22.0.0", "@cucumber/gherkin-streams": "4.0.0", "@cucumber/html-formatter": "17.0.0", "@cucumber/messages": "17.1.1", From 3cc3c90129b191fbd0690afc96ded419c7012d71 Mon Sep 17 00:00:00 2001 From: aurelien-reeves Date: Fri, 1 Oct 2021 12:06:11 +0200 Subject: [PATCH 5/5] Fix requires of cucumber-expressions GeneratedExpression class --- .../javascript_snippet_syntax_spec.ts | 2 +- src/formatter/step_definition_snippet_builder/snippet_syntax.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/formatter/step_definition_snippet_builder/javascript_snippet_syntax_spec.ts b/src/formatter/step_definition_snippet_builder/javascript_snippet_syntax_spec.ts index 18fcf7781..16747cfe8 100644 --- a/src/formatter/step_definition_snippet_builder/javascript_snippet_syntax_spec.ts +++ b/src/formatter/step_definition_snippet_builder/javascript_snippet_syntax_spec.ts @@ -3,9 +3,9 @@ import { expect } from 'chai' import JavascriptSnippetSyntax from './javascript_snippet_syntax' import { SnippetInterface } from './snippet_syntax' import { ISnippetSyntaxBuildOptions } from '../../../lib/formatter/step_definition_snippet_builder/snippet_syntax' -import GeneratedExpression from '@cucumber/cucumber-expressions/dist/src/GeneratedExpression' import { CucumberExpressionGenerator, + GeneratedExpression, ParameterTypeRegistry, } from '@cucumber/cucumber-expressions' import { reindent } from 'reindent-template-literals' diff --git a/src/formatter/step_definition_snippet_builder/snippet_syntax.ts b/src/formatter/step_definition_snippet_builder/snippet_syntax.ts index 264ec3ab2..ca25a8f2c 100644 --- a/src/formatter/step_definition_snippet_builder/snippet_syntax.ts +++ b/src/formatter/step_definition_snippet_builder/snippet_syntax.ts @@ -1,4 +1,4 @@ -import GeneratedExpression from '@cucumber/cucumber-expressions/dist/src/GeneratedExpression' +import { GeneratedExpression } from '@cucumber/cucumber-expressions' export enum SnippetInterface { AsyncAwait = 'async-await',