Merge branch 'develop' into dependabot/npm_and_yarn/storybook/addon-l…

…inks-6.2.0-rc.0
openlattice · Mar 15, 2021 · 8a1ac2f · 8a1ac2f
2 parents 24a7f08 + 7dc02c5
commit 8a1ac2f
Show file tree

Hide file tree

Showing 2 changed files with 97 additions and 82 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "eslint-config-airbnb": "~18.2.0",
     "eslint-import-resolver-webpack": "~0.13.0",
     "eslint-loader": "~4.0.0",
-    "eslint-plugin-flowtype": "~5.3.0",
+    "eslint-plugin-flowtype": "~5.4.0",
     "eslint-plugin-import": "~2.22.0",
     "eslint-plugin-jest": "~24.1.0",
     "eslint-plugin-jsx-a11y": "~6.4.1",
@@ -97,7 +97,7 @@
     "stylelint-config-styled-components": "~0.1.0",
     "stylelint-processor-styled-components": "~1.10.0",
     "uuid": "~8.3.2",
-    "webpack": "~5.24.0",
+    "webpack": "~5.26.0",
     "webpack-cli": "~4.5.0",
     "webpack-dev-server": "~3.11.0",
     "webpack-hot-middleware": "~2.25.0",