fe / yoho-activity-node · Commits

Go to a project

Authored by 毕凯
Commit 5c48fcf5f3c6437cbee8f7997349d6216906c581 2 parents 3b897bee c9cbdf1c

Merge branch 'release/coupon-summer-2' into develop

Inline Side-by-side
Showing 2 changed files with 7 additions and 5 deletions
@@ -22,7 +22,7 @@ From: [eslint-config-yoho](https://www.npmjs.com/package/eslint-config-yoho) @@ -22,7 +22,7 @@ From: [eslint-config-yoho](https://www.npmjs.com/package/eslint-config-yoho)
22 # 项目启动方法 22 # 项目启动方法
23 23
24 - 拉取代码 24 - 拉取代码
25 -- 安装全局包：`npm i -g eslint eslint-config-yoho yo generator-yohos nodemon` 25 +- 安装全局包：`npm i -g yo generator-yohos`
26 - 安装本地依赖 26 - 安装本地依赖
27 - 启动 Web Server 服务进程:当前目录下运行`npm start` 27 - 启动 Web Server 服务进程:当前目录下运行`npm start`
28 - 进入模块的静态资源目录，运行`gulp` 28 - 进入模块的静态资源目录，运行`gulp`
@@ -4,10 +4,10 @@ @@ -4,10 +4,10 @@
4 "private": true, 4 "private": true,
5 "scripts": { 5 "scripts": {
6 "start": "node ./bin/www", 6 "start": "node ./bin/www",
7 - "dev": "nodemon -e js,hbs -i public/ ./bin/www", 7 + "dev": "node_modules/.bin/nodemon -e js,hbs -i public/ ./bin/www",
8 "online": "NODE_ENV=\"production\" node bin/www", 8 "online": "NODE_ENV=\"production\" node bin/www",
9 - "lint-js": "eslint -c .eslintrc --cache --fix `git diff --cached --name-only --diff-filter=ACM | grep .js$` app.js",  
10 - "lint-css": "stylelint --config .stylelintrc `git diff --cached --name-only --diff-filter=ACM | grep .css$`", 9 + "lint-js": "node_modules/.bin/eslint -c .eslintrc --cache --fix `git diff --cached --name-only --diff-filter=ACM | grep .js$` app.js",
  10 + "lint-css": "node_modules/.bin/stylelint --config .stylelintrc `git diff --cached --name-only --diff-filter=ACM | grep .css$`",
11 "precommit": "npm run lint-js && npm run lint-css" 11 "precommit": "npm run lint-js && npm run lint-css"
12 }, 12 },
13 "dependencies": { 13 "dependencies": {
@@ -33,7 +33,8 @@ @@ -33,7 +33,8 @@
33 "babel-plugin-transform-runtime": "^6.1.18", 33 "babel-plugin-transform-runtime": "^6.1.18",
34 "babel-preset-es2015": "^6.1.18", 34 "babel-preset-es2015": "^6.1.18",
35 "babel-runtime": "^6.1.18", 35 "babel-runtime": "^6.1.18",
36 - "eslint-config-yoho": "^0.1.2", 36 + "eslint": "^2.8.0",
  37 + "eslint-config-yoho": "^0.1.6",
37 "gulp": "^3.9.1", 38 "gulp": "^3.9.1",
38 "gulp-cssnano": "^2.1.1", 39 "gulp-cssnano": "^2.1.1",
39 "gulp-postcss": "^6.1.0", 40 "gulp-postcss": "^6.1.0",
@@ -41,6 +42,7 @@ @@ -41,6 +42,7 @@
41 "gulp-util": "^3.0.7", 42 "gulp-util": "^3.0.7",
42 "husky": "^0.11.4", 43 "husky": "^0.11.4",
43 "jquery": "^2.2.3", 44 "jquery": "^2.2.3",
  45 + "nodemon": "^1.9.1",
44 "postcss-assets": "^4.0.1", 46 "postcss-assets": "^4.0.1",
45 "postcss-calc": "^5.2.0", 47 "postcss-calc": "^5.2.0",
46 "postcss-center": "^1.0.0", 48 "postcss-center": "^1.0.0",