summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2014-03-23 10:35:29 +0000
committerMichael Williamson <mike@zwobble.org>2014-03-23 10:35:29 +0000
commit7bc03aea6a7edfd9ca8f7700ca8573e960a58a39 (patch)
tree792054f6036b19c4553ead51745c9c56d6de6f0e
parente0a04c1921a3a873c2dbc458d1962857c39a809c (diff)
Update bluebird for browserify support
-rw-r--r--browser/promises.js7
-rw-r--r--package.json8
2 files changed, 3 insertions, 12 deletions
diff --git a/browser/promises.js b/browser/promises.js
deleted file mode 100644
index 42b1539..0000000
--- a/browser/promises.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var q = require("q");
-
-exports.defer = q.defer;
-exports.when = q.when;
-exports.resolve = q.resolve;
-exports.all = q.all;
-exports.nfcall = q.nfcall;
diff --git a/package.json b/package.json
index 675498e..44188ea 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
"url": "https://github.com/mwilliamson/mammoth.js.git"
},
"dependencies": {
- "bluebird": "~1.0.8",
+ "bluebird": "1.1.0",
"sax": "~0.5.2",
"underscore": "~1.4.4",
"lop": "~0.2.8",
@@ -33,12 +33,10 @@
"license-sniffer": "~0.1.0",
"duck": "~0.1.11",
"uglify-js": "~2.4.8",
- "temp": "~0.7.0",
- "q": "~1.0.1"
+ "temp": "~0.7.0"
},
"browser": {
- "./lib/unzip.js": "./browser/unzip.js",
- "./lib/promises.js": "./browser/promises.js"
+ "./lib/unzip.js": "./browser/unzip.js"
},
"bin": {
"mammoth": "bin/mammoth"