From 1401434594b36b7292e11ca54a24cdc3f028bd99 Mon Sep 17 00:00:00 2001
From: Hana Shiro <shirohana0608@gmail.com>
Date: Sat, 22 Jul 2017 07:40:38 +0800
Subject: [PATCH 1/2] Resolve non-js package importing

---
 lib/app/App.vue        | 2 +-
 lib/builder/builder.js | 1 +
 lib/core/nuxt.js       | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/app/App.vue b/lib/app/App.vue
index a47e53bce9..d2e9f8a163 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 '<%= wp(c.src || c) %>'
+import '<%= relativeToBuild(resolvePath(c.src || c)) %>'
 <% }) %>
 
 let layouts = {
diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index f847f4ff12..1e8f68eaf6 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -242,6 +242,7 @@ export default class Builder extends Tapable {
           hash,
           r,
           wp,
+          resolvePath: this.nuxt.resolvePath.bind(this.nuxt),
           relativeToBuild: this.relativeToBuild
         }
       })
diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index b0ac429e5f..9e56920d85 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -16,6 +16,7 @@ export default class Nuxt extends Tapable {
 
     this.options = Options(_options)
 
+
     this.initialized = false
     this.errorHandler = this.errorHandler.bind(this)
 

From 72a9beff6451751c87baebdfc0bc27a61f3d5888 Mon Sep 17 00:00:00 2001
From: Hana Shiro <shirohana0608@gmail.com>
Date: Sat, 22 Jul 2017 20:30:31 +0800
Subject: [PATCH 2/2] Resolve requires from `rootDir`

---
 lib/core/nuxt.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/core/nuxt.js b/lib/core/nuxt.js
index 9e56920d85..92d103e997 100644
--- a/lib/core/nuxt.js
+++ b/lib/core/nuxt.js
@@ -5,6 +5,7 @@ import Renderer from './renderer'
 import Options from './options'
 import Debug from 'debug'
 import enableDestroy from 'server-destroy'
+import Module from 'module'
 import { join, resolve } from 'path'
 
 const debug = Debug('nuxt:')
@@ -16,6 +17,8 @@ export default class Nuxt extends Tapable {
 
     this.options = Options(_options)
 
+    // Paths for resolving requires from `rootDir`
+    this.nodeModulePaths = Module._nodeModulePaths(this.options.rootDir)
 
     this.initialized = false
     this.errorHandler = this.errorHandler.bind(this)
@@ -102,7 +105,7 @@ export default class Nuxt extends Tapable {
   resolvePath (path) {
     // Try to resolve using NPM resolve path first
     try {
-      let resolvedPath = require.resolve(path)
+      let resolvedPath = Module._resolveFilename(path, { paths: this.nodeModulePaths })
       return resolvedPath
     } catch (e) {
       // Just continue