From a1d78988c0c176ed0d263043bb01003bb5f308d7 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 26 May 2017 13:34:11 +0430
Subject: [PATCH] fix: call to wp instead of r for css

The intention of using r was to fix problems with windows paths, but calling r will try to resolve path as well. This was breaking original webpack resolve mechanism from node_modules
---
 lib/app/App.vue | 2 +-
 lib/build.js    | 5 +++--
 lib/utils.js    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/app/App.vue b/lib/app/App.vue
index f7a01ef361..fa8ef6d403 100644
--- a/lib/app/App.vue
+++ b/lib/app/App.vue
@@ -8,7 +8,7 @@
 <script>
 <% if (loading) { %>import NuxtLoading from '<%= (typeof loading === "string" ? loading : "./components/nuxt-loading.vue") %>'<% } %>
 <% css.forEach(function (c) { %>
-import '<%= r(c.src || c) %>'
+import '<%= wp(c.src || c) %>'
 <% }) %>
 
 let layouts = {
diff --git a/lib/build.js b/lib/build.js
index 8263b17fa4..a2395a8266 100644
--- a/lib/build.js
+++ b/lib/build.js
@@ -10,7 +10,7 @@ import PostCompilePlugin from 'post-compile-webpack-plugin'
 import serialize from 'serialize-javascript'
 import { createBundleRenderer } from 'vue-server-renderer'
 import { join, resolve, basename, dirname } from 'path'
-import { isUrl, r } from './utils'
+import { isUrl, r, wp } from './utils'
 import clientWebpackConfig from './webpack/client.config.js'
 import serverWebpackConfig from './webpack/server.config.js'
 const debug = require('debug')('nuxt:build')
@@ -275,7 +275,8 @@ async function generateRoutesAndFiles () {
       imports: {
         serialize,
         hash,
-        r
+        r,
+        wp
       }
     })
     const content = template(Object.assign({}, templateVars, {
diff --git a/lib/utils.js b/lib/utils.js
index 601d68dfe0..4e69f0f636 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -77,7 +77,7 @@ export function chainFn (base, fn) {
   }
 }
 
-function wp (p) {
+export function wp (p) {
   /* istanbul ignore if */
   if (/^win/.test(process.platform)) {
     p = p.replace(/\\/g, '\\\\')