Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into design-system
Browse files Browse the repository at this point in the history
  • Loading branch information
Shurtu-gal committed Apr 1, 2024
2 parents b91ad06 + f6dfad2 commit 0ebfb60
Show file tree
Hide file tree
Showing 11 changed files with 16,186 additions and 12,110 deletions.
19 changes: 14 additions & 5 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,10 @@
"avatar_url": "https://avatars.githubusercontent.com/u/13396189?v=4",
"profile": "https://github.com/jonaslagoni",
"contributions": [
"code",
"ideas",
"review",
"test"
"code",
"ideas",
"review",
"test"
]
},
{
Expand All @@ -323,11 +323,20 @@
{
"login": "smoya",
"name": "Sergio Moya ",
"avatar_url" : "https://avatars.githubusercontent.com/u/1083296?v=4",
"avatar_url": "https://avatars.githubusercontent.com/u/1083296?v=4",
"profile": "https://github.com/smoya",
"contributions": [
"code"
]
},
{
"login": "Vishal2002",
"name": "Vishal Sharma",
"avatar_url": "https://avatars.githubusercontent.com/u/35897449?v=4",
"profile": "https://github.com/Vishal2002",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-docs-in-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'master'
paths:
- 'docs/*.md'

workflow_dispatch:
jobs:
Make-PR:
name: Make PR on website repository with updated latest CLI documentation
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM node:16-alpine
FROM node:20-alpine

ARG ASYNCAPI_CLI_VERSION=0.59.1
# Set ARG to explicit value to build chosen version. Default is "latest"
ARG ASYNCAPI_CLI_VERSION=

# Create a non-root user
RUN addgroup -S myuser && adduser -S myuser -G myuser
Expand All @@ -14,6 +15,7 @@ ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
# Since 0.14.0 release of html-template chromium is needed for pdf generation.
# More custom packages for specific template should not be added to this dockerfile. Instead, we should come up with some extensibility solution.
RUN apk --update add git chromium && \
apk add --no-cache --virtual .gyp python3 make g++ && \
rm -rf /var/lib/apt/lists/* && \
rm /var/cache/apk/*

Expand Down
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,17 @@ Thanks go to these wonderful people ([emoji key](https://allcontributors.org/doc
<td align="center" valign="top" width="14.28%"><a href="https://github.com/GreenRover"><img src="https://avatars.githubusercontent.com/u/512850?v=4?s=100" width="100px;" alt="Heiko Henning"/><br /><sub><b>Heiko Henning</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=GreenRover" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/aayush-saini-0a25931b1/"><img src="https://avatars.githubusercontent.com/u/60972989?v=4?s=100" width="100px;" alt="Zack_Aayush"/><br /><sub><b>Zack_Aayush</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=AayushSaini101" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ayushnau"><img src="https://avatars.githubusercontent.com/u/78146753?v=4?s=100" width="100px;" alt="Ayush Nautiyal"/><br /><sub><b>Ayush Nautiyal</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=ayushnau" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/AnishKacham"><img src="https://avatars.githubusercontent.com/u/79566582?v=4?s=100" width="100px;" alt="Anish Kacham"/><br /><sub><b>AnishKacham</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=AnishKacham" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/AnishKacham"><img src="https://avatars.githubusercontent.com/u/79566582?v=4?s=100" width="100px;" alt="AnishKacham"/><br /><sub><b>AnishKacham</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=Anish Kacham" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/aeworxet"><img src="https://avatars.githubusercontent.com/u/16149591?v=4?s=100" width="100px;" alt="Viacheslav Turovskyi"/><br /><sub><b>Viacheslav Turovskyi</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=aeworxet" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/amanbedi1"><img src="https://avatars.githubusercontent.com/u/82234871?v=4?s=100" width="100px;" alt="Amanpreet Singh Bedi"/><br /><sub><b>Amanpreet Singh Bedi</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=amanbedi1" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/amanbedi1"><img src="https://avatars.githubusercontent.com/u/82234871?v=4?s=100" width="100px;" alt="Amanpreet Singh Bedi "/><br /><sub><b>Amanpreet Singh Bedi </b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=amanbedi1" title="Code">💻</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ron-debajyoti"><img src="https://avatars.githubusercontent.com/u/22571664?v=4?s=100" width="100px;" alt="Debajyoti Halder"/><br /><sub><b>Debajyoti Halder</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=ron-debajyoti" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Savio629"><img src="https://avatars.githubusercontent.com/u/91362589?v=4?s=100" width="100px;" alt="Savio Dias"/><br /><sub><b>Savio Dias</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=Savio629" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jonaslagoni"><img src="https://avatars.githubusercontent.com/u/13396189?v=4?s=100" width="100px;" alt="Savio Dias"/><br /><sub><b>Jonas Lagoni</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=jonaslagoni" title="Ideas, Planning, & Feedback">🤔</a><a href="https://github.com/asyncapi/cli/commits?author=jonaslagoni" title="Code">💻</a><a href="https://github.com/asyncapi/cli/commits?author=jonaslagoni" title="Tests">⚠️</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/KhudaDad414"><img src="https://avatars.githubusercontent.com/u/32505158?v=4?s=100" width="100px;" alt="Savio Dias"/><br /><sub><b>Khuda Dad Nomani</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=KhudaDad414" title="Code">💻</a><a href="https://github.com/asyncapi/cli/commits?author=KhudaDad414" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/smoya"><img src="https://avatars.githubusercontent.com/u/1083296?v=4?s=100" width="100px;" alt="Savio Dias"/><br /><sub><b>Sergio Moya </b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=smoya" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jonaslagoni"><img src="https://avatars.githubusercontent.com/u/13396189?v=4?s=100" width="100px;" alt="Jonas Lagoni"/><br /><sub><b>Jonas Lagoni</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=jonaslagoni" title="Code">💻</a> <a href="#ideas-jonaslagoni" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/asyncapi/cli/pulls?q=is%3Apr+reviewed-by%3Ajonaslagoni" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/asyncapi/cli/commits?author=jonaslagoni" title="Tests">⚠️</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/KhudaDad414"><img src="https://avatars.githubusercontent.com/u/32505158?v=4?s=100" width="100px;" alt="Khuda Dad Nomani"/><br /><sub><b>Khuda Dad Nomani</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=KhudaDad414" title="Code">💻</a> <a href="https://github.com/asyncapi/cli/commits?author=KhudaDad414" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/smoya"><img src="https://avatars.githubusercontent.com/u/1083296?v=4?s=100" width="100px;" alt="Sergio Moya "/><br /><sub><b>Sergio Moya </b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=smoya" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Vishal2002"><img src="https://avatars.githubusercontent.com/u/35897449?v=4?s=100" width="100px;" alt="Vishal Sharma"/><br /><sub><b>Vishal Sharma</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=Vishal2002" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
102 changes: 51 additions & 51 deletions assets/create-glee-app/templates/default/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/create-glee-app/templates/default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"homepage": "https://github.com/asyncapi/glee-hello-world#readme",
"dependencies": {
"@asyncapi/glee": "^0.36.5"
"@asyncapi/glee": "^0.36.6"
},
"devDependencies": {
"@types/node": "^20.5.9"
Expand Down
Loading

0 comments on commit 0ebfb60

Please sign in to comment.