Skip to content

Commit 2c9eca3

Browse files
committed
Merge branch 'master' of github.com:fossasia/open-event-next into ky
2 parents 5ce887b + fe84b07 commit 2c9eca3

File tree

8 files changed

+783
-274
lines changed

8 files changed

+783
-274
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- run: yarn install --immutable --immutable-cache --check-cache
2323
- run: yarn lint
2424
- run: yarn build
25-
- run: yarn test --passWithNoTests
25+
- run: yarn test
2626
- run: npx next export
2727
- name: 'Upload Artifact'
2828
uses: actions/upload-artifact@v2

package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,52 +27,52 @@
2727
]
2828
},
2929
"dependencies": {
30-
"@emotion/react": "^11.8.1",
30+
"@emotion/react": "^11.8.2",
3131
"@emotion/styled": "^11.8.1",
3232
"@lingui/detect-locale": "^3.13.2",
3333
"@lingui/react": "^3.13.2",
34-
"@mui/icons-material": "^5.4.4",
35-
"@mui/material": "^5.4.4",
36-
"@mui/styles": "^5.4.4",
37-
"@sentry/browser": "^6.18.1",
34+
"@mui/icons-material": "^5.5.1",
35+
"@mui/material": "^5.5.2",
36+
"@mui/styles": "^5.5.1",
37+
"@sentry/browser": "^6.19.2",
3838
"@sentry/integrations": "^6.18.1",
3939
"@sentry/node": "^6.18.1",
4040
"@sentry/webpack-plugin": "^1.18.8",
4141
"babel-plugin-macros": "^3.1.0",
42-
"dayjs": "^1.10.8",
43-
"ky": "^0.30.0",
44-
"next": "12.1.0",
42+
"dayjs": "^1.11.0",
43+
"next": "12.1.1",
4544
"nprogress": "^0.2.0",
4645
"react": "17.0.2",
4746
"react-dom": "17.0.2",
47+
"sass": "^1.49.9",
4848
"zustand": "^3.7.1"
4949
},
5050
"devDependencies": {
5151
"@lingui/cli": "^3.13.2",
5252
"@lingui/loader": "^3.13.2",
5353
"@lingui/macro": "^3.13.2",
54-
"@testing-library/react": "^12.1.3",
54+
"@testing-library/react": "^12.1.4",
5555
"@types/jest": "^27.4.1",
5656
"@types/lodash-es": "^4.17.6",
57-
"@types/node": "^17.0.21",
57+
"@types/node": "^17.0.23",
5858
"@types/nprogress": "^0.2.0",
59-
"@types/react": "^17.0.39",
60-
"@typescript-eslint/eslint-plugin": "^5.13.0",
61-
"@typescript-eslint/parser": "^5.13.0",
59+
"@types/react": "^17.0.43",
60+
"@typescript-eslint/eslint-plugin": "^5.16.0",
61+
"@typescript-eslint/parser": "^5.16.0",
6262
"babel-jest": "^27.5.1",
63-
"eslint": "^8.10.0",
63+
"eslint": "^8.11.0",
6464
"eslint-config-prettier": "^8.5.0",
6565
"eslint-plugin-jsx-a11y": "^6.5.1",
66-
"eslint-plugin-react": "^7.29.3",
66+
"eslint-plugin-react": "^7.29.4",
6767
"eslint-plugin-react-hooks": "^4.3.0",
6868
"husky": "^7.0.4",
6969
"identity-obj-proxy": "^3.0.0",
7070
"jest": "^27.5.1",
7171
"jest-watch-typeahead": "^1.0.0",
72-
"lint-staged": "^12.3.4",
72+
"lint-staged": "^12.3.7",
7373
"lodash-es": "^4.17.21",
74-
"prettier": "^2.5.1",
75-
"typescript": "^4.6.2"
74+
"prettier": "^2.6.0",
75+
"typescript": "^4.6.3"
7676
},
7777
"optionalDependencies": {
7878
"fsevents": "^2.3.2"
@@ -117,4 +117,4 @@
117117
],
118118
"sourceLocale": "en"
119119
}
120-
}
120+
}

pages/_app.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useEffect } from 'react'
22
import { AppProps } from 'next/app'
33
import { ThemeProvider, StyledEngineProvider } from '@mui/material/styles'
44
import StylesProvider from '@mui/styles/StylesProvider'
5-
import '../styles/globals.css'
5+
import '../styles/globals.scss'
66
import theme from '../src/theme'
77
import { CssBaseline } from '@mui/material'
88
import { init } from '../utils/sentry'
File renamed without changes.

0 commit comments

Comments
 (0)