Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy-node into develop

+{
+    "extends": "yoho"
+}

-node_modules/
+
+# Created by https://www.gitignore.io/api/node,webstorm,netbeans,sublimetext,vim
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules
+jspm_packages
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history
+
+
+### WebStorm ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+
+# Sensitive or high-churn files:
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/dataSources.local.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+# Gradle:
+.idea/gradle.xml
+.idea/libraries
+
+# Mongo Explorer plugin:
+.idea/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### WebStorm Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+
+
+### NetBeans ###
+nbproject/private/
+build/
+nbbuild/
 dist/
 dist/
-npm-debug.log
+nbdist/
+nbactions.xml
+.nb-gradle/
+
+
+### SublimeText ###
+# cache files for sublime text
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+
+# workspace files are user-specific
+*.sublime-workspace
+
+# project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using SublimeText
+# *.sublime-project
+
+# sftp configuration file
+sftp-config.json
+
+
+### Vim ###
+# swap
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags
+
+### YOHO ###
+dist
 public/css/*
 public/css/*
 public/bundle/*
 public/bundle/*
+.eslintcache

+{
+  "extends": "stylelint-config-yoho"
+}

@@ -5,8 +5,8 @@
  */
  */
 
 
 module.exports = app => {
 module.exports = app => {
-    //公共服务
+    // 公共服务
 
 
-    //业务模块
+    // 业务模块
     app.use('/guang', require('./apps/guang'));
     app.use('/guang', require('./apps/guang'));
 };
 };

 {
 {
   "name": "m-yohobuy-node",
   "name": "m-yohobuy-node",
   "version": "0.0.1",
   "version": "0.0.1",
+  "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {
     "type": "git",
     "type": "git",
     "url": "http://git.dev.yoho.cn/web/yohobuy-node.git"
     "url": "http://git.dev.yoho.cn/web/yohobuy-node.git"
   },
   },
+  "scripts": {
+    "start": "node app.js",
+    "dev": "node_modules/.bin/nodemon -e js,hbs -i public/ app.js",
+    "online": "NODE_ENV=\"production\" node app.js",
+    "debug": "DEBUG=\"express:*\" node app.js",
+    "lint-js": "node_modules/.bin/eslint -c .eslintrc --cache --fix `git diff --cached --name-only --diff-filter=ACM | grep .js$` app.js",
+    "lint-css": "node_modules/.bin/stylelint --config .stylelintrc `git diff --cached --name-only --diff-filter=ACM | grep .css$`",
+    "precommit": "npm run lint-js && npm run lint-css"
+  },
   "license": "MIT",
   "license": "MIT",
   "dependencies": {
   "dependencies": {
     "body-parser": "^1.15.0",
     "body-parser": "^1.15.0",
@@ -15,17 +25,19 @@
     "lodash": "^4.8.2",
     "lodash": "^4.8.2",
     "morgan": "^1.7.0",
     "morgan": "^1.7.0",
     "request-promise": "^2.0.1",
     "request-promise": "^2.0.1",
-    "serve-favicon": "^2.3.0",
-    "shelljs": "^0.7.0"
+    "serve-favicon": "^2.3.0"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "autoprefixer": "^6.3.6",
     "autoprefixer": "^6.3.6",
+    "eslint": "^2.9.0",
+    "eslint-config-yoho": "^1.0.1",
     "gulp": "^3.9.1",
     "gulp": "^3.9.1",
     "gulp-cssnano": "^2.1.2",
     "gulp-cssnano": "^2.1.2",
     "gulp-ftp": "^1.1.0",
     "gulp-ftp": "^1.1.0",
     "gulp-postcss": "^6.1.0",
     "gulp-postcss": "^6.1.0",
     "gulp-sourcemaps": "^2.0.0-alpha",
     "gulp-sourcemaps": "^2.0.0-alpha",
     "gulp-util": "^3.0.7",
     "gulp-util": "^3.0.7",
+    "husky": "^0.11.4",
     "postcss-assets": "^4.0.1",
     "postcss-assets": "^4.0.1",
     "postcss-cachebuster": "^0.1.2",
     "postcss-cachebuster": "^0.1.2",
     "postcss-calc": "^5.2.1",
     "postcss-calc": "^5.2.1",
@@ -38,8 +50,11 @@
     "postcss-sprites": "^3.1.2",
     "postcss-sprites": "^3.1.2",
     "postcss-use": "^2.0.2",
     "postcss-use": "^2.0.2",
     "precss": "^1.4.0",
     "precss": "^1.4.0",
+    "stylelint": "^6.2.2",
+    "stylelint-config-yoho": "^1.2.0",
     "webpack": "^1.13.0",
     "webpack": "^1.13.0",
     "webpack-dev-server": "^1.14.1",
     "webpack-dev-server": "^1.14.1",
-    "webpack-stream": "^3.1.0"
+    "webpack-stream": "^3.1.0",
+    "shelljs": "^0.7.0"
   }
   }
 }
 }

@@ -61,7 +61,7 @@ const postcssPlugin = (et) => {
     // assets & sprites config in both dev and pro
     // assets & sprites config in both dev and pro
     if (et === env.pro) {
     if (et === env.pro) {
         assets = {
         assets = {
-            loadPaths: [dist.img, dist.font],
+            loadPaths: [dist.img, dist.font]
         };
         };
 
 
         Object.assign(sprites, {
         Object.assign(sprites, {
@@ -80,7 +80,7 @@ const postcssPlugin = (et) => {
             stylesheetPath: 'css/',
             stylesheetPath: 'css/',
             spritePath: 'img/'
             spritePath: 'img/'
         });
         });
-    };
+    }
 
 
     plugins = [
     plugins = [
         require('autoprefixer')({
         require('autoprefixer')({
@@ -92,7 +92,7 @@ const postcssPlugin = (et) => {
         require('postcss-calc'),
         require('postcss-calc'),
         require('postcss-opacity'),
         require('postcss-opacity'),
 
 
-        //可选
+        // 可选
         require('postcss-use')({
         require('postcss-use')({
             modules: ['postcss-clearfix', 'postcss-crip', 'postcss-short', 'postcss-center', 'postcss-position']
             modules: ['postcss-clearfix', 'postcss-crip', 'postcss-short', 'postcss-center', 'postcss-position']
         })
         })
@@ -145,7 +145,7 @@ gulp.task('img', () => {
         .pipe(gulp.dest(dist.img));
         .pipe(gulp.dest(dist.img));
 });
 });
 
 
-//copy font
+// copy font
 gulp.task('font', () => {
 gulp.task('font', () => {
     return gulp.src('font/*')
     return gulp.src('font/*')
         .pipe(gulp.dest(dist.font));
         .pipe(gulp.dest(dist.font));

@@ -15,9 +15,9 @@ require('shelljs/global');
 
 
 var entries = {};
 var entries = {};
 
 
-//构建各模块子页面JS。生成规则module.page.js
+// 构建各模块子页面JS。生成规则module.page.js
 ls(__dirname + '/js/**/*.page.js').forEach((f) => {
 ls(__dirname + '/js/**/*.page.js').forEach((f) => {
-    var dir = _.slice(f.split('/'), -2); //[modulename, xx.page.js]
+    var dir = _.slice(f.split('/'), -2); // [modulename, xx.page.js]
 
 
     // Important
     // Important
     // 生成规则：module.page: './js/module/xx.page.js'
     // 生成规则：module.page: './js/module/xx.page.js'
@@ -27,7 +27,7 @@ ls(__dirname + '/js/**/*.page.js').forEach((f) => {
 module.exports = {
 module.exports = {
     entry: entries,
     entry: entries,
     output: {
     output: {
-        path: path.join(__dirname, 'bundle'), //absolute path
+        path: path.join(__dirname, 'bundle'), // absolute path
         filename: '[name].js'
         filename: '[name].js'
     }
     }
 };
 };