fix(gatsby-plugin-offline): prevent incorrect revisioning of static f…

…ile by workbox (gatsbyjs#10416)
gpetrioli · Jan 22, 2019 · 57b82b6 · 57b82b6
1 parent 20b6044
commit 57b82b6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/packages/gatsby-plugin-offline/.gitignore b/packages/gatsby-plugin-offline/.gitignore
@@ -1,3 +1,4 @@
 /*.js
 !index.js
+!sw-append.js
 yarn.lock
diff --git a/packages/gatsby-plugin-offline/README.md b/packages/gatsby-plugin-offline/README.md
@@ -40,12 +40,12 @@ const options = {
   cacheId: `gatsby-plugin-offline`,
   // Don't cache-bust JS or CSS files, and anything in the static directory,
   // since these files have unique URLs and their contents will never change
-  dontCacheBustUrlsMatching: /(\.js$|\.css$|\/static\/)/,
+  dontCacheBustUrlsMatching: /(\.js$|\.css$|static\/)/,
   runtimeCaching: [
     {
       // Use cacheFirst since these don't need to be revalidated (same RegExp
       // and same reason as above)
-      urlPattern: /(\.js$|\.css$|\/static\/)/,
+      urlPattern: /(\.js$|\.css$|static\/)/,
       handler: `cacheFirst`,
     },
     {

diff --git a/packages/gatsby-plugin-offline/src/gatsby-node.js b/packages/gatsby-plugin-offline/src/gatsby-node.js
@@ -82,12 +82,12 @@ exports.onPostBuild = (args, pluginOptions) => {
     cacheId: `gatsby-plugin-offline`,
     // Don't cache-bust JS or CSS files, and anything in the static directory,
     // since these files have unique URLs and their contents will never change
-    dontCacheBustUrlsMatching: /(\.js$|\.css$|\/static\/)/,
+    dontCacheBustUrlsMatching: /(\.js$|\.css$|static\/)/,
     runtimeCaching: [
       {
         // Use cacheFirst since these don't need to be revalidated (same RegExp
         // and same reason as above)
-        urlPattern: /(\.js$|\.css$|\/static\/)/,
+        urlPattern: /(\.js$|\.css$|static\/)/,
         handler: `cacheFirst`,
       },
       {
@@ -126,7 +126,7 @@ exports.onPostBuild = (args, pluginOptions) => {
         .readFileSync(`${__dirname}/sw-append.js`, `utf8`)
         .replace(/%pathPrefix%/g, pathPrefix)
 
-      fs.appendFileSync(`public/sw.js`, swAppend)
+      fs.appendFileSync(`public/sw.js`, `\n` + swAppend)
       console.log(
         `Generated ${swDest}, which will precache ${count} files, totaling ${size} bytes.`
       )

diff --git a/...es/gatsby-plugin-offline/src/sw-append.js → packages/gatsby-plugin-offline/sw-append.js b/...es/gatsby-plugin-offline/src/sw-append.js → packages/gatsby-plugin-offline/sw-append.js