Merge branch 'dev' of github.com:nuxt/nuxt.js into dev

README.md

@@ -158,10 +158,12 @@ Learn more at [nuxtjs.org](https://nuxtjs.org).
 ## Templates
 
 You can start by using one of our starter templates:
-- [starter](https://github.com/nuxt/starter): Basic Nuxt.js project template
-- [express](https://github.com/nuxt/express): Nuxt.js + Express
-- [koa](https://github.com/nuxt/koa): Nuxt.js + Koa
-- [adonuxt](https://github.com/nuxt/adonuxt): Nuxt.js + AdonisJS
+- [starter](https://github.com/nuxt-community/starter-template): Basic Nuxt.js project template
+- [express](https://github.com/nuxt-community/express-template): Nuxt.js + Express
+- [koa](https://github.com/nuxt-community/koa-template): Nuxt.js + Koa
+- [adonuxt](https://github.com/nuxt-community/adonuxt-template): Nuxt.js + AdonisJS
+- [micro](https://github.com/nuxt-community/micro-template): Nuxt.js + Micro
+- [nuxtent](https://github.com/nuxt-community/nuxtent-template): Nuxt.js + Nuxtent module for content heavy sites 
 
 ## Using nuxt.js programmatically
 

examples/vue-apollo/README.md

@@ -1,5 +1,7 @@
 # Vue-Apollo with Nuxt.js
 
+Demo: https://nuxt-vue-apollo.now.sh/
+
 https://github.com/nuxt-community/apollo-module
 
 https://github.com/Akryum/vue-apollo

lib/builder/builder.js

@@ -329,7 +329,7 @@ export default class Builder extends Tapable {
     this.compiler.plugin('done', async stats => {
       // Don't reload failed builds
       /* istanbul ignore if */
-      if (stats.hasErrors() || stats.hasWarnings()) {
+      if (stats.hasErrors()) {
         return
       }
       // Reload renderer if available

lib/builder/webpack/base.config.js

@@ -116,6 +116,20 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
     )
   }
 
+  // Workaround for hiding Warnings about plugins without a default export (#1179)
+  config.plugins.push({
+    apply (compiler) {
+      compiler.plugin('done', stats => {
+        stats.compilation.warnings = stats.compilation.warnings.filter(warn => {
+          if (warn.name === 'ModuleDependencyWarning' && warn.message.includes(`export 'default'`) && warn.message.includes('plugin')) {
+            return false
+          }
+          return true
+        })
+      })
+    }
+  })
+
   // --------------------------------------
   // Dev specific config
   // --------------------------------------

lib/core/options.js

@@ -107,7 +107,7 @@ export const defaultOptions = {
     vendor: [],
     plugins: [],
     babel: {},
-    postcss: [],
+    postcss: undefined,
     templates: [],
     watch: [],
     devMiddleware: {},