Skip to content

Commit

Permalink
Merge branch 'feature/single-release-build' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
evanvosberg committed Mar 21, 2015
2 parents b0e3f98 + 4ae7566 commit f6b1e59
Show file tree
Hide file tree
Showing 129 changed files with 558 additions and 10,535 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
build
.svn
16 changes: 16 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"bitwise" : false, // Prohibits the use of bitwise operators (not confuse & with &&)
"curly" : true, // Requires to always put curly braces around blocks in loops and conditionals
"eqeqeq" : false, // Prohibits the use of == and != in favor of === and !==
"eqnull" : true, // Suppresses warnings about == null comparisons
"immed" : true, // Requires immediate invocations to be wrapped in parens e.g. `(function () { } ());`
"latedef" : true, // Prohibits the use of a variable before it was defined
"newcap" : false, // Requires to capitalize names of constructor functions
"noarg" : true, // Prohibits the use of arguments.caller and arguments.callee
"strict" : false, // Requires all functions to run in ECMAScript 5's strict mode
"undef" : true, // Require non-global variables to be declared (prevents global leaks)
"asi" : true, // Suppresses warnings about missing semicolons
"globals": {
"CryptoJS": true
}
}
49 changes: 49 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/*jshint node: true*/

'use strict';

var path = require('path');

module.exports = function (grunt) {

// Load all grunt tasks from node_modules, and config from /grunt/config
require('load-grunt-config')(grunt, {
configPath: path.join(process.cwd(), 'grunt/config'),
config: {
pkg: grunt.file.readJSON('package.json'),
meta: {
cwd: '',
cwdAll: '**/*',

source: 'src/',
sourceAll: 'src/**/*',

build: 'build/',
buildAll: 'build/**/*',

test: 'test/',
testAll: 'test/**/*',

npm: 'node_modules/',
npmAll: 'node_modules/**/*'
}
}
});

// Will load the custom tasks
grunt.loadTasks('./grunt/tasks');

grunt.registerTask('build', 'Build a bundle', [
'clean:build',
'modularize:build',
'copy:build',
'update_json:npm',
'update_json:bower'
]);

grunt.registerTask('default', 'Run code checker', [
'jsonlint',
'jshint'
]);

};
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,17 @@ See: https://code.google.com/p/crypto-js
- ```crypto-js/pad-zeropadding```
- ```crypto-js/pad-nopadding```

## Contribution

### Git Flow

The crypto-js project uses [git flow](https://github.com/nvie/gitflow) to manage branches.
Do your changes on the `develop` or even better on a `feature/*` branch. Don't do any changes on the `master` branch.

### Pull request

Target your pull request on `develop` branch. Other pull request won't be accepted.

## License

[The MIT License (MIT)](http://opensource.org/licenses/MIT)
Expand Down
10 changes: 0 additions & 10 deletions build/components/aes-min.js

This file was deleted.

213 changes: 0 additions & 213 deletions build/components/aes.js

This file was deleted.

14 changes: 0 additions & 14 deletions build/components/cipher-core-min.js

This file was deleted.

Loading

0 comments on commit f6b1e59

Please sign in to comment.