From 189aaa476812caa697fb10d758de89d6d82daf84 Mon Sep 17 00:00:00 2001
From: Victor Parpoil <vparpoil@gmail.com>
Date: Tue, 5 May 2020 11:26:26 +0200
Subject: [PATCH] Replace kadira:flow-router with ostrio:flow-router-extra

see issue #11014
---
 tools/static-assets/skel-full/.meteor/packages             | 5 ++---
 .../skel-full/imports/startup/client/routes.js             | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/tools/static-assets/skel-full/.meteor/packages b/tools/static-assets/skel-full/.meteor/packages
index cc572bf945..8f6a2ce1df 100644
--- a/tools/static-assets/skel-full/.meteor/packages
+++ b/tools/static-assets/skel-full/.meteor/packages
@@ -19,9 +19,8 @@ ecmascript              # Enable ECMAScript2015+ syntax in app code
 typescript              # Enable TypeScript syntax in .ts and .tsx modules
 shell-server            # Server-side component of the `meteor shell` command
 
-kadira:flow-router      # FlowRouter is a very simple router for Meteor
-kadira:blaze-layout     # Layout manager for blaze (works well with FlowRouter)
-less                    # Leaner CSS language
+ostrio:flow-router-extra # FlowRouter is a very simple router for Meteor
+less                     # Leaner CSS language
 
 meteortesting:mocha               # A package for writing and running your meteor app and package tests with mocha
 johanbrook:publication-collector  # Test a Meteor publication by collecting its output
diff --git a/tools/static-assets/skel-full/imports/startup/client/routes.js b/tools/static-assets/skel-full/imports/startup/client/routes.js
index df5f472d6d..b599c8916f 100644
--- a/tools/static-assets/skel-full/imports/startup/client/routes.js
+++ b/tools/static-assets/skel-full/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 needed templates
 import '../../ui/layouts/body/body.js';
@@ -10,12 +9,12 @@ import '../../ui/pages/not-found/not-found.js';
 FlowRouter.route('/', {
   name: 'App.home',
   action() {
-    BlazeLayout.render('App_body', { main: 'App_home' });
+    this.render('App_body', { main: 'App_home' });
   },
 });
 
 FlowRouter.notFound = {
   action() {
-    BlazeLayout.render('App_body', { main: 'App_notFound' });
+    this.render('App_body', { main: 'App_notFound' });
   },
 };