diff --git a/make-webpack-config.js b/make-webpack-config.js index 27c6cef09b5..fab6f6666ca 100644 --- a/make-webpack-config.js +++ b/make-webpack-config.js @@ -72,7 +72,9 @@ module.exports = function(rules, options) { new UglifyJsPlugin({ uglifyOptions: { mangle: specialOptions.mangle, - compress: specialOptions.mangle, + compress: specialOptions.mangle ? { + dead_code: true + } : false, beautify: !specialOptions.mangle, }, diff --git a/package-lock.json b/package-lock.json index 9dc48833796..0dea7d253a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,7 +61,7 @@ }, "onetime": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", "dev": true }, @@ -7497,8 +7497,7 @@ "version": "2.1.1", "resolved": false, "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -7522,15 +7521,13 @@ "version": "1.0.0", "resolved": false, "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "resolved": false, "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7547,22 +7544,19 @@ "version": "1.1.0", "resolved": false, "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "resolved": false, "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "resolved": false, "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -7693,8 +7687,7 @@ "version": "2.0.3", "resolved": false, "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -7708,7 +7701,6 @@ "resolved": false, "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7725,7 +7717,6 @@ "resolved": false, "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7734,15 +7725,13 @@ "version": "0.0.8", "resolved": false, "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "resolved": false, "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==", "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -7763,7 +7752,6 @@ "resolved": false, "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -7852,8 +7840,7 @@ "version": "1.0.1", "resolved": false, "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -7867,7 +7854,6 @@ "resolved": false, "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -7963,8 +7949,7 @@ "version": "5.1.1", "resolved": false, "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -8006,7 +7991,6 @@ "resolved": false, "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -8028,7 +8012,6 @@ "resolved": false, "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -8077,15 +8060,13 @@ "version": "1.0.2", "resolved": false, "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.2", "resolved": false, "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=", - "dev": true, - "optional": true + "dev": true } } }, @@ -12823,7 +12804,6 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, - "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -14132,8 +14112,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true, - "optional": true + "dev": true }, "loose-envify": { "version": "1.3.1", @@ -19031,15 +19010,6 @@ "prop-types": "^15.5.10" } }, - "react-addons-perf": { - "version": "15.4.2", - "resolved": "https://registry.npmjs.org/react-addons-perf/-/react-addons-perf-15.4.2.tgz", - "integrity": "sha1-EQvc9cRZxPd8uF7WNLzTOXU2ODs=", - "requires": { - "fbjs": "^0.8.4", - "object-assign": "^4.1.0" - } - }, "react-debounce-input": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/react-debounce-input/-/react-debounce-input-3.2.0.tgz", @@ -22869,7 +22839,7 @@ "webpack-addons": "^1.1.5", "yargs": "^9.0.1", "yeoman-environment": "^2.0.0", - "yeoman-generator": "git://github.com/ev1stensberg/generator.git#Feature-getArgument" + "yeoman-generator": "git://github.com/ev1stensberg/generator.git#9e24fa31c85302ca1145ae34fc68b4f133251ca0" }, "dependencies": { "ansi-escapes": { diff --git a/package.json b/package.json index c43d8b5727a..024935c7bd9 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,6 @@ "memoizee": "^0.4.12", "prop-types": "^15.5.10", "react": "^15.6.2", - "react-addons-perf": "^15.4.0", "react-debounce-input": "^3.2.0", "react-dom": "^15.6.2", "react-immutable-proptypes": "2.1.0", diff --git a/src/core/components/debug.jsx b/src/core/components/debug.jsx index f778e598b38..bf3df8370fb 100644 --- a/src/core/components/debug.jsx +++ b/src/core/components/debug.jsx @@ -2,7 +2,6 @@ import React from "react" import PropTypes from "prop-types" import { presets } from "react-motion" import ObjectInspector from "react-inspector" -import Perf from "react-addons-perf" export default class Debug extends React.Component { @@ -15,7 +14,6 @@ export default class Debug extends React.Component { e.preventDefault() this.setState({jsonDumpOpen: !this.state.jsonDumpOpen}) } - window.Perf = Perf } plusOrMinus(bool) { @@ -51,4 +49,3 @@ Debug.propTypes = { getState: PropTypes.func.isRequired, getComponent: PropTypes.func.isRequired, } - diff --git a/src/core/index.js b/src/core/index.js index f17b5f9c85e..def68aa2d8a 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -8,7 +8,7 @@ import * as AllPlugins from "core/plugins/all" import { parseSearch } from "core/utils" if (process.env.NODE_ENV !== "production" && typeof window !== "undefined") { - win.Perf = require("react-addons-perf") + win.Perf = require("react-dom/lib/ReactPerf") } // eslint-disable-next-line no-undef