Skip to content
This repository has been archived by the owner on Mar 26, 2018. It is now read-only.

Commit

Permalink
fix(gen) gulpfile.js fixes
Browse files Browse the repository at this point in the history
Some fixes after testing

#1299
  • Loading branch information
Alexander Deider committed May 17, 2016
1 parent 28064ce commit 226ea45
Showing 1 changed file with 15 additions and 11 deletions.
26 changes: 15 additions & 11 deletions templates/common/root/_gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,20 @@ var paths = {
styles: [yeoman.app + '/styles/**/*.' + cssx],
test: ['test/spec/**/*.' + jsx],
testRequire: [
yeoman.app + '/bower_components/angular/angular.js',
yeoman.app + '/bower_components/angular-mocks/angular-mocks.js',
yeoman.app + '/bower_components/angular-resource/angular-resource.js',
yeoman.app + '/bower_components/angular-cookies/angular-cookies.js',
yeoman.app + '/bower_components/angular-sanitize/angular-sanitize.js',
yeoman.app + '/bower_components/angular-route/angular-route.js',
'bower_components/angular/angular.js',
'bower_components/angular-mocks/angular-mocks.js',
'bower_components/angular-resource/angular-resource.js',
'bower_components/angular-cookies/angular-cookies.js',
'bower_components/angular-sanitize/angular-sanitize.js',
'bower_components/angular-route/angular-route.js',
'bower_components/angular-animate/angular-animate.js',
'bower_components/angular-touch/angular-touch.js',
'bower_components/angular-ui-sortable/sortable.js',
'bower_components/angular-local-storage/dist/angular-local-storage.js',
'test/mock/**/*.' + jsx,
'test/spec/**/*.' + jsx
],
karma: 'karma.conf.js',
karma: yeoman.test + '/karma.conf.js',
views: {
main: yeoman.app + '/index.html',
bowermain: yeoman.temp + '/index.html',
Expand Down Expand Up @@ -98,7 +102,7 @@ gulp.task('start:client', ['start:server', <% if (coffee) { %>'coffee', <% } els

gulp.task('start:server', function() {
$.connect.server({
root: [yeoman.app, yeoman.temp],
root: [yeoman.temp, yeoman.app],
livereload: true,
// Change this to '0.0.0.0' to access the server from outside.
port: 9000,
Expand All @@ -108,7 +112,7 @@ gulp.task('start:server', function() {

gulp.task('start:server:test', function() {
$.connect.server({
root: [yeoman.test, yeoman.app, yeoman.temp],
root: [yeoman.temp, yeoman.test, yeoman.app],
livereload: true,
port: 9001,
middleware: serveStaticBower
Expand Down Expand Up @@ -152,7 +156,7 @@ gulp.task('serve', function (cb) {
gulp.task('serve:prod', function() {
$.connect.server({
root: [yeoman.dist],
livereload: true
livereload: true,
port: argv.port || 80,
middleware: serveStaticBower
});
Expand All @@ -171,7 +175,7 @@ gulp.task('test', ['start:server:test'], function () {
gulp.task('bower', function () {
return gulp.src(paths.views.main)
.pipe(wiredep({
directory: /*yeoman.app + */'/bower_components',
directory: /*yeoman.app + */'./bower_components',
ignorePath: '..'
}))
// .pipe(gulp.dest(yeoman.app + '/views'));
Expand Down

0 comments on commit 226ea45

Please sign in to comment.