From 80cde5ec3c9a58d3a3ed18b5b8b88d8bdee450ed Mon Sep 17 00:00:00 2001 From: guoxianzhe <53285945+guoxianzhe@users.noreply.github.com> Date: Wed, 27 Dec 2023 11:19:23 +0900 Subject: [PATCH] [2.1.0]bump websdk to 4.20.0 (#177) * chore: upgrade agora-rtc-sdk-ng to 4.20.0 (#176) * docs: change README --------- Co-authored-by: sda-rob <149643938+sda-rob@users.noreply.github.com> Co-authored-by: guoxianzhe --- .github/workflows/upgrade-dep.yml | 48 ++++------ README.md | 2 + package.json | 2 +- packages/agora-rtc-react/package.json | 2 +- pnpm-lock.yaml | 124 +++++++++----------------- 5 files changed, 65 insertions(+), 113 deletions(-) diff --git a/.github/workflows/upgrade-dep.yml b/.github/workflows/upgrade-dep.yml index a4cce7bd..e08a0e54 100644 --- a/.github/workflows/upgrade-dep.yml +++ b/.github/workflows/upgrade-dep.yml @@ -12,19 +12,16 @@ on: description: "upgrade package version: [eg: '*.*.*']" required: true type: string - create-branch-name: - description: "head branch name: [eg: 'dev/upgrade-dep']" - required: true - type: string jobs: upgrade-dep: runs-on: ubuntu-latest - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - - name: Checkout ๐Ÿ›Ž๏ธ - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GITHUB_TOKEN }} - name: Setup ๐Ÿ› ๏ธ uses: ./.github/actions/setup @@ -32,29 +29,18 @@ jobs: - name: Upgrade Dependencies ๐Ÿš€ run: | pnpm install - git config --global user.email "${{ github.actor }}@users.noreply.github.com" - git config --global user.name "${{ github.actor }}" - git fetch - if git rev-parse --verify origin/${{ inputs.create-branch-name }} >/dev/null 2>&1 - then - git switch ${{ inputs.create-branch-name }} - else - git switch -c ${{ inputs.create-branch-name }} - echo "CREATE_PR=1" >> "$GITHUB_ENV" - fi pnpm -r exec esbuild-dev $PWD/scripts/upgrade-deps.ts dep:${{ inputs.package-name }} @${{ inputs.package-version }} pnpm -w exec esbuild-dev $PWD/scripts/upgrade-deps.ts dep:${{ inputs.package-name }} @${{ inputs.package-version }} pnpm install --no-frozen-lockfile - # pnpm run test - if git diff --quiet; - then - echo "No changes, no need to update dependencies."; - else - git add . - git commit -m "chore: upgrade ${{inputs.package-name}} to ${{inputs.package-version}}" - git push origin ${{ inputs.create-branch-name }} - fi - - name: Create Pull Request ๐Ÿ“ - if: env.CREATE_PR == 1 - run: | - gh pr create -B ${{ github.ref_name }} -H ${{ inputs.create-branch-name }} --title '๐Ÿค–chore: upgrade ${{inputs.package-name}} to ${{inputs.package-version}}' --body 'Created by Github action' --label 'ci:dep-upgrade' + pnpm run test + + - name: Create pull request + uses: AgoraIO-Extensions/actions/.github/actions/pr@main + with: + github-token: ${{ secrets.GH_TOKEN }} + target-repo: ${{ github.workspace }} + target-branch: ${{ github.ref_name }} + target-branch-name-surffix: dep-update + pull-request-title: | + chore: upgrade ${{inputs.package-name}} to ${{inputs.package-version}} + add-paths: . diff --git a/README.md b/README.md index b1b95458..2a007aa0 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,8 @@ English | [็ฎ€ไฝ“ไธญๆ–‡](./README.zh-CN.md) agora-rtc-react makes it easier to integrate [agora-rtc-sdk-ng](https://www.npmjs.com/package/agora-rtc-sdk-ng) in React applications. +Since 2.0.0, you no longer need to add agora-rtc-sdk-ng in your own package.json. + # Installation ```bash diff --git a/package.json b/package.json index fde81acf..e2d4bbf5 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@types/react": "^18.2.14", "@types/react-dom": "^18.2.7", "@types/testing-library__jest-dom": "^5.14.8", - "agora-rtc-sdk-ng": "4.19.3", + "agora-rtc-sdk-ng": "4.20.0", "agora-rtc-sdk-ng-fake": "github:AgoraIO-Extensions/agora-rtc-sdk-ng-fake#semver:^1.0.4", "react-test-renderer": "^18.2.0", "storybook": "^7.0.26", diff --git a/packages/agora-rtc-react/package.json b/packages/agora-rtc-react/package.json index 5568dd84..2e1da76d 100644 --- a/packages/agora-rtc-react/package.json +++ b/packages/agora-rtc-react/package.json @@ -54,7 +54,7 @@ }, "main": "src/index.ts", "devDependencies": { - "agora-rtc-sdk-ng": "4.19.3", + "agora-rtc-sdk-ng": "4.20.0", "agora-rtc-react-ui": "workspace:*" }, "release-it": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index deb1c39c..7f32f5f6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -95,8 +95,8 @@ importers: specifier: ^0.34.6 version: 0.34.6(vitest@0.34.6) agora-rtc-sdk-ng: - specifier: 4.19.3 - version: 4.19.3 + specifier: 4.20.0 + version: 4.20.0 agora-rtc-sdk-ng-fake: specifier: github:AgoraIO-Extensions/agora-rtc-sdk-ng-fake#semver:^1.0.4 version: github.com/AgoraIO-Extensions/agora-rtc-sdk-ng-fake/ab8f42f2b5c11d530b680c4da70f24eeead999ab @@ -174,7 +174,7 @@ importers: version: 5.1.6 vite: specifier: ^4.5.1 - version: 4.5.1(@types/node@20.5.0) + version: 4.5.1(@types/node@20.5.0)(sass@1.64.0) vitest: specifier: ^0.34.6 version: 0.34.6(@vitest/ui@0.34.6)(jsdom@22.1.0) @@ -241,7 +241,7 @@ importers: version: 13.3.2(sass@1.64.0)(webpack@5.89.0) unocss: specifier: ^0.53.5 - version: 0.53.5(postcss@8.4.31)(vite@4.5.0) + version: 0.53.5(postcss@8.4.31)(vite@4.5.1) examples/mobx: dependencies: @@ -287,10 +287,10 @@ importers: version: 4.1.1 unocss: specifier: ^0.53.5 - version: 0.53.5(postcss@8.4.31)(vite@4.5.0) + version: 0.53.5(postcss@8.4.31)(vite@4.5.1) vite-plugin-externals: specifier: ^0.6.2 - version: 0.6.2(vite@4.5.0) + version: 0.6.2(vite@4.5.1) packages/agora-rtc-react: dependencies: @@ -302,8 +302,8 @@ importers: specifier: workspace:* version: link:../agora-rtc-react-ui agora-rtc-sdk-ng: - specifier: 4.19.3 - version: 4.19.3 + specifier: 4.20.0 + version: 4.20.0 packages/agora-rtc-react-ui: dependencies: @@ -326,12 +326,12 @@ packages: resolution: {integrity: sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw==} dev: true - /@agora-js/media@4.19.3: - resolution: {integrity: sha512-isdguA/wAYRILVN831Xuyaz7MWqhWBECuAoIQg+7aATbRNtNO8Y/OvWpb9dhHnUgyf8V/CIH1wz/6dWXQtIXTA==} + /@agora-js/media@4.20.0: + resolution: {integrity: sha512-cprH3BmxiM2fEbbdSORCv0/LMl+7R4Zq5MUbCCRV4/BWDoDL+Fdp5otUi1GOoVV4jWNepDl7pkOOH64IfJ1n0Q==} dependencies: - '@agora-js/report': 4.19.3 - '@agora-js/shared': 4.19.3 - agora-rte-extension: 1.2.3 + '@agora-js/report': 4.20.0 + '@agora-js/shared': 4.20.0 + agora-rte-extension: 1.2.4 axios: 0.27.2 pako: 2.1.0 webrtc-adapter: 8.2.0 @@ -339,17 +339,17 @@ packages: - debug dev: true - /@agora-js/report@4.19.3: - resolution: {integrity: sha512-g64mpKEhuItmoKv8YJdjJAZyFxKwfCtOZ99RZ2d2HcN9yuKT7WoMJ1TbHdCl9nwigtxBloZTv49ukOp2qIUpcw==} + /@agora-js/report@4.20.0: + resolution: {integrity: sha512-TaY+4M1qEdAtM4xmYDUlmzQdGmao23ljnrcBGtS1BXdTrDTH/GbN6+/NAng5Zp5TmBniYwpMHvfPwfVW9LX8Gg==} dependencies: - '@agora-js/shared': 4.19.3 + '@agora-js/shared': 4.20.0 axios: 0.27.2 transitivePeerDependencies: - debug dev: true - /@agora-js/shared@4.19.3: - resolution: {integrity: sha512-APC7HEA4240pSTk3Ri++lzzW+E4lr35YsgU8Va4WciLDQSlDrTybxiyY0gdZ5DqhrRE4Si0bOX32yc3p1HllWg==} + /@agora-js/shared@4.20.0: + resolution: {integrity: sha512-+Em8k8MJsYlZ5ItqJidXHdNbn/vmQi3/P0hjh0jsHsMZLwz0l9kETbo5Q7Lq/so8IyrHQw4DoK5Jen0/B4uW4w==} dependencies: axios: 0.27.2 ua-parser-js: 0.7.36 @@ -3631,7 +3631,7 @@ packages: magic-string: 0.27.0 react-docgen-typescript: 2.2.2(typescript@5.1.6) typescript: 5.1.6 - vite: 4.5.1(@types/node@20.5.0) + vite: 4.5.1(@types/node@20.5.0)(sass@1.64.0) dev: true /@jridgewell/gen-mapping@0.3.3: @@ -4413,7 +4413,7 @@ packages: remark-slug: 6.1.0 rollup: 3.29.4 typescript: 5.1.6 - vite: 4.5.1(@types/node@20.5.0) + vite: 4.5.1(@types/node@20.5.0)(sass@1.64.0) transitivePeerDependencies: - encoding - supports-color @@ -4789,7 +4789,7 @@ packages: react: 18.2.0 react-docgen: 6.0.0-alpha.3 react-dom: 18.2.0(react@18.2.0) - vite: 4.5.1(@types/node@20.5.0) + vite: 4.5.1(@types/node@20.5.0)(sass@1.64.0) transitivePeerDependencies: - '@preact/preset-vite' - encoding @@ -5437,12 +5437,12 @@ packages: eslint-visitor-keys: 3.4.3 dev: true - /@unocss/astro@0.53.5(vite@4.5.0): + /@unocss/astro@0.53.5(vite@4.5.1): resolution: {integrity: sha512-W4A0uIN4xAzVH6Vwf5ukG8rJpCeIwQZcpZPrEBWsqY5YcHZcLTFGMHcNmxyeG0qoXpXoxtvHyXXhgGU0BY5ZEw==} dependencies: '@unocss/core': 0.53.5 '@unocss/reset': 0.53.5 - '@unocss/vite': 0.53.5(vite@4.5.0) + '@unocss/vite': 0.53.5(vite@4.5.1) transitivePeerDependencies: - rollup - vite @@ -5606,7 +5606,7 @@ packages: '@unocss/core': 0.53.5 dev: true - /@unocss/vite@0.53.5(vite@4.5.0): + /@unocss/vite@0.53.5(vite@4.5.1): resolution: {integrity: sha512-ez0MVRatewLUQq79LI+XRAVRbXWaGbK1K1ht2B8vGyL9OrL6uieEwzxjHV7+rUa8i+FEHfD4Ntmtdpb3WuQSAA==} peerDependencies: vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 @@ -5621,7 +5621,7 @@ packages: chokidar: 3.5.3 fast-glob: 3.3.1 magic-string: 0.30.5 - vite: 4.5.0(@types/node@20.5.0)(sass@1.64.0) + vite: 4.5.1(@types/node@20.5.0)(sass@1.64.0) transitivePeerDependencies: - rollup dev: true @@ -5637,7 +5637,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.22.5(@babel/core@7.23.2) magic-string: 0.27.0 react-refresh: 0.14.0 - vite: 4.5.1(@types/node@20.5.0) + vite: 4.5.1(@types/node@20.5.0)(sass@1.64.0) transitivePeerDependencies: - supports-color dev: true @@ -5653,7 +5653,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.22.5(@babel/core@7.23.2) '@types/babel__core': 7.20.3 react-refresh: 0.14.0 - vite: 4.5.1(@types/node@20.5.0) + vite: 4.5.1(@types/node@20.5.0)(sass@1.64.0) transitivePeerDependencies: - supports-color dev: true @@ -5965,13 +5965,13 @@ packages: indent-string: 4.0.0 dev: true - /agora-rtc-sdk-ng@4.19.3: - resolution: {integrity: sha512-vzIZ2wHoVRM/38YTCKIP6nQ3ehiBUfvpExsJw4Ala9QhCK6J8qMxmZxqBoNmz6jigMfMWi7c8UVZThbaNQM6Pg==} + /agora-rtc-sdk-ng@4.20.0: + resolution: {integrity: sha512-jgMn6NXuFKQ0nVkLP2hGn+Asxbx+DSV0gn5PY6X0iF7LC2xqsqEzGhehLASxliS81JjhMNKE72hHEzrQn0qtvQ==} dependencies: - '@agora-js/media': 4.19.3 - '@agora-js/report': 4.19.3 - '@agora-js/shared': 4.19.3 - agora-rte-extension: 1.2.3 + '@agora-js/media': 4.20.0 + '@agora-js/report': 4.20.0 + '@agora-js/shared': 4.20.0 + agora-rte-extension: 1.2.4 axios: 0.27.2 formdata-polyfill: 4.0.10 ua-parser-js: 0.7.36 @@ -5980,8 +5980,8 @@ packages: - debug dev: true - /agora-rte-extension@1.2.3: - resolution: {integrity: sha512-k3yNrYVyzJRoQJjaJUktKUI1XRtf8J1XsW8OzYKFqGlS8WQRMsES1+Phj2rfuEriiLObfuyuCimG6KHQCt5tiw==} + /agora-rte-extension@1.2.4: + resolution: {integrity: sha512-0ovZz1lbe30QraG1cU+ji7EnQ8aUu+Hf3F+a8xPml3wPOyUQEK6CTdxV9kMecr9t+fIDrGeW7wgJTsM1DQE7Nw==} dev: true /agora-token@2.0.3: @@ -14053,7 +14053,7 @@ packages: engines: {node: '>= 10.0.0'} dev: true - /unocss@0.53.5(postcss@8.4.31)(vite@4.5.0): + /unocss@0.53.5(postcss@8.4.31)(vite@4.5.1): resolution: {integrity: sha512-LXAdtzAaH8iEDWxW4t9i6TvJNw0OSrgdN+jw8rAZAWb73Nx51ZLoKPUB1rFvQMr2Li7LcsUj5hYpOrQbhhafYg==} engines: {node: '>=14'} peerDependencies: @@ -14062,7 +14062,7 @@ packages: '@unocss/webpack': optional: true dependencies: - '@unocss/astro': 0.53.5(vite@4.5.0) + '@unocss/astro': 0.53.5(vite@4.5.1) '@unocss/cli': 0.53.5 '@unocss/core': 0.53.5 '@unocss/extractor-arbitrary-variants': 0.53.5 @@ -14081,7 +14081,7 @@ packages: '@unocss/transformer-compile-class': 0.53.5 '@unocss/transformer-directives': 0.53.5 '@unocss/transformer-variant-group': 0.53.5 - '@unocss/vite': 0.53.5(vite@4.5.0) + '@unocss/vite': 0.53.5(vite@4.5.1) transitivePeerDependencies: - postcss - rollup @@ -14252,7 +14252,7 @@ packages: mlly: 1.4.2 pathe: 1.1.1 picocolors: 1.0.0 - vite: 4.5.1(@types/node@20.5.0) + vite: 4.5.1(@types/node@20.5.0)(sass@1.64.0) transitivePeerDependencies: - '@types/node' - less @@ -14264,7 +14264,7 @@ packages: - terser dev: true - /vite-plugin-externals@0.6.2(vite@4.5.0): + /vite-plugin-externals@0.6.2(vite@4.5.1): resolution: {integrity: sha512-R5oVY8xDJjLXLTs2XDYzvYbc/RTZuIwOx2xcFbYf+/VXB6eJuatDgt8jzQ7kZ+IrgwQhe6tU8U2fTyy72C25CQ==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -14274,47 +14274,10 @@ packages: es-module-lexer: 0.4.1 fs-extra: 10.1.0 magic-string: 0.25.9 - vite: 4.5.0(@types/node@20.5.0)(sass@1.64.0) + vite: 4.5.1(@types/node@20.5.0)(sass@1.64.0) dev: true - /vite@4.5.0(@types/node@20.5.0)(sass@1.64.0): - resolution: {integrity: sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==} - engines: {node: ^14.18.0 || >=16.0.0} - hasBin: true - peerDependencies: - '@types/node': '>= 14' - less: '*' - lightningcss: ^1.21.0 - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - '@types/node': 20.5.0 - esbuild: 0.18.20 - postcss: 8.4.31 - rollup: 3.29.4 - sass: 1.64.0 - optionalDependencies: - fsevents: 2.3.3 - dev: true - - /vite@4.5.1(@types/node@20.5.0): + /vite@4.5.1(@types/node@20.5.0)(sass@1.64.0): resolution: {integrity: sha512-AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -14346,6 +14309,7 @@ packages: esbuild: 0.18.20 postcss: 8.4.31 rollup: 3.29.4 + sass: 1.64.0 optionalDependencies: fsevents: 2.3.3 dev: true @@ -14413,7 +14377,7 @@ packages: strip-literal: 1.3.0 tinybench: 2.5.1 tinypool: 0.7.0 - vite: 4.5.1(@types/node@20.5.0) + vite: 4.5.1(@types/node@20.5.0)(sass@1.64.0) vite-node: 0.34.6(@types/node@20.5.0) why-is-node-running: 2.2.2 transitivePeerDependencies: