honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge conflict

This commit is contained in:
Jay Traband 2015-09-18 13:21:38 -07:00
parent 3d997d2994
commit 3f6a9833dd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gulpfile.js
View File

@ -39,7 +39,8 @@ the current session.
gulp.task('help', taskListing); gulp.task('help', taskListing);
gulp.task('serve-and-sync', function (cb) { gulp.task('serve-and-sync', function (cb) {
execCommands(['harp server'], {}, cb); // execCommands(['harp server'], {}, cb);
execCommands(['npm run harp'], {}, cb);
var browserSync = require('browser-sync').create(); var browserSync = require('browser-sync').create();
browserSync.init({ browserSync.init({

4
package.json
View File

@ -5,7 +5,8 @@
"description": "Angular 2 documentation", "description": "Angular 2 documentation",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1",
"harp": "harp server ."
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -34,6 +35,7 @@
"gulp-watch": "^4.3.4", "gulp-watch": "^4.3.4",
"html2jade": "^0.8.4", "html2jade": "^0.8.4",
"indent-string": "^2.1.0", "indent-string": "^2.1.0",
"harp": "^0.18.0",
"jasmine-core": "^2.3.4", "jasmine-core": "^2.3.4",
"karma": "^0.13.8", "karma": "^0.13.8",
"karma-chrome-launcher": "^0.2.0", "karma-chrome-launcher": "^0.2.0",