Skip to content

Commit 863fa6b

Browse files
added grunt-contrib-watch and grunt-htm2js to build
1 parent a0cdb22 commit 863fa6b

File tree

6 files changed

+702
-2423
lines changed

6 files changed

+702
-2423
lines changed

.bowerrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"directory": "vendor"
3+
}

Gruntfile.js

+26-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ module.exports = function(grunt) {
2424
files: [
2525
'vendor/jquery/jquery-2.1.0.min.js', // jQuery is included for the purposes of easier DOM selection when testing directives.
2626
'vendor/angular/angular.js',
27-
'vendor/angular/angular-mocks.js',
27+
'vendor/angular-mocks/angular-mocks.js',
28+
'vendor/angular-ui-router/release/angular-ui-router.js',
29+
'tmp/templates.js',
2830
'src/angularUtils.js',
2931
'src/filters/**/*.js',
3032
'src/filters/**/*.spec.js',
@@ -43,13 +45,34 @@ module.exports = function(grunt) {
4345
'PhantomJS'
4446
]
4547
}
46-
}
48+
},
49+
50+
watch: {
51+
jssrc: {
52+
files: [
53+
'src/**/*.js'
54+
],
55+
tasks: [ 'default' ]
56+
}
57+
},
58+
59+
html2js: {
60+
options: {
61+
// custom options, see below
62+
},
63+
main: {
64+
src: ['src/**/*.tpl.html'],
65+
dest: 'tmp/templates.js'
66+
},
67+
},
4768

4869
});
4970

5071
grunt.loadNpmTasks('grunt-karma');
5172
grunt.loadNpmTasks('grunt-contrib-jshint');
73+
grunt.loadNpmTasks('grunt-contrib-watch');
74+
grunt.loadNpmTasks('grunt-html2js');
5275

53-
grunt.registerTask('default', ['jshint', 'karma']);
76+
grunt.registerTask('default', ['jshint', 'html2js', 'karma']);
5477

5578
};

karma.conf.js

+9-10
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,21 @@ module.exports = function(config) {
1515

1616
// list of files / patterns to load in the browser
1717
files: [
18+
'vendor/jquery/jquery-2.1.0.min.js', // jQuery is included for the purposes of easier DOM selection when testing directives.
1819
'vendor/angular/angular.js',
19-
'vendor/angular-bootstrap/ui-bootstrap-tpls.min.js',
20-
'vendor/placeholders/angular-placeholders-0.0.1-SNAPSHOT.min.js',
21-
'vendor/angular-ui-router/release/angular-ui-router.js',
22-
'vendor/angular-ui-utils/modules/route/route.js',
23-
'build/templates-app.js',
24-
'build/templates-common.js',
25-
'vendor/angular-mocks/angular-mocks.js',
26-
27-
'src/**/*.js'
20+
'vendor/angular/angular-mocks.js',
21+
'src/angularUtils.js',
22+
'src/filters/**/*.js',
23+
'src/filters/**/*.spec.js',
24+
'src/directives/**/*.js',
25+
'src/directives/**/*.spec.js',
26+
'src/services/**/*.js',
27+
'src/services/**/*.spec.js'
2828
],
2929

3030

3131
// list of files to exclude
3232
exclude: [
33-
'src/e2e/**/*.js'
3433
],
3534

3635

package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
"karma-phantomjs-launcher": "~0.1.1",
1919
"karma": "~0.10.9",
2020
"grunt-karma": "~0.6.2",
21-
"grunt-contrib-jshint": "~0.8.0"
21+
"grunt-contrib-jshint": "~0.8.0",
22+
"bower": "^1.3.1",
23+
"grunt-contrib-watch": "^0.6.1",
24+
"grunt-html2js": "^0.2.4"
2225
}
2326
}

0 commit comments

Comments
 (0)