Merge branch 'next' into webgl

.github/workflows/next-deploy.yml

@@ -2,6 +2,7 @@ name: Vercel Deploy Next
 env:
   VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
   VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
+  ALIASES: ${{ vars.ALIASES }}
 on:
   push:
     branches:
@@ -31,7 +32,7 @@ jobs:
           run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
         id: deploy
       - name: Set deployment alias
-        run: vercel alias set ${{ steps.deploy.outputs.stdout }} ${{ secrets.TEST_PREVIEW_DOMAIN }} --token=${{ secrets.VERCEL_TOKEN }}
+        run: vercel alias set ${{ steps.deploy.outputs.stdout }} ${{ secrets.TEST_PREVIEW_DOMAIN }} --token=${{ secrets.VERCEL_TOKEN }} --scope=zaro
       # - uses: mshick/add-pr-comment@v2
       #   with:
       #     message: |

.github/workflows/preview.yml

@@ -2,6 +2,7 @@ name: Vercel Deploy Preview
 env:
   VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
   VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
+  ALIASES: ${{ vars.ALIASES }}
 on:
   issue_comment:
     types: [created]
@@ -42,13 +43,15 @@ jobs:
         with:
           run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
         id: deploy
-      - name: Set deployment alias
-        # only if on branch next
-        if: github.ref == 'refs/heads/next'
-        run: vercel alias set ${{ steps.deploy.outputs.stdout }} ${{ secrets.TEST_PREVIEW_DOMAIN }} --token=${{ secrets.VERCEL_TOKEN }}
       - uses: mshick/add-pr-comment@v2
         with:
           message: |
             Deployed to Vercel Preview: ${{ steps.deploy.outputs.stdout }}
             [Playground](${{ steps.deploy.outputs.stdout }}/playground.html)
             [Storybook](${{ steps.deploy.outputs.stdout }}/storybook/)
+      - name: Get deployment alias
+        run: node scripts/githubActions.mjs getAlias
+        id: alias
+      - name: Set deployment alias
+        if: ${{ steps.alias.outputs.alias != '' }}
+        run: vercel alias set ${{ steps.deploy.outputs.stdout }} ${{ steps.alias.outputs.alias }} --token=${{ secrets.VERCEL_TOKEN }} --scope=zaro

scripts/githubActions.mjs

@@ -0,0 +1,32 @@
+//@ts-check
+import fs from 'fs'
+import os from 'os'
+
+const fns = {
+  async getAlias () {
+    const aliasesRaw = process.env.ALIASES
+    if (!aliasesRaw) throw new Error('No aliases found')
+    const aliases = aliasesRaw.split('\n').map((x) => x.split('='))
+    const githubActionsPull = process.env.GITHUB_REF.match(/refs\/pull\/(\d+)\/merge/)
+    if (!githubActionsPull) throw new Error(`Not a pull request, got ${process.env.GITHUB_REF}`)
+    const prNumber = githubActionsPull[1]
+    const alias = aliases.find((x) => x[0] === prNumber)
+    if (alias) {
+      // set github output
+      setOutput('alias', alias[1])
+    }
+  }
+}
+
+function setOutput(key, value) {
+  // Temporary hack until core actions library catches up with github new recommendations
+  const output = process.env['GITHUB_OUTPUT']
+  fs.appendFileSync(output, `${key}=${value}${os.EOL}`)
+}
+
+const fn = fns[process.argv[2]]
+if (fn) {
+  fn()
+} else {
+  console.error('Function not found')
+}