Skip to content

Commit 1e10ee9

Browse files
authored
chore: upgrade dependencies (#364)
1 parent e59f675 commit 1e10ee9

File tree

7 files changed

+3322
-7861
lines changed

7 files changed

+3322
-7861
lines changed

.storybook/base.css

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

.storybook/main.js

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,4 @@
1-
const path = require('path')
2-
31
module.exports = {
4-
stories: ['../src/stories/**/*.(story|stories).(ts|tsx|js|jsx|mdx)'],
5-
addons: [
6-
'@storybook/addon-actions',
7-
'@storybook/addon-viewport',
8-
{
9-
name: '@storybook/preset-create-react-app',
10-
options: {
11-
tsDocgenLoaderOptions: {
12-
tsconfigPath: path.resolve(__dirname, '../tsconfig.json'),
13-
},
14-
},
15-
},
16-
// {
17-
// name: '@storybook/addon-docs',
18-
// options: {
19-
// configureJSX: true,
20-
// },
21-
// },
22-
],
2+
stories: ['../src/stories/**/*.@(story|stories).@(ts|tsx|js|jsx|mdx)'],
3+
addons: ['@storybook/addon-actions', '@storybook/addon-viewport'],
234
}

.storybook/preview-head.html

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<title>React IntersectionObserver</title>
2+
<style>
3+
body {
4+
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
5+
Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif;
6+
padding: 0;
7+
margin: 0;
8+
color: #0c0c0c;
9+
font-size: 16px;
10+
}
11+
12+
h1 {
13+
font-size: 2rem;
14+
}
15+
.sb-show-main {
16+
padding: 0 !important;
17+
}
18+
</style>

package.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,11 @@
140140
"@babel/preset-flow": "^7.9.0",
141141
"@babel/preset-react": "^7.9.4",
142142
"@babel/preset-typescript": "^7.9.0",
143-
"@emotion/react": "^11.0.0-next.12",
144-
"@storybook/addon-actions": "^5.3.18",
145-
"@storybook/addon-viewport": "^5.3.18",
146-
"@storybook/components": "^5.3.18",
147-
"@storybook/preset-create-react-app": "^3.1.2",
148-
"@storybook/react": "^5.3.18",
149-
"@storybook/theming": "^5.3.18",
143+
"@emotion/react": "11.0.0-next.12",
144+
"@storybook/addon-actions": "^6.0.13",
145+
"@storybook/addon-viewport": "^6.0.13",
146+
"@storybook/react": "^6.0.13",
147+
"@storybook/theming": "^6.0.13",
150148
"@testing-library/jest-dom": "^5.5.0",
151149
"@testing-library/react": "^10.0.2",
152150
"@types/jest": "^26.0.8",
@@ -174,16 +172,19 @@
174172
"lint-staged": "^10.1.3",
175173
"npm-run-all": "^4.1.5",
176174
"prettier": "^2.0.4",
177-
"react": "^16.13.1",
178-
"react-dom": "^16.13.1",
179-
"react-scripts": "^3.4.1",
180-
"react-test-renderer": "^16.13.1",
175+
"react": "^17.0.0-rc.0",
176+
"react-dom": "^17.0.0-rc.0",
177+
"react-test-renderer": "^17.0.0-rc.0",
181178
"rollup": "^2.6.0",
182179
"rollup-plugin-babel": "^4.4.0",
183180
"rollup-plugin-commonjs": "^10.0.1",
184181
"rollup-plugin-node-resolve": "^5.2.0",
185182
"rollup-plugin-replace": "^2.1.0",
186183
"rollup-plugin-terser": "^5.3.0",
187184
"typescript": "^3.8.3"
185+
},
186+
"resolutions": {
187+
"react": "17.0.0-rc.0",
188+
"react-dom": "17.0.0-rc.0"
188189
}
189190
}

src/test-utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const instanceMap = new Map()
55

66
beforeAll(() => {
77
// @ts-ignore
8-
global.IntersectionObserver = jest.fn((cb, options) => {
8+
global.IntersectionObserver = jest.fn((cb, options = {}) => {
99
const instance = {
1010
thresholds: Array.isArray(options.threshold)
1111
? options.threshold

0 commit comments

Comments
 (0)