mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-08-17 16:21:06 +02:00
Grunt.js and package.json change so we can build, thanks a ton jeffrey! Issue #89
This commit is contained in:
parent
b26dc7e0bf
commit
532439f821
3 changed files with 7 additions and 11 deletions
|
@ -83,6 +83,7 @@ Also huge shoutout for everyone who has put up a pull request that was pulled:
|
||||||
* Don Kirkby x2
|
* Don Kirkby x2
|
||||||
* "scientific-coder"
|
* "scientific-coder"
|
||||||
* "ace-coder"
|
* "ace-coder"
|
||||||
|
* Jeffrey Fisher
|
||||||
|
|
||||||
Or reported an issue that was successfully closed!
|
Or reported an issue that was successfully closed!
|
||||||
|
|
||||||
|
|
13
grunt.js
13
grunt.js
|
@ -94,12 +94,6 @@ module.exports = function(grunt) {
|
||||||
src: ['build/bundle.min.js', 'src/style/main.css'],
|
src: ['build/bundle.min.js', 'src/style/main.css'],
|
||||||
dest: 'build/'
|
dest: 'build/'
|
||||||
},
|
},
|
||||||
jasmine_node: {
|
|
||||||
specNameMatcher: 'spec', // load only specs containing specNameMatcher
|
|
||||||
projectRoot: '.',
|
|
||||||
forceExit: true,
|
|
||||||
verbose: true
|
|
||||||
},
|
|
||||||
watch: {
|
watch: {
|
||||||
files: '<config:lint.files>',
|
files: '<config:lint.files>',
|
||||||
tasks: 'watching'
|
tasks: 'watching'
|
||||||
|
@ -116,6 +110,9 @@ module.exports = function(grunt) {
|
||||||
shell: {
|
shell: {
|
||||||
gitAdd: {
|
gitAdd: {
|
||||||
command: 'git add build/'
|
command: 'git add build/'
|
||||||
|
},
|
||||||
|
test: {
|
||||||
|
command: 'jasmine-node spec/git.spec.js'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
jshint: {
|
jshint: {
|
||||||
|
@ -172,17 +169,15 @@ module.exports = function(grunt) {
|
||||||
// all my npm helpers
|
// all my npm helpers
|
||||||
grunt.loadNpmTasks('grunt-jslint');
|
grunt.loadNpmTasks('grunt-jslint');
|
||||||
grunt.loadNpmTasks('grunt-browserify');
|
grunt.loadNpmTasks('grunt-browserify');
|
||||||
grunt.loadNpmTasks('grunt-jasmine-node');
|
|
||||||
grunt.loadNpmTasks('grunt-hash');
|
grunt.loadNpmTasks('grunt-hash');
|
||||||
grunt.loadNpmTasks('grunt-rm');
|
grunt.loadNpmTasks('grunt-rm');
|
||||||
grunt.loadNpmTasks('grunt-shell');
|
grunt.loadNpmTasks('grunt-shell');
|
||||||
|
|
||||||
grunt.registerTask('build', 'rm browserify min hash buildIndex shell lint lintStrings test compliment');
|
grunt.registerTask('build', 'rm browserify min hash buildIndex shell lint lintStrings compliment');
|
||||||
grunt.registerTask('fastBuild', 'rm browserify hash buildIndex');
|
grunt.registerTask('fastBuild', 'rm browserify hash buildIndex');
|
||||||
|
|
||||||
grunt.registerTask('default', 'build');
|
grunt.registerTask('default', 'build');
|
||||||
|
|
||||||
grunt.registerTask('watching', 'fastBuild lint lintStrings');
|
grunt.registerTask('watching', 'fastBuild lint lintStrings');
|
||||||
grunt.registerTask('test', 'jasmine_node');
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -4,12 +4,12 @@
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"grunt": "~0.3.17",
|
"grunt": "~0.3.17",
|
||||||
"jasmine-node": "~1.0.28",
|
"jasmine-node": "~1.0.28",
|
||||||
"grunt-browserify": "~0.1.2",
|
"grunt-browserify": "0.1.1",
|
||||||
"grunt-jslint": "~0.2.2-1",
|
"grunt-jslint": "~0.2.2-1",
|
||||||
"grunt-jasmine-node": "latest",
|
"grunt-jasmine-node": "latest",
|
||||||
"grunt-hash": "latest",
|
"grunt-hash": "latest",
|
||||||
"grunt-rm": "~0.0.3",
|
"grunt-rm": "~0.0.3",
|
||||||
"grunt-shell": "latest",
|
"grunt-shell": "0.1.4",
|
||||||
"prompt": "latest"
|
"prompt": "latest"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue