@@ -24,16 +24,20 @@ var paths = {
2424 styles : [ yeoman . app + '/styles/**/*.' + cssx ] ,
2525 test : [ 'test/spec/**/*.' + jsx ] ,
2626 testRequire : [
27- yeoman . app + '/bower_components/angular/angular.js' ,
28- yeoman . app + '/bower_components/angular-mocks/angular-mocks.js' ,
29- yeoman . app + '/bower_components/angular-resource/angular-resource.js' ,
30- yeoman . app + '/bower_components/angular-cookies/angular-cookies.js' ,
31- yeoman . app + '/bower_components/angular-sanitize/angular-sanitize.js' ,
32- yeoman . app + '/bower_components/angular-route/angular-route.js' ,
27+ 'bower_components/angular/angular.js' ,
28+ 'bower_components/angular-mocks/angular-mocks.js' ,
29+ 'bower_components/angular-resource/angular-resource.js' ,
30+ 'bower_components/angular-cookies/angular-cookies.js' ,
31+ 'bower_components/angular-sanitize/angular-sanitize.js' ,
32+ 'bower_components/angular-route/angular-route.js' ,
33+ 'bower_components/angular-animate/angular-animate.js' ,
34+ 'bower_components/angular-touch/angular-touch.js' ,
35+ 'bower_components/angular-ui-sortable/sortable.js' ,
36+ 'bower_components/angular-local-storage/dist/angular-local-storage.js' ,
3337 'test/mock/**/*.' + jsx ,
3438 'test/spec/**/*.' + jsx
3539 ] ,
36- karma : ' karma.conf.js',
40+ karma : yeoman . test + '/ karma.conf.js',
3741 views : {
3842 main : yeoman . app + '/index.html' ,
3943 bowermain : yeoman . temp + '/index.html' ,
@@ -98,7 +102,7 @@ gulp.task('start:client', ['start:server', <% if (coffee) { %>'coffee', <% } els
98102
99103gulp.task('start:server', function() {
100104 $ . connect . server ( {
101- root : [ yeoman . app , yeoman . temp ] ,
105+ root : [ yeoman . temp , yeoman . app ] ,
102106 livereload : true ,
103107 // Change this to '0.0.0.0' to access the server from outside.
104108 port : 9000 ,
@@ -108,7 +112,7 @@ gulp.task('start:server', function() {
108112
109113gulp.task('start:server:test', function() {
110114 $ . connect . server ( {
111- root : [ yeoman . test , yeoman . app , yeoman . temp ] ,
115+ root : [ yeoman . temp , yeoman . test , yeoman . app ] ,
112116 livereload : true ,
113117 port : 9001 ,
114118 middleware : serveStaticBower
@@ -152,7 +156,7 @@ gulp.task('serve', function (cb) {
152156gulp.task('serve:prod', function() {
153157 $ . connect . server ( {
154158 root : [ yeoman . dist ] ,
155- livereload : true
159+ livereload : true ,
156160 port : argv . port || 80 ,
157161 middleware : serveStaticBower
158162 } ) ;
@@ -171,7 +175,7 @@ gulp.task('test', ['start:server:test'], function () {
171175gulp.task('bower', function () {
172176 return gulp . src ( paths . views . main )
173177 . pipe ( wiredep ( {
174- directory : /*yeoman.app + */ '/bower_components' ,
178+ directory : /*yeoman.app + */ '. /bower_components' ,
175179 ignorePath : '..'
176180 } ) )
177181 // .pipe(gulp.dest(yeoman.app + '/views'));
0 commit comments