From a93706424f163e0035ab4d68b7fa58c829fc0559 Mon Sep 17 00:00:00 2001 From: asyncapi-bot Date: Sun, 31 Mar 2024 19:17:46 +0200 Subject: [PATCH 1/8] fix: update @asyncapi/parser to 3.0.11 version (#1158) --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 978fd6d54..f28db37af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@asyncapi/generator-react-sdk": "^1.0.13", - "@asyncapi/parser": "^3.0.10", + "@asyncapi/parser": "^3.0.11", "@npmcli/arborist": "5.6.3", "@smoya/multi-parser": "^5.0.0", "ajv": "^8.12.0", @@ -143,11 +143,11 @@ } }, "node_modules/@asyncapi/parser": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.10.tgz", - "integrity": "sha512-x9qo7SHGzPWbC1XCRyilcI+Z6UZsWZ9uRl05h9j4G/v+3IjNG3krwngiAbt59nbLlYZD/nBS7Hc03GayoocnQw==", + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.11.tgz", + "integrity": "sha512-YrmPY6Me7Eh6yH7xISKrDuiybaNVDUxVjbChUAoJZ4dnVGAmMVTxQTlwoqEwQ9bfTHzAb3RixdJ3TC6I4RoHNw==", "dependencies": { - "@asyncapi/specs": "^6.5.3", + "@asyncapi/specs": "^6.5.4", "@openapi-contrib/openapi-schema-to-json-schema": "~3.2.0", "@stoplight/json": "^3.20.2", "@stoplight/json-ref-readers": "^1.2.2", @@ -231,9 +231,9 @@ } }, "node_modules/@asyncapi/specs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.3.tgz", - "integrity": "sha512-mZROlCOLkZEWy5tN4pPop3JEJflSKmLLMGO1TebF5wjnroqZ3yp/GuGUxVIl3jVNxFk1i5nZ2AtWzAD/HaUj3Q==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.4.tgz", + "integrity": "sha512-olC+iuboGIGjFRKuqfwaXxm5I6Wae3JohmySwMfExl21nYUd88IbfwywunOPLWyLV05aXeoTJ5tDXiM9e4gWcQ==", "dependencies": { "@types/json-schema": "^7.0.11" } @@ -15292,11 +15292,11 @@ } }, "@asyncapi/parser": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.10.tgz", - "integrity": "sha512-x9qo7SHGzPWbC1XCRyilcI+Z6UZsWZ9uRl05h9j4G/v+3IjNG3krwngiAbt59nbLlYZD/nBS7Hc03GayoocnQw==", + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.11.tgz", + "integrity": "sha512-YrmPY6Me7Eh6yH7xISKrDuiybaNVDUxVjbChUAoJZ4dnVGAmMVTxQTlwoqEwQ9bfTHzAb3RixdJ3TC6I4RoHNw==", "requires": { - "@asyncapi/specs": "^6.5.3", + "@asyncapi/specs": "^6.5.4", "@openapi-contrib/openapi-schema-to-json-schema": "~3.2.0", "@stoplight/json": "^3.20.2", "@stoplight/json-ref-readers": "^1.2.2", @@ -15367,9 +15367,9 @@ } }, "@asyncapi/specs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.3.tgz", - "integrity": "sha512-mZROlCOLkZEWy5tN4pPop3JEJflSKmLLMGO1TebF5wjnroqZ3yp/GuGUxVIl3jVNxFk1i5nZ2AtWzAD/HaUj3Q==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.5.4.tgz", + "integrity": "sha512-olC+iuboGIGjFRKuqfwaXxm5I6Wae3JohmySwMfExl21nYUd88IbfwywunOPLWyLV05aXeoTJ5tDXiM9e4gWcQ==", "requires": { "@types/json-schema": "^7.0.11" } diff --git a/package.json b/package.json index 35090ff4e..d1b60f21d 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "homepage": "https://github.com/asyncapi/generator", "dependencies": { "@asyncapi/generator-react-sdk": "^1.0.13", - "@asyncapi/parser": "^3.0.10", + "@asyncapi/parser": "^3.0.11", "@npmcli/arborist": "5.6.3", "@smoya/multi-parser": "^5.0.0", "ajv": "^8.12.0", From 22289c9e5934dd2a8b082557bea294632913e0c6 Mon Sep 17 00:00:00 2001 From: asyncapi-bot Date: Sun, 31 Mar 2024 19:53:10 +0200 Subject: [PATCH 2/8] fix: update @asyncapi/generator-react-sdk to 1.0.15 version (#1161) --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index f28db37af..2dd87ceef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.17.14", "license": "Apache-2.0", "dependencies": { - "@asyncapi/generator-react-sdk": "^1.0.13", + "@asyncapi/generator-react-sdk": "^1.0.15", "@asyncapi/parser": "^3.0.11", "@npmcli/arborist": "5.6.3", "@smoya/multi-parser": "^5.0.0", @@ -76,11 +76,11 @@ } }, "node_modules/@asyncapi/generator-react-sdk": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/@asyncapi/generator-react-sdk/-/generator-react-sdk-1.0.13.tgz", - "integrity": "sha512-Kc5ZuF0jFaRhtktz9gCQ+YTOt6dETDDhp2rKeXx/2ohjFVg2xQii6c9Yx0NrQjegmLaofn+Au+VCx38Jhd87iQ==", + "version": "1.0.15", + "resolved": "https://registry.npmjs.org/@asyncapi/generator-react-sdk/-/generator-react-sdk-1.0.15.tgz", + "integrity": "sha512-2ewO8pWSw39NkL3fvG3YMgou6VXMaIuxYE7Uw5MEE/o4Iy8v8uHfR1UM6Ppy3t4PCzpSdN8VkePAaNeuAZz/YA==", "dependencies": { - "@asyncapi/parser": "^3.0.9", + "@asyncapi/parser": "^3.0.11", "@babel/core": "7.12.9", "@babel/preset-env": "^7.12.7", "@babel/preset-react": "^7.12.7", @@ -15233,11 +15233,11 @@ } }, "@asyncapi/generator-react-sdk": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/@asyncapi/generator-react-sdk/-/generator-react-sdk-1.0.13.tgz", - "integrity": "sha512-Kc5ZuF0jFaRhtktz9gCQ+YTOt6dETDDhp2rKeXx/2ohjFVg2xQii6c9Yx0NrQjegmLaofn+Au+VCx38Jhd87iQ==", + "version": "1.0.15", + "resolved": "https://registry.npmjs.org/@asyncapi/generator-react-sdk/-/generator-react-sdk-1.0.15.tgz", + "integrity": "sha512-2ewO8pWSw39NkL3fvG3YMgou6VXMaIuxYE7Uw5MEE/o4Iy8v8uHfR1UM6Ppy3t4PCzpSdN8VkePAaNeuAZz/YA==", "requires": { - "@asyncapi/parser": "^3.0.9", + "@asyncapi/parser": "^3.0.11", "@babel/core": "7.12.9", "@babel/preset-env": "^7.12.7", "@babel/preset-react": "^7.12.7", diff --git a/package.json b/package.json index d1b60f21d..b223514fe 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "license": "Apache-2.0", "homepage": "https://github.com/asyncapi/generator", "dependencies": { - "@asyncapi/generator-react-sdk": "^1.0.13", + "@asyncapi/generator-react-sdk": "^1.0.15", "@asyncapi/parser": "^3.0.11", "@npmcli/arborist": "5.6.3", "@smoya/multi-parser": "^5.0.0", From 907c099ae57e8462e591eb006beb9714368201d5 Mon Sep 17 00:00:00 2001 From: asyncapi-bot Date: Sun, 31 Mar 2024 20:24:20 +0200 Subject: [PATCH 3/8] chore(release): v1.17.16 (#1162) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2dd87ceef..32ce5aa31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@asyncapi/generator", - "version": "1.17.14", + "version": "1.17.16", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@asyncapi/generator", - "version": "1.17.14", + "version": "1.17.16", "license": "Apache-2.0", "dependencies": { "@asyncapi/generator-react-sdk": "^1.0.15", diff --git a/package.json b/package.json index b223514fe..df26c6621 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@asyncapi/generator", - "version": "1.17.14", + "version": "1.17.16", "description": "The AsyncAPI generator. It can generate documentation, code, anything!", "main": "./lib/generator.js", "bin": { From 41c6282d08ccd03ea863133abfc1ff4cafee9fec Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 11:33:46 +0200 Subject: [PATCH 4/8] chore: add GavinZhengOI as a contributor for doc (#1152) Co-authored-by: Lukasz Gornicki --- .all-contributorsrc | 11 ++++++++++- README.md | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index c5ea28626..f2af9f96a 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -8,7 +8,7 @@ ], "imageSize": 100, "commit": false, - "commitConvention": "none", + "commitConvention": "angular", "contributors": [ { "login": "fmvilas", @@ -167,6 +167,15 @@ "contributions": [ "code" ] + }, + { + "login": "GavinZhengOI", + "name": "GavinZhengOI", + "avatar_url": "https://avatars.githubusercontent.com/u/33168669?v=4", + "profile": "https://blog.orzzh.icu/", + "contributions": [ + "doc" + ] } ], "contributorsPerLine": 3, diff --git a/README.md b/README.md index c62591064..356efca87 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d swastik suvam singh
swastik suvam singh
💻 + GavinZhengOI
GavinZhengOI
📖 From 57627417ace753da9070b990281c58e0e4144f64 Mon Sep 17 00:00:00 2001 From: asyncapi-bot Date: Tue, 2 Apr 2024 16:03:39 +0200 Subject: [PATCH 5/8] fix: update @asyncapi/html-template to 2.3.0 version (#1166) --- test/test-project/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-project/package.json b/test/test-project/package.json index 1368264cb..37df6fdb8 100644 --- a/test/test-project/package.json +++ b/test/test-project/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@asyncapi/generator": "file:../..", - "@asyncapi/html-template": "^2.2.2" + "@asyncapi/html-template": "^2.3.0" }, "devDependencies": { "fs-extra": "9.1.0", From 0ad57ce3c97195641f3db59987a61aa3f39d929b Mon Sep 17 00:00:00 2001 From: asyncapi-bot Date: Wed, 3 Apr 2024 09:48:23 +0200 Subject: [PATCH 6/8] chore(release): v1.17.17 (#1167) Co-authored-by: asyncapi-bot --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 32ce5aa31..c647f01f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@asyncapi/generator", - "version": "1.17.16", + "version": "1.17.17", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@asyncapi/generator", - "version": "1.17.16", + "version": "1.17.17", "license": "Apache-2.0", "dependencies": { "@asyncapi/generator-react-sdk": "^1.0.15", diff --git a/package.json b/package.json index df26c6621..533155852 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@asyncapi/generator", - "version": "1.17.16", + "version": "1.17.17", "description": "The AsyncAPI generator. It can generate documentation, code, anything!", "main": "./lib/generator.js", "bin": { From fc0a7ef9a8e8e51e16f483afe07041539f01780a Mon Sep 17 00:00:00 2001 From: Zeel Rajodiya Date: Wed, 3 Apr 2024 15:01:32 +0530 Subject: [PATCH 7/8] ci: docker-compose command in PR testing with test project workflow (#1169) Co-authored-by: Lukasz Gornicki --- .github/workflows/pr-testing-with-test-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-testing-with-test-project.yml b/.github/workflows/pr-testing-with-test-project.yml index 057070f2c..87cbc7daa 100644 --- a/.github/workflows/pr-testing-with-test-project.yml +++ b/.github/workflows/pr-testing-with-test-project.yml @@ -17,5 +17,5 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Run test - run: NODE_IMAGE_TAG=${{ matrix.node }} docker-compose up --abort-on-container-exit --remove-orphans --force-recreate + run: NODE_IMAGE_TAG=${{ matrix.node }} docker compose up --abort-on-container-exit --remove-orphans --force-recreate working-directory: ./test/test-project From 33d5607532ca302340c72eeff232c5dae4193b7e Mon Sep 17 00:00:00 2001 From: asyncapi-bot Date: Wed, 3 Apr 2024 11:41:58 +0200 Subject: [PATCH 8/8] ci: update of files from global .github repo (#1168) Co-authored-by: asyncapi-bot-eve %0ACo-authored-by: asyncapi-bot %0ACo-authored-by: Lukasz Gornicki --- .github/workflows/help-command.yml | 1 + .github/workflows/if-nodejs-pr-testing.yml | 5 +- .github/workflows/if-nodejs-release.yml | 10 +++- .github/workflows/if-nodejs-version-bump.yml | 2 +- .../workflows/please-take-a-look-command.yml | 54 +++++++++++++++++++ 5 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/please-take-a-look-command.yml diff --git a/.github/workflows/help-command.yml b/.github/workflows/help-command.yml index d4ba4a44c..ada81682e 100644 --- a/.github/workflows/help-command.yml +++ b/.github/workflows/help-command.yml @@ -31,6 +31,7 @@ jobs: At the moment the following comments are supported in pull requests: + - \`/please-take-a-look` or \`/ptal\` - This comment will add a comment to the PR asking for attention from the reviewrs who have not reviewed the PR yet. - \`/ready-to-merge\` or \`/rtm\` - This comment will trigger automerge of PR in case all required checks are green, approvals in place and do-not-merge label is not added - \`/do-not-merge\` or \`/dnm\` - This comment will block automerging even if all conditions are met and ready-to-merge label is added - \`/autoupdate\` or \`/au\` - This comment will add \`autoupdate\` label to the PR and keeps your PR up-to-date to the target branch's future changes. Unless there is a merge conflict or it is a draft PR.` diff --git a/.github/workflows/if-nodejs-pr-testing.yml b/.github/workflows/if-nodejs-pr-testing.yml index 9ce9f9a19..75eaaac7b 100644 --- a/.github/workflows/if-nodejs-pr-testing.yml +++ b/.github/workflows/if-nodejs-pr-testing.yml @@ -33,6 +33,7 @@ jobs: id: should_run name: Should Run run: echo "shouldrun=true" >> $GITHUB_OUTPUT + shell: bash - if: steps.should_run.outputs.shouldrun == 'true' name: Set git to use LF #to once and for all finish neverending fight between Unix and Windows run: | @@ -60,13 +61,13 @@ jobs: - if: steps.packagejson.outputs.exists == 'true' name: Install dependencies id: first-installation - run: npm install --loglevel verbose + run: npm ci continue-on-error: true - if: steps.first-installation.outputs.status == 'failure' && steps.packagejson.outputs.exists == 'true' name: Clear NPM cache and install deps again run: | npm cache clean --force - npm install --loglevel verbose + npm ci - if: steps.packagejson.outputs.exists == 'true' name: Test run: npm test --if-present diff --git a/.github/workflows/if-nodejs-release.yml b/.github/workflows/if-nodejs-release.yml index 4938a37da..fbad21df5 100644 --- a/.github/workflows/if-nodejs-release.yml +++ b/.github/workflows/if-nodejs-release.yml @@ -85,6 +85,7 @@ jobs: - name: Check if Node.js project and has package.json id: packagejson run: test -e ./package.json && echo "exists=true" >> $GITHUB_OUTPUT || echo "exists=false" >> $GITHUB_OUTPUT + shell: bash - if: steps.packagejson.outputs.exists == 'true' name: Check package-lock version uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master @@ -98,7 +99,14 @@ jobs: cache-dependency-path: '**/package-lock.json' - if: steps.packagejson.outputs.exists == 'true' name: Install dependencies - run: npm install + id: first-installation + run: npm ci + continue-on-error: true + - if: steps.first-installation.outputs.status == 'failure' && steps.packagejson.outputs.exists == 'true' + name: Clear NPM cache and install deps again + run: | + npm cache clean --force + npm ci - if: steps.packagejson.outputs.exists == 'true' name: Add plugin for conventional commits for semantic-release run: npm install --save-dev conventional-changelog-conventionalcommits@5.0.0 diff --git a/.github/workflows/if-nodejs-version-bump.yml b/.github/workflows/if-nodejs-version-bump.yml index 7e27f90bb..36847d803 100644 --- a/.github/workflows/if-nodejs-version-bump.yml +++ b/.github/workflows/if-nodejs-version-bump.yml @@ -37,7 +37,7 @@ jobs: cache-dependency-path: '**/package-lock.json' - if: steps.packagejson.outputs.exists == 'true' name: Install dependencies - run: npm install + run: npm ci - if: steps.packagejson.outputs.exists == 'true' name: Assets generation run: npm run generate:assets --if-present diff --git a/.github/workflows/please-take-a-look-command.yml b/.github/workflows/please-take-a-look-command.yml new file mode 100644 index 000000000..216055ca5 --- /dev/null +++ b/.github/workflows/please-take-a-look-command.yml @@ -0,0 +1,54 @@ +# This action is centrally managed in https://github.com/asyncapi/.github/ +# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo + +# It uses Github actions to listen for comments on issues and pull requests and +# if the comment contains /ping-for-attention or /pfa it will add a comment pinging +# the code-owners who have not yet reviewed the pull request + +name: Please take a Look + +on: + issue_comment: + types: [created] + +jobs: + ping-for-attention: + if: > + github.event.issue.pull_request && + github.event.issue.state != 'closed' && + github.actor != 'asyncapi-bot' && + ( + contains(github.event.comment.body, '/please-take-a-look') || + contains(github.event.comment.body, '/ptal') || + contains(github.event.comment.body, '/PTAL') + ) + runs-on: ubuntu-latest + steps: + - name: Check for Please Take a Look Command + uses: actions/github-script@v6 + with: + github-token: ${{ secrets.GH_TOKEN }} + script: | + const prDetailsUrl = context.payload.issue.pull_request.url; + const { data: pull } = await github.request(prDetailsUrl); + const reviewers = pull.requested_reviewers.map(reviewer => reviewer.login); + + const { data: reviews } = await github.rest.pulls.listReviews({ + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: context.issue.number + }); + + const reviewersWhoHaveReviewed = reviews.map(review => review.user.login); + + const reviewersWhoHaveNotReviewed = reviewers.filter(reviewer => !reviewersWhoHaveReviewed.includes(reviewer)); + + if (reviewersWhoHaveNotReviewed.length > 0) { + const comment = reviewersWhoHaveNotReviewed.map(reviewer => `@${reviewer}`).join(' '); + await github.rest.issues.createComment({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + body: `${comment} Please take a look at this PR. Thanks! :wave:` + }); + }