|
...
|
...
|
@@ -63,24 +63,12 @@ |
|
|
|
"passport-sina": "^0.1.0",
|
|
|
|
"passport-strategy": "^1.0.0",
|
|
|
|
"passport-weixin": "^0.1.0",
|
|
|
|
<<<<<<< HEAD
|
|
|
|
"redis": "^2.7.1",
|
|
|
|
"request": "^2.81.0",
|
|
|
|
"request-promise": "^4.2.1",
|
|
|
|
"semver": "^5.4.1",
|
|
|
|
"sitemap": "^1.13.0",
|
|
|
|
"uuid": "^3.1.0",
|
|
|
|
=======
|
|
|
|
"postcss-calc": "^5.3.1",
|
|
|
|
"redis": "^2.7.1",
|
|
|
|
"request": "^2.81.0",
|
|
|
|
"request-promise": "^4.2.1",
|
|
|
|
"semver": "^5.3.0",
|
|
|
|
"sitemap": "^1.12.0",
|
|
|
|
"uuid": "^3.0.1",
|
|
|
|
"vue-infinite-scroll": "^2.0.1",
|
|
|
|
"vue-lazyload": "^1.0.5",
|
|
|
|
>>>>>>> master
|
|
|
|
"xml2js": "^0.4.17",
|
|
|
|
"yoho-express-session": "^2.0.0",
|
|
|
|
"yoho-md5": "^2.0.0",
|
|
...
|
...
|
@@ -125,6 +113,8 @@ |
|
|
|
"stylelint-processor-html": "^1.0.0",
|
|
|
|
"stylelint-webpack-plugin": "^0.9.0",
|
|
|
|
"vue": "^2.4.2",
|
|
|
|
"vue-infinite-scroll": "^2.0.1",
|
|
|
|
"vue-lazyload": "^1.0.5",
|
|
|
|
"vue-loader": "^13.0.2",
|
|
|
|
"vue-template-compiler": "^2.4.2",
|
|
|
|
"webpack": "^3.4.1",
|
...
|
...
|
|
