Skip to content

Commit

Permalink
updated scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
jonniespratley committed Dec 17, 2014
1 parent 1dec6d6 commit a142594
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 17 deletions.
29 changes: 16 additions & 13 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,6 @@ module.exports = function (grunt) {

// Watches files for changes and runs tasks based on the changed files
watch: {
coffee: {
files: ['<%= yeoman.app %>/scripts/{,*/}*.{coffee,litcoffee,coffee.md}'],
tasks: ['newer:coffee:dist']
},
coffeeTest: {
files: ['test/spec/{,**/}*.{coffee,litcoffee,coffee.md}'],
tasks: ['coffee:test', 'newer:coffee:test', 'karma:unit']
},

compass: {
files: ['<%= yeoman.app %>/styles/{,*/}*.{scss,sass}'],
tasks: ['compass:server', 'autoprefixer']
Expand All @@ -69,6 +60,10 @@ module.exports = function (grunt) {
files: ['<%= yeoman.app %>/styles/{,*/}*.css'],
tasks: ['newer:copy:styles', 'autoprefixer']
},
scripts: {
files: ['<%= yeoman.app %>/scripts/{,**/}*.js'],
tasks: ['jshint:app']
},
gruntfile: {
files: ['Gruntfile.js']
},
Expand All @@ -77,9 +72,9 @@ module.exports = function (grunt) {
livereload: '<%= connect.options.livereload %>'
},
files: [
// '<%= yeoman.app %>/{,**/}*.html',
'.tmp/styles/{,*/}*.css',
'<%= yeoman.app %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}'
'<%= yeoman.app %>/*.html',
'<%= yeoman.app %>/views/*.html',
'.tmp/styles/{,*/}*.css'
],
tasks: ['ngtemplates']
}
Expand All @@ -94,7 +89,7 @@ module.exports = function (grunt) {
livereload: 35729,
base: ['.tmp', '<%= yeoman.app %>'],
onCreateServer: function(server, connect, options) {
console.warn('onCreateServer', options);
grunt.util.log('onCreateServer', options);
}
},
livereload: {
Expand Down Expand Up @@ -152,6 +147,10 @@ module.exports = function (grunt) {
},
all: [
//'Gruntfile.js'
],
app: [
'<%= yeoman.app %>/scripts',
'!<%= yeoman.app %>/scripts/libs'
]
},

Expand Down Expand Up @@ -435,6 +434,10 @@ module.exports = function (grunt) {

// Run some tasks in parallel to speed up the build process
concurrent: {
options: {
limit: 10,
logConcurrentOutput: true
},
server: [
'coffee:dist',
// 'compass:server',
Expand Down
Binary file modified app/.DS_Store
Binary file not shown.
8 changes: 4 additions & 4 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<script src="bower_components/angular-ui-utils/ui-utils.js"></script>
<script src="bower_components/angular-strap/dist/angular-strap.min.js"></script>
<script src="bower_components/angular-strap/dist/angular-strap.tpl.min.js"></script>

<script src="bower_components/angular-animate/angular-animate.js"></script>
<script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/angular-resource/angular-resource.js"></script>
Expand All @@ -109,9 +109,9 @@
<!-- endbower -->
<!-- endbuild -->
<!-- Dependent libs -->
<script src="scripts/libs/parse-1.2.17.min.js"></script>
<script src="scripts/libs/md5.js"></script>
<script src="scripts/libs/markdown.js"></script>
<script src="libs/parse-1.2.17.min.js"></script>
<script src="libs/md5.js"></script>
<script src="libs/markdown.js"></script>



Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit a142594

Please sign in to comment.