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

This commit is contained in:
Claire
2021-02-03 17:02:48 +01:00
33 changed files with 453 additions and 319 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.4",
"mini-css-extract-plugin": "^1.3.5",
"mkdirp": "^1.0.4",
"npmlog": "^4.1.2",
"object-assign": "^4.1.1",
@@ -168,7 +168,7 @@
"uuid": "^8.3.1",
"webpack": "^4.46.0",
"webpack-assets-manifest": "^4.0.1",
"webpack-bundle-analyzer": "^4.3.0",
"webpack-bundle-analyzer": "^4.4.0",
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.7.3",
"wicg-inert": "^3.1.0"