From eb8b26a6bc5f87156013e65774e7b5879d3e487d Mon Sep 17 00:00:00 2001 From: Matteo De Micheli Date: Wed, 29 Oct 2014 22:01:34 +0100 Subject: [PATCH] Upgraded boilerplate to 1.0 --- .meteor/release | 2 +- .meteor/versions | 57 +++++++++---------- client/config/router.js | 6 +- client/views/layouts/basic.html | 4 +- client/views/notFound/notFound.html | 2 +- .../create/routes/templates/route.coffee | 6 +- .../profiles/coffee/reset/homeRoute.coffee | 11 +--- .../default/create/routes/templates/route.js | 6 +- .../cli/profiles/default/reset/homeRoute.js | 11 +--- .../es6/create/routes/templates/route.next.js | 6 +- .../cli/profiles/es6/reset/homeRoute.next.js | 11 +--- routes/defaultRoutes.js | 8 +-- 12 files changed, 48 insertions(+), 82 deletions(-) diff --git a/.meteor/release b/.meteor/release index 7057f80..87bf495 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@0.9.4 +METEOR@1.0 diff --git a/.meteor/versions b/.meteor/versions index 8109d17..53942d3 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,23 +1,21 @@ accounts-base@1.1.2 -accounts-password@1.0.3 -accounts-ui-unstyled@1.1.3 -accounts-ui@1.1.2 +accounts-password@1.0.4 +accounts-ui-unstyled@1.1.4 +accounts-ui@1.1.3 aldeed:collection2@2.2.0 aldeed:simple-schema@1.0.3 -amplify@1.0.0 application-configuration@1.0.3 -autoupdate@1.1.2 +autoupdate@1.1.3 base64@1.0.1 binary-heap@1.0.1 blaze-tools@1.0.1 -blaze@2.0.2 +blaze@2.0.3 boilerplate-generator@1.0.1 callback-hook@1.0.1 check@1.0.2 -coffeescript@1.0.4 ctl-helper@1.0.4 ctl@1.0.2 -ddp@1.0.10 +ddp@1.0.11 deps@1.0.5 ejson@1.0.4 email@1.0.4 @@ -26,28 +24,31 @@ follower-livedata@1.0.2 geojson-utils@1.0.1 html-tools@1.0.2 htmljs@1.0.2 -http@1.0.7 +http@1.0.8 id-map@1.0.1 -iron:core@0.3.4 -iron:dynamic-template@0.4.1 -iron:layout@0.4.1 -iron:router@0.9.4 +iron:controller@1.0.0 +iron:core@1.0.0 +iron:dynamic-template@1.0.0 +iron:layout@1.0.0 +iron:location@1.0.0 +iron:middleware-stack@1.0.0 +iron:router@1.0.0 +iron:url@1.0.0 jquery@1.0.1 json@1.0.1 -less@1.0.10 +launch-screen@1.0.0 +less@1.0.11 livedata@1.0.11 localstorage@1.0.1 -logging@1.0.4 -meteor-platform@1.1.2 -meteor@1.1.2 -mike:mocha@0.3.12 -minifiers@1.1.1 -minimongo@1.0.4 +logging@1.0.5 +meteor-platform@1.2.0 +meteor@1.1.3 +minifiers@1.1.2 +minimongo@1.0.5 mobile-status-bar@1.0.1 mongo-livedata@1.0.6 -mongo@1.0.7 -mrt:iron-router-progress@0.9.2 -nooitaf:semantic-ui@0.19.3 +mongo@1.0.8 +nooitaf:semantic-ui-less@0.19.3 npm-bcrypt@0.7.7 observe-sequence@1.0.3 ordered-dict@1.0.1 @@ -59,18 +60,16 @@ reload@1.1.1 retry@1.0.1 routepolicy@1.0.2 service-configuration@1.0.2 -session@1.0.3 +session@1.0.4 sha@1.0.1 spacebars-compiler@1.0.3 spacebars@1.0.3 srp@1.0.1 standard-app-packages@1.0.3 -templating@1.0.8 +templating@1.0.9 tracker@1.0.3 ui@1.0.4 underscore@1.0.1 -url@1.0.1 -velocity:core@0.2.14 -velocity:html-reporter@0.2.4 +url@1.0.2 webapp-hashing@1.0.1 -webapp@1.1.3 +webapp@1.1.4 diff --git a/client/config/router.js b/client/config/router.js index 7f8c6ba..a1325d9 100644 --- a/client/config/router.js +++ b/client/config/router.js @@ -1,8 +1,4 @@ Router.configure({ layoutTemplate: 'basicLayout', - notFoundTemplate: 'notFound', - yieldTemplates: { - 'header': { to: 'header' }, - 'footer': { to: 'footer' } - } + notFoundTemplate: 'notFound' }); \ No newline at end of file diff --git a/client/views/layouts/basic.html b/client/views/layouts/basic.html index dc89032..9814876 100644 --- a/client/views/layouts/basic.html +++ b/client/views/layouts/basic.html @@ -1,12 +1,12 @@ diff --git a/client/views/notFound/notFound.html b/client/views/notFound/notFound.html index a0b17c3..6663560 100644 --- a/client/views/notFound/notFound.html +++ b/client/views/notFound/notFound.html @@ -1,6 +1,6 @@ diff --git a/private/cli/profiles/coffee/create/routes/templates/route.coffee b/private/cli/profiles/coffee/create/routes/templates/route.coffee index 9b4b85c..580f2af 100644 --- a/private/cli/profiles/coffee/create/routes/templates/route.coffee +++ b/private/cli/profiles/coffee/create/routes/templates/route.coffee @@ -1,4 +1,2 @@ -Router.map (-> - this.route '__routeName__', - path : '__routePath__' -) +Router.route '__routePath__', -> + this.render '__routeName__' diff --git a/private/cli/profiles/coffee/reset/homeRoute.coffee b/private/cli/profiles/coffee/reset/homeRoute.coffee index a38517c..3097953 100644 --- a/private/cli/profiles/coffee/reset/homeRoute.coffee +++ b/private/cli/profiles/coffee/reset/homeRoute.coffee @@ -1,9 +1,2 @@ -HomeController = RouteController.extend( - template: 'home' -) - -Router.map (-> - this.route 'HomeRoute', - path : '/', - controller : HomeController -) +Router.route '/', -> + this.render 'HomeRoute' diff --git a/private/cli/profiles/default/create/routes/templates/route.js b/private/cli/profiles/default/create/routes/templates/route.js index 011223b..4c7ae81 100644 --- a/private/cli/profiles/default/create/routes/templates/route.js +++ b/private/cli/profiles/default/create/routes/templates/route.js @@ -1,5 +1,3 @@ -Router.map(function () { - this.route('__routeName__', { - path : '__routePath__' - }); +Router.route('__routePath__', function () { + this.render('__routeName__'); }); diff --git a/private/cli/profiles/default/reset/homeRoute.js b/private/cli/profiles/default/reset/homeRoute.js index cd05d63..ed67bc5 100644 --- a/private/cli/profiles/default/reset/homeRoute.js +++ b/private/cli/profiles/default/reset/homeRoute.js @@ -1,10 +1,3 @@ -var HomeController = RouteController.extend({ - template: 'home' -}); - -Router.map(function () { - this.route('home', { - path : '/', - controller : HomeController - }); +Router.route('/', function () { + this.render('home'); }); diff --git a/private/cli/profiles/es6/create/routes/templates/route.next.js b/private/cli/profiles/es6/create/routes/templates/route.next.js index 011223b..4c7ae81 100644 --- a/private/cli/profiles/es6/create/routes/templates/route.next.js +++ b/private/cli/profiles/es6/create/routes/templates/route.next.js @@ -1,5 +1,3 @@ -Router.map(function () { - this.route('__routeName__', { - path : '__routePath__' - }); +Router.route('__routePath__', function () { + this.render('__routeName__'); }); diff --git a/private/cli/profiles/es6/reset/homeRoute.next.js b/private/cli/profiles/es6/reset/homeRoute.next.js index cd05d63..ed67bc5 100644 --- a/private/cli/profiles/es6/reset/homeRoute.next.js +++ b/private/cli/profiles/es6/reset/homeRoute.next.js @@ -1,10 +1,3 @@ -var HomeController = RouteController.extend({ - template: 'home' -}); - -Router.map(function () { - this.route('home', { - path : '/', - controller : HomeController - }); +Router.route('/', function () { + this.render('home'); }); diff --git a/routes/defaultRoutes.js b/routes/defaultRoutes.js index e88e3d3..c45993b 100644 --- a/routes/defaultRoutes.js +++ b/routes/defaultRoutes.js @@ -1,6 +1,4 @@ -Router.map(function () { - // Home Route - this.route('home', { - path : '/' - }); +// Home Route +Router.route('/', function () { + this.render('home'); });