Skip to content

Commit 3bf65cc

Browse files
committed
fix(inject): using angular sort plugin for injected files
And remove useless style inject. Closes #21.
1 parent 361ebce commit 3bf65cc

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

app/templates/client/index.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
<!-- bower:css -->
1717
<!-- endinject -->
1818

19-
<!-- inject:css -->
20-
<!-- endinject -->
19+
<link rel="stylesheet" href="styles/css/app.css">
2120

2221
<!-- endbuild -->
2322

app/templates/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"del": "^1.1.1",
77
"errorhandler": "^1.3.3",
88
"gulp": "^3.8.10",
9+
"gulp-angular-filesort": "^1.1.1",
910
"gulp-angular-templatecache": "^1.5.0",
1011
"gulp-autoprefixer": "^2.1.0",
1112
"gulp-bump": "^0.3.0",

app/templates/tasks/config/#filesToInject.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ module.exports = [
99
'client/directives/**/*.js', '!client/directives/**/*.spec.js',
1010
'client/filters/**/*.js', '!client/filters/**/*.spec.js',
1111
'client/services/**/*.js', '!client/services/**/*.spec.js',
12-
'client/views/**/*.js', '!client/views/**/*.spec.js', '!client/views/**/*.e2e.js',
13-
'client/styles/css/app.css'
12+
'client/views/**/*.js', '!client/views/**/*.spec.js', '!client/views/**/*.e2e.js'
1413
];

app/templates/tasks/inject.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,21 @@
66

77
var gulp = require('gulp');
88
var bowerFiles = require('main-bower-files');
9+
var fileSort = require('gulp-angular-filesort');
910
var inject = require('gulp-inject');
1011

1112
var toInject = require('./config/filesToInject');
1213
var toExclude = require('./config/bowerFilesToExclude');
1314

1415
module.exports = function () {
15-
var sources = gulp.src(toInject, { read: false });
16-
1716
return gulp.src('client/index.html')
1817
.pipe(inject(gulp.src(bowerFiles(), { read: false }), {
1918
name: 'bower',
2019
relative: 'true',
2120
ignorePath: toExclude
2221
}))
23-
.pipe(inject(sources, { relative: true }))
22+
.pipe(inject(
23+
gulp.src(toInject).pipe(fileSort()), { relative: true }
24+
))
2425
.pipe(gulp.dest('client'));
2526
};

0 commit comments

Comments
 (0)