Upgraded to react-router 0.12

Author: seanadkinson

README.md

@@ -9,7 +9,13 @@ Based on [react-proxy-loader](https://github.com/webpack/react-proxy-loader), ad
 
 ## Dependencies
 
-Right now, this library depends on [bluebird](https://github.com/petkaantonov/bluebird) for promises, which is an amazing library.  May be a little heavy, though, so feel free to send a PR if you'd rather it use something else.
+Which version to use depends on your version of `react-router`
+
+| react-router     | react-router-proxy-loader |
+| ---------------- | ------------------------- |
+| 0.11.x and below | 0.1.x                     |
+| 0.12.x and above | 0.2.x                     |
+
 
 ## Usage
 

index.js

@@ -13,24 +13,30 @@ module.exports.pitch = function(remainingRequest) {
 
         // BEGIN CHANGE
         '    statics: {',
-        '        willTransitionTo: function(transition, params, query) {',
-        '           var Promise = require("bluebird");',
-        '           transition.wait(new Promise(function(resolve) {',
-        '                require.ensure([], function() {',
-        '                    component = require(' + JSON.stringify(moduleRequest) + ');',
-        '                    var resolveNow = true;',
-        '                    if (component.willTransitionTo) { ',
-        '                        var origWait = transition.wait;',
-        '                        transition.wait = function(p) { resolveNow = false; p.then(resolve); }',
-        '                        component.willTransitionTo(transition, params, query);',
-        '                        transition.wait = origWait;',
-        '                    } ',
-        '                    resolveNow && resolve();',
-        '                });',
-        '            }));',
+        '        willTransitionTo: function(transition, params, query, callback) {',
+        '            require.ensure([], function() {',
+        '                component = require(' + JSON.stringify(moduleRequest) + ');',
+        '                if (component.willTransitionTo) { ',
+        '                    component.willTransitionTo(transition, params, query, callback);',
+        '                    if (component.willTransitionTo.length < 4) {',
+        '                        callback(); ',
+        '                    }',
+        '                } ',
+        '                else {',
+        '                    callback();',
+        '                }',
+        '            });',
         '        },',
-        '        willTransitionFrom: function(transition, params, query) {',
-        '            component && component.willTransitionFrom && component.willTransitionFrom(transition, params, query);',
+        '        willTransitionFrom: function(transition, component, callback) {',
+        '            if (component && component.willTransitionFrom) {',
+        '                component.willTransitionFrom(transition, component, callback);',
+        '                if (component.willTransitionFrom.length < 3) {',
+        '                    callback(); ',
+        '                }',
+        '            }',
+        '            else {',
+        '                callback();',
+        '            }',
         '        }',
         '    }, ',
         // END CHANGE

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router-proxy-loader",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Dynamically load react-router components on-demand",
   "main": "index.js",
   "scripts": {
@@ -23,7 +23,6 @@
   },
   "homepage": "https://github.com/odysseyscience/react-router-proxy-loader",
   "peerDependencies": {
-    "bluebird": "*",
-    "react-router": "0.11.x"
+    "react-router": "^0.12.0"
   }
 }