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

This commit is contained in:
Claire
2021-01-18 13:57:12 +01:00
18 changed files with 48 additions and 43 deletions

View File

@@ -71,7 +71,7 @@
"@clusterws/cws": "^3.0.0",
"@gamestdio/websocket": "^0.3.2",
"@github/webauthn-json": "^0.5.7",
"@rails/ujs": "^6.1.0",
"@rails/ujs": "^6.1.1",
"array-includes": "^3.1.2",
"atrament": "0.2.4",
"arrow-key-navigation": "^1.2.0",
@@ -156,7 +156,7 @@
"requestidlecallback": "^0.3.0",
"reselect": "^4.0.0",
"rimraf": "^3.0.2",
"sass": "^1.32.0",
"sass": "^1.32.2",
"sass-loader": "^10.1.0",
"stacktrace-js": "^2.0.2",
"stringz": "^2.1.0",
@@ -166,7 +166,7 @@
"throng": "^4.0.0",
"tiny-queue": "^0.2.1",
"uuid": "^8.3.1",
"webpack": "^4.44.2",
"webpack": "^4.45.0",
"webpack-assets-manifest": "^4.0.0",
"webpack-bundle-analyzer": "^4.3.0",
"webpack-cli": "^3.3.12",
@@ -175,7 +175,7 @@
},
"devDependencies": {
"@testing-library/jest-dom": "^5.11.8",
"@testing-library/react": "^11.2.2",
"@testing-library/react": "^11.2.3",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.6.3",
"eslint": "^7.17.0",