Skip to content

Commit

Permalink
Merge pull request #30 from SteamerTeam/react-dev
Browse files Browse the repository at this point in the history 
update copy-webpack-plugin-hash
  • Loading branch information
@lcxfs1991
lcxfs1991 authored Jan 23, 2017
2 parents 7493567 + b082cc1 commit d6bca25
Show file tree
Hide file tree
Showing 14 changed files with 75 additions and 61 deletions.
Empty file modified .eslintignore
100644 → 100755
View file
Empty file.
Empty file modified .steamer/steamer-react.js
100644 → 100755
View file
Empty file.
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "steamer-react",
"version": "1.6.3",
"version": "1.7.0",
"description": "react-redux-webpack-boilerplate",
"main": "./.steamer/steamer-react.js",
"scripts": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"caniuse-db": "^1.0.30000602",
"classnames": "^2.2.3",
"clean-webpack-plugin": "^0.1.14",
"copy-webpack-plugin-hash": "^3.0.2",
"copy-webpack-plugin-hash": "^4.0.1",
"css-loader": "^0.22.0",
"eslint": "^3.12.2",
"eslint-plugin-babel": "^4.0.0",
Expand All @@ -66,7 +66,7 @@
"happypack": "^3.0.0",
"history": "^3.0.0",
"html-loader": "^0.4.4",
"html-res-webpack-plugin": "^1.2.5",
"html-res-webpack-plugin": "^1.3.0",
"http-proxy": "^1.12.0",
"image-webpack-loader": "^1.8.0",
"immutable": "^3.7.6",
Expand All @@ -80,9 +80,9 @@
"preact-redux": "^1.2.0",
"proxy-middleware": "^0.15.0",
"pure-render-deepcompare-decorator": "^1.0.1",
"react": "^15.4.1",
"react-addons-perf": "^15.4.1",
"react-dom": "^15.4.1",
"react": "^15.4.2",
"react-addons-perf": "^15.4.2",
"react-dom": "^15.4.2",
"react-hot-loader": "^3.0.0-beta.6",
"react-list-scroll": "^0.1.0",
"react-redux": "^4.4.5",
Expand Down
Empty file modified src/js/common/utils.js
100644 → 100755
View file
Empty file.
Empty file modified src/page/common/constants/index.js
100644 → 100755
View file
Empty file.
Empty file modified src/page/common/db/index.js
100644 → 100755
View file
Empty file.
Empty file modified src/page/index/root/Root.hot.js
100644 → 100755
View file
Empty file.
Empty file modified src/page/spa/root/Root.hot.js
100644 → 100755
View file
Empty file.
Empty file modified tools/config-template/config.js
100644 → 100755
View file
Empty file.
Empty file modified tools/config/eslint-config.js
100644 → 100755
View file
Empty file.
Empty file modified tools/config/stylelint.config.js
100644 → 100755
View file
Empty file.
2 changes: 1 addition & 1 deletion tools/webpack.dev.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ var devConfig = {
new CopyWebpackPlugin([
{
from: 'src/libs/',
to: 'libs/'
to: 'libs/[name].[ext]'
}
]),
new webpack.optimize.OccurenceOrderPlugin(),
Expand Down
6 changes: 2 additions & 4 deletions tools/webpack.prod.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,9 @@ var prodConfig = {
new CopyWebpackPlugin([
{
from: 'src/libs/',
to: 'libs/'
to: 'libs/[name]-' + configWebpack.hash + '.[ext]'
}
], {
namePattern: "[name]-" + configWebpack.contenthash + ".js"
}),
]),
new HappyPack({
id: 'jsxHappy',
verbose: false,
Expand Down
116 changes: 66 additions & 50 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ acorn@^4.0.1:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"

ajv-keywords@^1.0.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.0.tgz#c11e6859eafff83e0dafc416929472eca946aa2c"
version "1.5.1"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"

ajv@^4.7.0:
version "4.10.4"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.10.4.tgz#c0974dd00b3464984892d6010aa9c2c945933254"
version "4.11.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.2.tgz#f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6"
dependencies:
co "^4.6.0"
json-stable-stringify "^1.0.1"
Expand Down Expand Up @@ -212,14 +212,14 @@ asynckit@^0.4.0:
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"

autoprefixer@^6.0.0, autoprefixer@^6.3.1, autoprefixer@^6.5.4:
version "6.6.1"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.6.1.tgz#11a4077abb4b313253ec2f6e1adb91ad84253519"
version "6.7.0"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.0.tgz#88992cf04df141e7b8293550f2ee716c565d1cae"
dependencies:
browserslist "~1.5.1"
caniuse-db "^1.0.30000604"
browserslist "~1.6.0"
caniuse-db "^1.0.30000613"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
postcss "^5.2.8"
postcss "^5.2.11"
postcss-value-parser "^3.2.3"

aws-sign2@~0.6.0:
Expand All @@ -239,8 +239,8 @@ babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
js-tokens "^3.0.0"

babel-core@^6.18.2, babel-core@^6.22.0:
version "6.22.0"
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.22.0.tgz#643deaeb520bcd2b06c11e39945c877e0200d128"
version "6.22.1"
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.22.1.tgz#9c5fd658ba1772d28d721f6d25d968fc7ae21648"
dependencies:
babel-code-frame "^6.22.0"
babel-generator "^6.22.0"
Expand All @@ -249,7 +249,7 @@ babel-core@^6.18.2, babel-core@^6.22.0:
babel-register "^6.22.0"
babel-runtime "^6.22.0"
babel-template "^6.22.0"
babel-traverse "^6.22.0"
babel-traverse "^6.22.1"
babel-types "^6.22.0"
babylon "^6.11.0"
convert-source-map "^1.1.0"
Expand Down Expand Up @@ -709,9 +709,9 @@ babel-template@^6.22.0, babel-template@^6.3.0, babel-template@^6.7.0:
babylon "^6.11.0"
lodash "^4.2.0"

babel-traverse@^6.15.0, babel-traverse@^6.22.0:
version "6.22.0"
resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.22.0.tgz#998b6de3228bd2bab0d748a6ec0588c32033d3c7"
babel-traverse@^6.15.0, babel-traverse@^6.22.0, babel-traverse@^6.22.1:
version "6.22.1"
resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.22.1.tgz#3b95cd6b7427d6f1f757704908f2fc9748a5f59f"
dependencies:
babel-code-frame "^6.22.0"
babel-messages "^6.22.0"
Expand Down Expand Up @@ -834,6 +834,10 @@ bluebird@^2.10.2:
version "2.11.0"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"

bluebird@^3.4.7:
version "3.4.7"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"

boom@2.x.x:
version "2.10.1"
resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
Expand Down Expand Up @@ -867,11 +871,12 @@ browserify-zlib@^0.1.4:
dependencies:
pako "~0.2.0"

browserslist@^1.0.1, browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.5.1, browserslist@^1.5.2, browserslist@~1.5.1:
version "1.5.2"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.5.2.tgz#1c82fde0ee8693e6d15c49b7bff209dc06298c56"
browserslist@^1.0.1, browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.5.1, browserslist@^1.5.2, browserslist@~1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.6.0.tgz#85fb7c993540d3fda31c282baf7f5aee698ac9ee"
dependencies:
caniuse-db "^1.0.30000604"
caniuse-db "^1.0.30000613"
electron-to-chromium "^1.2.0"

buffer-crc32@~0.2.3:
version "0.2.13"
Expand Down Expand Up @@ -959,7 +964,7 @@ caniuse-api@^1.5.2:
lodash.uniq "^4.3.0"
shelljs "^0.7.0"

caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000602, caniuse-db@^1.0.30000604:
caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000602, caniuse-db@^1.0.30000613:
version "1.0.30000613"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000613.tgz#639133b7a5380c1416f9701d23d54d093dd68299"

Expand Down Expand Up @@ -1052,8 +1057,8 @@ classnames@^2.2.3:
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"

clean-css@3.4.x:
version "3.4.23"
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.23.tgz#604fbbca24c12feb59b02f00b84f1fb7ded6d001"
version "3.4.24"
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.24.tgz#89f5a5e9da37ae02394fe049a41388abbe72c3b5"
dependencies:
commander "2.8.x"
source-map "0.4.x"
Expand Down Expand Up @@ -1185,7 +1190,7 @@ colormin@^1.0.5:
css-color-names "0.0.4"
has "^1.0.1"

colors@~1.1.2:
colors@^1.1.2, colors@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"

Expand Down Expand Up @@ -1311,13 +1316,14 @@ cookie@0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"

copy-webpack-plugin-hash@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/copy-webpack-plugin-hash/-/copy-webpack-plugin-hash-3.0.2.tgz#634ecb14a50aa03a90c86598971f27e614fedab2"
copy-webpack-plugin-hash@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/copy-webpack-plugin-hash/-/copy-webpack-plugin-hash-4.0.1.tgz#497261ef9e3b0ec78fd1a017f708c3a6f386caea"
dependencies:
bluebird "^2.10.2"
fs-extra "^0.26.4"
glob "^6.0.4"
is-glob "^3.1.0"
loader-utils "^0.2.15"
lodash "^4.3.0"
minimatch "^3.0.0"
Expand Down Expand Up @@ -1762,6 +1768,10 @@ ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"

electron-to-chromium@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.2.0.tgz#3bd7761f85bd4163602259ae6c7ed338050b17e7"

emojis-list@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
Expand Down Expand Up @@ -1815,8 +1825,8 @@ error-stack-parser@^1.3.6:
stackframe "^0.3.1"

es-abstract@^1.5.0:
version "1.6.1"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.6.1.tgz#bb8a2064120abcf928a086ea3d9043114285ec99"
version "1.7.0"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.7.0.tgz#dfade774e01bfcd97f96180298c449c8623fb94c"
dependencies:
es-to-primitive "^1.1.1"
function-bind "^1.1.0"
Expand Down Expand Up @@ -1939,8 +1949,8 @@ eslint-plugin-react@^6.8.0:
jsx-ast-utils "^1.3.4"

eslint@^3.12.2:
version "3.13.1"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.13.1.tgz#564d2646b5efded85df96985332edd91a23bff25"
version "3.14.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.14.0.tgz#2c617e5f782fda5cbee5bc8be7ef5053af8e63a3"
dependencies:
babel-code-frame "^6.16.0"
chalk "^1.1.3"
Expand Down Expand Up @@ -2203,8 +2213,8 @@ faye-websocket@^0.10.0:
websocket-driver ">=0.5.1"

faye-websocket@~0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.0.tgz#d9ccf0e789e7db725d74bc4877d23aa42972ac50"
version "0.11.1"
resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
dependencies:
websocket-driver ">=0.5.1"

Expand Down Expand Up @@ -2832,10 +2842,12 @@ html-minifier@^3.0.1:
relateurl "0.2.x"
uglify-js "2.7.x"

html-res-webpack-plugin:
version "1.2.4"
resolved "https://registry.yarnpkg.com/html-res-webpack-plugin/-/html-res-webpack-plugin-1.2.4.tgz#c287f94ea85ae4c080749ae708f3b347d4280200"
html-res-webpack-plugin@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/html-res-webpack-plugin/-/html-res-webpack-plugin-1.3.0.tgz#e2b86f530ffa0693b5f25e061579c9768317d187"
dependencies:
bluebird "^3.4.7"
colors "^1.1.2"
html-minifier "^1.1.1"
loader-utils "^0.2.15"
lodash "^3.10.1"
Expand Down Expand Up @@ -3229,7 +3241,7 @@ is-png@^1.0.0:

is-posix-bracket@^0.1.0:
version "0.1.1"
resolved "http://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"

is-primitive@^2.0.0:
version "2.0.0"
Expand Down Expand Up @@ -3799,8 +3811,8 @@ map-obj@^1.0.0, map-obj@^1.0.1:
resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"

math-expression-evaluator@^1.2.14:
version "1.2.14"
resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.14.tgz#39511771ed9602405fba9affff17eb4d2a3843ab"
version "1.2.15"
resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.15.tgz#38dc5f0194c5bf5ff1c690ad4c4b64df71ac0187"
dependencies:
lodash.indexof "^4.0.5"

Expand Down Expand Up @@ -3969,8 +3981,8 @@ mute-stream@0.0.5:
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"

nan@^2.3.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.0.tgz#aa8f1e34531d807e9e27755b234b4a6ec0c152a8"
version "2.5.1"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2"

natural-compare@^1.4.0:
version "1.4.0"
Expand Down Expand Up @@ -4753,14 +4765,14 @@ postcss-zindex@^2.0.1:
postcss "^5.0.4"
uniqs "^2.0.0"

postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.18, postcss@^5.0.2, postcss@^5.0.20, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.4, postcss@^5.2.5, postcss@^5.2.8, postcss@^5.2.9:
version "5.2.10"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.10.tgz#b58b64e04f66f838b7bc7cb41f7dac168568a945"
postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.18, postcss@^5.0.2, postcss@^5.0.20, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.11, postcss@^5.2.4, postcss@^5.2.5, postcss@^5.2.9:
version "5.2.11"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.11.tgz#ff29bcd6d2efb98bfe08a022055ec599bbe7b761"
dependencies:
chalk "^1.1.3"
js-base64 "^2.1.9"
source-map "^0.5.6"
supports-color "^3.1.2"
supports-color "^3.2.3"

preact-redux@^1.2.0:
version "1.2.0"
Expand Down Expand Up @@ -4903,7 +4915,7 @@ rc@^1.1.2, rc@~1.1.6:
minimist "^1.2.0"
strip-json-comments "~1.0.4"

react-addons-perf@^15.4.1:
react-addons-perf@^15.4.2:
version "15.4.2"
resolved "https://registry.yarnpkg.com/react-addons-perf/-/react-addons-perf-15.4.2.tgz#110bdcf5c459c4f77cb85ed634bcd3397536383b"
dependencies:
Expand Down Expand Up @@ -4931,7 +4943,7 @@ react-dock@^0.2.1:
lodash.debounce "^3.1.1"
object-assign "^4.0.1"

react-dom@^15.4.1:
react-dom@^15.4.2:
version "15.4.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.4.2.tgz#015363f05b0a1fd52ae9efdd3a0060d90695208f"
dependencies:
Expand All @@ -4958,6 +4970,10 @@ react-json-tree@^0.10.0:
react-base16-styling "^0.4.1"
react-pure-render "^1.0.2"

react-list-scroll@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/react-list-scroll/-/react-list-scroll-0.1.0.tgz#6c51fa8657d64a3430cf3f3e8373ca9346fc8800"

react-proxy@^3.0.0-alpha.0:
version "3.0.0-alpha.1"
resolved "https://registry.yarnpkg.com/react-proxy/-/react-proxy-3.0.0-alpha.1.tgz#4400426bcfa80caa6724c7755695315209fa4b07"
Expand Down Expand Up @@ -4991,7 +5007,7 @@ react-router@^3.0.0:
loose-envify "^1.2.0"
warning "^3.0.0"

react@^15.4.1:
react@^15.4.2:
version "15.4.2"
resolved "https://registry.yarnpkg.com/react/-/react-15.4.2.tgz#41f7991b26185392ba9bae96c8889e7e018397ef"
dependencies:
Expand Down Expand Up @@ -5222,7 +5238,7 @@ regenerator-transform@0.9.8:

regex-cache@^0.4.2:
version "0.4.3"
resolved "http://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
dependencies:
is-equal-shallow "^0.1.3"
is-primitive "^2.0.0"
Expand Down Expand Up @@ -5676,7 +5692,7 @@ steamer-browserutils@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/steamer-browserutils/-/steamer-browserutils-1.0.0.tgz#449bb0c4787f35cb6f271985fbf555e97cdcc013"

steamer-net@^1.1.0:
steamer-net@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/steamer-net/-/steamer-net-1.1.1.tgz#d7eae506aa8949643264c3d91df9e2567072f981"

Expand Down Expand Up @@ -5897,7 +5913,7 @@ supports-color@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"

supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.1.2:
supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.2.3:
version "3.2.3"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
dependencies:
Expand Down

0 comments on commit d6bca25

Please sign in to comment.