Remove gatsby-plugin-offline, support for PWA added

Author: thandaanda

gatsby-wordpress-theme-libre/gatsby-config.js

@@ -88,6 +88,8 @@ module.exports = (themeOptions) => {
             `/404`,
             `/404.html`,
             `/offline-plugin-app-shell-fallback`,
+            '/offline',
+            '/offline.html'
           ],
           createLinkInHead: true,
           addUncaughtPages: true,
@@ -96,7 +98,6 @@ module.exports = (themeOptions) => {
       `gatsby-plugin-catch-links`,
       `gatsby-plugin-react-helmet`,
       `gatsby-plugin-force-trailing-slashes`,
-      `gatsby-plugin-offline`,
       {
         resolve: `gatsby-plugin-manifest`,
         options: {
@@ -109,6 +110,7 @@ module.exports = (themeOptions) => {
           icon: "static/favicon.png",
         },
       },
+      'gatsby-plugin-remove-serviceworker',
       {
         resolve: `gatsby-plugin-feed`,
         options: {
@@ -161,7 +163,7 @@ module.exports = (themeOptions) => {
         options: {
           canonicalBaseUrl: siteConfig.siteUrl,
           components: [`amp-form`],
-          excludedPaths: [`/404*`, `/`],
+          excludedPaths: [`/404*`, `/`, `/offline*`],
           pathIdentifier: `amp/`,
           relAmpHtmlPattern: `{{canonicalBaseUrl}}{{pathname}}{{pathIdentifier}}`,
           useAmpClientIdApi: true,

gatsby-wordpress-theme-libre/gatsby-ssr.js

@@ -0,0 +1,20 @@
+const React = require("react");
+
+exports.onRenderBody = ({ pathname, setHeadComponents }) => {
+  setHeadComponents([
+    <script
+      type="module"
+      dangerouslySetInnerHTML={{
+        __html: `import 'https://cdn.jsdelivr.net/npm/@pwabuilder/pwaupdate';`,
+      }}
+    ></script>,
+    <style
+      dangerouslySetInnerHTML={{
+        __html: `pwa-update {
+      display: none;
+    }`,
+      }}
+    ></style>,
+    <pwa-update showOfflineToast="false"></pwa-update>,
+  ]);
+};

gatsby-wordpress-theme-libre/package.json

@@ -56,9 +56,9 @@
     "gatsby-plugin-feed": "^2.4.1",
     "gatsby-plugin-force-trailing-slashes": "^1.0.4",
     "gatsby-plugin-manifest": "^2.2.48",
-    "gatsby-plugin-offline": "^3.0.40",
     "gatsby-plugin-react-helmet": "^3.1.23",
     "gatsby-plugin-remove-generator": "^1.0.5",
+    "gatsby-plugin-remove-serviceworker": "^1.0.0",
     "gatsby-plugin-sharp": "^2.4.11",
     "gatsby-plugin-typescript": "^2.2.3",
     "gatsby-source-filesystem": "^2.1.53",

gatsby-wordpress-theme-libre/src/pages/offline.js

@@ -0,0 +1,20 @@
+import React from "react";
+import { Link } from "gatsby";
+
+const NotFound = () => {
+  return (
+    <div className="error-message-container">
+      <div className="error-message">
+        <h2 className="error-title">Offline :(</h2>
+        <p className="error-description">
+          Looks like you lost your connection. Please check it and try again.
+        </p>
+        <Link to="/" className="error-link">
+          Try again →
+        </Link>
+      </div>
+    </div>
+  );
+};
+
+export default NotFound;

gatsby-wordpress-theme-libre/static/pwabuilder-sw.js

@@ -0,0 +1,48 @@
+// This is the "Offline page" service worker
+
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.0.0/workbox-sw.js');
+
+const CACHE = "libre-theme-cache";
+
+// TODO: replace the following with the correct offline fallback page i.e.: const offlineFallbackPage = "offline.html";
+const offlineFallbackPage = "offline/index.html";
+
+self.skipWaiting();
+// self.addEventListener("message", (event) => {
+//   if (event.data && event.data.type === "SKIP_WAITING") {
+//     self.skipWaiting();
+//   }
+// });
+
+self.addEventListener('install', async (event) => {
+  event.waitUntil(
+    caches.open(CACHE)
+      .then((cache) => cache.add(offlineFallbackPage))
+  );
+});
+
+if (workbox.navigationPreload.isSupported()) {
+  workbox.navigationPreload.enable();
+}
+
+self.addEventListener('fetch', (event) => {
+  if (event.request.mode === 'navigate') {
+    event.respondWith((async () => {
+      try {
+        const preloadResp = await event.preloadResponse;
+
+        if (preloadResp) {
+          return preloadResp;
+        }
+
+        const networkResp = await fetch(event.request);
+        return networkResp;
+      } catch (error) {
+
+        const cache = await caches.open(CACHE);
+        const cachedResp = await cache.match(offlineFallbackPage);
+        return cachedResp;
+      }
+    })());
+  }
+});