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

lib/builder/webpack/base.config.js

@@ -28,7 +28,7 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
   }
 
   const config = {
-    devtool: this.options.dev ? 'cheap-module-source-map' : false,
+    devtool: this.options.dev ? 'cheap-module-source-map' : 'nosources-source-map',
     entry: {
       vendor: ['vue', 'vue-router', 'vue-meta']
     },
@@ -136,6 +136,11 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
         minimize: true
       })
     )
+
+    // Scope Hoisting
+    // config.plugins.push(
+    //   new webpack.optimize.ModuleConcatenationPlugin()
+    // )
   }
 
   // Clone deep avoid leaking config between Client and Server

lib/builder/webpack/server.config.js

@@ -23,7 +23,8 @@ export default function webpackServerConfig () {
 
   config = Object.assign(config, {
     target: 'node',
-    devtool: (this.options.dev ? 'source-map' : false),
+    node: false,
+    devtool: 'source-map',
     entry: resolve(this.options.buildDir, 'server.js'),
     output: Object.assign({}, config.output, {
       filename: 'server-bundle.js',

lib/core/renderer.js

@@ -24,6 +24,27 @@ const parseTemplate = templateStr => _.template(templateStr, {
   interpolate: /{{([\s\S]+?)}}/g
 })
 
+const resourceMap = [
+  {
+    key: 'clientManifest',
+    fileName: 'vue-ssr-client-manifest.json',
+    transform: JSON.parse
+  },
+  {
+    key: 'serverBundle',
+    fileName: 'server-bundle.json',
+    transform: JSON.parse
+  },
+  {
+    key: 'appTemplate',
+    fileName: 'index.html',
+    transform: parseTemplate
+  }
+]
+
+// Protector utility against request to SSR bundle files
+const ssrResourceRegex = new RegExp(resourceMap.map(resource => resource.fileName).join('|'), 'i')
+
 export default class Renderer extends Tapable {
   constructor (nuxt) {
     super()
@@ -91,29 +112,15 @@ export default class Renderer extends Tapable {
     return this
   }
 
-  async loadResources (_fs = fs, isServer) {
+  async loadResources (_fs) {
     let distPath = resolve(this.options.buildDir, 'dist')
 
-    const resourceMap = {
-      clientManifest: {
-        path: join(distPath, 'vue-ssr-client-manifest.json'),
-        transform: JSON.parse
-      },
-      serverBundle: {
-        path: join(distPath, 'server-bundle.json'),
-        transform: JSON.parse
-      },
-      appTemplate: {
-        path: join(distPath, 'index.html'),
-        transform: parseTemplate
-      }
-    }
-
     let updated = []
 
-    Object.keys(resourceMap).forEach(resourceKey => {
+    resourceMap.forEach(({ key, fileName, transform }) => {
-      let { path, transform } = resourceMap[resourceKey]
+      let rawKey = '$$' + key
-      let rawKey = '$$' + resourceKey
+      const path = join(distPath, fileName)
+
       let rawData, data
       if (!_fs.existsSync(path)) {
         return // Resource not exists
@@ -128,8 +135,8 @@ export default class Renderer extends Tapable {
       if (!data) {
         return // Invalid data ?
       }
-      this.resources[resourceKey] = data
+      this.resources[key] = data
-      updated.push(resourceKey)
+      updated.push(key)
     })
 
     if (updated.length > 0) {
@@ -149,7 +156,11 @@ export default class Renderer extends Tapable {
       clientManifest: this.resources.clientManifest,
       runInNewContext: false,
       basedir: this.options.rootDir
-    }, this.options.render.ssr))
+    }, this.options.render.ssr, this.options.build.ssr))
+
+    if (this.options.build.ssr) {
+      console.warn('[nuxt] `build.ssr` is deprecated and will be removed in 1.0 release, please use `renderer.ssr` instead!')
+    }
 
     // Promisify renderToString
     this.bundleRenderer.renderToString = pify(this.bundleRenderer.renderToString)
@@ -185,8 +196,7 @@ export default class Renderer extends Tapable {
       await this.serveStatic(req, res)
 
       // Serve .nuxt/dist/ files (only for production)
-      const isValidExtension = (req.url.slice(-3) === '.js') || (req.url.slice(-4) === '.css') || (req.url.slice(-4) === '.map')
+      if (!this.options.dev && !ssrResourceRegex.test(req.url)) {
-      if (!this.options.dev && isValidExtension) {
         const url = req.url
         if (req.url.indexOf(this.options.build.publicPath) === 0) {
           req.url = req.url.replace(this.options.build.publicPath, '/')