Skip to content

Commit

Permalink
Merge branch 'cookpete:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
williamli authored Dec 30, 2023
2 parents c121315 + 8ca9747 commit 269933b
Show file tree
Hide file tree
Showing 13 changed files with 125 additions and 54 deletions.
20 changes: 16 additions & 4 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,20 @@ on:
- minor
- major
- prerelease
- from-package
- from-git
prerelease:
type: choice
required: false
description: Pre-release
options:
-
- canary
- beta
dryrun:
description: 'Dry-run'
type: boolean

run-name: Deploy ${{ inputs.version }} ${{ inputs.dryrun && '--dry-run' || '' }} ${{ inputs.prerelease && format('--prerelease {0}', inputs.prerelease) || '' }}

jobs:
deploy:
Expand All @@ -38,11 +44,12 @@ jobs:
CONVENTIONAL_GITHUB_RELEASER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Fetch all history for all tags and branches
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 20
# this line is required for the setup-node action to be able to run the npm publish below.
registry-url: 'https://registry.npmjs.org'
- uses: fregante/setup-git-user@v1
Expand All @@ -53,4 +60,9 @@ jobs:
- run: npm run build:demo
- run: npm run build:dist
- run: npm run build:standalone
- run: npx --yes [email protected] release ${{ inputs.version }} --prerelease "${{ inputs.prerelease }}" --provenance --changelog --github-release
- run: npx --yes [email protected] release ${{ inputs.version }} ${{ inputs.dryrun && '--dry-run' || '' }} ${{ inputs.prerelease && format('--prerelease {0}', inputs.prerelease) || '' }} --provenance --changelog --github-release --verbose
- name: Get NPM version
id: npm-version
uses: martinbeentjes/[email protected]
- name: Released ${{ steps.npm-version.outputs.current-version}} ✨
run: echo ${{ steps.npm-version.outputs.current-version}}
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
node-version: [18.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: npm
Expand All @@ -28,9 +28,9 @@ jobs:
node-version: [18.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: npm
Expand All @@ -45,9 +45,9 @@ jobs:
node-version: [16.x, 18.x, 20.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: npm
Expand Down
4 changes: 4 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ src
test
webpack/*
yarn-error.log
/demo/
/examples/
/disttest/
/scripts/
24 changes: 22 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,29 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [v2.14.1](https://github.com/cookpete/react-player/compare/v2.14.0...v2.14.1)

- fix: cjs interop require default pita [`#1722`](https://github.com/cookpete/react-player/pull/1722)
- docs(CHANGELOG): 2.14.1 [`921b0e0`](https://github.com/cookpete/react-player/commit/921b0e01148925f048716435333fcdc9ce2df24a)
- chore: npm ignore unneeded folders [`678f466`](https://github.com/cookpete/react-player/commit/678f466553d36dc02dfe2b926a31e8694b746842)

#### [v2.14.0](https://github.com/cookpete/react-player/compare/v2.13.0...v2.14.0)

> 14 December 2023
- fix: repo url [`#1709`](https://github.com/cookpete/react-player/pull/1709)
- fix: pkg repository.url [`#1708`](https://github.com/cookpete/react-player/pull/1708)
- chore: add CD workflow [`#1706`](https://github.com/cookpete/react-player/pull/1706)
- chore: use Node matrix with 16.x, 18.x, 20.x [`#1688`](https://github.com/cookpete/react-player/pull/1688)
- docs: update demo App.js link [`#1689`](https://github.com/cookpete/react-player/pull/1689)
- fix: modernize build using esbuild [`#1684`](https://github.com/cookpete/react-player/pull/1684)
- docs(CHANGELOG): 2.14.0 [`e018c42`](https://github.com/cookpete/react-player/commit/e018c4255dee89a1684f2fff8b1cb4db81ad2cce)
- chore(release): 2.14.0 [`1496f67`](https://github.com/cookpete/react-player/commit/1496f679fcefae26ecb5b1ea77c75b36f401dd90)

#### [v2.13.0](https://github.com/cookpete/react-player/compare/v2.12.0...v2.13.0)

> 5 September 2023
- Fix #1604 - FilePlayer does not work if I passed an array of urls [`#1612`](https://github.com/cookpete/react-player/pull/1612)
- fix: `src` sttribute become "undefinded" if `url` is an array [`#1648`](https://github.com/cookpete/react-player/pull/1648)
- Adding keepPlaying to other player types [`#1639`](https://github.com/cookpete/react-player/pull/1639)
Expand Down Expand Up @@ -672,7 +693,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Add standalone player [`4ffd201`](https://github.com/cookpete/react-player/commit/4ffd20112f18c2c7b3c25e39c283f8cfe9be88fc)
- Update description and keywords [`0194b43`](https://github.com/cookpete/react-player/commit/0194b43758fccbbda755d13d9eb0d2a4a80aba77)

#### [v1.0.0](https://github.com/cookpete/react-player/compare/v1.0.0-beta.7...v1.0.0)
### [v1.0.0](https://github.com/cookpete/react-player/compare/v1.0.0-beta.7...v1.0.0)

> 17 January 2018
Expand Down Expand Up @@ -914,7 +935,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
> 5 May 2017
- Fix initial loading bug for Private Vimeo videos [`#187`](https://github.com/cookpete/react-player/pull/187)
- Fix initial loading bug for Private Vimeo videos [`ff8a449`](https://github.com/cookpete/react-player/commit/ff8a449546121be7bfd6f3bb357d9dc06a94fcaa)

#### [v0.17.0](https://github.com/cookpete/react-player/compare/v0.16.0...v0.17.0)

Expand Down
5 changes: 3 additions & 2 deletions dist/ReactPlayer.js

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion dist/ReactPlayer.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit 269933b

Please sign in to comment.