Merge branch 'muxinc:main' into main

Author: AdamJaggard

.github/dependabot.yml

@@ -0,0 +1,24 @@
+version: 2
+updates:
+  - package-ecosystem: 'npm'
+    directories:
+      - '/packages/*'
+    schedule:
+      interval: 'daily'
+    commit-message:
+      prefix: 'fix'
+      prefix-development: 'chore'
+    groups:
+      prod-dependencies:
+        patterns:
+          - 'media-chrome'
+          - 'player.style'
+          - 'castable-video'
+          - 'custom-media-element'
+          - 'media-tracks'
+    allow:
+      - dependency-name: 'media-chrome'
+      - dependency-name: 'player.style'
+      - dependency-name: 'castable-video'
+      - dependency-name: 'custom-media-element'
+      - dependency-name: 'media-tracks'

.github/release-please/.release-please-manifest.json

@@ -0,0 +1,13 @@
+{
+  "packages/mux-active-viewer-count": "0.2.0-alpha.13",
+  "packages/mux-audio": "0.15.4",
+  "packages/mux-audio-react": "0.15.4",
+  "packages/mux-elements-codemod": "1.1.11",
+  "packages/mux-player": "3.3.1",
+  "packages/mux-player-react": "3.3.1",
+  "packages/mux-uploader": "1.2.0",
+  "packages/mux-uploader-react": "1.2.0",
+  "packages/mux-video": "0.24.4",
+  "packages/mux-video-react": "0.24.4",
+  "packages/playback-core": "0.28.4"
+}

.github/release-please/release-please-config.json

@@ -0,0 +1,70 @@
+{
+  "bump-minor-pre-major": true,
+  "bump-patch-for-minor-pre-major": false,
+  "tag-separator": "@",
+  "include-component-in-tag": true,
+  "include-v-in-tag": false,
+  "plugins": [
+    {
+      "type": "node-workspace",
+      "merge": false
+    },
+    {
+      "type": "linked-versions",
+      "groupName": "player",
+      "components": ["@mux/mux-player", "@mux/mux-player-react"]
+    },
+    {
+      "type": "linked-versions",
+      "groupName": "audio",
+      "components": ["@mux/mux-audio", "@mux/mux-audio-react"]
+    },
+    {
+      "type": "linked-versions",
+      "groupName": "video",
+      "components": ["@mux/mux-video", "@mux/mux-video-react"]
+    },
+    {
+      "type": "linked-versions",
+      "groupName": "uploader",
+      "components": ["@mux/mux-uploader", "@mux/mux-uploader-react"]
+    }
+  ],
+  "packages": {
+    "packages/mux-active-viewer-count": {
+      "component": "@mux/mux-active-viewer-count",
+      "prerelease": true,
+      "versioning": "prerelease"
+    },
+    "packages/mux-audio": {
+      "component": "@mux/mux-audio"
+    },
+    "packages/mux-audio-react": {
+      "component": "@mux/mux-audio-react"
+    },
+    "packages/mux-elements-codemod": {
+      "component": "@mux/mux-elements-codemod"
+    },
+    "packages/mux-player": {
+      "component": "@mux/mux-player"
+    },
+    "packages/mux-player-react": {
+      "component": "@mux/mux-player-react"
+    },
+    "packages/mux-uploader": {
+      "component": "@mux/mux-uploader"
+    },
+    "packages/mux-uploader-react": {
+      "component": "@mux/mux-uploader-react"
+    },
+    "packages/mux-video": {
+      "component": "@mux/mux-video"
+    },
+    "packages/mux-video-react": {
+      "component": "@mux/mux-video-react"
+    },
+    "packages/playback-core": {
+      "component": "@mux/playback-core"
+    }
+  }
+}

.github/workflows/cd.yml

@@ -3,50 +3,73 @@ name: Deployment
 concurrency: production
 
 on:
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
+  push:
+    branches:
+      - main
 
 jobs:
-  deploy:
+  release:
     runs-on: ubuntu-latest
     environment: production
+    permissions:
+      contents: write
+      pull-requests: write
+      id-token: write
+
     steps:
+      - uses: googleapis/release-please-action@v4
+        id: release
+        with:
+          config-file: .github/release-please/release-please-config.json
+          manifest-file: .github/release-please/.release-please-manifest.json
+
       - uses: actions/checkout@v4
+        # these if statements ensure that a publication only occurs when
+        # a new release is created:
+        if: ${{ steps.release.outputs.releases_created == 'true' }}
         with:
           fetch-depth: 0 # Fetch all history for all tags and branches
       - name: read node version from the .nvmrc file
+        if: ${{ steps.release.outputs.releases_created == 'true' }}
         run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc)
         shell: bash
         id: nvmrc
       - uses: actions/setup-node@v4
+        if: ${{ steps.release.outputs.releases_created == 'true' }}
         with:
           node-version: ${{steps.nvmrc.outputs.NODE_VERSION}}
           # this line is required for the setup-node action to be able to run the npm publish below.
           registry-url: 'https://registry.npmjs.org'
+
       - name: Install
-        run: yarn install --frozen-lockfile
+        if: ${{ steps.release.outputs.releases_created == 'true' }}
+        run: npm ci
       - name: Clean
-        run: yarn clean
+        if: ${{ steps.release.outputs.releases_created == 'true' }}
+        run: npm run clean
       - name: Test
-        run: yarn test
+        if: ${{ steps.release.outputs.releases_created == 'true' }}
+        run: npm test
       - name: Clean
-        run: yarn clean
+        if: ${{ steps.release.outputs.releases_created == 'true' }}
+        run: npm run clean
       - name: Build
-        run: yarn build:packages
+        if: ${{ steps.release.outputs.releases_created == 'true' }}
+        run: npm run build:packages
       - name: Publish
-        run: yarn deploy --yes
+        if: ${{ steps.release.outputs.releases_created == 'true' }}
+        run: npm exec -c publish-packages
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - name: Create Release Notes
-        run: yarn create-release-notes
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: 'Get message'
+        if: ${{ steps.release.outputs.releases_created == 'true' }}
         id: 'deploy_message'
         run: |
           echo "::set-output name=commit_msg::$(git log -1 --format=%B)"
           echo "::set-output name=commit_sha::$(git log -1 --format=%H)"
       - name: Slack Notify
+        if: ${{ steps.release.outputs.releases_created == 'true' }}
         uses: rtCamp/action-slack-notify@v2.2.0
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/ci.yml

@@ -9,8 +9,13 @@ env:
 
 jobs:
   build:
+    # Don't run if the CI is triggered by Release Please
+    if: ${{ github.event.commits[0].author.name != 'github-actions[bot]' }}
+
     runs-on: ubuntu-latest
     timeout-minutes: 15
+    permissions:
+      id-token: write
 
     steps:
       - uses: actions/checkout@v4
@@ -23,16 +28,19 @@ jobs:
           node-version: ${{steps.nvmrc.outputs.NODE_VERSION}}
           # this line is required for the setup-node action to be able to run the npm publish below.
           registry-url: 'https://registry.npmjs.org'
-          cache: yarn
-      - run: yarn install --frozen-lockfile
-      - run: yarn clean
-      - run: yarn build:packages
-      - run: npm run publish-release -- canary
+          cache: npm
+      - run: npm ci
+      - run: npm run clean
+      - run: npm run build:packages
+      - run: npx --yes -w packages wet-run@1.2.5 release prerelease --prerelease canary --provenance --log-level verbose
         if: ${{ github.ref == 'refs/heads/main' }}
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   lint:
+    # Don't run if the CI is triggered by Release Please
+    if: ${{ github.event.commits[0].author.name != 'github-actions[bot]' }}
+
     runs-on: ubuntu-latest
 
     steps:
@@ -44,26 +52,34 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{steps.nvmrc.outputs.NODE_VERSION}}
-          cache: yarn
-      - run: yarn install --frozen-lockfile
-      - run: yarn lint
+          cache: npm
+      - run: npm ci
+      - run: npm run lint
 
   test:
+    # Don't run if the CI is triggered by Release Please
+    if: ${{ github.event.commits[0].author.name != 'github-actions[bot]' }}
+
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: yarn
+          cache: npm
       # esbuild requires --ignore-scripts to NOT be added here.
-      - run: yarn install --frozen-lockfile
-      - run: yarn clean
+      - run: npm ci
+      - run: npm run clean
       - name: Install playwright browsers
         run: npx playwright install --with-deps
-      # run yarn and pass through `-- --all` to turborepo
-      - run: yarn test -- -- --all
+      # Retry the test command up to 3 times with a timeout of 10 minutes
+      - uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 10
+          max_attempts: 3
+          # run npm test and pass through `-- --all` to turborepo
+          command: npm run test -- -- --all
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v2.1.0
         with:

.gitignore

@@ -131,3 +131,4 @@ dist
 packages/*/src/polyfills
 
 .turbo
+examples/astro/.vercel/

README.md

@@ -22,8 +22,8 @@ Elements are written to make it easy to work in a variety of web frameworks. If
 | [mux-video-react](packages/mux-video-react)                 | Mux React video component          | React         | Public Beta             |
 | [mux-audio](packages/mux-audio)                             | Mux HTML5 audio element            | Web Component | Public Beta             |
 | [mux-audio-react](packages/mux-audio-react)                 | Mux HTML5 audio component          | React         | Public Beta             |
-| [mux-player](packages/mux-player)                           | Mux HTML5 media player component   | Web Component | 2.x.x 🎉                |
-| [mux-player-react](packages/mux-player-react)               | Mux React media player component   | React         | 2.x.x 🎉                |
+| [mux-player](packages/mux-player)                           | Mux HTML5 media player component   | Web Component | 3.x.x 🎉                |
+| [mux-player-react](packages/mux-player-react)               | Mux React media player component   | React         | 3.x.x 🎉                |
 | [mux-uploader](packages/mux-uploader)                       | Mux HTML5 media uploader component | Web Component | 1.x.x 🎉                |
 | [mux-uploader-react](packages/mux-uploader-react)           | Mux React media uploader component | React         | 1.x.x 🎉                |
 | [mux-active-viewer-count](packages/mux-active-viewer-count) | Mux HTML5 viewer count component   | Web Component | Public Alpha            |