Skip to content

Commit ece5161

Browse files
authored
Fix update dependencies (#223)
* Fix update dependencies * Fix * Fix * Fix
1 parent 8bb29d1 commit ece5161

File tree

7 files changed

+2583
-3186
lines changed

7 files changed

+2583
-3186
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99

1010
strategy:
1111
matrix:
12-
node-version: [10.x]
12+
node-version: [14.x]
1313

1414
steps:
1515
- uses: actions/checkout@v2

.storybook/preview.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { addParameters } from '@storybook/react'
55
import { withScreenshot } from 'storycap'
66

77
import { Global, css } from '@emotion/core'
8-
import { ThemeProvider as StyledThemeProvider } from 'emotion-theming'
9-
import { ThemeProvider as MaterialThemeProvider } from '@material-ui/styles'
8+
import { ThemeProvider as StyledThemeProvider } from '@emotion/react'
9+
import { ThemeProvider as MaterialThemeProvider } from '@material-ui/core/styles'
1010

1111
import { getTheme } from '../src/theme'
1212

package.json

+32-33
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@
2222
"build:all": "yarn build && yarn build:reg"
2323
},
2424
"dependencies": {
25-
"@emotion/core": "10.1.1",
26-
"@emotion/styled": "10.0.27",
25+
"@emotion/react": "11.1.2",
26+
"@emotion/styled": "11.0.0",
2727
"@material-ui/core": "4.11.2",
2828
"@material-ui/icons": "4.11.2",
2929
"chokidar": "3.4.3",
3030
"dayjs": "1.9.7",
31-
"emotion": "10.0.27",
32-
"emotion-theming": "10.0.27",
31+
"emotion": "11.0.0",
3332
"htmr": "0.9.2",
3433
"jdown": "1.0.4",
3534
"marked-sanitizer-github": "1.0.1",
@@ -48,55 +47,55 @@
4847
"react-use": "15.3.4"
4948
},
5049
"devDependencies": {
51-
"@babel/core": "7.12.3",
52-
"@storybook/addon-actions": "6.0.28",
53-
"@storybook/addon-knobs": "6.0.28",
54-
"@storybook/addon-links": "6.0.28",
55-
"@storybook/addon-viewport": "6.0.28",
56-
"@storybook/addons": "6.0.28",
57-
"@storybook/cli": "6.0.28",
58-
"@storybook/react": "6.0.28",
59-
"@testing-library/react-hooks": "3.4.2",
50+
"@babel/core": "7.12.10",
51+
"@storybook/addon-actions": "6.1.11",
52+
"@storybook/addon-knobs": "6.1.11",
53+
"@storybook/addon-links": "6.1.11",
54+
"@storybook/addon-viewport": "6.1.11",
55+
"@storybook/addons": "6.1.11",
56+
"@storybook/cli": "6.1.11",
57+
"@storybook/react": "6.1.11",
58+
"@testing-library/react-hooks": "3.7.0",
6059
"@types/enzyme": "3.10.8",
6160
"@types/enzyme-adapter-react-16": "1.0.6",
62-
"@types/faker": "5.1.4",
63-
"@types/jest": "26.0.15",
64-
"@types/marked": "1.1.0",
65-
"@types/node": "14.14.7",
61+
"@types/faker": "5.1.5",
62+
"@types/jest": "26.0.19",
63+
"@types/marked": "1.2.1",
64+
"@types/node": "14.14.14",
6665
"@types/node-emoji": "1.8.1",
6766
"@types/prismjs": "1.16.2",
68-
"@types/react": "16.9.56",
69-
"@types/react-dom": "16.9.9",
67+
"@types/react": "16.9.49",
68+
"@types/react-dom": "16.9.8",
7069
"@types/react-hot-loader": "4.1.1",
7170
"@types/react-router-dom": "5.1.6",
7271
"@types/react-scroll": "1.8.2",
73-
"@types/webpack-env": "1.15.3",
74-
"@typescript-eslint/eslint-plugin": "4.7.0",
75-
"@typescript-eslint/parser": "4.7.0",
76-
"babel-loader": "8.2.1",
72+
"@types/webpack-env": "1.16.0",
73+
"@typescript-eslint/eslint-plugin": "4.10.0",
74+
"@typescript-eslint/parser": "4.10.0",
75+
"babel-loader": "8.2.2",
7776
"enzyme": "3.11.0",
7877
"enzyme-adapter-react-16": "1.15.5",
79-
"eslint": "7.13.0",
80-
"eslint-config-prettier": "6.15.0",
78+
"eslint": "7.16.0",
79+
"eslint-config-prettier": "7.1.0",
8180
"eslint-plugin-import": "2.22.1",
82-
"eslint-plugin-prettier": "3.1.4",
81+
"eslint-plugin-prettier": "3.3.0",
8382
"eslint-plugin-react": "7.21.5",
8483
"eslint-plugin-react-hooks": "4.2.0",
8584
"faker": "5.1.0",
86-
"husky": "4.3.0",
85+
"husky": "4.3.6",
8786
"jest": "26.6.3",
8887
"jest-enzyme": "7.1.2",
89-
"lint-staged": "10.5.1",
90-
"markdownlint-cli": "0.24.0",
88+
"lint-staged": "10.5.3",
89+
"markdownlint-cli": "0.26.0",
9190
"npm-run-all": "4.1.5",
92-
"prettier": "2.1.2",
93-
"reg-cli": "0.16.2",
91+
"prettier": "2.2.1",
92+
"reg-cli": "0.16.4",
9493
"serve": "11.3.2",
95-
"storycap": "3.0.1",
94+
"storycap": "3.0.3",
9695
"style-loader": "2.0.0",
9796
"ts-config-webpack-plugin": "2.0.0",
9897
"ts-jest": "26.4.4",
99-
"typescript": "4.0.5"
98+
"typescript": "4.1.3"
10099
},
101100
"resolutions": {
102101
"@types/react": "16.9.56",

plugins/material-ui/node.api.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React from 'react'
2-
import { ServerStyleSheets, ThemeProvider } from '@material-ui/styles'
3-
import { createMuiTheme } from '@material-ui/core/styles'
2+
import { ServerStyleSheets, ThemeProvider, createMuiTheme } from '@material-ui/core/styles'
43

54
const theme = createMuiTheme({
65
palette: {

src/components/organisms/Header/index.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,9 @@ const WrappedIcons = styled.span`
4646
justify-content: inherit;
4747
`
4848

49-
const Menu: React.FC<Omit<
50-
ActionProps,
51-
'onThemeChange' | 'onThemeToggle'
52-
>> = React.memo(({ onHomeLinkClick, onAboutLinkClick, onPostsLinkClick }) => (
49+
const Menu: React.FC<
50+
Omit<ActionProps, 'onThemeChange' | 'onThemeToggle'>
51+
> = React.memo(({ onHomeLinkClick, onAboutLinkClick, onPostsLinkClick }) => (
5352
<StyledDiv>
5453
<A onClick={onHomeLinkClick}>Home</A>
5554
<A onClick={onAboutLinkClick}>About</A>

src/components/templates/Layout.tsx

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
import * as React from 'react'
2-
import { Global, css } from '@emotion/core'
2+
import {
3+
Global,
4+
css,
5+
ThemeProvider as StyledThemeProvider,
6+
} from '@emotion/react'
37
import styled from '@emotion/styled'
4-
import { ThemeProvider as StyledThemeProvider } from 'emotion-theming'
58
import CssBaseline from '@material-ui/core/CssBaseline'
69
import Container from '@material-ui/core/Container'
7-
import { ThemeProvider as MaterialThemeProvider } from '@material-ui/styles'
10+
import { ThemeProvider as MaterialThemeProvider } from '@material-ui/core/styles'
811

912
import Header, { Props as HeaderProps } from '../organisms/Header'
1013
import Footer, { Props as FooterProps } from '../organisms/Footer'

0 commit comments

Comments
 (0)