Skip to content

Commit cd6c34f

Browse files
committed
Merge branch 'release/2.4.0'
2 parents dcb56ed + c30cf48 commit cd6c34f

File tree

6 files changed

+11303
-10720
lines changed

6 files changed

+11303
-10720
lines changed

.storybook/config.js

Lines changed: 0 additions & 23 deletions
This file was deleted.

.storybook/main.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module.exports = {
2+
stories: ['../stories/**/*.stories.js'],
3+
};

.storybook/preview.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { withKnobs } from '@storybook/addon-knobs';
2+
3+
// reset the window on each story
4+
const withWindowReset = (storyFn) => {
5+
window.scrollTo(0, 0);
6+
return storyFn();
7+
};
8+
9+
export const decorators = [withKnobs, withWindowReset];

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
language: node_js
22
node_js:
3-
- '8'
3+
- "14"
44
cache:
55
directories:
6-
- 'node_modules'
6+
- "node_modules"
77
script: yarn test && codecov && yarn storybook:export
8+
install:
9+
- yarn
810
deploy:
911
skip-cleanup: true
1012
provider: surge

package.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-scroll-parallax",
3-
"version": "2.3.5",
3+
"version": "2.4.0",
44
"description": "React components to create parallax scroll effects for banners, images or any other DOM elements.",
55
"repository": {
66
"type": "git",
@@ -59,7 +59,8 @@
5959
"prop-types": "^15.5.10"
6060
},
6161
"peerDependencies": {
62-
"react": "^16.3.0-0"
62+
"react": "^16.3.0-0 || >=17.0.1",
63+
"react-dom": "^16.3.0-0 || >=17.0.1"
6364
},
6465
"devDependencies": {
6566
"@babel/cli": "^7.0.0",
@@ -68,13 +69,13 @@
6869
"@babel/plugin-proposal-export-default-from": "^7.0.0",
6970
"@babel/preset-env": "^7.0.0",
7071
"@babel/preset-react": "^7.0.0",
71-
"@storybook/addon-actions": "^5.0.6",
72-
"@storybook/addon-knobs": "^5.0.6",
73-
"@storybook/addon-links": "^5.0.6",
74-
"@storybook/addons": "^5.0.6",
75-
"@storybook/react": "^5.0.6",
72+
"@storybook/addon-actions": "^6.2.9",
73+
"@storybook/addon-knobs": "^6.2.9",
74+
"@storybook/addon-links": "^6.2.9",
75+
"@storybook/addons": "^6.2.9",
76+
"@storybook/react": "^6.2.9",
7677
"@types/jest": "^24.0.11",
77-
"@types/react": "^16.8.10",
78+
"@types/react": "^17.0.1",
7879
"babel-core": "^7.0.0-bridge.0",
7980
"babel-eslint": "^10.0.1",
8081
"babel-jest": "^23.4.2",
@@ -89,9 +90,9 @@
8990
"express": "^4.14.1",
9091
"jest": "^24.0.1",
9192
"node-sass": "^4.5.0",
92-
"react": "^16.8.0",
93-
"react-dom": "^16.8.0",
94-
"react-test-renderer": "^16.8.0",
93+
"react": "^17.0.1",
94+
"react-dom": "^17.0.1",
95+
"react-test-renderer": "^17.0.1",
9596
"regenerator-runtime": "^0.10.5",
9697
"sass-loader": "^7.1.0",
9798
"style-loader": "^0.23.1",

0 commit comments

Comments
 (0)