Authored by 沈志敏

Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -19,14 +19,14 @@ @@ -19,14 +19,14 @@
19 }, 19 },
20 "license": "MIT", 20 "license": "MIT",
21 "dependencies": { 21 "dependencies": {
22 - "bluebird": "^3.4.1", 22 + "bluebird": "^3.4.2",
23 "body-parser": "^1.15.2", 23 "body-parser": "^1.15.2",
24 "connect-memcached": "^0.2.0", 24 "connect-memcached": "^0.2.0",
25 "connect-multiparty": "^2.0.0", 25 "connect-multiparty": "^2.0.0",
26 "cookie-parser": "^1.4.3", 26 "cookie-parser": "^1.4.3",
27 "express": "^4.14.0", 27 "express": "^4.14.0",
28 "express-handlebars": "^3.0.0", 28 "express-handlebars": "^3.0.0",
29 - "express-session": "^1.14.0", 29 + "express-session": "^1.14.1",
30 "influxdb-winston": "^1.0.1", 30 "influxdb-winston": "^1.0.1",
31 "lodash": "^4.15.0", 31 "lodash": "^4.15.0",
32 "memcached": "^2.2.1", 32 "memcached": "^2.2.1",
@@ -39,14 +39,14 @@ @@ -39,14 +39,14 @@
39 "winston": "^2.2.0", 39 "winston": "^2.2.0",
40 "winston-daily-rotate-file": "^1.3.0", 40 "winston-daily-rotate-file": "^1.3.0",
41 "yoho-md5": "^2.0.0", 41 "yoho-md5": "^2.0.0",
42 - "yoho-node-lib": "0.0.41" 42 + "yoho-node-lib": "0.0.43"
43 }, 43 },
44 "devDependencies": { 44 "devDependencies": {
45 "autoprefixer": "^6.4.0", 45 "autoprefixer": "^6.4.0",
46 - "babel-core": "^6.13.2", 46 + "babel-core": "^6.14.0",
47 "babel-loader": "^6.2.5", 47 "babel-loader": "^6.2.5",
48 "babel-plugin-transform-runtime": "^6.12.0", 48 "babel-plugin-transform-runtime": "^6.12.0",
49 - "babel-preset-es2015": "^6.13.2", 49 + "babel-preset-es2015": "^6.14.0",
50 "babel-runtime": "^6.11.6", 50 "babel-runtime": "^6.11.6",
51 "eslint": "^3.3.1", 51 "eslint": "^3.3.1",
52 "eslint-config-yoho": "^1.0.1", 52 "eslint-config-yoho": "^1.0.1",
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
64 "nodemon": "^1.10.2", 64 "nodemon": "^1.10.2",
65 "postcss-assets": "^4.0.1", 65 "postcss-assets": "^4.0.1",
66 "postcss-cachebuster": "^0.1.3", 66 "postcss-cachebuster": "^0.1.3",
67 - "postcss-calc": "^5.2.1", 67 + "postcss-calc": "^5.3.1",
68 "postcss-center": "^1.0.0", 68 "postcss-center": "^1.0.0",
69 "postcss-clearfix": "^1.0.0", 69 "postcss-clearfix": "^1.0.0",
70 "postcss-crip": "^2.0.0", 70 "postcss-crip": "^2.0.0",
@@ -83,12 +83,12 @@ @@ -83,12 +83,12 @@
83 "vue": "1.0.26", 83 "vue": "1.0.26",
84 "vue-infinite-scroll": "0.2.3", 84 "vue-infinite-scroll": "0.2.3",
85 "vue-lazyload": "^0.7.0", 85 "vue-lazyload": "^0.7.0",
86 - "vue-loader": "^8.5.2", 86 + "vue-loader": "^8.5.3",
87 "vue-swipe": "0.2.6", 87 "vue-swipe": "0.2.6",
88 "vue-touch": "1.1.0", 88 "vue-touch": "1.1.0",
89 "webpack": "^1.13.2", 89 "webpack": "^1.13.2",
90 - "webpack-dashboard": "^0.1.6",  
91 - "webpack-dev-server": "^1.14.1", 90 + "webpack-dashboard": "^0.1.8",
  91 + "webpack-dev-server": "^1.15.0",
92 "webpack-stream": "^3.1.0", 92 "webpack-stream": "^3.1.0",
93 "yoho-cookie": "1.2.0", 93 "yoho-cookie": "1.2.0",
94 "yoho-qs": "1.0.1", 94 "yoho-qs": "1.0.1",