Use when instead of es6-promise

Fixes remix-run#194
heydemo · Aug 30, 2014 · a85267a · a85267a
1 parent 3da6013
commit a85267a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/modules/components/Routes.js b/modules/components/Routes.js
@@ -1,7 +1,7 @@
 var React = require('react');
 var warning = require('react/lib/warning');
 var copyProperties = require('react/lib/copyProperties');
-var Promise = require('es6-promise').Promise;
+var Promise = require('when/lib/Promise');
 var LocationActions = require('../actions/LocationActions');
 var Route = require('../components/Route');
 var Path = require('../helpers/Path');

diff --git a/modules/helpers/resolveAsyncState.js b/modules/helpers/resolveAsyncState.js
@@ -1,4 +1,4 @@
-var Promise = require('es6-promise').Promise;
+var Promise = require('when/lib/Promise');
 
 /**
  * Resolves all values in asyncState and calls the setState

diff --git a/package.json b/package.json
@@ -48,10 +48,10 @@
     "react": ">=0.11.0"
   },
   "dependencies": {
-    "es6-promise": "1.0.0",
     "events": "1.0.1",
     "flux": "2.0.0",
-    "qs": "1.2.2"
+    "qs": "1.2.2",
+    "when": "^3.4.4"
   },
   "keywords": [
     "react",
@@ -64,4 +64,4 @@
   "browserify-shim": {
     "react": "global:React"
   }
-}
+}
diff --git a/specs/AsyncState.spec.js b/specs/AsyncState.spec.js
@@ -1,5 +1,5 @@
 require('./helper');
-var Promise = require('es6-promise').Promise;
+var Promise = require('when/lib/Promise');
 var AsyncState = require('../modules/mixins/AsyncState');
 
 describe('AsyncState', function () {