diff --git a/package.json b/package.json
index 3a4a6a213..fc5ed0484 100644
--- a/package.json
+++ b/package.json
@@ -32,11 +32,7 @@
"csv-loader": "^2.1.1",
"daggy": "^1.2.0",
"dedent-js": "^1.0.1",
- "deep-assign": "^2.0.0",
"express": "^4.16.3",
- "fantasy-combinators": "0.0.1",
- "fantasy-land": "^3.5.0",
- "fantasy-tuples": "^1.0.0",
"file-loader": "^1.1.11",
"focus-trap-react": "^3.1.2",
"fuse.js": "^3.2.0",
@@ -76,9 +72,6 @@
"react-virtualized-select": "^3.1.3",
"reduce-reducers": "^0.1.2",
"redux": "^3.7.2",
- "redux-devtools": "^3.4.1",
- "redux-devtools-dock-monitor": "^1.1.3",
- "redux-devtools-log-monitor": "^1.4.0",
"redux-form": "^7.3.0",
"redux-persist": "^5.9.1",
"reselect": "^3.0.1",
diff --git a/source/DevTools.js b/source/DevTools.js
deleted file mode 100644
index b08c46c7c..000000000
--- a/source/DevTools.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react'
-
-// Exported from redux-devtools
-import { createDevTools } from 'redux-devtools'
-
-// Monitors are separate packages, and you can make a custom one
-import LogMonitor from 'redux-devtools-log-monitor'
-import DockMonitor from 'redux-devtools-dock-monitor'
-
-// createDevTools takes a monitor and produces a DevTools component
-const DevTools = createDevTools(
- // Monitors are individually adjustable with props.
- // Consult their repositories to learn about those props.
- // Here, we put LogMonitor inside a DockMonitor.
- // Note: DockMonitor is visible by default.
-
-
-
-)
-
-export default DevTools
diff --git a/source/entry.js b/source/entry.js
index c8415b4e3..52cd3ee92 100644
--- a/source/entry.js
+++ b/source/entry.js
@@ -7,7 +7,6 @@ import { render } from 'react-dom'
import { AppContainer } from 'react-hot-loader'
import { Provider } from 'react-redux'
import { applyMiddleware, compose, createStore } from 'redux'
-import DevTools from './DevTools'
import computeThemeColours from './components/themeColours'
import Layout from './containers/Layout'
import lang from './i18n'
@@ -48,10 +47,8 @@ let initialStore = {
previousSimulation: retrievePersistedSimulation()
}
-let enhancer = compose(
- process.env.NODE_ENV !== 'production'
- ? DevTools.instrument({ maxAge: 10 })
- : x => x,
+const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose
+let enhancer = composeEnhancers(
applyMiddleware(debounceFormChangeActions(), trackDomainActions(tracker))
)
@@ -62,10 +59,7 @@ persistSimulation(store)
let App = ({ store }) => (
- <>
-
- {process.env.NODE_ENV !== 'production' && }
-
+
)
diff --git a/yarn.lock b/yarn.lock
index c56069f91..1edc6dd23 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1750,7 +1750,7 @@ babel-register@^6.26.0, babel-register@^6.9.0:
mkdirp "^0.5.1"
source-map-support "^0.4.15"
-babel-runtime@6.x, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0, babel-runtime@^6.6.1:
+babel-runtime@6.x, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
dependencies:
@@ -1810,10 +1810,6 @@ balanced-match@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-base16@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/base16/-/base16-1.0.0.tgz#e297f60d7ec1014a7a971a39ebc8a98c0b681e70"
-
base64-js@^1.0.2:
version "1.3.0"
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
@@ -2854,10 +2850,6 @@ d@1:
dependencies:
es5-ext "^0.10.9"
-daggy@0.0.x:
- version "0.0.1"
- resolved "https://registry.yarnpkg.com/daggy/-/daggy-0.0.1.tgz#ae9c932c9f7136e655a04afb21e8baadfd0d3707"
-
daggy@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/daggy/-/daggy-1.2.0.tgz#f0151fcffd58f1742d63d8c53a7556e84b258cb4"
@@ -2931,12 +2923,6 @@ dedent-js@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/dedent-js/-/dedent-js-1.0.1.tgz#bee5fb7c9e727d85dffa24590d10ec1ab1255305"
-deep-assign@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/deep-assign/-/deep-assign-2.0.0.tgz#ebe06b1f07f08dae597620e3dd1622f371a1c572"
- dependencies:
- is-obj "^1.0.0"
-
deep-eql@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
@@ -3678,31 +3664,6 @@ extsprintf@^1.2.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-fantasy-combinators@0.0.1, fantasy-combinators@0.0.x:
- version "0.0.1"
- resolved "https://registry.yarnpkg.com/fantasy-combinators/-/fantasy-combinators-0.0.1.tgz#d18388aed94be790ac4069031f5ea018345e33a1"
-
-fantasy-land@^3.5.0:
- version "3.5.0"
- resolved "https://registry.yarnpkg.com/fantasy-land/-/fantasy-land-3.5.0.tgz#710b29f7aeb81cb545cc696882149b56d0994552"
- dependencies:
- daggy "0.0.x"
- fantasy-combinators "0.0.x"
-
-"fantasy-land@git+https://github.com/fantasyland/fantasy-land.git":
- version "3.5.0"
- resolved "git+https://github.com/fantasyland/fantasy-land.git#1d44642355a88e19ea67cc3fb90bfea145d07c8b"
- dependencies:
- daggy "0.0.x"
- fantasy-combinators "0.0.x"
-
-fantasy-tuples@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/fantasy-tuples/-/fantasy-tuples-1.0.0.tgz#1b407e993bdc8131218473080691c7327fe63fbb"
- dependencies:
- daggy "0.0.x"
- fantasy-land "git+https://github.com/fantasyland/fantasy-land.git"
-
fast-deep-equal@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
@@ -5450,10 +5411,6 @@ lodash-es@^4.17.5, lodash-es@^4.2.1:
version "4.17.10"
resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.10.tgz#62cd7104cdf5dd87f235a837f0ede0e8e5117e05"
-lodash._getnative@^3.0.0:
- version "3.9.1"
- resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-
lodash._reinterpolate@~3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -5466,28 +5423,10 @@ lodash.camelcase@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-lodash.curry@^4.0.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz#248e36072ede906501d75966200a86dab8b23170"
-
-lodash.debounce@^3.1.1:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz#812211c378a94cc29d5aa4e3346cf0bfce3a7df5"
- dependencies:
- lodash._getnative "^3.0.0"
-
-lodash.debounce@^4.0.4:
- version "4.0.8"
- resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-
lodash.flattendeep@^4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
-lodash.flow@^3.3.0:
- version "3.5.0"
- resolved "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a"
-
lodash.get@^4.4.2:
version "4.4.2"
resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
@@ -6489,10 +6428,6 @@ parse-json@^4.0.0:
error-ex "^1.3.1"
json-parse-better-errors "^1.0.1"
-parse-key@^0.2.1:
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/parse-key/-/parse-key-0.2.1.tgz#7bcf76595536e36075664be4d687e4bdd910208f"
-
parse-passwd@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
@@ -6977,7 +6912,7 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"
-prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1:
+prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1:
version "15.6.1"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
dependencies:
@@ -7041,10 +6976,6 @@ punycode@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
-pure-color@^1.2.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz#1fe064fb0ac851f0de61320a8bf796836422f33e"
-
q@^1.1.2:
version "1.5.1"
resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -7170,15 +7101,6 @@ react-addons-css-transition-group@^15.6.2:
dependencies:
react-transition-group "^1.2.0"
-react-base16-styling@^0.5.1:
- version "0.5.3"
- resolved "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.5.3.tgz#3858f24e9c4dd8cbd3f702f3f74d581ca2917269"
- dependencies:
- base16 "^1.0.0"
- lodash.curry "^4.0.1"
- lodash.flow "^3.3.0"
- pure-color "^1.2.0"
-
react-color@^2.14.0:
version "2.14.1"
resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.14.1.tgz#db8ad4f45d81e74896fc2e1c99508927c6d084e0"
@@ -7189,13 +7111,6 @@ react-color@^2.14.0:
reactcss "^1.2.0"
tinycolor2 "^1.4.1"
-react-dock@^0.2.4:
- version "0.2.4"
- resolved "https://registry.yarnpkg.com/react-dock/-/react-dock-0.2.4.tgz#e727dc7550b3b73116635dcb9c0e04d0b7afe17c"
- dependencies:
- lodash.debounce "^3.1.1"
- prop-types "^15.5.8"
-
react-dom@^16.3.1:
version "16.3.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.2.tgz#cb90f107e09536d683d84ed5d4888e9640e0e4df"
@@ -7250,22 +7165,10 @@ react-is@^16.3.2:
version "16.3.2"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.2.tgz#f4d3d0e2f5fbb6ac46450641eb2e25bf05d36b22"
-react-json-tree@^0.11.0:
- version "0.11.0"
- resolved "https://registry.yarnpkg.com/react-json-tree/-/react-json-tree-0.11.0.tgz#f5b17e83329a9c76ae38be5c04fda3a7fd684a35"
- dependencies:
- babel-runtime "^6.6.1"
- prop-types "^15.5.8"
- react-base16-styling "^0.5.1"
-
react-lifecycles-compat@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.2.tgz#7279047275bd727a912e25f734c0559527e84eff"
-react-pure-render@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/react-pure-render/-/react-pure-render-1.0.2.tgz#9d8a928c7f2c37513c2d064e57b3e3c356e9fabb"
-
react-reconciler@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.7.0.tgz#9614894103e5f138deeeb5eabaf3ee80eb1d026d"
@@ -7527,47 +7430,6 @@ reduce-reducers@^0.1.2:
version "0.1.5"
resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.1.5.tgz#ff77ca8068ff41007319b8b4b91533c7e0e54576"
-redux-devtools-dock-monitor@^1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/redux-devtools-dock-monitor/-/redux-devtools-dock-monitor-1.1.3.tgz#1205e823c82536570aac8551a1c4b70972cba6aa"
- dependencies:
- babel-runtime "^6.2.0"
- parse-key "^0.2.1"
- prop-types "^15.5.8"
- react-dock "^0.2.4"
- react-pure-render "^1.0.2"
-
-redux-devtools-instrument@^1.0.1:
- version "1.8.3"
- resolved "https://registry.yarnpkg.com/redux-devtools-instrument/-/redux-devtools-instrument-1.8.3.tgz#c510d67ab4e5e4525acd6e410c25ab46b85aca7c"
- dependencies:
- lodash "^4.2.0"
- symbol-observable "^1.0.2"
-
-redux-devtools-log-monitor@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/redux-devtools-log-monitor/-/redux-devtools-log-monitor-1.4.0.tgz#716b9580eda2a331cd359a36aa09e3a1602a854b"
- dependencies:
- lodash.debounce "^4.0.4"
- prop-types "^15.0.0"
- react-json-tree "^0.11.0"
- react-pure-render "^1.0.2"
- redux-devtools-themes "^1.0.0"
-
-redux-devtools-themes@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/redux-devtools-themes/-/redux-devtools-themes-1.0.0.tgz#c482dce3c5373976045f40134907d9dcb3ae3d5d"
- dependencies:
- base16 "^1.0.0"
-
-redux-devtools@^3.4.1:
- version "3.4.1"
- resolved "https://registry.yarnpkg.com/redux-devtools/-/redux-devtools-3.4.1.tgz#09d342ce0ab6087be679e953a1d7c530efa1138e"
- dependencies:
- lodash "^4.2.0"
- prop-types "^15.5.7"
- redux-devtools-instrument "^1.0.1"
-
redux-form@^7.3.0:
version "7.3.0"
resolved "https://registry.yarnpkg.com/redux-form/-/redux-form-7.3.0.tgz#b92ef1639c86a6009b0821aacfc80ad8b5ac8c05"
@@ -8505,7 +8367,7 @@ symbol-observable@^0.2.2:
version "0.2.4"
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
-symbol-observable@^1.0.2, symbol-observable@^1.0.3:
+symbol-observable@^1.0.3:
version "1.2.0"
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"