diff options
| author | Michael Williamson <mike@zwobble.org> | 2014-03-21 19:49:19 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2014-03-21 19:49:19 +0000 |
| commit | cc94aa68b577c5b79c124e616a63071bcaeed908 (patch) | |
| tree | bdd541d46a35a080c4f7543dec1e5a9fd089b707 | |
| parent | 3a7c7e0339417a7f9339fc7276ec92145c453006 (diff) | |
Move generated browser files to root
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | browser-demo/index.html | 2 | ||||
| -rw-r--r-- | makefile | 12 | ||||
| -rw-r--r-- | package.json | 8 |
4 files changed, 14 insertions, 12 deletions
@@ -2,5 +2,5 @@ /_build /static/bootstrap /static/jszip -/browser-demo/bundle.js -/browser-demo/bundle.min.js +/mammoth.browser.js +/mammoth.browser.min.js diff --git a/browser-demo/index.html b/browser-demo/index.html index 45dcc0a..552da7b 100644 --- a/browser-demo/index.html +++ b/browser-demo/index.html @@ -25,7 +25,7 @@ </div> </div> - <script src="bundle.js"></script> + <script src="../mammoth.browser.js"></script> <script src="demo.js"></script> </body> </html> @@ -1,9 +1,9 @@ -.PHONY: test browser-demo/bundle.js +.PHONY: test mammoth.browser.js test: npm test -setup: static/bootstrap static/jszip browser-demo/bundle.min.js +setup: static/bootstrap static/jszip mammoth.browser.min.js static/bootstrap: mkdir -p _build/bootstrap @@ -17,8 +17,8 @@ static/jszip: mkdir -p static/jszip cp _build/jszip/*.js static/jszip -browser-demo/bundle.js: - rm $@ +mammoth.browser.js: + rm $@ -f cat static/jszip/jszip.js >> $@ cat static/jszip/jszip-deflate.js >> $@ cat static/jszip/jszip-inflate.js >> $@ @@ -26,5 +26,5 @@ browser-demo/bundle.js: node_modules/.bin/node-license-sniffer . --recurse --js-comment >> $@ node_modules/.bin/browserify lib/index.js --standalone mammoth >> $@ -browser-demo/bundle.min.js: browser-demo/bundle.js - node_modules/.bin/uglifyjs browser-demo/bundle.js -c > $@ +mammoth.browser.min.js: mammoth.browser.js + node_modules/.bin/uglifyjs mammoth.browser.js -c > $@ diff --git a/package.json b/package.json index 32a6482..675498e 100644 --- a/package.json +++ b/package.json @@ -29,14 +29,16 @@ }, "devDependencies": { "mocha": "~1.8", - "browserify": "~3.18.0", + "browserify": "~3.33.0", "license-sniffer": "~0.1.0", "duck": "~0.1.11", "uglify-js": "~2.4.8", - "temp": "~0.7.0" + "temp": "~0.7.0", + "q": "~1.0.1" }, "browser": { - "./lib/unzip.js": "./browser/unzip.js" + "./lib/unzip.js": "./browser/unzip.js", + "./lib/promises.js": "./browser/promises.js" }, "bin": { "mammoth": "bin/mammoth" |