Blaze update to 1.10.2 and update flow router to ostrio:flow-router-extra

.meteor/.finished-upgraders

@@ -16,3 +16,4 @@ notices-for-facebook-graph-api-2
 1.4.3-split-account-service-packages
 1.5-add-dynamic-import-package
 1.7-split-underscore-from-meteor-base
+1.8.3-split-jquery-from-blaze

.meteor/packages

@@ -6,7 +6,7 @@
 
 # meteor libraries
 meteor-base@1.4.0
-ecmascript@0.11.0
+ecmascript@0.14.3
 es5-shim@4.8.0
 check@1.3.1
 tracker@1.2.0
@@ -18,13 +18,13 @@ less@2.7.12
 
 # ui
 blaze-html-templates@1.0.4
-reactive-dict@1.2.0
+reactive-dict@1.3.0
 reactive-var@1.0.11
 aldeed:template-extension
 percolate:momentum
 
 # data
-mongo@1.5.0
+mongo@1.10.0
 aldeed:simple-schema
 aldeed:collection2
 dburles:collection-helpers
@@ -33,29 +33,27 @@ mdg:validated-method
 mdg:validation-error
 
 # routing
-kadira:flow-router
-kadira:blaze-layout
-arillo:flow-router-helpers
-zimme:active-route
+ostrio:flow-router-extra
 
 # i18n
 tap:i18n
 
 # accounts
-accounts-password@1.5.1
+accounts-password@1.6.0
 useraccounts:core
 useraccounts:unstyled
-useraccounts:flow-routing
+mealsunite:flow-routing-extra # useraccounts routes for flow-routing-extra
+kadira:blaze-layout           # needed by mealsunite:flow-routing-extra
 softwarerero:accounts-t9n
 
 # mobile
 crosswalk@1.7.1
-mobile-experience@1.0.5
+mobile-experience@1.1.0
 chriswessels:hammer
 
 # production
 juliancwirko:postcss
-standard-minifier-js@2.3.4
+standard-minifier-js@2.6.0
 ddp-rate-limiter@1.0.7
 app-prod-security
 
@@ -70,9 +68,9 @@ practicalmeteor:sinon
 meteortesting:mocha
 hwillson:stub-collections
 johanbrook:publication-collector
-shell-server@0.3.1
+shell-server@0.5.0
 dburles:factory
 
 # security
 audit-argument-checks@1.0.7
-dynamic-import@0.4.0
+dynamic-import@0.5.2

.meteor/release

@@ -1 +1 @@
-METEOR@1.7.0.1
+METEOR@1.10.2

.meteor/versions

@@ -1,5 +1,5 @@
-accounts-base@1.4.2
-accounts-password@1.5.1
+accounts-base@1.6.0
+accounts-password@1.6.0
 aldeed:collection2@2.10.0
 aldeed:collection2-core@1.2.0
 aldeed:schema-deny@1.1.0
@@ -8,24 +8,23 @@ aldeed:simple-schema@1.5.4
 aldeed:template-extension@4.1.0
 allow-deny@1.1.0
 app-prod-security@0.0.0
-arillo:flow-router-helpers@0.5.2
 audit-argument-checks@1.0.7
-autoupdate@1.4.0
-babel-compiler@7.1.0
-babel-runtime@1.2.2
-base64@1.0.11
-binary-heap@1.0.10
-blaze@2.3.2
+autoupdate@1.6.0
+babel-compiler@7.5.3
+babel-runtime@1.5.0
+base64@1.0.12
+binary-heap@1.0.11
+blaze@2.3.4
 blaze-html-templates@1.1.2
 blaze-tools@1.0.10
-boilerplate-generator@1.5.0
+boilerplate-generator@1.7.0
 browser-policy@1.1.0
 browser-policy-common@1.0.11
 browser-policy-content@1.1.0
 browser-policy-framing@1.1.0
-caching-compiler@1.1.12
-caching-html-compiler@1.1.2
-callback-hook@1.1.0
+caching-compiler@1.2.2
+caching-html-compiler@1.1.3
+callback-hook@1.3.0
 cfs:http-methods@0.0.32
 check@1.3.1
 chriswessels:hammer@4.0.2
@@ -34,93 +33,97 @@ crosswalk@1.7.1
 dburles:collection-helpers@1.1.0
 dburles:factory@1.1.0
 ddp@1.4.0
-ddp-client@2.3.2
+ddp-client@2.3.3
 ddp-common@1.4.0
 ddp-rate-limiter@1.0.7
-ddp-server@2.2.0
+ddp-server@2.3.1
 deps@1.0.12
-diff-sequence@1.1.0
-dynamic-import@0.4.0
-ecmascript@0.11.0
+diff-sequence@1.1.1
+dynamic-import@0.5.2
+ecmascript@0.14.3
 ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.7.1
-ecmascript-runtime-server@0.7.0
-ejson@1.1.0
+ecmascript-runtime-client@0.10.0
+ecmascript-runtime-server@0.9.0
+ejson@1.1.1
 email@1.2.3
 es5-shim@4.8.0
+fetch@0.1.1
 force-ssl@1.1.0
 force-ssl-common@1.1.0
 geojson-utils@1.0.10
 hot-code-push@1.0.4
 html-tools@1.0.11
 htmljs@1.0.11
-http@1.4.1
-hwillson:stub-collections@1.0.8
+http@1.4.2
+hwillson:stub-collections@1.0.9
 id-map@1.1.0
+inter-process-messaging@0.1.1
 johanbrook:publication-collector@1.1.0
 jquery@1.11.11
 juliancwirko:postcss@1.3.0
 kadira:blaze-layout@2.3.0
-kadira:flow-router@2.12.1
-launch-screen@1.1.1
-less@2.7.12
+launch-screen@1.2.0
+less@2.8.0
 livedata@1.0.18
 lmieulet:meteor-coverage@2.0.2
 localstorage@1.2.0
 logging@1.1.20
-mdg:validated-method@1.1.0
+mdg:validated-method@1.2.0
 mdg:validation-error@0.5.1
-meteor@1.9.0
+mealsunite:flow-routing-extra@2.0.2
+meteor@1.9.3
 meteor-base@1.4.0
 meteorspark:util@0.2.0
 meteortesting:browser-tests@0.2.0
 meteortesting:mocha@0.6.0
-minifier-css@1.3.1
-minifier-js@2.3.5
-minimongo@1.4.4
-mobile-experience@1.0.5
-mobile-status-bar@1.0.14
-modern-browsers@0.1.1
-modules@0.12.0
-modules-runtime@0.10.0
-mongo@1.5.0
+minifier-css@1.5.0
+minifier-js@2.6.0
+minimongo@1.6.0
+mobile-experience@1.1.0
+mobile-status-bar@1.1.0
+modern-browsers@0.1.5
+modules@0.15.0
+modules-runtime@0.12.0
+mongo@1.10.0
+mongo-decimal@0.1.1
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
 npm-bcrypt@0.9.3
-npm-mongo@3.0.7
+npm-mongo@3.7.0
 observe-sequence@1.0.16
 ordered-dict@1.1.0
+ostrio:flow-router-extra@3.7.4
 percolate:momentum@0.7.2
 percolate:velocityjs@1.2.1_1
 practicalmeteor:chai@2.1.0_1
 practicalmeteor:mocha-core@1.0.1
 practicalmeteor:sinon@1.14.1_2
-promise@0.11.1
+promise@0.11.2
 raix:eventemitter@0.1.3
-random@1.1.0
+random@1.2.0
 rate-limit@1.0.9
-reactive-dict@1.2.0
+reactive-dict@1.3.0
 reactive-var@1.0.11
-reload@1.2.0
+reload@1.3.0
 retry@1.1.0
-reywood:publish-composite@1.6.0
-routepolicy@1.0.13
+reywood:publish-composite@1.7.3
+routepolicy@1.1.0
 service-configuration@1.0.11
-session@1.1.7
+session@1.2.0
 sha@1.0.9
-shell-server@0.3.1
+shell-server@0.5.0
 simple:authenticate-user-by-token@1.0.1
 simple:json-routes@2.1.0
 simple:rest@1.1.1
 simple:rest-accounts-password@1.1.2
 simple:rest-bearer-token-parser@1.0.1
 simple:rest-json-error-handler@1.0.1
-socket-stream-client@0.2.1
+socket-stream-client@0.3.0
 softwarerero:accounts-t9n@1.3.11
 spacebars@1.0.15
 spacebars-compiler@1.1.3
-srp@1.0.10
-standard-minifier-js@2.3.4
+srp@1.1.0
+standard-minifier-js@2.6.0
 tap:i18n@1.8.2
 templating@1.3.2
 templating-compiler@1.3.3
@@ -129,11 +132,9 @@ templating-tools@1.1.2
 tracker@1.2.0
 ui@1.0.13
 underscore@1.0.10
-url@1.2.0
+url@1.3.0
 useraccounts:core@1.14.2
-useraccounts:flow-routing@1.14.2
 useraccounts:unstyled@1.14.2
-webapp@1.6.0
+webapp@1.9.1
 webapp-hashing@1.0.9
-xolvio:cleaner@0.3.3
-zimme:active-route@2.3.2
+xolvio:cleaner@0.4.0

imports/startup/both/useraccounts-configuration.js

@@ -6,6 +6,7 @@ import { AccountsTemplates } from 'meteor/useraccounts:core';
  */
 
 AccountsTemplates.configure({
+  defaultLayoutType: 'blaze',
   showForgotPasswordLink: true,
   defaultTemplate: 'Auth_page',
   defaultLayout: 'App_body',

imports/startup/client/routes.app-test.js

@@ -3,7 +3,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { DDP } from 'meteor/ddp-client';
-import { FlowRouter } from 'meteor/kadira:flow-router';
+import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
 import { assert } from 'meteor/practicalmeteor:chai';
 import { Promise } from 'meteor/promise';
 import { $ } from 'meteor/jquery';

imports/startup/client/routes.js

@@ -1,5 +1,4 @@
-import { FlowRouter } from 'meteor/kadira:flow-router';
-import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
 
 // Import to load these templates
 import '../../ui/layouts/app-body.js';
@@ -13,20 +12,21 @@ import '../../ui/accounts/accounts-templates.js';
 FlowRouter.route('/lists/:_id', {
   name: 'Lists.show',
   action() {
-    BlazeLayout.render('App_body', { main: 'Lists_show_page' });
+    this.render('App_body', { main: 'Lists_show_page' });
   },
 });
 
 FlowRouter.route('/', {
   name: 'App.home',
   action() {
-    BlazeLayout.render('App_body', { main: 'app_rootRedirector' });
+      this.render('App_body', { main: 'app_rootRedirector' });
   },
 });
 
 // the App_notFound template is used for unknown routes and missing lists
-FlowRouter.notFound = {
+FlowRouter.route('*', {
+  name: "NotFound",
   action() {
-    BlazeLayout.render('App_body', { main: 'App_notFound' });
+      this.render('App_body', { main: 'App_notFound' });
   },
-};
+});

imports/ui/components/lists-show.js

@@ -6,7 +6,7 @@ import { Mongo } from 'meteor/mongo';
 import { ReactiveDict } from 'meteor/reactive-dict';
 import { Tracker } from 'meteor/tracker';
 import { $ } from 'meteor/jquery';
-import { FlowRouter } from 'meteor/kadira:flow-router';
+import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
 import { SimpleSchema } from 'meteor/aldeed:simple-schema';
 import { TAPi18n } from 'meteor/tap:i18n';
 

imports/ui/layouts/app-body.js

@@ -4,8 +4,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { ReactiveDict } from 'meteor/reactive-dict';
 import { Template } from 'meteor/templating';
-import { ActiveRoute } from 'meteor/zimme:active-route';
-import { FlowRouter } from 'meteor/kadira:flow-router';
+import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { T9n } from 'meteor/softwarerero:accounts-t9n';
 import { _ } from 'meteor/underscore';
@@ -69,7 +68,7 @@ Template.App_body.helpers({
     ] });
   },
   activeListClass(list) {
-    const active = ActiveRoute.name('Lists.show')
+    const active = FlowRouter.current().route.name === 'Lists.show'
       && FlowRouter.getParam('_id') === list._id;
 
     return active && 'active';
@@ -121,7 +120,7 @@ Template.App_body.events({
     Meteor.logout();
 
     // if we are on a private list, we'll need to go to a public one
-    if (ActiveRoute.name('Lists.show')) {
+    if (FlowRouter.current().route.name === 'Lists.show') {
       // TODO -- test this code path
       const list = Lists.findOne(FlowRouter.getParam('_id'));
       if (list.userId) {

imports/ui/pages/client/lists-show-page.tests.js

@@ -9,7 +9,7 @@ import StubCollections from 'meteor/hwillson:stub-collections';
 import { Template } from 'meteor/templating';
 import { _ } from 'meteor/underscore';
 import { $ } from 'meteor/jquery';
-import { FlowRouter } from 'meteor/kadira:flow-router';
+import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
 import { sinon } from 'meteor/practicalmeteor:sinon';
 
 

imports/ui/pages/lists-show-page.js

@@ -1,5 +1,5 @@
 import { Template } from 'meteor/templating';
-import { FlowRouter } from 'meteor/kadira:flow-router';
+import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
 
 import { Lists } from '../../api/lists/lists.js';
 

imports/ui/pages/root-redirector.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
-import { FlowRouter } from 'meteor/kadira:flow-router';
+import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
 import { Lists } from '../../api/lists/lists.js';
 
 import './root-redirector.html';