Merge branch 'staging' into next

Author: braddialpad

.claude/commands/pr-fill.md

@@ -90,7 +90,6 @@ For all PRs:
 For all Vue changes:
 
 - [x] I have added / updated unit tests.
-- [ ] I have made my changes in Vue 2 and Vue 3. Note: you may sync your changes from Vue 2 to Vue 3 (or vice versa) using the `./scripts/dialtone-vue-sync.sh` script. Read docs here: [Dialtone Vue Sync Script](../packages/dialtone-vue3/.github/CONTRIBUTING.md#dialtone-vue-sync-script)
 - [ ] I have validated components with a screen reader.
 - [ ] I have validated components keyboard navigation.
 

.github/pull_request_template.md

@@ -58,7 +58,6 @@ For all PRs:
 For all Vue changes:
 
 - [ ] I have added / updated unit tests.
-- [ ] I have made my changes in Vue 2 and Vue 3. Note: you may sync your changes from Vue 2 to Vue 3 (or vice versa) using the `./scripts/dialtone-vue-sync.sh` script. Read docs here: [Dialtone Vue Sync Script](../packages/dialtone-vue3/.github/CONTRIBUTING.md#dialtone-vue-sync-script)
 - [ ] I have validated components with a screen reader.
 - [ ] I have validated components keyboard navigation.
 
@@ -75,7 +74,7 @@ If new component:
 
 - I am exporting any new components or constants:
   - [ ] from the index.js in the component directory.
-  - [ ] from the index.js in the root (either `packages/dialtone-vue2` or `packages/dialtone-vue3`).
+  - [ ] from the index.js in the root (like `packages/dialtone-vue3`).
 - [ ] I have added the styles for the new component to the `packages/dialtone-css` package.
 - [ ] I have created a page for the new component on the documentation site in `apps/dialtone-documentation`.
 - [ ] I have added the new component to `common/components_list.js`

.github/workflows/a11y_tests.yml

@@ -59,22 +59,8 @@ jobs:
       - name: Check out branch
         uses: actions/checkout@v4
 
-      - name: Use pnpm
-        uses: pnpm/action-setup@v3
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: "pnpm"
-          registry-url: "https://npm.pkg.github.com"
-          scope: "dialpad"
-        env:
-          NODE_AUTH_TOKEN: ${{ github.token }}
-
-      - name: Install dependencies
-        shell: bash
-        run: pnpm install --frozen-lockfile
+      - name: Setup Environment
+        uses: ./.github/actions/setup-environment
 
       - name: Install Playwright Browsers
         run: pnpm exec playwright install --with-deps
@@ -92,22 +78,8 @@ jobs:
       - name: Check out branch
         uses: actions/checkout@v4
 
-      - name: Use pnpm
-        uses: pnpm/action-setup@v3
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: "pnpm"
-          registry-url: "https://npm.pkg.github.com"
-          scope: "dialpad"
-        env:
-          NODE_AUTH_TOKEN: ${{ github.token }}
-
-      - name: Install dependencies
-        shell: bash
-        run: pnpm install --frozen-lockfile
+      - name: Setup Environment
+        uses: ./.github/actions/setup-environment
 
       - name: Install Playwright Browsers
         run: pnpm exec playwright install --with-deps

.github/workflows/clean-preview.yml

@@ -12,8 +12,7 @@ jobs:
       id-token: 'write'
     env:
       DIALTONE_BUCKET_DIRECTORY: dialtone.dialpad.com/deploy-previews/pr-${{ github.event.pull_request.number }}/
-      DIALTONE_VUE_2_BUCKET_DIRECTORY: dialtone.dialpad.com/vue/deploy-previews/pr-${{ github.event.pull_request.number }}/
-      DIALTONE_VUE_3_BUCKET_DIRECTORY: dialtone.dialpad.com/vue3/deploy-previews/pr-${{ github.event.pull_request.number }}/
+      DIALTONE_VUE_3_BUCKET_DIRECTORY: dialtone.dialpad.com/vue/deploy-previews/pr-${{ github.event.pull_request.number }}/
     steps:
       - uses: actions/checkout@v4
 
@@ -33,11 +32,6 @@ jobs:
           gcloud storage rm --recursive ${{ format('gs://{0}', env.DIALTONE_BUCKET_DIRECTORY) }}
 
       - name: Clean up dialtone-vue preview
-        continue-on-error: true
-        run: |
-          gcloud storage rm --recursive ${{ format('gs://{0}', env.DIALTONE_VUE_2_BUCKET_DIRECTORY) }}
-
-      - name: Clean up dialtone-vue3 preview
         continue-on-error: true
         run: |
           gcloud storage rm --recursive ${{ format('gs://{0}', env.DIALTONE_VUE_3_BUCKET_DIRECTORY) }}

.github/workflows/deploy.yml

@@ -22,9 +22,9 @@ on:
       - 'packages/dialtone-tokens/themes/**'
       - 'packages/dialtone-tokens/tokens/**'
       - 'packages/dialtone-tokens/gulpfile.cjs'
-      - 'packages/dialtone-vue*/**/*.vue'
-      - 'packages/dialtone-vue*/**/*.*js'
-      - 'packages/dialtone-vue*/**/*.stories.js'
+      - 'packages/dialtone-vue3/**/*.vue'
+      - 'packages/dialtone-vue3/**/*.*js'
+      - 'packages/dialtone-vue3/**/*.stories.js'
       - '!**/*.test.*js'
   pull_request:
     paths:
@@ -40,17 +40,16 @@ on:
       - 'packages/dialtone-tokens/themes/**'
       - 'packages/dialtone-tokens/tokens/**'
       - 'packages/dialtone-tokens/gulpfile.cjs'
-      - 'packages/dialtone-vue*/**/*.vue'
-      - 'packages/dialtone-vue*/**/*.*js'
-      - 'packages/dialtone-vue*/**/*.stories.js'
+      - 'packages/dialtone-vue3/**/*.vue'
+      - 'packages/dialtone-vue3/**/*.*js'
+      - 'packages/dialtone-vue3/**/*.stories.js'
       - '!**/*.test.*js'
 
 env:
   HUSKY: 0
   BASE_URL: ${{ github.event_name == 'pull_request' && format('deploy-previews/pr-{0}/', github.event.pull_request.number) || (github.ref_name != 'production' && format('{0}/', github.ref_name)) || '' }}
   DIALTONE_BUCKET_DIRECTORY: dialtone.dialpad.com
-  DIALTONE_VUE_2_BUCKET_DIRECTORY: dialtone.dialpad.com/vue
-  DIALTONE_VUE_3_BUCKET_DIRECTORY: dialtone.dialpad.com/vue3
+  DIALTONE_VUE_3_BUCKET_DIRECTORY: dialtone.dialpad.com/vue
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.ref }}"
@@ -86,19 +85,6 @@ jobs:
               - 'packages/dialtone-tokens/tokens/**'
               - 'packages/dialtone-tokens/gulpfile.cjs'
               - 'packages/dialtone-vue3/{common,components,directives,localization,recipes}/**/!(*.story.vue|*.test.js|*.stories.js)'
-            dialtone-vue2:
-              - 'packages/dialtone-css/**/*.less'
-              - 'packages/dialtone-css/postcss/*.cjs'
-              - 'packages/dialtone-css/gulpfile.cjs'
-              - 'packages/dialtone-emojis/src/**'
-              - 'packages/dialtone-icons/src/**'
-              - 'packages/dialtone-icons/gulpfile.cjs'
-              - 'packages/dialtone-tokens/*.js'
-              - 'packages/dialtone-tokens/postcss/**'
-              - 'packages/dialtone-tokens/themes/**'
-              - 'packages/dialtone-tokens/tokens/**'
-              - 'packages/dialtone-tokens/gulpfile.cjs'
-              - 'packages/dialtone-vue2/**'
             dialtone-vue3:
               - 'packages/dialtone-css/**/*.less'
               - 'packages/dialtone-css/postcss/*.cjs'
@@ -130,7 +116,7 @@ jobs:
     name: Deploy sites
     if: ${{ needs.filter-actions.outputs.packages != '[]' }}
     env:
-      BUCKET_CLEANUP_EXCLUDE: '/alpha/|/beta/|/deploy-previews/|/staging/|/next/|/vue/|/vue3/'
+      BUCKET_CLEANUP_EXCLUDE: '/alpha/|/beta/|/deploy-previews/|/staging/|/next/|/vue/'
     strategy:
       fail-fast: false
       matrix:
@@ -162,18 +148,13 @@ jobs:
         id: expand
         env:
           DIALTONE_DIST_DIRECTORY: apps/dialtone-documentation/docs/.vuepress/dist
-          DIALTONE_VUE_2_DIST_DIRECTORY: packages/dialtone-vue2/storybook-static
           DIALTONE_VUE_3_DIST_DIRECTORY: packages/dialtone-vue3/storybook-static
         run: |
           if [[ ${{ matrix.package }} == 'dialtone-documentation' ]]; then
             echo "VUEPRESS_BASE_URL=/$BASE_URL" >> $GITHUB_ENV;
             echo "source_directory=$DIALTONE_DIST_DIRECTORY" >> $GITHUB_OUTPUT;
             echo "dest_directory=$DIALTONE_BUCKET_DIRECTORY/$BASE_URL" >> $GITHUB_OUTPUT;
             echo "build_command=dialtone-documentation:build" >> $GITHUB_OUTPUT;
-          elif [[ ${{ matrix.package }} == 'dialtone-vue2' ]]; then
-            echo "source_directory=$DIALTONE_VUE_2_DIST_DIRECTORY" >> $GITHUB_OUTPUT;
-            echo "dest_directory=$DIALTONE_VUE_2_BUCKET_DIRECTORY/$BASE_URL" >> $GITHUB_OUTPUT;
-            echo "build_command=dialtone-vue2:build-storybook" >> $GITHUB_OUTPUT;
           elif [[ ${{ matrix.package }} == 'dialtone-vue3' ]]; then
             echo "source_directory=$DIALTONE_VUE_3_DIST_DIRECTORY" >> $GITHUB_OUTPUT;
             echo "dest_directory=$DIALTONE_VUE_3_BUCKET_DIRECTORY/$BASE_URL" >> $GITHUB_OUTPUT;
@@ -238,7 +219,6 @@ jobs:
           message: |
             ✔️ Deploy previews ready!
             ${{ contains(needs.filter-actions.outputs.packages, 'dialtone-documentation') && format('😎 Dialtone documentation preview: https://{0}/{1}', env.DIALTONE_BUCKET_DIRECTORY, env.BASE_URL) }}
-            ${{ contains(needs.filter-actions.outputs.packages, 'dialtone-vue2') && format('😎 Dialtone-vue 2 preview: https://{0}/{1}', env.DIALTONE_VUE_2_BUCKET_DIRECTORY, env.BASE_URL) || '' }}
-            ${{ contains(needs.filter-actions.outputs.packages, 'dialtone-vue3') && format('😎 Dialtone-vue 3 the preview: https://{0}/{1}', env.DIALTONE_VUE_3_BUCKET_DIRECTORY, env.BASE_URL) || '' }}
+            ${{ contains(needs.filter-actions.outputs.packages, 'dialtone-vue3') && format('😎 Dialtone-vue preview: https://{0}/{1}', env.DIALTONE_VUE_3_BUCKET_DIRECTORY, env.BASE_URL) || '' }}
           message-id: 'deploy-preview-message'
           refresh-message-position: true

.github/workflows/lint-pr.yml

@@ -16,22 +16,8 @@ jobs:
       - name: Check out branch
         uses: actions/checkout@v4
 
-      - name: Use pnpm
-        uses: pnpm/action-setup@v3
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: "pnpm"
-          registry-url: "https://npm.pkg.github.com"
-          scope: "dialpad"
-        env:
-          NODE_AUTH_TOKEN: ${{ github.token }}
-
-      - name: Install dependencies
-        shell: bash
-        run: pnpm install --frozen-lockfile
+      - name: Setup Environment
+        uses: ./.github/actions/setup-environment
 
       - name: Lint pull request title
         run: |

.github/workflows/publish-android.yml

@@ -76,22 +76,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Use pnpm
-        uses: pnpm/action-setup@v3
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: "pnpm"
-          registry-url: "https://npm.pkg.github.com"
-          scope: "dialpad"
-        env:
-          NODE_AUTH_TOKEN: ${{ github.token }}
-
-      - name: Install dependencies
-        shell: bash
-        run: pnpm install --frozen-lockfile
+      - name: Setup Environment
+        uses: ./.github/actions/setup-environment
 
       - name: Setup Java
         uses: actions/setup-java@v4

.github/workflows/publish-ios.yml

@@ -31,22 +31,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Use pnpm
-        uses: pnpm/action-setup@v3
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: "pnpm"
-          registry-url: "https://npm.pkg.github.com"
-          scope: "dialpad"
-        env:
-          NODE_AUTH_TOKEN: ${{ github.token }}
-
-      - name: Install dependencies
-        shell: bash
-        run: pnpm install --frozen-lockfile
+      - name: Setup Environment
+        uses: ./.github/actions/setup-environment
 
       - name: Build swift
         run: pnpm nx run dialtone-tokens:build:ios

.github/workflows/publish-web.yml

@@ -116,18 +116,19 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       packages: write
+      id-token: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Setup Environment
         uses: ./.github/actions/setup-environment
 
-      - name: Remove GitHub registry if publishing to npm
+      - name: Configure registry for publishing
         if: matrix.registry == 'npm'
         run: |
-          pnpm config delete @dialpad:registry;
-          pnpm config set //registry.npmjs.org/:_authToken=${{ secrets.DIALTONE_NPM_TOKEN }}
+          pnpm config delete @dialpad:registry
+          pnpm config set registry 'https:${{ matrix.registry_url }}'
 
       - name: Delay job to avoid npm rate limits
         if: matrix.package == 'dialtone-vue3'

.github/workflows/release.yml

@@ -64,7 +64,6 @@ jobs:
     env:
       RELEASE_TAG: ${{ needs.get-branch-name.outputs.current_branch == 'staging' && 'latest' || needs.get-branch-name.outputs.current_branch }}
       DIALTONE_VUE3_RELEASE_TAG: ${{ needs.get-branch-name.outputs.current_branch == 'staging' && 'vue3' || needs.get-branch-name.outputs.current_branch }}
-      NPM_TOKEN: ${{ secrets.DIALTONE_NPM_TOKEN }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Checkout
@@ -73,22 +72,8 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.DIALTONE_CI_TOKEN }}
 
-      - name: Use pnpm
-        uses: pnpm/action-setup@v3
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: "pnpm"
-          registry-url: "https://npm.pkg.github.com"
-          scope: "dialpad"
-        env:
-          NODE_AUTH_TOKEN: ${{ github.token }}
-
-      - name: Install dependencies
-        shell: bash
-        run: pnpm install --frozen-lockfile
+      - name: Setup Environment
+        uses: ./.github/actions/setup-environment
 
       # Release to GitHub
       - name: Release Dialtone Combinator ${{ env.RELEASE_TAG }}