Skip to content

Commit b052b62

Browse files
committed
Merged branch grunt into master
2 parents 24863a2 + b22be65 commit b052b62

File tree

7 files changed

+1416
-27
lines changed

7 files changed

+1416
-27
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
*.pyc
44
*.pyo
55
*.db
6+
node_modules/*
7+
bower_components/*
8+
npm-debug.log

Gruntfile.js

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
/*global module:false*/
2+
module.exports = function(grunt) {
3+
4+
// Project configuration.
5+
grunt.initConfig({
6+
// Metadata.
7+
pkg: grunt.file.readJSON('package.json'),
8+
banner: '/*! <%= pkg.name %> - v<%= pkg.version %> - ' +
9+
'<%= grunt.template.today("yyyy-mm-dd") %>\n' +
10+
'<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
11+
'* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.authors.join(", ") %>;' +
12+
' Licensed <%= pkg.license %> */\n',
13+
// Task configuration.
14+
concat: {
15+
options: {
16+
banner: '<%= banner %>',
17+
stripBanners: true
18+
},
19+
dist: {
20+
src: ['<%= pkg.main %>'],
21+
dest: 'dist/<%= pkg.name %>.js'
22+
}
23+
},
24+
uglify: {
25+
options: {
26+
banner: '<%= banner %>'
27+
},
28+
dist: {
29+
src: 'dist/<%= pkg.name %>.js',
30+
dest: 'dist/<%= pkg.name %>.min.js'
31+
}
32+
},
33+
jshint: {
34+
options: {
35+
curly: true,
36+
eqeqeq: true,
37+
immed: true,
38+
latedef: true,
39+
newcap: true,
40+
noarg: true,
41+
sub: true,
42+
undef: true,
43+
unused: true,
44+
boss: true,
45+
eqnull: true,
46+
browser: true,
47+
globals: {}
48+
},
49+
all: ['Gruntfile.js']
50+
},
51+
qunit: {
52+
files: ['test/**/*.html']
53+
},
54+
watch: {
55+
gruntfile: {
56+
files: '<%= jshint.gruntfile.src %>',
57+
tasks: ['jshint:gruntfile']
58+
},
59+
lib_test: {
60+
files: '<%= jshint.lib_test.src %>',
61+
tasks: ['jshint:lib_test', 'qunit']
62+
}
63+
},
64+
bower_version: {
65+
update: []
66+
}
67+
});
68+
69+
// These plugins provide necessary tasks.
70+
grunt.loadNpmTasks('grunt-contrib-concat');
71+
grunt.loadNpmTasks('grunt-contrib-uglify');
72+
grunt.loadNpmTasks('grunt-contrib-qunit');
73+
grunt.loadNpmTasks('grunt-contrib-jshint');
74+
grunt.loadNpmTasks('grunt-contrib-watch');
75+
grunt.loadNpmTasks('grunt-bower-version');
76+
77+
78+
// Default task.
79+
grunt.registerTask('default', ['concat', 'uglify', 'bower_version']);
80+
81+
};

bower.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "mule-uploader",
33
"main": "mule-uploader.js",
4-
"version": "1.1.3",
4+
"version": "1.2.0",
55
"homepage": "https://github.com/cinely/mule-uploader",
66
"authors": [
77
"gabipurcaru"
@@ -26,5 +26,8 @@
2626
"components",
2727
"test",
2828
"tests"
29-
]
30-
}
29+
],
30+
"dependencies": {
31+
"crypto-js": "^3.1.6"
32+
}
33+
}

0 commit comments

Comments
 (0)