Skip to content

Commit 8826d0c

Browse files
authored
Merge pull request #138 from dvtng/upgrade-deps
Upgrade all dependencies to latest
2 parents 1691d54 + afacdf3 commit 8826d0c

File tree

8 files changed

+3746
-3816
lines changed

8 files changed

+3746
-3816
lines changed

.yarn/releases/yarn-3.1.0.cjs

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

.yarn/releases/yarn-3.2.0.cjs

Lines changed: 785 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
nodeLinker: node-modules
22

3-
yarnPath: .yarn/releases/yarn-3.1.0.cjs
3+
yarnPath: .yarn/releases/yarn-3.2.0.cjs

package.json

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -49,46 +49,46 @@
4949
"not IE 11"
5050
],
5151
"devDependencies": {
52-
"@babel/core": "^7.16.0",
53-
"@rollup/plugin-typescript": "^8.3.0",
54-
"@storybook/addon-essentials": "^6.3.12",
55-
"@storybook/addon-links": "^6.3.12",
56-
"@storybook/react": "^6.3.12",
57-
"@swc/core": "^1.2.111",
58-
"@swc/jest": "^0.2.5",
59-
"@testing-library/jest-dom": "^5.15.0",
60-
"@testing-library/react": "^12.1.2",
61-
"@types/react": "^17.0.35",
62-
"@types/react-dom": "^17.0.11",
63-
"@typescript-eslint/eslint-plugin": "^5.4.0",
64-
"@typescript-eslint/parser": "^5.4.0",
65-
"babel-loader": "^8.2.3",
66-
"eslint": "^8.2.0",
67-
"eslint-config-airbnb": "^19.0.0",
68-
"eslint-config-airbnb-typescript": "^16.0.0",
69-
"eslint-config-prettier": "^8.3.0",
70-
"eslint-plugin-import": "^2.25.3",
71-
"eslint-plugin-jest": "^25.2.4",
72-
"eslint-plugin-jest-dom": "^3.9.2",
52+
"@babel/core": "^7.17.9",
53+
"@rollup/plugin-typescript": "^8.3.1",
54+
"@storybook/addon-essentials": "^6.4.21",
55+
"@storybook/addon-links": "^6.4.21",
56+
"@storybook/react": "^6.4.21",
57+
"@swc/core": "^1.2.165",
58+
"@swc/jest": "^0.2.20",
59+
"@testing-library/jest-dom": "^5.16.4",
60+
"@testing-library/react": "^13.0.0",
61+
"@types/react": "^18.0.1",
62+
"@types/react-dom": "^18.0.0",
63+
"@typescript-eslint/eslint-plugin": "^5.18.0",
64+
"@typescript-eslint/parser": "^5.18.0",
65+
"babel-loader": "^8.2.4",
66+
"eslint": "^8.13.0",
67+
"eslint-config-airbnb": "^19.0.4",
68+
"eslint-config-airbnb-typescript": "^17.0.0",
69+
"eslint-config-prettier": "^8.5.0",
70+
"eslint-plugin-import": "^2.26.0",
71+
"eslint-plugin-jest": "^26.1.4",
72+
"eslint-plugin-jest-dom": "^4.0.1",
7373
"eslint-plugin-jsx-a11y": "^6.5.1",
74-
"eslint-plugin-react": "^7.27.1",
75-
"eslint-plugin-react-hooks": "^4.3.0",
76-
"eslint-plugin-testing-library": "^5.0.0",
74+
"eslint-plugin-react": "^7.29.4",
75+
"eslint-plugin-react-hooks": "^4.4.0",
76+
"eslint-plugin-testing-library": "^5.2.1",
7777
"husky": "^7.0.4",
78-
"jest": "^27.3.1",
79-
"lint-staged": "^12.0.3",
80-
"prettier": "^2.4.1",
81-
"react": "^17.0.2",
82-
"react-dom": "^17.0.2",
78+
"jest": "^27.5.1",
79+
"lint-staged": "^12.3.7",
80+
"prettier": "^2.6.2",
81+
"react": "^18.0.0",
82+
"react-dom": "^18.0.0",
8383
"rimraf": "^3.0.2",
84-
"rollup": "^2.60.0",
84+
"rollup": "^2.70.1",
8585
"rollup-plugin-copy": "^3.4.0",
8686
"tslib": "^2.3.1",
87-
"typescript": "^4.5.2",
88-
"webpack": "^5.64.2"
87+
"typescript": "^4.6.3",
88+
"webpack": "^5.72.0"
8989
},
9090
"peerDependencies": {
9191
"react": ">=16.8.0"
9292
},
93-
"packageManager": "yarn@3.1.0"
93+
"packageManager": "yarn@3.2.0"
9494
}

src/Skeleton.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable react/no-array-index-key */
2-
import React, { CSSProperties, ReactElement } from 'react'
2+
import React, { CSSProperties, PropsWithChildren, ReactElement } from 'react'
33
import { SkeletonThemeContext } from './SkeletonThemeContext'
44
import { SkeletonStyleProps } from './SkeletonStyleProps'
55

@@ -41,7 +41,7 @@ function styleOptionsToCssProperties({
4141

4242
export interface SkeletonProps extends SkeletonStyleProps {
4343
count?: number
44-
wrapper?: React.FunctionComponent
44+
wrapper?: React.FunctionComponent<PropsWithChildren<unknown>>
4545

4646
className?: string
4747
containerClassName?: string

src/__stories__/Skeleton.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export const CustomStyles: React.VFC = () => (
113113
export const Circle: React.VFC = () => <Skeleton height={50} width={50} circle />
114114

115115
// Use https://bennettfeely.com/clippy/ to try out other shapes
116-
const StarWrapper: React.FC = ({ children }) => (
116+
const StarWrapper: React.FC<PropsWithChildren<unknown>> = ({ children }) => (
117117
<div
118118
style={{
119119
display: 'inline-block',

src/__tests__/Skeleton.test.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react'
1+
import React, { PropsWithChildren } from 'react'
22
import { render, screen } from '@testing-library/react'
33
import { Skeleton } from '../Skeleton'
44
import {
@@ -107,7 +107,9 @@ it('applies the containerClassName and containerTestId', () => {
107107
})
108108

109109
it('renders a skeleton with a wrapper', () => {
110-
const Wrapper: React.FC = ({ children }) => <div className="box">{children}</div>
110+
const Wrapper: React.FC<PropsWithChildren<unknown>> = ({ children }) => (
111+
<div className="box">{children}</div>
112+
)
111113

112114
render(<Skeleton wrapper={Wrapper} />)
113115

0 commit comments

Comments
 (0)