fix(workbox): restore sw.js with smart build (fixes #352)

nuxt-community · Oct 10, 2020 · 491f440 · 491f440
1 parent f35d2e7
commit 491f440
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 26 deletions.
diff --git a/lib/workbox/module.js b/lib/workbox/module.js
@@ -1,13 +1,14 @@
-const path = require('path')
+const { resolve } = require('path')
+const { existsSync, writeFile, readFile } = require('fs-extra')
 
 const { getOptions } = require('./options')
 const { readJSFiles, pick } = require('./utils')
 
 module.exports = function nuxtWorkbox (pwa) {
-  this.nuxt.hook('build:before', async () => {
-    // Get options
-    const options = getOptions.call(this, pwa)
+  const { nuxt } = this
+  const options = getOptions.call(this, pwa)
 
+  this.nuxt.hook('build:before', async () => {
     // Warning for dev option
     if (options.dev) {
       // eslint-disable-next-line no-console
@@ -17,7 +18,7 @@ module.exports = function nuxtWorkbox (pwa) {
     // Register plugin
     if (options.autoRegister) {
       this.addPlugin({
-        src: path.resolve(__dirname, `templates/workbox${options.enabled ? '' : '.unregister'}.js`),
+        src: resolve(__dirname, `templates/workbox${options.enabled ? '' : '.unregister'}.js`),
         ssr: false,
         fileName: 'workbox.js',
         options: {
@@ -28,30 +29,47 @@ module.exports = function nuxtWorkbox (pwa) {
 
     // Add sw.js
     if (options.swTemplate) {
-      await this.addTemplate({
+      const templateOptions = {
+        swOptions: pick(options, [
+          'workboxURL',
+          'importScripts',
+          'config',
+          'cacheNames',
+          'clientsClaim',
+          'skipWaiting',
+          'cleanupOutdatedCaches',
+          'offlineAnalytics',
+          'preCaching',
+          'runtimeCaching',
+          'offlinePage',
+          'pagesURLPattern',
+          'offlineStrategy'
+        ]),
+        routingExtensions: await readJSFiles.call(this, options.routingExtensions),
+        cachingExtensions: await readJSFiles.call(this, options.cachingExtensions),
+        workboxExtensions: await readJSFiles.call(this, options.workboxExtensions)
+      }
+
+      this.addTemplate({
+        src: options.swTemplate,
+        fileName: 'pwa/sw.js',
+        options: templateOptions
+      })
+
+      this.addTemplate({
         src: options.swTemplate,
         fileName: options.swDest,
-        options: {
-          swOptions: pick(options, [
-            'workboxURL',
-            'importScripts',
-            'config',
-            'cacheNames',
-            'clientsClaim',
-            'skipWaiting',
-            'cleanupOutdatedCaches',
-            'offlineAnalytics',
-            'preCaching',
-            'runtimeCaching',
-            'offlinePage',
-            'pagesURLPattern',
-            'offlineStrategy'
-          ]),
-          routingExtensions: await readJSFiles.call(this, options.routingExtensions),
-          cachingExtensions: await readJSFiles.call(this, options.cachingExtensions),
-          workboxExtensions: await readJSFiles.call(this, options.workboxExtensions)
-        }
+        options: templateOptions
       })
     }
   })
+
+  if (nuxt.options.target === 'static') {
+    nuxt.hook('generate:before', async () => {
+      const swJS = resolve(nuxt.options.buildDir, 'pwa/sw.js')
+      if (existsSync(swJS)) {
+        await writeFile(options.swDest, await readFile(swJS))
+      }
+    })
+  }
 }
diff --git a/test/fixture/nuxt.config.js b/test/fixture/nuxt.config.js
@@ -1,6 +1,7 @@
 module.exports = {
   dev: false,
   rootDir: __dirname,
+  target: 'static',
 
   buildModules: [
     { handler: require('../../') }