From fcae73a79b0d1a8ccf4bb03938e2e0d328d131b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Sat, 24 Dec 2016 17:58:52 +0100
Subject: [PATCH] Remove nuxt-container

---
 lib/app/App.vue                               |  9 +++++++--
 lib/app/components/nuxt-container.vue         | 16 ----------------
 lib/app/index.js                              |  3 ---
 lib/build/index.js                            |  3 ++-
 test/fixtures/with-config/layouts/app.vue     |  5 -----
 test/fixtures/with-config/layouts/default.vue |  6 ++++++
 6 files changed, 15 insertions(+), 27 deletions(-)
 delete mode 100644 lib/app/components/nuxt-container.vue
 delete mode 100644 test/fixtures/with-config/layouts/app.vue
 create mode 100644 test/fixtures/with-config/layouts/default.vue

diff --git a/lib/app/App.vue b/lib/app/App.vue
index 58b3ba1e36..da80cc8910 100644
--- a/lib/app/App.vue
+++ b/lib/app/App.vue
@@ -1,7 +1,7 @@
 <template>
-  <nuxt-container>
+  <div id="__nuxt">
     <component v-if="layout" :is="layout"></component>
-  </nuxt-container>
+  </div>
 </template>
 
 <script>
@@ -14,6 +14,7 @@ layoutsKeys.forEach(function (key, i) { %>
 }
 
 export default {
+  head: <%= JSON.stringify(head) %>,
   data: () => ({
     layout: null,
     layoutName: ''
@@ -46,3 +47,7 @@ export default {
   }
 }
 </script>
+
+<% css.forEach(function (c) { %>
+<style src="<%= (typeof c === 'string' ? c : c.src) %>" lang="<%= (c.lang ? c.lang : 'css') %>"></style>
+<% }) %>
diff --git a/lib/app/components/nuxt-container.vue b/lib/app/components/nuxt-container.vue
deleted file mode 100644
index e351bf3c5c..0000000000
--- a/lib/app/components/nuxt-container.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<template>
-  <div id="__nuxt">
-    <slot></slot>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'nuxt-container',
-  head: <%= JSON.stringify(head) %>
-}
-</script>
-
-<% css.forEach(function (c) { %>
-<style src="<%= (typeof c === 'string' ? c : c.src) %>" lang="<%= (c.lang ? c.lang : 'css') %>"></style>
-<% }) %>
diff --git a/lib/app/index.js b/lib/app/index.js
index 7e6eba54f9..64eba583f1 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -4,14 +4,11 @@ import Vue from 'vue'
 import Meta from 'vue-meta'
 import router from './router.js'
 <% if (store) { %>import store from '~store/index.js'<% } %>
-import NuxtContainer from './components/nuxt-container.vue'
 import NuxtChild from './components/nuxt-child.js'
 import NuxtLink from './components/nuxt-link.js'
 import Nuxt from './components/nuxt.vue'
 import App from '<%= appPath %>'
 
-// Component: <nuxt-container>
-Vue.component(NuxtContainer.name, NuxtContainer)
 // Component: <nuxt-child>
 Vue.component(NuxtChild.name, NuxtChild)
 // Component: <nuxt-link>
diff --git a/lib/build/index.js b/lib/build/index.js
index 79378e6bfb..4e7a8f15dc 100644
--- a/lib/build/index.js
+++ b/lib/build/index.js
@@ -154,7 +154,6 @@ function * generateRoutesAndFiles () {
     'router.js',
     'server.js',
     'utils.js',
-    'components/nuxt-container.vue',
     'components/nuxt-loading.vue',
     'components/nuxt-child.js',
     'components/nuxt-link.js',
@@ -360,8 +359,10 @@ function createRenderer (bundle) {
 
 function watchPages () {
   const patterns = [
+    r(this.srcDir, 'pages'),
     r(this.srcDir, 'pages/*.vue'),
     r(this.srcDir, 'pages/**/*.vue'),
+    r(this.srcDir, 'layouts'),
     r(this.srcDir, 'layouts/*.vue'),
     r(this.srcDir, 'layouts/**/*.vue')
   ]
diff --git a/test/fixtures/with-config/layouts/app.vue b/test/fixtures/with-config/layouts/app.vue
deleted file mode 100644
index 25fab4ce30..0000000000
--- a/test/fixtures/with-config/layouts/app.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template>
-  <nuxt-container>
-    <nuxt/>
-  </nuxt-container>
-</template>
diff --git a/test/fixtures/with-config/layouts/default.vue b/test/fixtures/with-config/layouts/default.vue
new file mode 100644
index 0000000000..4555ce65c4
--- /dev/null
+++ b/test/fixtures/with-config/layouts/default.vue
@@ -0,0 +1,6 @@
+<template>
+  <div>
+    <h1>Default layout</h1>
+    <nuxt/>
+  </div>
+</template>