From 8cb4a06595ff25b83e01b3a166a3c31a74c19aed Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Sat, 22 Aug 2020 23:05:16 -0700 Subject: [PATCH] bump mobx-react for hooks support --- app/components/Layout.js | 10 ++++----- app/components/Sidebar/Sidebar.js | 4 ++-- app/index.js | 36 ++++++++++++------------------- package.json | 5 ++--- yarn.lock | 21 +++++++++--------- 5 files changed, 33 insertions(+), 43 deletions(-) diff --git a/app/components/Layout.js b/app/components/Layout.js index 03ad3095b7..fcd6851895 100644 --- a/app/components/Layout.js +++ b/app/components/Layout.js @@ -44,22 +44,22 @@ class Layout extends React.Component { @observable redirectTo: ?string; @observable keyboardShortcutsOpen: boolean = false; - constructor() { + constructor(props) { super(); - this.updateBackground(); + this.updateBackground(props); } componentDidUpdate() { - this.updateBackground(); + this.updateBackground(this.props); if (this.redirectTo) { this.redirectTo = undefined; } } - updateBackground() { + updateBackground(props) { // ensure the wider page color always matches the theme - window.document.body.style.background = this.props.theme.background; + window.document.body.style.background = props.theme.background; } @keydown("shift+/") diff --git a/app/components/Sidebar/Sidebar.js b/app/components/Sidebar/Sidebar.js index 3b61b31883..9ba2d47ab5 100644 --- a/app/components/Sidebar/Sidebar.js +++ b/app/components/Sidebar/Sidebar.js @@ -1,5 +1,5 @@ // @flow -import { observer, inject } from "mobx-react"; +import { inject } from "mobx-react"; import { CloseIcon, MenuIcon } from "outline-icons"; import * as React from "react"; import { withRouter } from "react-router-dom"; @@ -116,4 +116,4 @@ const Toggle = styled.a` `}; `; -export default withRouter(inject("ui")(observer(Sidebar))); +export default withRouter(inject("ui")(Sidebar)); diff --git a/app/index.js b/app/index.js index 8c2d3ad1fb..41b75aa4b7 100644 --- a/app/index.js +++ b/app/index.js @@ -12,32 +12,24 @@ import Toasts from "components/Toasts"; import Routes from "./routes"; import env from "env"; -let DevTools; -if (process.env.NODE_ENV !== "production") { - DevTools = require("mobx-react-devtools").default; // eslint-disable-line global-require -} - const element = document.getElementById("root"); if (element) { render( - <> - - - - - <> - - - - - - - - - - {DevTools && } - , + + + + + <> + + + + + + + + + , element ); } diff --git a/package.json b/package.json index 39d7be4fc8..bff5859fb9 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "koa-static": "^4.0.1", "lodash": "^4.17.19", "mobx": "4.6.0", - "mobx-react": "^5.4.2", + "mobx-react": "^6.2.5", "natural-sort": "^1.0.0", "nodemailer": "^4.4.0", "outline-icons": "^1.21.0-6", @@ -176,7 +176,6 @@ "jest-cli": "^26.0.0", "koa-webpack-dev-middleware": "^1.4.5", "koa-webpack-hot-middleware": "^1.0.3", - "mobx-react-devtools": "^6.0.3", "nodemon": "^1.19.4", "prettier": "^2.0.5", "rimraf": "^2.5.4", @@ -191,4 +190,4 @@ "js-yaml": "^3.13.1" }, "version": "0.46.0" -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 79c095a831..52855fad79 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7877,18 +7877,17 @@ mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.3: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mobx-react-devtools@^6.0.3: - version "6.1.1" - resolved "https://registry.yarnpkg.com/mobx-react-devtools/-/mobx-react-devtools-6.1.1.tgz#a462b944085cf11ff96fc937d12bf31dab4c8984" - integrity sha512-nc5IXLdEUFLn3wZal65KF3/JFEFd+mbH4KTz/IG5BOPyw7jo8z29w/8qm7+wiCyqVfUIgJ1gL4+HVKmcXIOgqA== +mobx-react-lite@>=2.0.6: + version "2.0.7" + resolved "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-2.0.7.tgz#1bfb3b4272668e288047cf0c7940b14e91cba284" + integrity sha512-YKAh2gThC6WooPnVZCoC+rV1bODAKFwkhxikzgH18wpBjkgTkkR9Sb0IesQAH5QrAEH/JQVmy47jcpQkf2Au3Q== -mobx-react@^5.4.2: - version "5.4.4" - resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-5.4.4.tgz#b3de9c6eabcd0ed8a40036888cb0221ab9568b80" - integrity sha512-2mTzpyEjVB/RGk2i6KbcmP4HWcAUFox5ZRCrGvSyz49w20I4C4qql63grPpYrS9E9GKwgydBHQlA4y665LuRCQ== +mobx-react@^6.2.5: + version "6.2.5" + resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-6.2.5.tgz#9020a17b79cc6dc3d124ad89ab36eb9ea540a45b" + integrity sha512-LxtXXW0GkOAO6VOIg2m/6WL6ZuKlzOWwESIFdrWelI0ZMIvtKCMZVUuulcO5GAWSDsH0ApaMkGLoaPqKjzyziQ== dependencies: - hoist-non-react-statics "^3.0.0" - react-lifecycles-compat "^3.0.2" + mobx-react-lite ">=2.0.6" mobx@4.6.0: version "4.6.0" @@ -9346,7 +9345,7 @@ react-keydown@^1.7.3: dependencies: core-js "^3.1.2" -react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.2: +react-lifecycles-compat@^3.0.0: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==