diff --git a/gherkin/php/composer.json b/gherkin/php/composer.json index e69de29bb2..9b093814ab 100644 --- a/gherkin/php/composer.json +++ b/gherkin/php/composer.json @@ -0,0 +1,37 @@ +{ + "name": "cucumber/gherkin", + "description": "Gherkin parser", + "author": "Cucumber Limited ", + "license": "MIT", + "type": "library", + "autoload": { + "psr-4": { + "Cucumber\\Gherkin\\": [ + "src/", + "src-generated/" + ] + } + }, + "require": { + "php": "^8.1", + "ext-mbstring": "*", + "cucumber/messages": "^18.0||^19.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^4.20", + "friendsofphp/php-cs-fixer": "^3.5", + "psalm/plugin-phpunit": "^0.17.0" + }, + "repositories": [ + { + "type": "path", + "url": "../../messages/php", + "options": { + "versions": { + "cucumber/messages": "18.0.0" + } + } + } + ] +} \ No newline at end of file diff --git a/messages/CHANGELOG.md b/messages/CHANGELOG.md index 4e96dc9476..2d87bb10a9 100644 --- a/messages/CHANGELOG.md +++ b/messages/CHANGELOG.md @@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Fixed +* [Javascript] Schema was still ignored from 19.1.1 due to how npm manages the files attribute in package.json + ([PR#2020](/~https://github.com/cucumber/common/pull/2020)) + ## [19.1.1] - 2022-06-22 ### Fixed diff --git a/messages/javascript/package.json b/messages/javascript/package.json index d7c795d010..a8f0b9e9bb 100644 --- a/messages/javascript/package.json +++ b/messages/javascript/package.json @@ -8,7 +8,7 @@ "files": [ "dist/cjs", "dist/esm", - "schema" + "schema/*.json" ], "module": "dist/esm/src/index.js", "exports": { diff --git a/messages/javascript/schema/.npmignore b/messages/javascript/schema/.npmignore new file mode 100644 index 0000000000..8524fef95f --- /dev/null +++ b/messages/javascript/schema/.npmignore @@ -0,0 +1,3 @@ +.gitkeep +.gitignore +!*.json diff --git a/messages/php/scripts/update-gherkin-dependency.php b/messages/php/scripts/update-gherkin-dependency.php index 1d6fdfe440..2e0963faf4 100644 --- a/messages/php/scripts/update-gherkin-dependency.php +++ b/messages/php/scripts/update-gherkin-dependency.php @@ -42,11 +42,14 @@ if (str_contains($dependencyString, $newDependency)) { fwrite(STDERR, 'Nothing to update, already depends on ' . $newDependency . "\n"); - exit(0); + $newDependency = ''; } -// '||' is OR -$newDependencyString = $dependencyString . '||' .$newDependency; +$newDependencyString = $dependencyString; +if ($newDependency !== '') { + // '||' is OR + $newDependencyString = $dependencyString . '||' .$newDependency; +} $json['require']['cucumber/messages'] = $newDependencyString;