Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: alampros/react-confetti
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v6.0.1
Choose a base ref
...
head repository: alampros/react-confetti
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v6.1.0
Choose a head ref
  • 7 commits
  • 5 files changed
  • 4 contributors

Commits on May 11, 2022

  1. Copy the full SHA
    6598781 View commit details

Commits on May 20, 2022

  1. Merge pull request #132 from gameflow-tv/react-18

    fix: Allow react 18 in peer dependency
    alampros authored May 20, 2022
    Copy the full SHA
    7c8a548 View commit details
  2. Copy the full SHA
    7af7f03 View commit details
  3. Merge branch 'develop'

    # Conflicts:
    #	yarn.lock
    alampros committed May 20, 2022
    Copy the full SHA
    bb37abd View commit details
  4. Copy the full SHA
    ecc2d87 View commit details
  5. Copy the full SHA
    fb14930 View commit details
  6. chore(release): 6.1.0 [skip ci]

    # [6.1.0](v6.0.1...v6.1.0) (2022-05-20)
    
    ### Bug Fixes
    
    * **ci:** add gh and npm tokens ([ecc2d87](ecc2d87))
    * **ci:** explicitly add npm token ([fb14930](fb14930))
    * Allow react 18 in peer dependency ([6598781](6598781))
    
    ### Features
    
    * **ci:** travis => gh actions ([7af7f03](7af7f03))
    semantic-release-bot committed May 20, 2022
    Copy the full SHA
    510e1fd View commit details
Showing with 1,840 additions and 1,865 deletions.
  1. +29 −0 .github/workflows/publish.yaml
  2. +0 −30 .travis.yml
  3. +14 −0 CHANGELOG.md
  4. +2 −2 package.json
  5. +1,795 −1,833 yarn.lock
29 changes: 29 additions & 0 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Publish

on:
push:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: 16
cache: 'yarn'
- run: yarn
- run: yarn semantic-release
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- run: yarn build-storybook
- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@v4.3.3
with:
branch: gh-pages
folder: storybook-static
30 changes: 0 additions & 30 deletions .travis.yml

This file was deleted.

14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# [6.1.0](https://github.com/alampros/react-confetti/compare/v6.0.1...v6.1.0) (2022-05-20)


### Bug Fixes

* **ci:** add gh and npm tokens ([ecc2d87](https://github.com/alampros/react-confetti/commit/ecc2d87a29e01ec0a00151480619535784a35575))
* **ci:** explicitly add npm token ([fb14930](https://github.com/alampros/react-confetti/commit/fb149307b8a172a98ec3697ae190a65d40d69622))
* Allow react 18 in peer dependency ([6598781](https://github.com/alampros/react-confetti/commit/65987818ebc384891e60874998904ec5056f42b2))


### Features

* **ci:** travis => gh actions ([7af7f03](https://github.com/alampros/react-confetti/commit/7af7f0335d68838a62a75c9631ff58245fe8e00c))

## [6.0.1](https://github.com/alampros/react-confetti/compare/v6.0.0...v6.0.1) (2021-02-22)


4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-confetti",
"version": "6.0.1",
"version": "6.1.0",
"description": "React component to draw confetti for your party.",
"main": "dist/react-confetti.min.js",
"types": "dist/types/ReactConfetti.d.ts",
@@ -45,7 +45,7 @@
"develop": "start-storybook -p 3000"
},
"peerDependencies": {
"react": "^16.3.0 || ^17.0.1"
"react": "^16.3.0 || ^17.0.1 || ^18.0.0"
},
"dependencies": {
"tween-functions": "^1.2.0"
Loading