Skip to content
This repository was archived by the owner on May 28, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
bower_components
node_modules
coverage
vendor/closure-compiler*
12 changes: 10 additions & 2 deletions .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,13 @@
"-W053": true,
"-W086": true,

"predef": ["define", "environment", "Packages", "Benchmark", "_", "phantom"]
}
"globals": {
"define": false,
"environment": false,
"Packages": false,
"phantom": false,

"Benchmark": true,
"_": true
}
}
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ before_install:
- "[ $BIN == 'ringo' ] && sudo ln -s /opt/ringojs-0.9/bin/ringo /usr/local/bin/ringo && sudo chmod +x /usr/local/bin/ringo || true"
install:
- "npm install"
- "npm install -g bower"
- "bower install"
script:
- "node build.js"
- "cd ./test"
Expand Down
16 changes: 10 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Please use the [GitHub issue tracker](https://github.com/bestiejs/json3/issues)

## Pull Requests ##

If you'd like to contribute a feature or bug fix, you can [fork](http://help.github.com/fork-a-repo/) JSON 3, commit your changes, and [send a pull request](http://help.github.com/send-pull-requests/) **against the `dev` branch**. Please make sure to update the unit tests in the `test` directory as well.
If you'd like to contribute a feature or bug fix, you can [fork](http://help.github.com/fork-a-repo/) JSON 3, commit your changes, and [send a pull request](http://help.github.com/send-pull-requests/) **against the `master` branch**. Please make sure to update the unit tests in the `test` directory as well.

**Please do not send pull requests against `gh-pages`**; this branch is reserved for releases, builder updates, and project page changes.

Expand Down Expand Up @@ -82,12 +82,16 @@ To add a test:
t.done(15);
});

### Project Page and Minification ###
### Builds ###

The builder (`build.js`) is a Node script that:

* Regenerates the [GitHub project page](https://bestiejs.github.io/json3/) from `README.md`...
* Downloads the [Closure Compiler](https://developers.google.com/closure/compiler/) if it's not already on your system, and...
* Minifies `lib/json3.js`.
* Regenerates the [GitHub project pages](https://bestiejs.github.io/json3/)...
* Builds `lib/json3.js` using [webpack](https://webpack.github.io/), and...
* Minifies `lib/json3.js` using the [Closure Compiler](https://developers.google.com/closure/compiler/).

You don't need to run the builder before submitting your pull request; we'll do this before each release.
You'll need [Node](https://nodejs.org/) (or [io.js](https://iojs.org)), [npm](https://docs.npmjs.com/getting-started/installing-node), and [Bower](http://bower.io/) installed to run the build script. To update the development dependencies and build JSON 3:

$ npm install
$ bower install
$ node build
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@ Check out a working copy of the JSON 3 source code with [Git](http://git-scm.com

$ git clone git://github.com/bestiejs/json3.git
$ cd json3
$ npm install
$ bower install

We ♥ bug reports, suggestions, questions, and pull requests! Please see our [contribution guidelines](https://bestiejs.github.io/json3/contribute.html) if you'd like to contribute.

Expand Down
5 changes: 4 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,8 @@
"authors": [
"Kit Cambridge <github@kitcambridge.be>"
],
"license": "MIT"
"license": "MIT",
"devDependencies": {
"closure-compiler": "https://dl.google.com/closure-compiler/compiler-latest.tar.gz"
}
}
Loading