Authored by 沈志敏

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

... ... @@ -19,14 +19,14 @@
},
"license": "MIT",
"dependencies": {
"bluebird": "^3.4.1",
"bluebird": "^3.4.2",
"body-parser": "^1.15.2",
"connect-memcached": "^0.2.0",
"connect-multiparty": "^2.0.0",
"cookie-parser": "^1.4.3",
"express": "^4.14.0",
"express-handlebars": "^3.0.0",
"express-session": "^1.14.0",
"express-session": "^1.14.1",
"influxdb-winston": "^1.0.1",
"lodash": "^4.15.0",
"memcached": "^2.2.1",
... ... @@ -39,14 +39,14 @@
"winston": "^2.2.0",
"winston-daily-rotate-file": "^1.3.0",
"yoho-md5": "^2.0.0",
"yoho-node-lib": "0.0.41"
"yoho-node-lib": "0.0.43"
},
"devDependencies": {
"autoprefixer": "^6.4.0",
"babel-core": "^6.13.2",
"babel-core": "^6.14.0",
"babel-loader": "^6.2.5",
"babel-plugin-transform-runtime": "^6.12.0",
"babel-preset-es2015": "^6.13.2",
"babel-preset-es2015": "^6.14.0",
"babel-runtime": "^6.11.6",
"eslint": "^3.3.1",
"eslint-config-yoho": "^1.0.1",
... ... @@ -64,7 +64,7 @@
"nodemon": "^1.10.2",
"postcss-assets": "^4.0.1",
"postcss-cachebuster": "^0.1.3",
"postcss-calc": "^5.2.1",
"postcss-calc": "^5.3.1",
"postcss-center": "^1.0.0",
"postcss-clearfix": "^1.0.0",
"postcss-crip": "^2.0.0",
... ... @@ -83,12 +83,12 @@
"vue": "1.0.26",
"vue-infinite-scroll": "0.2.3",
"vue-lazyload": "^0.7.0",
"vue-loader": "^8.5.2",
"vue-loader": "^8.5.3",
"vue-swipe": "0.2.6",
"vue-touch": "1.1.0",
"webpack": "^1.13.2",
"webpack-dashboard": "^0.1.6",
"webpack-dev-server": "^1.14.1",
"webpack-dashboard": "^0.1.8",
"webpack-dev-server": "^1.15.0",
"webpack-stream": "^3.1.0",
"yoho-cookie": "1.2.0",
"yoho-qs": "1.0.1",
... ...