Skip to content

Commit d1ba9ef

Browse files
Awk34Awk34
committed
feat(gulp): Fix a bunch of things, update a buttload of packages..
It's still not working, but there's progress. It seems like none of my files are getting put into the .tmp directory, and wiredep isn't putting anything in index.html
1 parent 10708a4 commit d1ba9ef

2 files changed

Lines changed: 58 additions & 60 deletions

File tree

‎app/templates/_package.json‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -31,35 +31,36 @@
3131
},
3232
"devDependencies": {<% if(filters.gulp) { %>
3333
"gulp": "^3.9.0",
34-
"gulp-autoprefixer": "0.0.7",
35-
"gulp-cache": "^0.1.3",
36-
"gulp-clean": "^0.2.4",
37-
"gulp-filter": "^0.4.1",
38-
"gulp-imagemin": "^0.5.0",
39-
"gulp-jshint": "^1.5.5",
34+
"gulp-autoprefixer": "2.3.1",
35+
"gulp-cache": "^0.2.10",
36+
"gulp-clean": "^0.3.1",
37+
"gulp-filter": "^2.0.2",
38+
"gulp-imagemin": "^2.2.1",
39+
"gulp-jshint": "^1.11.0",
4040
"gulp-karma": "0.0.4",
41-
"gulp-livereload": "^1.3.1",
42-
"gulp-load-plugins": "^0.5.0",
43-
"gulp-plumber": "^0.6.1",
44-
"gulp-rev": "^0.3.2",
45-
"gulp-rev-replace": "^0.1.0",
46-
"gulp-uglify": "^0.2.1",
41+
"gulp-livereload": "^3.8.0",
42+
"gulp-load-plugins": "^1.0.0-rc.1",
43+
"gulp-minify-css": "^1.1.6",
44+
"gulp-ngmin": "^0.3.0",
45+
"gulp-plumber": "^1.0.1",
46+
"gulp-rev": "^5.0.0",
47+
"gulp-rev-replace": "^0.4.2",
48+
"gulp-svgmin": "^1.1.2",
49+
"gulp-uglify": "^1.2.0",
4750
"gulp-useref": "^0.4.2",
48-
"gulp-minify-css": "^0.3.4",
49-
"gulp-util": "^2.2.14",
50-
"gulp-watch": "^0.6.2",
51-
"gulp-ngmin": "^0.2.0",
52-
"utile": "~0.2.1",
53-
"nodemon": "^1.0.17",
54-
"run-sequence": "^0.3.6",
55-
"wiredep": "^1.4.4",<% if(filters.jade) { %>
56-
"gulp-jade": "^0.5.0",<% } %>
57-
"lazypipe": "^0.2.1",<% if(filters.stylus) { %>
58-
"gulp-stylus": "^1.0.0",
59-
"nib": "^1.0.2",<% } %><% if(filters.sass) { %>
60-
"gulp-ruby-sass": "^0.4.3",<% } %><% if(filters.coffee) { %>
61-
"gulp-coffeelint": "^0.3.2",
62-
"gulp-coffee": "^1.4.2",<% } %><% } else { %>
51+
"gulp-util": "^3.0.5",
52+
"gulp-watch": "^4.2.4",
53+
"utile": "~0.3.0",
54+
"nodemon": "^1.3.7",
55+
"run-sequence": "^1.1.0",
56+
"lazypipe": "^0.2.3",
57+
"wiredep": "^2.2.2",<% if(filters.jade) { %>
58+
"gulp-jade": "^1.0.1",<% } %><% if(filters.stylus) { %>
59+
"gulp-stylus": "^2.0.4",
60+
"nib": "^1.1.0",<% } %><% if(filters.sass) { %>
61+
"gulp-ruby-sass": "^1.0.5",<% } %><% if(filters.coffee) { %>
62+
"gulp-coffeelint": "^0.5.0",
63+
"gulp-coffee": "^2.3.1",<% } %><% } else { %>
6364
"grunt": "~0.4.4",
6465
"grunt-autoprefixer": "~0.7.2",
6566
"grunt-wiredep": "~1.8.0",

‎app/templates/gulpfile.babel.js‎

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,34 +21,35 @@ var yeoman = {
2121

2222
var paths = {
2323
client: {
24-
scripts: [yeoman.app + '/scripts/**/*.<% if(filters.coffee) { %>coffee<% } else { %>js<% } %>'],
25-
styles: [yeoman.app + '/styles/**/*.<% if(filters.stylus) { %>styl<% } else if (filters.sass) { %>scss<% } else { %>css<% } %>'],
26-
test: ['test/client/**/*.<% if(filters.coffee) { %>coffee<% } else { %>js<% } %>'],
24+
scripts: [
25+
'client/**/*.<% if(filters.coffee) { %>coffee<% } else { %>js<% } %>',
26+
'!client/bower_components/**/*.js'
27+
],
28+
styles: ['client/**/*.<% if(filters.stylus) { %>styl<% } else if (filters.sass) { %>scss<% } else { %>css<% } %>'],
29+
test: ['client/**/*.spec.<% if(filters.coffee) { %>coffee<% } else { %>js<% } %>'],
2730
testRequire: [
28-
yeoman.app + '/bower_components/angular/angular.js',
29-
yeoman.app + '/bower_components/angular-mocks/angular-mocks.js',
30-
yeoman.app + '/bower_components/angular-resource/angular-resource.js',
31-
yeoman.app + '/bower_components/angular-cookies/angular-cookies.js',
32-
yeoman.app + '/bower_components/angular-sanitize/angular-sanitize.js',
33-
yeoman.app + '/bower_components/angular-route/angular-route.js',<% if(filters.coffee) { %>
34-
'test/mock/**/*.coffee',
35-
'test/spec/**/*.coffee'<% } else { %>
36-
'test/mock/**/*.js',
37-
'test/spec/**/*.js'<% } %>
31+
'client/bower_components/angular/angular.js',
32+
'client/bower_components/angular-mocks/angular-mocks.js',
33+
'client/bower_components/angular-resource/angular-resource.js',
34+
'client/bower_components/angular-cookies/angular-cookies.js',
35+
'client/bower_components/angular-sanitize/angular-sanitize.js',
36+
'client/bower_components/angular-route/angular-route.js',<% if(filters.coffee) { %>
37+
'client/**/*.spec.coffee'<% } else { %>
38+
'client/**/*.spec.js'<% } %>
3839
]
3940
},
4041
server: {<% if(filters.coffee) { %>
41-
scripts: ['lib/**/*.coffee'],
42-
test: ['test/server/**/*.coffee'],<% } else { %>
43-
scripts: ['lib/**/*.js'],
44-
test: ['test/server/**/*.js'],<% } %>
42+
scripts: ['server/**/*.coffee'],
43+
test: ['server/**/*.spec.coffee'],<% } else { %>
44+
scripts: ['server/**/*.js'],
45+
test: ['server/**/*.spec.js'],<% } %>
4546

4647
},
4748
views: {<% if(filters.jade) { %>
48-
main: yeoman.app + '/views/index.jade',
49-
files: [yeoman.app + '/views/**/*.jade']<% } else {%>
50-
main: yeoman.app + '/views/index.html',
51-
files: [yeoman.app + '/views/**/*.html']<% } %>
49+
main: 'client/app/index.jade',
50+
files: ['client/app/**/*.jade']<% } else {%>
51+
main: 'client/app/index.html',
52+
files: ['client/app/**/*.html']<% } %>
5253
},
5354
karma: 'karma.conf.js'
5455
};
@@ -101,10 +102,7 @@ var styles = lazypipe()<% if(filters.stylus) { %>
101102
use: [nib()],
102103
errors: true
103104
})<% } %><% if(filters.sass) { %>
104-
.pipe(plugins.rubySass, {
105-
style: 'expanded',
106-
precision: 10
107-
})<% } %>
105+
.pipe(plugins.rubySass, paths.client.styles)<% } %>
108106
.pipe(plugins.autoprefixer, 'last 1 version')
109107
.pipe(gulp.dest, '.tmp/styles');
110108

@@ -113,8 +111,7 @@ var styles = lazypipe()<% if(filters.stylus) { %>
113111
///////////
114112

115113
gulp.task('styles', function () {
116-
return gulp.src(paths.client.styles)
117-
.pipe(styles());
114+
return styles();
118115
});<% if(filters.coffee) { %>
119116

120117
gulp.task('coffee', function() {
@@ -142,31 +139,31 @@ gulp.task('start:client', [<% if(filters.coffee) { %>'coffee', <% } %>'styles'],
142139

143140
gulp.task('start:server', function () {
144141
process.env.NODE_ENV = process.env.NODE_ENV || 'development';
145-
config = require('./lib/config/config');
146-
nodemon('-w lib server.js')
142+
config = require('./server/config/environment');
143+
nodemon('-w lib server/app.js')
147144
.on('log', onServerLog);
148145
});
149146

150147
gulp.task('watch', function () {
151148
var testFiles = paths.client.test.concat(paths.server.test);
152149

153-
plugins.watch({glob: paths.client.styles})
150+
plugins.watch(paths.client.styles)
154151
.pipe(plugins.plumber())
155152
.pipe(styles())
156153
.pipe(plugins.livereload());
157154

158-
plugins.watch({glob: paths.views.files})
155+
plugins.watch(paths.views.files)
159156
.pipe(plugins.plumber())
160157
.pipe(plugins.livereload());
161158

162-
plugins.watch({glob: paths.client.scripts})
159+
plugins.watch(paths.client.scripts)
163160
.pipe(plugins.plumber())
164161
.pipe(lintScripts())<% if(filters.coffee) { %>
165162
.pipe(plugins.coffee({bare: true}).on('error', plugins.util.log))
166163
.pipe(gulp.dest('.tmp/scripts'))<% } %>
167164
.pipe(plugins.livereload());
168165

169-
plugins.watch({glob: paths.server.scripts.concat(testFiles)})
166+
plugins.watch(paths.server.scripts.concat(testFiles))
170167
.pipe(plugins.plumber())
171168
.pipe(lintScripts());
172169

0 commit comments

Comments
 (0)