diff --git a/package.json b/package.json index d83d6ab6..94480d07 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "DevTools extension for Redux", "scripts": { "start": "gulp", - "build:extension": "cross-env BABEL_ENV=production gulp build:extension", + "build:extension": "rimraf build/extension && cross-env BABEL_ENV=production gulp build:extension", "build:firefox": "cross-env BABEL_ENV=production gulp build:firefox", "build:examples": "babel-node examples/buildAll.js", "precompress:extension": "npm run lint && npm run test:app && npm run build:extension && npm run test:chrome && npm run test:electron", @@ -30,13 +30,13 @@ "license": "MIT", "devDependencies": { "babel-cli": "^6.18.0", - "babel-core": "^6.18.0", + "babel-core": "^6.21.0", "babel-eslint": "^7.1.0", - "babel-loader": "^6.2.7", + "babel-loader": "^6.2.10", "babel-plugin-add-module-exports": "^0.2.1", "babel-plugin-react-transform": "^2.0.2", "babel-plugin-transform-decorators-legacy": "^1.2.0", - "babel-polyfill": "^6.16.0", + "babel-polyfill": "^6.20.0", "babel-preset-es2015": "^6.18.0", "babel-preset-react": "^6.16.0", "babel-preset-stage-0": "^6.16.0", diff --git a/src/app/stores/backgroundStore.js b/src/app/stores/backgroundStore.js index cce44ee0..4f0e0662 100644 --- a/src/app/stores/backgroundStore.js +++ b/src/app/stores/backgroundStore.js @@ -4,4 +4,15 @@ import api from '../middlewares/api'; export default function configureStore(preloadedState) { return createStore(rootReducer, preloadedState, applyMiddleware(api)); +/* + let enhancer; + if (process.env.NODE_ENV === 'production') { + enhancer = applyMiddleware(api); + } else { + const logger = require('redux-logger'); + enhancer = applyMiddleware(api, logger()); + } + + return createStore(rootReducer, preloadedState, enhancer); +*/ } diff --git a/src/app/stores/windowStore.js b/src/app/stores/windowStore.js index 55984807..b5f18307 100644 --- a/src/app/stores/windowStore.js +++ b/src/app/stores/windowStore.js @@ -29,13 +29,5 @@ export default function configureStore(baseStore, position, preloadedState) { }); }); - if (module.hot) { - // Enable Webpack hot module replacement for reducers - module.hot.accept('../reducers', () => { - const nextReducer = require('../reducers'); - store.replaceReducer(nextReducer); - }); - } - return store; } diff --git a/webpack/base.config.js b/webpack/base.config.js index c33d23cd..d4b27f05 100644 --- a/webpack/base.config.js +++ b/webpack/base.config.js @@ -27,6 +27,7 @@ const baseConfig = (params) => ({ new webpack.DefinePlugin(params.globals), ...(params.plugins ? params.plugins : [ + new webpack.optimize.OccurrenceOrderPlugin(), new webpack.optimize.DedupePlugin(), new webpack.optimize.UglifyJsPlugin({ comments: false, diff --git a/yarn.lock b/yarn.lock index 47d0ef66..78a2cc39 100644 --- a/yarn.lock +++ b/yarn.lock @@ -225,7 +225,7 @@ babel-code-frame@^6.16.0, babel-code-frame@^6.20.0: esutils "^2.0.2" js-tokens "^2.0.0" -babel-core@^6.18.0: +babel-core@^6.18.0, babel-core@^6.21.0: version "6.21.0" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.21.0.tgz#75525480c21c803f826ef3867d22c19f080a3724" dependencies: @@ -398,7 +398,7 @@ babel-helpers@^6.16.0: babel-runtime "^6.0.0" babel-template "^6.16.0" -babel-loader@^6.2.7: +babel-loader@^6.2.10: version "6.2.10" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.2.10.tgz#adefc2b242320cd5d15e65b31cea0e8b1b02d4b0" dependencies: @@ -790,7 +790,7 @@ babel-plugin-transform-strict-mode@^6.18.0: babel-runtime "^6.0.0" babel-types "^6.18.0" -babel-polyfill@^6.16.0: +babel-polyfill@^6.16.0, babel-polyfill@^6.20.0: version "6.20.0" resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.20.0.tgz#de4a371006139e20990aac0be367d398331204e7" dependencies: @@ -886,7 +886,7 @@ babel-register@^6.18.0: mkdirp "^0.5.1" source-map-support "^0.4.2" -babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.20.0, babel-runtime@^6.3.19, babel-runtime@^6.6.1, babel-runtime@^6.9.0, babel-runtime@^6.9.1: +babel-runtime@6.20.0, babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.20.0, babel-runtime@^6.3.19, babel-runtime@^6.6.1, babel-runtime@^6.9.0, babel-runtime@^6.9.1: version "6.20.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.20.0.tgz#87300bdcf4cd770f09bf0048c64204e17806d16f" dependencies: @@ -927,8 +927,8 @@ babel-types@^6.13.0, babel-types@^6.15.0, babel-types@^6.16.0, babel-types@^6.18 to-fast-properties "^1.0.1" babylon@^6.11.0, babylon@^6.13.0: - version "6.14.1" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.14.1.tgz#956275fab72753ad9b3435d7afe58f8bf0a29815" + version "6.15.0" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e" balanced-match@^0.4.1: version "0.4.2" @@ -1642,8 +1642,8 @@ electron-download@^3.0.1: sumchecker "^1.2.0" electron@^1.4.4: - version "1.4.13" - resolved "https://registry.yarnpkg.com/electron/-/electron-1.4.13.tgz#aecc073484c25d351007d75ad8972b0f2f835ab3" + version "1.4.14" + resolved "https://registry.yarnpkg.com/electron/-/electron-1.4.14.tgz#e374b76ccdc432bccad9bb3ce1add453bf5648b4" dependencies: electron-download "^3.0.1" extract-zip "^1.0.3" @@ -2813,9 +2813,9 @@ is-glob@^2.0.0, is-glob@^2.0.1: dependencies: is-extglob "^1.0.0" -is-in-browser@^1.0.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.2.tgz#9e3e5e02159dd43eda45b681210bbc920f680a72" +is-in-browser@1.0.2, is-in-browser@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.0.2.tgz#f688bea8f1e5aadc3244ebc870d188cfb9b613cf" is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4: version "2.15.0" @@ -3073,25 +3073,26 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.3.6" -jss-nested@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/jss-nested/-/jss-nested-2.5.0.tgz#d1a5ec778bcc3352616c8917abbed0b80ef1286f" +jss-nested@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/jss-nested/-/jss-nested-3.0.1.tgz#14c10265c8fc5bd61b450b48f1e9fb36d90ae569" dependencies: warning "^3.0.0" -jss-vendor-prefixer@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/jss-vendor-prefixer/-/jss-vendor-prefixer-3.0.3.tgz#b36a9cb36273707595d8b60c84d07d60947e8254" +jss-vendor-prefixer@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jss-vendor-prefixer/-/jss-vendor-prefixer-4.0.0.tgz#df16a8fcc6ecb4567394174e6ab90145cf8b34a3" dependencies: css-vendor "^0.3.8" -jss@^5.5.6: - version "5.5.6" - resolved "https://registry.yarnpkg.com/jss/-/jss-5.5.6.tgz#30107928dc6f608f6b8e3e70e0577edc8a94e216" +jss@^6.0.0: + version "6.1.1" + resolved "https://registry.yarnpkg.com/jss/-/jss-6.1.1.tgz#9126c210045bea79cfd7cd106e96295d9e6864e1" dependencies: - is-in-browser "^1.0.2" - murmurhash-js "^1.0.0" - warning "^3.0.0" + babel-runtime "6.20.0" + is-in-browser "1.0.2" + murmurhash-js "1.0.0" + warning "3.0.0" jstransformer@1.0.0: version "1.0.0" @@ -3735,7 +3736,7 @@ mumath@^3.0.0: dependencies: almost-equal "^1.1.0" -murmurhash-js@^1.0.0: +murmurhash-js@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/murmurhash-js/-/murmurhash-js-1.0.0.tgz#b06278e21fc6c37fa5313732b0412bcb6ae15f51" @@ -3948,13 +3949,7 @@ object.values@^1.0.3: function-bind "^1.1.0" has "^1.0.1" -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -once@~1.3.0, once@~1.3.3: +once@^1.3.0, once@~1.3.0, once@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20" dependencies: @@ -4735,8 +4730,8 @@ remotedev-app@^0.10.4: styled-components "^1.1.1" remotedev-inspector-monitor@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/remotedev-inspector-monitor/-/remotedev-inspector-monitor-0.10.0.tgz#a5a962be680acf61bb42c37bc8d9e92d66b3c498" + version "0.10.1" + resolved "https://registry.yarnpkg.com/remotedev-inspector-monitor/-/remotedev-inspector-monitor-0.10.1.tgz#fa2d3dd87328a2d4147c006b48ffa540f46faa20" dependencies: babel-runtime "^6.3.19" dateformat "^1.0.12" @@ -4744,9 +4739,9 @@ remotedev-inspector-monitor@^0.10.0: immutable "^3.7.6" javascript-stringify "^1.1.0" jsondiffpatch "^0.2.4" - jss "^5.5.6" - jss-nested "^2.5.0" - jss-vendor-prefixer "^3.0.1" + jss "^6.0.0" + jss-nested "^3.0.0" + jss-vendor-prefixer "^4.0.0" lodash.debounce "^4.0.3" react-base16-styling "^0.4.1" react-dragula "^1.1.17" @@ -5056,8 +5051,8 @@ socketcluster-client@^5.0.0: ws "1.1.1" source-list-map@~0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.7.tgz#d4b5ce2a46535c72c7e8527c71a77d250618172e" + version "0.1.8" + resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106" source-map-support@^0.4.2: version "0.4.8" @@ -5536,7 +5531,7 @@ void-elements@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" -warning@^3.0.0: +warning@3.0.0, warning@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" dependencies: