Skip to content

Commit cc94aa6

Browse files
committed
Move generated browser files to root
1 parent 3a7c7e0 commit cc94aa6

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
/_build
33
/static/bootstrap
44
/static/jszip
5-
/browser-demo/bundle.js
6-
/browser-demo/bundle.min.js
5+
/mammoth.browser.js
6+
/mammoth.browser.min.js

browser-demo/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h3>Messages</h3>
2525
</div>
2626
</div>
2727

28-
<script src="bundle.js"></script>
28+
<script src="../mammoth.browser.js"></script>
2929
<script src="demo.js"></script>
3030
</body>
3131
</html>

makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
.PHONY: test browser-demo/bundle.js
1+
.PHONY: test mammoth.browser.js
22

33
test:
44
npm test
55

6-
setup: static/bootstrap static/jszip browser-demo/bundle.min.js
6+
setup: static/bootstrap static/jszip mammoth.browser.min.js
77

88
static/bootstrap:
99
mkdir -p _build/bootstrap
@@ -17,14 +17,14 @@ static/jszip:
1717
mkdir -p static/jszip
1818
cp _build/jszip/*.js static/jszip
1919

20-
browser-demo/bundle.js:
21-
rm $@
20+
mammoth.browser.js:
21+
rm $@ -f
2222
cat static/jszip/jszip.js >> $@
2323
cat static/jszip/jszip-deflate.js >> $@
2424
cat static/jszip/jszip-inflate.js >> $@
2525
cat static/jszip/jszip-load.js >> $@
2626
node_modules/.bin/node-license-sniffer . --recurse --js-comment >> $@
2727
node_modules/.bin/browserify lib/index.js --standalone mammoth >> $@
2828

29-
browser-demo/bundle.min.js: browser-demo/bundle.js
30-
node_modules/.bin/uglifyjs browser-demo/bundle.js -c > $@
29+
mammoth.browser.min.js: mammoth.browser.js
30+
node_modules/.bin/uglifyjs mammoth.browser.js -c > $@

package.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,16 @@
2929
},
3030
"devDependencies": {
3131
"mocha": "~1.8",
32-
"browserify": "~3.18.0",
32+
"browserify": "~3.33.0",
3333
"license-sniffer": "~0.1.0",
3434
"duck": "~0.1.11",
3535
"uglify-js": "~2.4.8",
36-
"temp": "~0.7.0"
36+
"temp": "~0.7.0",
37+
"q": "~1.0.1"
3738
},
3839
"browser": {
39-
"./lib/unzip.js": "./browser/unzip.js"
40+
"./lib/unzip.js": "./browser/unzip.js",
41+
"./lib/promises.js": "./browser/promises.js"
4042
},
4143
"bin": {
4244
"mammoth": "bin/mammoth"

0 commit comments

Comments
 (0)