Merge branch 'master' into ft/3052-extensions

2017-11-20 09:48:33 -06:00
parent 31694d7533 2ad1bacf6f
commit 8ff2d77398
30 changed files with 680 additions and 286 deletions
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -7,8 +7,7 @@ import * as AllPlugins from "core/plugins/all"
 import { parseSearch } from "core/utils"

 if (process.env.NODE_ENV !== "production") {
-  const Perf = require("react-addons-perf")
-  window.Perf = Perf
+  window.Perf = require("react-addons-perf")
 }

 // eslint-disable-next-line no-undef