Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream's README got updated, but we have a completely different one. Kept ours.
This commit is contained in:
10
package.json
10
package.json
@ -60,7 +60,7 @@
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@babel/core": "^7.14.2",
|
||||
"@babel/core": "^7.14.3",
|
||||
"@babel/plugin-proposal-decorators": "^7.14.2",
|
||||
"@babel/plugin-transform-react-inline-elements": "^7.12.13",
|
||||
"@babel/plugin-transform-runtime": "^7.14.3",
|
||||
@ -86,7 +86,7 @@
|
||||
"color-blend": "^3.0.1",
|
||||
"compression-webpack-plugin": "^6.1.1",
|
||||
"cross-env": "^7.0.3",
|
||||
"css-loader": "^5.2.4",
|
||||
"css-loader": "^5.2.5",
|
||||
"cssnano": "^4.1.11",
|
||||
"detect-passive-events": "^2.0.3",
|
||||
"dotenv": "^9.0.2",
|
||||
@ -154,7 +154,7 @@
|
||||
"requestidlecallback": "^0.3.0",
|
||||
"reselect": "^4.0.0",
|
||||
"rimraf": "^3.0.2",
|
||||
"sass": "^1.33.0",
|
||||
"sass": "^1.34.0",
|
||||
"sass-loader": "^10.2.0",
|
||||
"stacktrace-js": "^2.0.2",
|
||||
"stringz": "^2.1.0",
|
||||
@ -167,7 +167,7 @@
|
||||
"uuid": "^8.3.1",
|
||||
"webpack": "^4.46.0",
|
||||
"webpack-assets-manifest": "^4.0.6",
|
||||
"webpack-bundle-analyzer": "^4.4.1",
|
||||
"webpack-bundle-analyzer": "^4.4.2",
|
||||
"webpack-cli": "^3.3.12",
|
||||
"webpack-merge": "^5.7.3",
|
||||
"wicg-inert": "^3.1.1",
|
||||
@ -179,7 +179,7 @@
|
||||
"babel-eslint": "^10.1.0",
|
||||
"babel-jest": "^26.6.3",
|
||||
"eslint": "^7.26.0",
|
||||
"eslint-plugin-import": "~2.23.2",
|
||||
"eslint-plugin-import": "~2.23.3",
|
||||
"eslint-plugin-jsx-a11y": "~6.4.1",
|
||||
"eslint-plugin-promise": "~5.1.0",
|
||||
"eslint-plugin-react": "~7.23.2",
|
||||
|
Reference in New Issue
Block a user