From 5df216fc619f53b06bf8a5d4cd81524c1cbfa28a Mon Sep 17 00:00:00 2001 From: Jhen Date: Sat, 22 Dec 2018 16:32:03 +0800 Subject: [PATCH] Fix example configuration of redux-slider-monitor --- .../examples/todomvc/package.json | 4 +- .../examples/todomvc/webpack.config.js | 37 ++++----- .../examples/todomvc/yarn.lock | 77 +------------------ packages/redux-slider-monitor/package.json | 12 ++- yarn.lock | 41 +--------- 5 files changed, 29 insertions(+), 142 deletions(-) diff --git a/packages/redux-slider-monitor/examples/todomvc/package.json b/packages/redux-slider-monitor/examples/todomvc/package.json index e78a333d..10102953 100644 --- a/packages/redux-slider-monitor/examples/todomvc/package.json +++ b/packages/redux-slider-monitor/examples/todomvc/package.json @@ -5,8 +5,7 @@ "main": "server.js", "scripts": { "start": "webpack-dev-server", - "build": "webpack --config webpack.config.prod.js", - "deploy": "gh-pages -d dist" + "build": "webpack --config webpack.config.prod.js" }, "repository": { "type": "git", @@ -23,7 +22,6 @@ "babel-preset-es2015": "^6.24.1", "babel-preset-react": "^6.24.1", "babel-preset-stage-0": "^6.24.1", - "gh-pages": "^0.12.0", "node-libs-browser": "^0.5.2", "raw-loader": "^0.5.1", "react-hot-loader": "^3.0.0-beta.6", diff --git a/packages/redux-slider-monitor/examples/todomvc/webpack.config.js b/packages/redux-slider-monitor/examples/todomvc/webpack.config.js index 18bb2b70..9aa9d25a 100755 --- a/packages/redux-slider-monitor/examples/todomvc/webpack.config.js +++ b/packages/redux-slider-monitor/examples/todomvc/webpack.config.js @@ -20,32 +20,29 @@ module.exports = { path: path.join(__dirname, 'dist'), filename: 'bundle.js' }, - plugins: [ - new webpack.HotModuleReplacementPlugin(), - new webpack.NoEmitOnErrorsPlugin() - ], + plugins: [new webpack.HotModuleReplacementPlugin(), new webpack.NoEmitOnErrorsPlugin()], resolve: { alias: { 'redux-slider-monitor': path.join(__dirname, '..', '..', 'src/SliderMonitor'), - react: path.join(__dirname, '../../node_modules', 'react'), - 'react-dom': path.join(__dirname, '../../node_modules', 'react-dom'), - 'redux-devtools': path.join(__dirname, '../../node_modules', 'redux-devtools') + react: path.join(__dirname, '../../../../node_modules', 'react'), + 'react-dom': path.join(__dirname, '../../../../node_modules', 'react-dom'), + 'redux-devtools': path.join(__dirname, '../../..', 'redux-devtools') }, extensions: ['.js'] }, module: { - rules: [{ - test: /\.js$/, - use: ['babel-loader'], - exclude: /node_modules/, - include: [ - __dirname, - path.join(__dirname, '..', '..', 'src') - ] - }, { - test: /\.css?$/, - use: ['style-loader', 'raw-loader'], - include: __dirname - }] + rules: [ + { + test: /\.js$/, + use: ['babel-loader'], + exclude: /node_modules/, + include: [__dirname, path.join(__dirname, '..', '..', 'src')] + }, + { + test: /\.css?$/, + use: ['style-loader', 'raw-loader'], + include: __dirname + } + ] } }; diff --git a/packages/redux-slider-monitor/examples/todomvc/yarn.lock b/packages/redux-slider-monitor/examples/todomvc/yarn.lock index 1871f2ed..619a1a4b 100644 --- a/packages/redux-slider-monitor/examples/todomvc/yarn.lock +++ b/packages/redux-slider-monitor/examples/todomvc/yarn.lock @@ -161,12 +161,6 @@ async-each@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" -async@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/async/-/async-2.1.2.tgz#612a4ab45ef42a70cde806bad86ee6db047e8385" - dependencies: - lodash "^4.14.0" - async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" @@ -1171,24 +1165,12 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" -collections@^0.2.0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/collections/-/collections-0.2.2.tgz#1f23026b2ef36f927eecc901e99c5f0d48fa334e" - dependencies: - weak-map "1.0.0" - combined-stream@^1.0.5, combined-stream@~1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009" dependencies: delayed-stream "~1.0.0" -commander@2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - dependencies: - graceful-readlink ">= 1.0.0" - commander@^2.11.0: version "2.11.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" @@ -1792,18 +1774,6 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -gh-pages@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-0.12.0.tgz#d951e3ed98b85699d4b0418eb1a15b1a04988dc1" - dependencies: - async "2.1.2" - commander "2.9.0" - globby "^6.1.0" - graceful-fs "4.1.10" - q "1.4.1" - q-io "1.13.2" - rimraf "^2.5.4" - glob-base@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" @@ -1849,18 +1819,10 @@ globby@^6.1.0: pify "^2.0.0" pinkie-promise "^2.0.0" -graceful-fs@4.1.10: - version "4.1.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.10.tgz#f2d720c22092f743228775c75e3612632501f131" - graceful-fs@^4.1.2, graceful-fs@^4.1.4: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" -"graceful-readlink@>= 1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" - handle-thing@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4" @@ -2492,14 +2454,10 @@ mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, dependencies: mime-db "~1.30.0" -mime@1.4.1, mime@^1.2.11, mime@^1.3.4: +mime@1.4.1, mime@^1.3.4: version "1.4.1" resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" -mimeparse@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/mimeparse/-/mimeparse-0.1.4.tgz#dafb02752370fd226093ae3152c271af01ac254a" - min-document@^2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" @@ -2957,33 +2915,10 @@ pure-color@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz#1fe064fb0ac851f0de61320a8bf796836422f33e" -q-io@1.13.2: - version "1.13.2" - resolved "https://registry.yarnpkg.com/q-io/-/q-io-1.13.2.tgz#eea130d481ddb5e1aa1bc5a66855f7391d06f003" - dependencies: - collections "^0.2.0" - mime "^1.2.11" - mimeparse "^0.1.4" - q "^1.0.1" - qs "^1.2.1" - url2 "^0.0.0" - -q@1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e" - -q@^1.0.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1" - qs@6.5.1: version "6.5.1" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" -qs@^1.2.1: - version "1.2.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-1.2.2.tgz#19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88" - qs@~6.4.0: version "6.4.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" @@ -3286,7 +3221,7 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1: +rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" dependencies: @@ -3737,10 +3672,6 @@ url-parse@^1.1.8: querystringify "~1.0.0" requires-port "1.0.x" -url2@^0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/url2/-/url2-0.0.0.tgz#4eaabd1d5c3ac90d62ab4485c998422865a04b1a" - url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" @@ -3826,10 +3757,6 @@ wbuf@^1.1.0, wbuf@^1.7.2: dependencies: minimalistic-assert "^1.0.0" -weak-map@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.0.tgz#b66e56a9df0bd25a76bbf1b514db129080614a37" - webpack-dev-middleware@^1.11.0: version "1.12.0" resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz#d34efefb2edda7e1d3b5dbe07289513219651709" diff --git a/packages/redux-slider-monitor/package.json b/packages/redux-slider-monitor/package.json index e046f80f..73d99364 100644 --- a/packages/redux-slider-monitor/package.json +++ b/packages/redux-slider-monitor/package.json @@ -10,15 +10,14 @@ "prepublish": "npm run lint && npm run clean && npm run build" }, "repository": { - "type": "git", - "url": "https://github.com/calesce/redux-slider-monitor.git" + "url": "https://github.com/reduxjs/redux-devtools" }, "author": "Cale Newman (http://github.com/calesce)", "license": "MIT", "bugs": { - "url": "https://github.com/calesce/redux-slider-monitor/issues" + "url": "https://github.com/reduxjs/redux-devtools/issues" }, - "homepage": "https://github.com/calesce/redux-slider-monitor", + "homepage": "https://github.com/reduxjs/redux-devtools", "devDependencies": { "babel-cli": "^6.24.1", "babel-core": "^6.24.1", @@ -34,9 +33,8 @@ "eslint-plugin-react": "^6.10.3", "react": "^16.7.0", "react-dom": "^16.7.0", - "react-redux": "^5.0.4", - "redux": "^3.0.0", - "redux-devtools": "^3.0.0", + "react-redux": "^6.0.0", + "redux": "^4.0.0", "rimraf": "^2.3.4" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index 46c30049..2b1a424c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5991,7 +5991,7 @@ hoist-non-react-statics@^2.3.1: resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47" integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw== -hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.2.1: +hoist-non-react-statics@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz#c09c0555c84b38a7ede6912b61efddafd6e75e1e" integrity sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw== @@ -7868,11 +7868,6 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" -lodash-es@^4.2.1: - version "4.17.11" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0" - integrity sha512-DHb1ub+rMjjrxqlB3H56/6MXtm1lSksDp2rA2cNWjG8mlDUYFhUj3Di2Zn5IwSU87xLv8tNIQ7sSwE/YOX/D/Q== - lodash._arraycopy@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1" @@ -9838,7 +9833,7 @@ promzard@^0.3.0: dependencies: read "1" -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.6.2: +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.2: version "15.6.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" integrity sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ== @@ -10173,7 +10168,7 @@ react-is-deprecated@0.1.2: resolved "https://registry.yarnpkg.com/react-is-deprecated/-/react-is-deprecated-0.1.2.tgz#301148f86ea428fe8e673eca7a372160b7579dbd" integrity sha1-MBFI+G6kKP6OZz7KejchYLdXnb0= -react-is@^16.3.2, react-is@^16.6.0, react-is@^16.6.3, react-is@^16.7.0: +react-is@^16.3.2, react-is@^16.6.3, react-is@^16.7.0: version "16.7.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.7.0.tgz#c1bd21c64f1f1364c6f70695ec02d69392f41bfa" integrity sha512-Z0VRQdF4NPDoI0tsXVMLkJLiwEBa+RP66g0xDHxgxysxSoCUccSten4RTF/UFvZF1dZvZ9Zu1sx+MDXwcOR34g== @@ -10193,11 +10188,6 @@ react-jsonschema-form@^0.48.2: prop-types "^15.5.8" setimmediate "^1.0.5" -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== - react-overlays@^0.6.12: version "0.6.12" resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.6.12.tgz#a079c750cc429d7db4c7474a95b4b54033e255c3" @@ -10228,19 +10218,6 @@ react-pure-render@^1.0.2: resolved "https://registry.yarnpkg.com/react-pure-render/-/react-pure-render-1.0.2.tgz#9d8a928c7f2c37513c2d064e57b3e3c356e9fabb" integrity sha1-nYqSjH8sN1E8LQZOV7Pjw1bp+rs= -react-redux@^5.0.4: - version "5.1.1" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.1.1.tgz#88e368682c7fa80e34e055cd7ac56f5936b0f52f" - integrity sha512-LE7Ned+cv5qe7tMV5BPYkGQ5Lpg8gzgItK07c67yHvJ8t0iaD9kPFPAli/mYkiyJYrs2pJgExR2ZgsGqlrOApg== - dependencies: - "@babel/runtime" "^7.1.2" - hoist-non-react-statics "^3.1.0" - invariant "^2.2.4" - loose-envify "^1.1.0" - prop-types "^15.6.1" - react-is "^16.6.0" - react-lifecycles-compat "^3.0.0" - react-redux@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-6.0.0.tgz#09e86eeed5febb98e9442458ad2970c8f1a173ef" @@ -10578,16 +10555,6 @@ redux-logger@^2.5.2: dependencies: deep-diff "0.3.4" -redux@^3.0.0: - version "3.7.2" - resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b" - integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A== - dependencies: - lodash "^4.2.1" - lodash-es "^4.2.1" - loose-envify "^1.1.0" - symbol-observable "^1.0.3" - redux@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5" @@ -11789,7 +11756,7 @@ symbol-observable@1.0.1: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ= -symbol-observable@^1.0.2, symbol-observable@^1.0.3, symbol-observable@^1.2.0: +symbol-observable@^1.0.2, symbol-observable@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==