Merge pull request #86 from bemusic/bluebird

use bluebird instead of prfun
bemusic · Feb 4, 2015 · 8f91242 · 8f91242
2 parents 18265a0 + a0a5ea3
commit 8f91242
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -1,5 +1,6 @@
 
 require('6to5/register')
-require('prfun')
+global.Promise = require('bluebird')
+
 require('glob').sync('./tasks/*.js').forEach(function(file) { require(file) })
 
diff --git a/package.json b/package.json
@@ -71,13 +71,13 @@
   },
   "dependencies": {
     "audio-context": "^0.1.0",
+    "bluebird": "^2.9.6",
     "bms": "^0.2.0",
     "co": "~4.1.0",
     "debug": "^2.1.1",
     "jquery": "^2.1.3",
     "keytime": "^0.1.0",
     "pixi.js": "^2.2.3",
-    "prfun": "^1.0.2",
     "ramda": "^0.9.1"
   }
 }
diff --git a/src/polyfill/index.js b/src/polyfill/index.js
@@ -1,3 +1,5 @@
 
 import '6to5/polyfill'
-import 'prfun'
+import Bluebird from 'bluebird'
+
+global.Promise = Bluebird
diff --git a/tasks/support/jscs.js b/tasks/support/jscs.js
@@ -16,7 +16,7 @@ function jscs() {
       file.jscs = result
       return file
     })
-    .nodify(callback)
+    .nodeify(callback)
   })
 }