From 7a8bb3bf0469093b3f57a75d2a934860edee4fbf Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Sun, 26 Aug 2018 01:48:56 +0430
Subject: [PATCH] fix(workbox): more fixes regarding nuxt 2 dist directory
 changes. fixes #83.

---
 packages/workbox/index.js           | 14 +++++++++++---
 test/__snapshots__/pwa.test.js.snap |  3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/workbox/index.js b/packages/workbox/index.js
index 60fe0b2b..8e5c23c1 100755
--- a/packages/workbox/index.js
+++ b/packages/workbox/index.js
@@ -30,8 +30,16 @@ module.exports = function nuxtWorkbox (moduleOptions) {
 
   // Get client output path (#83)
   this.extendBuild((config, { isClient }) => {
-    if (isClient && !options.globDirectory) {
-      options.globDirectory = config.output.path
+    if (!isClient) {
+      return
+    }
+
+    if (!options.clientBuildDir) {
+      options.clientBuildDir = config.output.path
+    }
+
+    if (!options.globDirectory) {
+      options.globDirectory = options.clientBuildDir
     }
   })
 
@@ -177,7 +185,7 @@ function emitAssets (options) {
   // Write assets after build
   const hook = builder => {
     assets.forEach(({ source, dst }) => {
-      writeFileSync(path.resolve(this.options.buildDir, 'dist', dst), source, 'utf-8')
+      writeFileSync(path.resolve(options.clientBuildDir, dst), source, 'utf-8')
     })
   }
 
diff --git a/test/__snapshots__/pwa.test.js.snap b/test/__snapshots__/pwa.test.js.snap
index 09d547a6..adcfd68c 100644
--- a/test/__snapshots__/pwa.test.js.snap
+++ b/test/__snapshots__/pwa.test.js.snap
@@ -28,12 +28,12 @@ Array [
   "fixture/.nuxt/dist/client/ons.40ac840e.js",
   "fixture/.nuxt/dist/client/pages",
   "fixture/.nuxt/dist/client/pages/index.js",
+  "fixture/.nuxt/dist/client/workbox.dev.42554690.js",
   "fixture/.nuxt/dist/server",
   "fixture/.nuxt/dist/server/index.spa.html",
   "fixture/.nuxt/dist/server/index.ssr.html",
   "fixture/.nuxt/dist/server/server-bundle.json",
   "fixture/.nuxt/dist/server/vue-ssr-client-manifest.json",
-  "fixture/.nuxt/dist/workbox.dev.42554690.js",
   "fixture/.nuxt/empty.js",
   "fixture/.nuxt/index.js",
   "fixture/.nuxt/layouts",
@@ -75,6 +75,7 @@ Array [
   "fixture/dist/_nuxt/ons.40ac840e.js",
   "fixture/dist/_nuxt/pages",
   "fixture/dist/_nuxt/pages/index.js",
+  "fixture/dist/_nuxt/workbox.dev.42554690.js",
   "fixture/dist/custom-sw.js",
   "fixture/dist/icon.png",
   "fixture/dist/index.html",