Skip to content

Commit

Permalink
Merge branch 'master' into feat/stretchable-layout
Browse files Browse the repository at this point in the history
  • Loading branch information
jonaslagoni authored Sep 5, 2024
2 parents 5f48f45 + 21d5680 commit cd3d847
Show file tree
Hide file tree
Showing 8 changed files with 502 additions and 726 deletions.
3 changes: 2 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,8 @@
"profile": "https://github.com/jespitae",
"contributions": [
"code",
"test"
"test",
"bug"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ Thanks go out to these wonderful people ([emoji key](https://allcontributors.org
<td align="center" valign="top" width="14.28%"><a href="https://github.com/janne-slamcore"><img src="https://avatars.githubusercontent.com/u/112867847?v=4?s=100" width="100px;" alt="Janne Husberg"/><br /><sub><b>Janne Husberg</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=janne-slamcore" title="Code">💻</a> <a href="https://github.com/asyncapi/modelina/commits?author=janne-slamcore" title="Tests">⚠️</a> <a href="https://github.com/asyncapi/modelina/issues?q=author%3Ajanne-slamcore" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/borrull"><img src="https://avatars.githubusercontent.com/u/5275400?v=4?s=100" width="100px;" alt="borrull"/><br /><sub><b>borrull</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=borrull" title="Code">💻</a> <a href="https://github.com/asyncapi/modelina/commits?author=borrull" title="Tests">⚠️</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.yokeplatform.com"><img src="https://avatars.githubusercontent.com/u/2106178?v=4?s=100" width="100px;" alt="Kamil Zuzda"/><br /><sub><b>Kamil Zuzda</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=kamaz" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jespitae"><img src="https://avatars.githubusercontent.com/u/23041146?v=4?s=100" width="100px;" alt="jespitae"/><br /><sub><b>jespitae</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=jespitae" title="Code">💻</a> <a href="https://github.com/asyncapi/modelina/commits?author=jespitae" title="Tests">⚠️</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jespitae"><img src="https://avatars.githubusercontent.com/u/23041146?v=4?s=100" width="100px;" alt="jespitae"/><br /><sub><b>jespitae</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=jespitae" title="Code">💻</a> <a href="https://github.com/asyncapi/modelina/commits?author=jespitae" title="Tests">⚠️</a> <a href="https://github.com/asyncapi/modelina/issues?q=author%3Ajespitae" title="Bug reports">🐛</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://pike.github.io/"><img src="https://avatars.githubusercontent.com/u/43494?v=4?s=100" width="100px;" alt="Axel Hecht"/><br /><sub><b>Axel Hecht</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=Pike" title="Code">💻</a> <a href="https://github.com/asyncapi/modelina/commits?author=Pike" title="Tests">⚠️</a></td>
Expand Down
8 changes: 4 additions & 4 deletions examples/integrate-with-next/package-lock.json

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

744 changes: 363 additions & 381 deletions examples/integrate-with-react/package-lock.json

Large diffs are not rendered by default.

459 changes: 126 additions & 333 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"dependencies": {
"@apidevtools/json-schema-ref-parser": "^11.1.0",
"@apidevtools/swagger-parser": "^10.1.0",
"@asyncapi/multi-parser": "^2.1.1",
"@asyncapi/parser": "^3.1.0",
"@smoya/multi-parser": "^5.0.1",
"@swc/core": "^1.3.5",
"@swc/jest": "^0.2.23",
"@types/node": "^20.3.3",
Expand Down
2 changes: 1 addition & 1 deletion src/processors/AsyncAPIInputProcessor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { fileURLToPath } from 'url';
import {
ConvertDocumentParserAPIVersion,
NewParser
} from '@smoya/multi-parser';
} from '@asyncapi/multi-parser';
import { createDetailedAsyncAPI } from '@asyncapi/parser/cjs/utils';

/**
Expand Down
8 changes: 4 additions & 4 deletions test/runtime/runtime-typescript/package-lock.json

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

0 comments on commit cd3d847

Please sign in to comment.