Skip to content

Commit d624f05

Browse files
committed
upgrade next and react
1 parent dd04930 commit d624f05

File tree

6 files changed

+349
-703
lines changed

6 files changed

+349
-703
lines changed

.eslintrc.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,12 @@ module.exports = {
4848
'react-hooks/exhaustive-deps': 0,
4949

5050
semi: ['error', 'never'],
51+
// mac / windows end of line
52+
'prettier/prettier': [
53+
'error',
54+
{
55+
endOfLine: 'auto',
56+
},
57+
],
5158
},
5259
}

next-env.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/// <reference types="next" />
2-
/// <reference types="next/types/global" />
32
/// <reference types="next/image-types/global" />
43

54
// NOTE: This file should not be edited

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
"dependencies": {
2929
"border-box.css": "^1.0.0",
3030
"framer-motion": "^4.1.17",
31-
"next": "^11.1.2",
31+
"next": "^12.2.5",
3232
"normalize.css": "^8.0.1",
33-
"react": "^17.0.2",
34-
"react-dom": "^17.0.2",
33+
"react": "^18.2.0",
34+
"react-dom": "^18.2.0",
3535
"react-modal": "^3.14.3",
36-
"styled-components": "^5.3.3"
36+
"styled-components": "^5.3.5"
3737
},
3838
"devDependencies": {
3939
"@next/eslint-plugin-next": "^11.1.2",
@@ -45,15 +45,15 @@
4545
"@testing-library/react": "^12.1.2",
4646
"@testing-library/user-event": "^13.5.0",
4747
"@types/jest": "^27.0.2",
48-
"@types/react": "^17.0.30",
49-
"@types/react-dom": "^17.0.10",
48+
"@types/react": "^18.0.17",
49+
"@types/react-dom": "^18.0.6",
5050
"@types/react-modal": "^3.13.1",
51-
"@types/styled-components": "^5.1.15",
51+
"@types/styled-components": "^5.1.26",
5252
"@typescript-eslint/eslint-plugin": "^5.19.0",
5353
"@typescript-eslint/parser": "^5.19.0",
5454
"babel-plugin-styled-components": "^1.13.3",
5555
"cypress": "^9.5.4",
56-
"eslint": "^8.12.0",
56+
"eslint": "^8.22.0",
5757
"eslint-config-airbnb": "^18.2.1",
5858
"eslint-config-prettier": "^8.3.0",
5959
"eslint-plugin-cypress": "^2.12.1",

pages/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ const Home = () => (
2525
/>
2626
</Head>
2727
<App />
28-
<Script strategy="afterInteractive">{GA}</Script>
28+
<Script id="ga-script" strategy="afterInteractive">
29+
{GA}
30+
</Script>
2931
</>
3032
)
3133

src/styles/global.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { createGlobalStyle } from 'styled-components'
22

33
import { palette } from './colors'
44

5-
export default createGlobalStyle`
5+
const GlobalStyles = createGlobalStyle`
66
${palette}
77
88
body {
@@ -32,3 +32,5 @@ export default createGlobalStyle`
3232
margin: 0;
3333
}
3434
`
35+
36+
export default GlobalStyles

0 commit comments

Comments
 (0)