Skip to content
This repository was archived by the owner on May 28, 2019. It is now read-only.

Commit 7e90864

Browse files
author
Kit Cambridge
committed
Use webpack for modular builds. Closes #75.
* Add `makeRunInContext`. * Modularize `build.js`. * Use Bower to download the Closure Compiler.
1 parent b42be9f commit 7e90864

27 files changed

+2018
-925
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1+
bower_components
12
node_modules
23
coverage
3-
vendor/closure-compiler*

.jshintrc

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,13 @@
6363
"-W053": true,
6464
"-W086": true,
6565

66-
"predef": ["define", "environment", "Packages", "Benchmark", "_", "phantom"]
67-
}
66+
"globals": {
67+
"define": false,
68+
"environment": false,
69+
"Packages": false,
70+
"phantom": false,
71+
72+
"Benchmark": true,
73+
"_": true
74+
}
75+
}

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Please use the [GitHub issue tracker](https://github.com/bestiejs/json3/issues)
66

77
## Pull Requests ##
88

9-
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.
9+
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.
1010

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

@@ -86,8 +86,8 @@ To add a test:
8686

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

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

9393
You don't need to run the builder before submitting your pull request; we'll do this before each release.

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ Check out a working copy of the JSON 3 source code with [Git](http://git-scm.com
150150

151151
$ git clone git://github.com/bestiejs/json3.git
152152
$ cd json3
153+
$ npm install
154+
$ bower install
153155

154156
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.
155157

bower.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,8 @@
3434
"authors": [
3535
"Kit Cambridge <[email protected]>"
3636
],
37-
"license": "MIT"
37+
"license": "MIT",
38+
"devDependencies": {
39+
"closure-compiler": "https://dl.google.com/closure-compiler/compiler-latest.tar.gz"
40+
}
3841
}

0 commit comments

Comments
 (0)