Skip to content

Commit 51d0f05

Browse files
committed
chore(gulp): update gulp-inject ^1.3.1 -> ^3.0.0
it now automatically creates less & sass tags.
1 parent f7dcd34 commit 51d0f05

File tree

6 files changed

+17
-15
lines changed

6 files changed

+17
-15
lines changed

app/templates/Gruntfile(grunt).js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -753,8 +753,8 @@ module.exports = function (grunt) {
753753
filePath = filePath.replace('/' + yoClient + '/components/', '../components/');
754754
return '@import \'' + filePath + '\';';
755755
},
756-
starttag: '// injector',
757-
endtag: '// endinjector'
756+
starttag: '/* inject:styl */',
757+
endtag: '/* endinject */'
758758
},
759759
files: {
760760
'<%%= yeoman.client %>/app/app.styl': [
@@ -773,8 +773,8 @@ module.exports = function (grunt) {
773773
filePath = filePath.replace('/' + yoClient + '/components/', '../components/');
774774
return '@import \'' + filePath + '\';';
775775
},
776-
starttag: '// injector',
777-
endtag: '// endinjector'
776+
starttag: '/* inject:scss */',
777+
endtag: '/* endinject */'
778778
},
779779
files: {
780780
'<%%= yeoman.client %>/app/app.scss': [
@@ -793,8 +793,8 @@ module.exports = function (grunt) {
793793
filePath = filePath.replace('/' + yoClient + '/components/', '../components/');
794794
return '@import \'' + filePath + '\';';
795795
},
796-
starttag: '// injector',
797-
endtag: '// endinjector'
796+
starttag: '/* inject:less */',
797+
endtag: '/* endinject */'
798798
},
799799
files: {
800800
'<%%= yeoman.client %>/app/app.less': [

app/templates/_package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"gulp-env": "^0.2.0",
5858
"gulp-filter": "^4.0.0",
5959
"gulp-imagemin": "^2.2.1",
60-
"gulp-inject": "^1.3.1",
60+
"gulp-inject": "^3.0.0",
6161
"gulp-istanbul": "~0.10.3",
6262
"gulp-istanbul-enforcer": "^1.0.3",
6363
"gulp-jscs": "^3.0.2",

app/templates/client/app/app(less).less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424
}
2525
<% } %>
26-
// injector
26+
/* inject:less */
2727
@import 'admin/admin.less';
2828
@import 'main/main.less';
29-
// endinjector
29+
/* endinject */

app/templates/client/app/app(sass).scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424
<% } %>
2525
// Component styles are injected through grunt
26-
// injector
26+
/* inject:scss */
2727
@import 'admin/admin.scss';
2828
@import 'main/main.scss';
29-
// endinjector
29+
/* endinject */

app/templates/client/app/app(stylus).styl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
max-width 730px
4545
<% } %>
4646
// Component styles are injected through grunt
47-
// injector
47+
/* inject:styl */
4848
@import "admin/admin"
4949
@import "main/main"
50-
// endinjector
50+
/* endinject */

app/templates/gulpfile.babel(gulp).js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,10 @@ gulp.task('inject:<%= styleExt %>', () => {
262262
gulp.src(_.union(paths.client.styles, ['!' + paths.client.mainStyle]), {read: false})
263263
.pipe(plugins.sort()),
264264
{
265-
starttag: '// injector',
266-
endtag: '// endinjector',
265+
<%_ if(filters.stylus) { _%>
266+
starttag: '/* inject:styl */',
267+
endtag: '/* endinject */',
268+
<%_ } _%>
267269
transform: (filepath) => {
268270
let newPath = filepath
269271
.replace(`/${clientPath}/app/`, '')

0 commit comments

Comments
 (0)