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

bin/nuxt-build

@@ -32,7 +32,7 @@ if (argv.help) {
       $ nuxt build <dir>
     Options
       --analyze, -a                       Launch webpack-bundle-analyzer to optimize your bundles.
-      --mode, -m [spa|universal|static] Nuxt Mode (default: universal)
+      --mode, -m [spa|universal|ssr-only] Nuxt Mode (default: universal)
       --config-file, -c                  Path to Nuxt.js config file (default: nuxt.config.js)
       --help, -h                         Displays this message
   `)
@@ -74,8 +74,10 @@ builder.build()
   .then(() => {
     debug('Building done')
     if (options.mode === 'spa') {
-      // Generate on spa mode
-      return new Generator(nuxt, builder).generate({ build: false }).then(() => {
+      // Disable minify to get exact results of nuxt start
+      nuxt.options.generate.minify = false
+      // Generate on SPA mode
+      return new Generator(nuxt, builder).generate({ build: false, minify: false }).then(() => {
         if (!nuxt.options.dev) {
           // eslint-disable-next-line no-console
           console.log(`✓ You can now directly upload ${nuxt.options.generate.dir}/ or start server using "nuxt start"`)

bin/nuxt-dev

@@ -42,7 +42,7 @@ if (argv.help) {
     Options
       --port, -p                          A port number on which to start the application
       --hostname, -H                      Hostname on which to start the application
-      --mode, -m [spa|universal|static] Nuxt Mode (default: universal)
+      --mode, -m [spa|universal|ssr-only] Nuxt Mode (default: universal)
       --config-file, -c                   Path to Nuxt.js config file (default: nuxt.config.js)
       --help, -h                          Displays this message
   `)

bin/nuxt-generate

@@ -30,7 +30,7 @@ if (argv.help) {
     Usage
       $ nuxt generate <dir>
     Options
-      --mode, -m [spa|universal|static] Nuxt Mode (default: universal)
+      --mode, -m [spa|universal|ssr-only] Nuxt Mode (default: universal)
       --config-file, -c                   Path to Nuxt.js config file (default: nuxt.config.js)
       --help, -h                          Displays this message
   `)

bin/nuxt-start

@@ -35,7 +35,7 @@ if (argv.help) {
     Options
       --port, -p                          A port number on which to start the application
       --hostname, -H                      Hostname on which to start the application
-      --mode, -m [spa|universal|static] Nuxt Mode (default: universal)
+      --mode, -m [spa|universal|ssr-only] Nuxt Mode (default: universal)
       --config-file, -c                   Path to Nuxt.js config file (default: nuxt.config.js)
       --help, -h                          Displays this message
   `)

lib/common/options.js

@@ -158,7 +158,7 @@ Options.modes = {
       ssr: true
     },
     render: {
-      ssr: 'static'
+      ssr: 'only'
     }
   }
 }

lib/core/renderer.js

@@ -116,8 +116,8 @@ export default class Renderer extends Tapable {
     return this.options.render.ssr === false
   }
 
-  get staticSSR () {
-    return this.options.render.ssr === 'static'
+  get onlySSR () {
+    return this.options.render.ssr === 'only'
   }
 
   get isReady () {
@@ -455,7 +455,7 @@ export default class Renderer extends Tapable {
 
     let resourceHints = ''
 
-    if (!this.staticSSR) {
+    if (!this.onlySSR) {
       if (this.options.render.resourceHints) {
         resourceHints = context.renderResourceHints()
         HEAD += resourceHints