Skip to content

Commit f6b1e59

Browse files
author
evanvosberg
committed
Merge branch 'feature/single-release-build' into develop
2 parents b0e3f98 + 4ae7566 commit f6b1e59

File tree

129 files changed

+558
-10535
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+558
-10535
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
node_modules
2+
build
23
.svn

‎.jshintrc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"bitwise" : false, // Prohibits the use of bitwise operators (not confuse & with &&)
3+
"curly" : true, // Requires to always put curly braces around blocks in loops and conditionals
4+
"eqeqeq" : false, // Prohibits the use of == and != in favor of === and !==
5+
"eqnull" : true, // Suppresses warnings about == null comparisons
6+
"immed" : true, // Requires immediate invocations to be wrapped in parens e.g. `(function () { } ());`
7+
"latedef" : true, // Prohibits the use of a variable before it was defined
8+
"newcap" : false, // Requires to capitalize names of constructor functions
9+
"noarg" : true, // Prohibits the use of arguments.caller and arguments.callee
10+
"strict" : false, // Requires all functions to run in ECMAScript 5's strict mode
11+
"undef" : true, // Require non-global variables to be declared (prevents global leaks)
12+
"asi" : true, // Suppresses warnings about missing semicolons
13+
"globals": {
14+
"CryptoJS": true
15+
}
16+
}

‎Gruntfile.js

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
/*jshint node: true*/
2+
3+
'use strict';
4+
5+
var path = require('path');
6+
7+
module.exports = function (grunt) {
8+
9+
// Load all grunt tasks from node_modules, and config from /grunt/config
10+
require('load-grunt-config')(grunt, {
11+
configPath: path.join(process.cwd(), 'grunt/config'),
12+
config: {
13+
pkg: grunt.file.readJSON('package.json'),
14+
meta: {
15+
cwd: '',
16+
cwdAll: '**/*',
17+
18+
source: 'src/',
19+
sourceAll: 'src/**/*',
20+
21+
build: 'build/',
22+
buildAll: 'build/**/*',
23+
24+
test: 'test/',
25+
testAll: 'test/**/*',
26+
27+
npm: 'node_modules/',
28+
npmAll: 'node_modules/**/*'
29+
}
30+
}
31+
});
32+
33+
// Will load the custom tasks
34+
grunt.loadTasks('./grunt/tasks');
35+
36+
grunt.registerTask('build', 'Build a bundle', [
37+
'clean:build',
38+
'modularize:build',
39+
'copy:build',
40+
'update_json:npm',
41+
'update_json:bower'
42+
]);
43+
44+
grunt.registerTask('default', 'Run code checker', [
45+
'jsonlint',
46+
'jshint'
47+
]);
48+
49+
};

‎README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,17 @@ See: https://code.google.com/p/crypto-js
122122
- ```crypto-js/pad-zeropadding```
123123
- ```crypto-js/pad-nopadding```
124124

125+
## Contribution
126+
127+
### Git Flow
128+
129+
The crypto-js project uses [git flow](https://github.com/nvie/gitflow) to manage branches.
130+
Do your changes on the `develop` or even better on a `feature/*` branch. Don't do any changes on the `master` branch.
131+
132+
### Pull request
133+
134+
Target your pull request on `develop` branch. Other pull request won't be accepted.
135+
125136
## License
126137

127138
[The MIT License (MIT)](http://opensource.org/licenses/MIT)

‎build/components/aes-min.js

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎build/components/aes.js

Lines changed: 0 additions & 213 deletions
This file was deleted.

‎build/components/cipher-core-min.js

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)