Skip to content

Commit d84f2ef

Browse files
committed
fix config files
1 parent 1a0dfcd commit d84f2ef

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

Gruntfile.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ module.exports = function (grunt) {
1818
// Define the configuration for all the tasks
1919
grunt.initConfig({
2020

21+
pkg: grunt.file.readJSON('package.json'),
22+
2123
// Project settings
2224
yeoman: {
2325
// configurable paths
@@ -127,7 +129,7 @@ module.exports = function (grunt) {
127129
files: [{
128130
expand: true,
129131
cwd: '<%= yeoman.app %>',
130-
src: ['*.html', 'views/*.html'],
132+
src: ['*.html', 'views/**/*.html'],
131133
dest: '<%= yeoman.dist %>'
132134
}]
133135
}
@@ -276,6 +278,7 @@ module.exports = function (grunt) {
276278
grunt.registerTask('build', [
277279
'clean:dist', // Clears out your .tmp/ and dist/ folders
278280
'useminPrepare', // Looks for those <!-- special blocks --> in your HTML
281+
'concurrent:dist',
279282
'concat', // Task used to concatenate your JS and CSS
280283
'ngmin',
281284
'copy:dist', // Copies files from .tmp/ and app/ into dist/

bower.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
"dependencies": {
55
"json3": "~3.2.4",
66
"es5-shim": "~2.1.0",
7-
"jquery": "~1.10.2",
8-
"jquery-ui": "~1.10.3",
97
"angular": "~1.2.6",
108
"angular-route": "~1.2.6",
119
"angular-animate": "~1.2.6",

karma.conf.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ module.exports = function(config) {
1313
files: [
1414
'app/bower_components/angular/angular.js',
1515
'app/bower_components/angular-mocks/angular-mocks.js',
16-
'app/bower_components/angular-route/angular-route.js',
16+
'app/bower_components/angular-animate/angular-animate.js',
17+
'app/bower_components/angular-cookies/angular-cookies.js',
18+
'app/bower_components/angular-resource/angular-resource.js',
19+
'app/bower_components/angular-touch/angular-touch.js',
20+
'app/bower_components/angular-ui-router/release/angular-ui-router.js',
1721
'app/scripts/*.js',
1822
'app/scripts/**/*.js',
1923
'test/mock/**/*.js',
@@ -48,6 +52,6 @@ module.exports = function(config) {
4852

4953
// Continuous Integration mode
5054
// if true, it capture browsers, run tests and exit
51-
singleRun: true
55+
singleRun: false
5256
});
5357
};

0 commit comments

Comments
 (0)