Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2021-01-21 16:51:12 +01:00
12 changed files with 84 additions and 84 deletions

View File

@@ -114,7 +114,7 @@
"lodash": "^4.17.19",
"mark-loader": "^0.1.6",
"marky": "^1.2.1",
"mini-css-extract-plugin": "^1.3.3",
"mini-css-extract-plugin": "^1.3.4",
"mkdirp": "^1.0.4",
"npmlog": "^4.1.2",
"object-assign": "^4.1.1",
@@ -142,7 +142,7 @@
"react-redux-loading-bar": "^4.0.8",
"react-router-dom": "^4.1.1",
"react-router-scroll-4": "^1.0.0-beta.1",
"react-select": "^3.1.1",
"react-select": "^3.2.0",
"react-sparklines": "^1.7.0",
"react-swipeable-views": "^0.13.9",
"react-textarea-autosize": "^8.3.0",
@@ -156,8 +156,8 @@
"requestidlecallback": "^0.3.0",
"reselect": "^4.0.0",
"rimraf": "^3.0.2",
"sass": "^1.32.2",
"sass-loader": "^10.1.0",
"sass": "^1.32.5",
"sass-loader": "^10.1.1",
"stacktrace-js": "^2.0.2",
"stringz": "^2.1.0",
"substring-trie": "^1.0.2",
@@ -166,19 +166,19 @@
"throng": "^4.0.0",
"tiny-queue": "^0.2.1",
"uuid": "^8.3.1",
"webpack": "^4.45.0",
"webpack-assets-manifest": "^4.0.0",
"webpack": "^4.46.0",
"webpack-assets-manifest": "^4.0.1",
"webpack-bundle-analyzer": "^4.3.0",
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.7.3",
"wicg-inert": "^3.1.0"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.11.8",
"@testing-library/jest-dom": "^5.11.9",
"@testing-library/react": "^11.2.3",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.6.3",
"eslint": "^7.17.0",
"eslint": "^7.18.0",
"eslint-plugin-import": "~2.22.1",
"eslint-plugin-jsx-a11y": "~6.4.1",
"eslint-plugin-promise": "~4.2.1",
@@ -188,7 +188,7 @@
"react-intl-translations-manager": "^5.0.3",
"react-test-renderer": "^16.14.0",
"sass-lint": "^1.13.1",
"webpack-dev-server": "^3.11.1",
"webpack-dev-server": "^3.11.2",
"yargs": "^16.2.0"
},
"resolutions": {