Merge branch 'dev' into local-fonts

This commit is contained in:
Mike Cao 2021-05-21 10:27:07 -07:00 committed by GitHub
commit e8fad828ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 757 additions and 336 deletions

View file

@ -60,7 +60,7 @@
"@fontsource/noto-sans-jp": "^4.3.0",
"@fontsource/noto-sans-sc": "^4.3.0",
"@fontsource/noto-sans-tc": "^4.3.0",
"@prisma/client": "2.21.2",
"@prisma/client": "2.23.0",
"@reduxjs/toolkit": "^1.5.1",
"bcryptjs": "^2.4.3",
"chalk": "^4.1.1",
@ -68,19 +68,19 @@
"classnames": "^2.3.1",
"cookie": "^0.4.1",
"cors": "^2.8.5",
"date-fns": "^2.16.1",
"date-fns": "^2.21.3",
"date-fns-tz": "^1.0.12",
"detect-browser": "^5.2.0",
"dotenv": "^8.2.0",
"formik": "^2.2.6",
"immer": "^8.0.1",
"formik": "^2.2.7",
"immer": "^9.0.2",
"ipaddr.js": "^2.0.0",
"is-localhost-ip": "^1.4.0",
"isbot": "^3.0.26",
"jose": "2.0.5",
"maxmind": "^4.3.1",
"moment-timezone": "^0.5.33",
"next": "^10.1.3",
"next": "^10.2.2",
"prompts": "2.4.1",
"prop-types": "^15.7.2",
"react": "^17.0.2",
@ -89,7 +89,7 @@
"react-redux": "^7.2.4",
"react-simple-maps": "^2.3.0",
"react-spring": "^8.0.27",
"react-tooltip": "^4.2.18",
"react-tooltip": "^4.2.19",
"react-use-measure": "^2.0.4",
"react-window": "^1.8.6",
"redux": "^4.1.0",
@ -102,7 +102,7 @@
"uuid": "^8.3.2"
},
"devDependencies": {
"@formatjs/cli": "^2.13.16",
"@formatjs/cli": "^4.2.15",
"@rollup/plugin-buble": "^0.21.3",
"@rollup/plugin-node-resolve": "^11.2.1",
"@rollup/plugin-replace": "^2.3.4",
@ -110,26 +110,28 @@
"cross-env": "^7.0.3",
"del": "^6.0.0",
"dotenv-cli": "^4.0.0",
"eslint": "^7.25.0",
"eslint": "^7.26.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.23.2",
"eslint-plugin-react-hooks": "^4.2.0",
"extract-react-intl-messages": "^4.1.1",
"husky": "^4.3.8",
"lint-staged": "^10.5.4",
"lint-staged": "^11.0.0",
"loadtest": "5.1.2",
"npm-run-all": "^4.1.5",
"postcss": "^8.2.15",
"postcss-flexbugs-fixes": "^5.0.2",
"postcss-import": "^13.0.0",
"postcss-preset-env": "^6.7.0",
"prettier": "^2.2.1",
"postcss-rtlcss": "^3.3.2",
"prettier": "^2.3.0",
"prettier-eslint": "^12.0.0",
"prisma": "2.21.2",
"rollup": "^2.45.2",
"prisma": "2.23.0",
"rollup": "^2.48.0",
"rollup-plugin-hashbang": "^2.2.2",
"rollup-plugin-terser": "^7.0.2",
"stylelint": "^13.13.0",
"stylelint": "^13.13.1",
"stylelint-config-css-modules": "^2.2.0",
"stylelint-config-prettier": "^8.0.1",
"stylelint-config-recommended": "^5.0.0",