Merge branch 'master' into feat/table-of-contents

asyncapi · Dec 7, 2023 · dbe4d33 · dbe4d33
2 parents 13cf0f8 + 8b7b392
commit dbe4d33
Show file tree

Hide file tree

Showing 85 changed files with 6,298 additions and 18,409 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -45,7 +45,7 @@ jobs:
         env:
           GITHUB_TOKEN: "${{ secrets.GH_TOKEN }}"
           GITHUB_LOGIN: asyncapi-bot
-          MERGE_LABELS: ""
+          MERGE_LABELS: "!do-not-merge"
           MERGE_METHOD: "squash"
           MERGE_COMMIT_MESSAGE: "{pullRequest.title} (#{pullRequest.number})"
           MERGE_RETRIES: "20"

diff --git a/README.md b/README.md
@@ -36,7 +36,6 @@ Use the following tools to set up the project:
 - [Node.js](https://nodejs.org/) v16.0.0+
 - [npm](https://www.npmjs.com/) v7.10.0+
 
-
 ## Run locally
 
 1. Fork the repository by clicking on `Fork` option on top right of the main repository.

diff --git a/components/Asyncapi3Comparison.js b/components/Asyncapi3Comparison.js
diff --git a/components/DemoAnimation.js b/components/DemoAnimation.js
@@ -44,7 +44,7 @@ export default function DemoAnimation({ className = '' }) {
     const common = (
       <>
         <div>
-          <span className="text-teal-400">asyncapi:</span> 2.6.0
+          <span className="text-teal-400">asyncapi:</span> 3.0.0
         </div>
         <div>
           <span className="text-teal-400">info:</span>
@@ -85,10 +85,34 @@ export default function DemoAnimation({ className = '' }) {
           <span className="text-teal-400">channels:</span>
         </div>
         <div>
-          <span className="text-yellow-300">&nbsp;&nbsp;user/signedup:</span>
+          <span className="text-yellow-300">&nbsp;&nbsp;userSignedup:</span>
         </div>
         <div>
-          <span className="text-purple-400">&nbsp;&nbsp;&nbsp;&nbsp;subscribe:</span>
+          <span className="text-purple-400">&nbsp;&nbsp;&nbsp;&nbsp;address:</span><span className="text-teal-200">'user/signedup'</span>
+        </div>
+        <div>
+          <span className="text-teal-400">&nbsp;&nbsp;&nbsp;&nbsp;messages:</span>
+        </div>
+        <div>
+          <span className="text-yellow-300">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;userSignedupMessage:</span>
+        </div>
+        <div>
+          <span className="text-teal-200">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$ref:</span><span className="text-teal-200">'#/components/messages/UserSignedUp'</span>
+        </div>
+        <div>
+          <span className="text-teal-400">operations:</span>
+        </div>
+        <div>
+          <span className="text-yellow-300">&nbsp;&nbsp;processUserSignups:</span>
+        </div>
+        <div>
+          <span className="text-purple-400">&nbsp;&nbsp;&nbsp;&nbsp;action:</span><span className="text-teal-200">'receive'</span>
+        </div>
+        <div>
+          <span className="text-teal-400">&nbsp;&nbsp;&nbsp;&nbsp;channel:</span>
+        </div>
+        <div>
+          <span className="text-teal-200">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$ref:</span><span className="text-teal-200"> '#/channels/userSignedup'</span>
         </div>
         <Typing.Delay ms={500} />
       </>,
@@ -99,12 +123,6 @@ export default function DemoAnimation({ className = '' }) {
   function renderUntilMessagePayload(callback) {
     return renderTyping(
       <>
-        <div>
-          <span className="text-teal-400">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;message:</span>
-        </div>
-        <div>
-          <span className="text-teal-200">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$ref:</span><span className="text-teal-200"> '#/components/messages/UserSignedUp'</span>
-        </div>
         <div>
           <span className="text-teal-400">components:</span>
         </div>
@@ -242,7 +260,7 @@ export default function DemoAnimation({ className = '' }) {
             </div>
 
             <div className={transitionClassNames(showChannelsAndOperation)}>
-              <span className="px-3 py-2 mr-2 bg-green-500 text-white font-bold rounded">SUB</span> <span className="text-lg text-gray-700">user/signedup</span>
+              <span className="px-3 py-2 mr-2 bg-green-500 text-white font-bold rounded">RECEIVES</span> <span className="text-lg text-gray-700">user/signedup</span>
             </div>
 
             <div className={transitionClassNames(showUntilMessagePayload)}>

diff --git a/components/GeneratorInstallation.js b/components/GeneratorInstallation.js
@@ -27,13 +27,13 @@ export default function GeneratorInstallation({ }) {
   }
 
   function getNpmCode() {
-    return `npm install -g @asyncapi/generator
-ag ${specPath} ${template} ${params}`
+    return `npm install -g @asyncapi/cli
+asyncapi generate fromTemplate ${specPath} ${template} ${params}`
   }
 
   function getDockerCode() {
-    return `docker run --rm -it -v \${PWD}/example:/app/example \\
-asyncapi/generator ${specPath} ${template} ${params}`
+    return `docker run --rm -it -v \${PWD}/example:/app/example -v \${PWD}/output:/app/output \\
+asyncapi/cli generate fromTemplate ${specPath} ${template} ${params}`
   }
 
   return (
@@ -56,10 +56,12 @@ asyncapi/generator ${specPath} ${template} ${params}`
         codeBlocks={[{
           language: 'npm',
           code: getNpmCode(),
-        }, {
+        },
+        {
           language: 'Docker',
           code: getDockerCode(),
-        }]}
+        },
+      ]}
       />
     </div>
   )