Merge branch 'megawac-browserify' into develop

Conflicts:
	README.md
This commit is contained in:
Jürg Lehni 2015-03-08 17:29:28 +01:00
commit 6fd74832dd
2 changed files with 4 additions and 1 deletions

View file

@ -131,7 +131,7 @@ In order to minify the resulting built versions, you can run the `minify.sh` scr
cd build
./minify.sh
### Editing and Running Directly from Separate Source Files During Development
### Running Directly from Separate Source Files
As a handy alternative to building the library after each change to try it out in your scripts, there is a helper script `src/load.js` that loads the library directly from all the separate source files in the `src` folder. The shell script `load.sh` in the `build` folder produces the `paper-full.js` and `paper-node.js` files in `dist` as symbolic links to `src/load.js`. This means you can switch between loading from sources and loading a built library simply by running `build.sh` or `load.sh` inside the `build` folder.

View file

@ -13,9 +13,12 @@
"Jonathan Puckey <jonathan@studiomoniker.com> (http://studiomoniker.com)"
],
"main": "dist/paper-node.js",
"browser": "dist/paper-full.js",
"files": [
"AUTHORS.md",
"dist/paper-node.js",
"dist/paper-full.js",
"dist/paper-core.js",
"examples/Node.js",
"LICENSE.txt",
"README.md"