Upgrade & Patches

Author: kwuite

README.md

@@ -1,4 +1,4 @@
-[![Meteor Icon](http://icon.meteor.com/package/useraccounts:flow-routing)](https://atmospherejs.com/useraccounts/flow-routing)
+[Flow-routing-extra](https://atmospherejs.com/useraccounts/flow-routing)
 
 # Flow Router add-on for User Accounts
 
@@ -25,7 +25,7 @@ Assuming you have a main layout that looks like this:
   <div class="content">
     {{> Template.dynamic template=main}}
   </div>
-
+useraccounts
   <footer>
     {{> Template.dynamic template=footer}}
   </footer>
@@ -58,13 +58,13 @@ AccountsTemplates.configure({
 });
 ```
 
-`useraccounts:flow-routing` uses the internal useraccounts `fullPageAtForm` is the built-in template useraccounts uses by default for its forms. You can override it on a per-route basis (see below) or replace it with `defaultTemplate:` field as above (templates specified in route config will still take precedence).  Omit `defaultTemplate` (or set to an empty string) to use the `fullPageAtForm` template built-in to your useraccounts UI package (ex [material](https://github.com/meteor-useraccounts/materialize/blob/master/lib/full_page_at_form.html)).
+`mealsunite:flow-routing-extra` uses the internal useraccounts `fullPageAtForm` is the built-in template useraccounts uses by default for its forms. You can override it on a per-route basis (see below) or replace it with `defaultTemplate:` field as above (templates specified in route config will still take precedence).  Omit `defaultTemplate` (or set to an empty string) to use the `fullPageAtForm` template built-in to your useraccounts UI package (ex [material](https://github.com/meteor-useraccounts/materialize/blob/master/lib/full_page_at_form.html)).
 
 NOTE: The above configs must load BEFORE your AccountsTemplates routes are defined (next section).
 
 ## React Configuration
 
-Firstly, please ensure that your app depends upon the [React Layout][3] and the [Blaze Layout][2] packages. User Accounts currents only renders Blaze templates. In order to use User Accounts with React we rely on the [Blaze To React][4] package to render the User Accounts templates.
+Firstly, please ensure that your app depends upon the [React Layout][3] and the [Blaze Layout][2] packages. User Accounts currents only renders Blaze templates. In order to use User Accounts with React we rely on the [Blaze To React][3] package to render the User Accounts templates.
 
 Before you configure routes for User Accounts with Flow Router, you will need to make sure you have set a few default configuration items.  
 
@@ -119,7 +119,7 @@ AccountsTemplates.configure({
 
 `useraccounts:flow-routing` uses `fullPageAtForm` for the `defaultTemplate` option.  `fullPageAtForm` is the built-in Blaze template that all UserAccounts themed packages (Bootstrap, Materialize, etc.) use for their forms. You can override it on a per-route basis (see below) or replace it as shown above (templates specified in a route config will still take precedence).  Omit `defaultTemplate` (or set to an empty string) to use the `fullPageAtForm` template built-in to your useraccounts UI package (ex [material](https://github.com/meteor-useraccounts/materialize/blob/master/lib/full_page_at_form.html)).
 
-Please note that this template must be a **Blaze** template. It will be rendered into your React layout using [Blaze To React][4].
+Please note that this template must be a **Blaze** template. It will be rendered into your React layout using [Blaze To React][3].
 
 NOTE: The above configs must load BEFORE your AccountsTemplates routes are defined (next section).
 
@@ -183,7 +183,7 @@ AccountsTemplates.configureRoute('signIn', {
 });
 ```
 
-All options are passed to FlowRouter.route() which then creates a new custom route (see the official Flow Router documentation [here](https://atmospherejs.com/kadira/flow-router) for more details).  
+All options are passed to FlowRouter.route() which then creates a new custom route (see the official Flow Router documentation [here][1] for more details).  
 
 The `redirect` field permits to specify where to redirect the user after successful form submit. Actually, `redirect` can be a function so that, for example, the following:
 
@@ -232,7 +232,6 @@ Or if you want to protect ALL routes in your app:
 FlowRouter.triggers.enter([AccountsTemplates.ensureSignedIn]);
 ```
 
-[1]: https://atmospherejs.com/kadira/flow-router
+[1]: https://atmospherejs.com/ostrio/flow-router-extra
 [2]: https://atmospherejs.com/kadira/blaze-layout
-[3]: https://atmospherejs.com/kadira/react-layout
-[4]: https://atmospherejs.com/gwendall/blaze-to-react
+[3]: https://atmospherejs.com/gadicc/blaze-react-component

lib/core.js

@@ -180,25 +180,29 @@ AccountsTemplates.configureRoute = function(route, options) {
     //
     // For now we need to render the main template using BlazeToReact
 
-    if (Package['react-runtime']) {
+    if (require) {
+      var React = require('react');
+    } else if (Package['react-runtime']) {
       var React = Package['react-runtime'].React;
     } else {
       throw new Error("layoutTemplate is a React element but React runtime package is not found");
     }
 
-    if (Package['kadira:react-layout']) {
+    if (require) {
+      var ReactLayout = {render: require('react-mounter').mount};
+    } else if (Package['kadira:react-layout']) {
       var ReactLayout = Package['kadira:react-layout'].ReactLayout;
     } else {
       throw new Error("useraccounts:flow-routing requires that your project includes kadira:react-layout package.");
     }
 
-    if (Package['gwendall:blaze-to-react']) {
-      var BlazeToReact = Package['gwendall:blaze-to-react'].BlazeToReact;
+    if (Package['gadicc:blaze-react-component']) {
+      var BlazeToReact = Package['gadicc:blaze-react-component'].default;
     } else {
-      throw new Error("useraccounts:flow-routing requires that your project includes the gwendall:blaze-to-react package.");
+      throw new Error("useraccounts:flow-routing requires that your project includes the gadicc:blaze-react-component package.");
     }
 
-    layoutRegions[contentRegion] = React.createElement(BlazeToReact, { blazeTemplate: template });
+    layoutRegions[contentRegion] = React.createElement(BlazeToReact, { template: template });
   }
 
   function doLayout() {

package.js

@@ -1,20 +1,12 @@
-// Package metadata for Meteor.js web platform (https://www.meteor.com/)
-// This file is defined within the Meteor documentation at
-//
-//   http://docs.meteor.com/#/full/packagejs
-//
-// and it is needed to define a Meteor package
-'use strict';
-
 Package.describe({
-  name: 'mealsunite:user-routing-extra',
+  name: 'mealsunite:flow-routing-extra',
   summary: 'UserAccounts package providing routes configuration capability via ostrio/flow-router-extra.',
-  version: '1.14.2',
+  version: '2.0.0',
   git: 'https://github.com/MealsUnite/flow-routing.git',
 });
 
 Package.onUse(function(api) {
-  api.versionsFrom('METEOR@1.5');
+  api.versionsFrom('METEOR@1.3');
 
   api.use([
     'check',
@@ -31,10 +23,9 @@ Package.onUse(function(api) {
   ], ['client', 'server']);
 
   api.use([
-     'react@0.14.1_1',
+     'react@15.0.1',
      'kadira:[email protected]',
-     'kadira:[email protected]',
-     'gwendall:[email protected]'
+     'gadicc:[email protected]'
   ], ['client', 'server'], { weak: true });
 
   api.addFiles([