Skip to content

Commit b7002ba

Browse files
committed
chore(Build): Add less files to releases
Closes #3368, Closes #2778
1 parent a0ec813 commit b7002ba

File tree

4 files changed

+28
-17
lines changed

4 files changed

+28
-17
lines changed

grunt/aliases.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = function (grunt, options) {
1010
'default': ['before-test', 'test:single', 'after-test'],
1111

1212
// Build with no testing
13-
'build': ['ngtemplates', 'concat', 'uglify', 'fontello', 'less', 'ngdocs', 'copy'],
13+
'build': ['ngtemplates', 'concat', 'uglify', 'fontello', 'less', 'ngdocs', 'copy:site'],
1414

1515
// Auto-test tasks for development
1616
'autotest:unit': ['karmangular:start'],
@@ -48,10 +48,10 @@ module.exports = function (grunt, options) {
4848
var currentTag = semver.clean( util.getCurrentTag() );
4949

5050
if (currentTag) {
51-
baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'cut-release', 'gh-pages:ui-grid-site', 'update-bower-json', 'gh-pages:bower', 'npm-publish'];
51+
baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'cut-release', 'copy:less_dist', 'gh-pages:ui-grid-site', 'update-bower-json', 'gh-pages:bower', 'npm-publish'];
5252
}
5353
else {
54-
baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'cut-release', 'gh-pages:ui-grid-site'];
54+
baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'cut-release', 'copy:less_dist', 'gh-pages:ui-grid-site'];
5555
}
5656

5757
return baseTasks;

grunt/copy.js

+10
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ module.exports = function ( grunt ) {
1414
dest: '<%= dist %>'
1515
}
1616
]
17+
},
18+
less_dist: {
19+
files: [
20+
{
21+
expand: true,
22+
cwd: 'src/less',
23+
src: '**/*.less',
24+
dest: '<%= dist %>/release/src/less'
25+
}
26+
]
1727
}
1828
};
1929
};

grunt/cut-release.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ module.exports = {
44
keepUnstable: false
55
},
66
dist: {
7-
src: '<%= dist %>/release/*.{js,css,svg,woff,ttf,eot}',
8-
dest: '<%= dist %>/release/'
7+
files: [
8+
{ src: '<%= dist %>/release/*.{js,css,svg,woff,ttf,eot}', dest: '<%= dist %>/release/' }
9+
]
910
}
1011
};

grunt/watch.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,57 +3,57 @@ var util = require('../lib/grunt/utils.js');
33
module.exports = function( grunt, options ){
44
var config = {
55
// list of files to watch, and tasks to run if those files change
6-
6+
77
gruntfile: {
88
files: ['<%= jshint.gruntfile.src %>', 'grunt/*.js'],
99
tasks: ['jshint:gruntfile', 'ngdocs']
1010
},
11-
11+
1212
ngtemplates: {
1313
// files: ['src/templates/**/*.html', 'src/features/*/templates/**/*.html'],
1414
files: '<%= ngtemplates.uigrid.src %>',
1515
tasks: ['ngtemplates']
1616
},
17-
17+
1818
rebuild: {
1919
files: util.testFiles.unit,
2020
tasks: ['jshint:src_test', 'jscs', 'karmangular:run', 'concat', 'uglify', 'ngdocs'],
2121
},
22-
22+
2323
protractor: {
2424
files: ['.tmp/doc-scenarios/**/*.spec.js', 'test/e2e/**/*.spec.js'],
2525
tasks: ['protractor:auto']
2626
},
27-
27+
2828
less: {
2929
files: 'src/**/*.less',
3030
tasks: ['less', 'ngdocs', 'concat:customizer_less']
3131
},
32-
32+
3333
fontello: {
3434
files: 'src/font/config.json',
3535
tasks: ['fontello', 'less']
3636
},
37-
37+
3838
docs: {
3939
files: ['misc/tutorial/**/*.ngdoc', 'misc/api/**/*.ngdoc', 'misc/doc/**'],
4040
tasks: 'ngdocs'
4141
},
42-
42+
4343
copy: {
4444
files: ['misc/site/**'],
45-
tasks: 'copy'
45+
tasks: 'copy:site'
4646
},
47-
47+
4848
livereload: {
4949
options: { livereload: true },
5050
files: ['dist/**/*', 'misc/demo/**/*.html', 'docs/**/*'],
5151
}
5252
};
53-
53+
5454
if (grunt.option('fast') || grunt.option('e2e') === false){
5555
config.protractor.tasks = [];
5656
}
57-
57+
5858
return config;
5959
};

0 commit comments

Comments
 (0)