feat(core, website): upgrade workbox to v4.x

juliomrqz · Jun 13, 2019 · 6952de3 · 6952de3
1 parent 2011bc6
commit 6952de3
Show file tree

Hide file tree

Showing 18 changed files with 342 additions and 180 deletions.
diff --git a/packages/@statusfy/core/client/components/icons/fortawesome/index.js b/packages/@statusfy/core/client/components/icons/fortawesome/index.js
@@ -9,4 +9,3 @@ import './minus-circle-solid'
 import './question-circle-regular'
 import './times-circle-solid'
 import './times-solid'
-import './unlink-solid'
diff --git a/packages/@statusfy/core/client/components/icons/fortawesome/unlink-solid.js b/packages/@statusfy/core/client/components/icons/fortawesome/unlink-solid.js
diff --git a/packages/@statusfy/core/client/locales/br-default.json b/packages/@statusfy/core/client/locales/br-default.json
@@ -55,11 +55,6 @@
       "description": "Desculpe, não podemos concluir sua requisição"
     }
   },
-  "offline": {
-    "title": "Estamos Offline!",
-    "subtitle": "Desculpe!",
-    "description": "Não foi possível carregar a página requisitada. Por gentileza verifique sua conexão e tente novamente."
-  },
   "systems": {
     "items": {
       "cdn": {

diff --git a/packages/@statusfy/core/client/locales/de-default.json b/packages/@statusfy/core/client/locales/de-default.json
@@ -55,11 +55,6 @@
       "description": "Wir konnten deine Anfrage nicht bearbeiten. Wir bedauern eventuelle Unannehmlichkeiten."
     }
   },
-  "offline": {
-    "title": "Keine Internetverbindung",
-    "subtitle": "Hoppla!",
-    "description": "Wir konnten die von dir angeforderte Seite nicht laden. Bitte überprüfe deine Netzwerkverbindung und versuche es erneut."
-  },
   "systems": {
     "items": {
       "cdn": {

diff --git a/packages/@statusfy/core/client/locales/en-default.json b/packages/@statusfy/core/client/locales/en-default.json
@@ -55,11 +55,6 @@
       "description": "We're sorry, but we cannot fulfill your request"
     }
   },
-  "offline": {
-    "title": "You're Offline",
-    "subtitle": "Sorry!",
-    "description": "We were unable to load the page you requested. Please check your network connection and try again."
-  },
   "systems": {
     "items": {
       "cdn": {

diff --git a/packages/@statusfy/core/client/locales/es-default.json b/packages/@statusfy/core/client/locales/es-default.json
@@ -55,11 +55,6 @@
       "description": "Lo sentimos, pero no podemos cumplir con tu solicitud"
     }
   },
-  "offline": {
-    "title": "Estás Fuera de Línea",
-    "subtitle": "¡Lo sentimos!",
-    "description": "No pudimos cargar la página solicitada. Verifica tu conexión de red y vuelve a intentarlo."
-  },
   "systems": {
     "items": {
       "cdn": {

diff --git a/packages/@statusfy/core/client/locales/hu-default.json b/packages/@statusfy/core/client/locales/hu-default.json
@@ -55,11 +55,6 @@
       "description": "Sajnáljuk, de a kérést nem lehet teljesíteni"
     }
   },
-  "offline": {
-    "title": "Ön offline",
-    "subtitle": "Sajnáljuk!",
-    "description": "Nem sikerült betölteni a kért oldalt. Kérjük, ellenőrizze a hálózati kapcsolatot és próbálja újra."
-  },
   "systems": {
     "items": {
       "cdn": {

diff --git a/packages/@statusfy/core/client/locales/it-default.json b/packages/@statusfy/core/client/locales/it-default.json
@@ -55,11 +55,6 @@
       "description": "Spiacenti, la richiesta non può essere elaborata"
     }
   },
-  "offline": {
-    "title": "Sei Offline",
-    "subtitle": "Spiacenti!",
-    "description": "Non è stato possibile caricare la pagina richiesta. Controlla la tua connessione di rete e riprova."
-  },
   "systems": {
     "items": {
       "cdn": {

diff --git a/packages/@statusfy/core/client/pages/offline.vue b/packages/@statusfy/core/client/pages/offline.vue
diff --git a/packages/@statusfy/core/lib/config/generate.js b/packages/@statusfy/core/lib/config/generate.js
@@ -132,6 +132,10 @@ module.exports = function generateConfig(sourceDir, cliOptions) {
         runtime.strategyOptions.cacheName = `${siteConfig.name}_${runtime.strategyOptions.cacheName}`;
       }
     });
+
+    if (siteConfig.analytics && siteConfig.analytics.ga) {
+      nuxtConfig.workbox.offlineAnalytics = true;
+    }
   } else {
     const nuxtiPwaModuleConfig = nuxtConfig.modules.find(
       item => item[0] === "@nuxtjs/pwa"

diff --git a/packages/@statusfy/core/nuxt.config.js b/packages/@statusfy/core/nuxt.config.js
@@ -179,14 +179,8 @@ module.exports = {
   },
   workbox: {
     publicPath: "/static/",
-    offlinePage: "/offline",
-    _runtimeCaching: [
-      {
-        urlPattern: "/static/(?!content).*$",
-        handler: "cacheFirst",
-        method: "GET"
-      }
-    ],
+    cleanupOutdatedCaches: true,
+    assetsURLPattern: "/static/(?!content).*$",
     runtimeCaching: [
       {
         urlPattern: "(/static/content)?/api/v0/.*",

diff --git a/packages/@statusfy/core/package.json b/packages/@statusfy/core/package.json
@@ -36,7 +36,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.19",
     "@nuxtjs/axios": "^5.5.4",
-    "@nuxtjs/pwa": "^2.5.0",
+    "@nuxtjs/pwa": "^3.0.0-beta.16",
     "@statusfy/common": "0.3.2-beta.3",
     "@statusfy/markdown": "0.3.2-beta.3",
     "body-parser": "^1.18.3",

diff --git a/packages/@statusfy/core/test/config/__snapshots__/nuxt.spec.js.snap b/packages/@statusfy/core/test/config/__snapshots__/nuxt.spec.js.snap
@@ -283,16 +283,11 @@ Object {
     "version": "0.3.2-beta.3",
   },
   "workbox": Object {
-    "_runtimeCaching": Array [
-      Object {
-        "handler": "cacheFirst",
-        "method": "GET",
-        "urlPattern": "/static/(?!content).*$",
-      },
-    ],
+    "assetsURLPattern": "/static/(?!content).*$",
     "cacheId": "app_name",
+    "cleanupOutdatedCaches": true,
     "globDirectory": "../.tmp/advanced/.statusfy/dist/client",
-    "offlinePage": "/offline",
+    "offlineAnalytics": true,
     "publicPath": "/static/",
     "runtimeCaching": Array [
       Object {
@@ -531,16 +526,10 @@ Object {
     "version": "0.3.2-beta.3",
   },
   "workbox": Object {
-    "_runtimeCaching": Array [
-      Object {
-        "handler": "cacheFirst",
-        "method": "GET",
-        "urlPattern": "/static/(?!content).*$",
-      },
-    ],
+    "assetsURLPattern": "/static/(?!content).*$",
     "cacheId": "title",
+    "cleanupOutdatedCaches": true,
     "globDirectory": "../.tmp/cli/.statusfy/dist/client",
-    "offlinePage": "/offline",
     "publicPath": "/static/",
     "runtimeCaching": Array [
       Object {
@@ -1010,16 +999,11 @@ Object {
     "version": "0.3.2-beta.3",
   },
   "workbox": Object {
-    "_runtimeCaching": Array [
-      Object {
-        "handler": "cacheFirst",
-        "method": "GET",
-        "urlPattern": "/static/(?!content).*$",
-      },
-    ],
+    "assetsURLPattern": "/static/(?!content).*$",
     "cacheId": "Nombre Aplicación",
+    "cleanupOutdatedCaches": true,
     "globDirectory": "../.tmp/spanish/.statusfy/dist/client",
-    "offlinePage": "/offline",
+    "offlineAnalytics": true,
     "publicPath": "/static/",
     "runtimeCaching": Array [
       Object {

diff --git a/packages/demo/test/__snapshots__/build-generate.spec.js.snap b/packages/demo/test/__snapshots__/build-generate.spec.js.snap
@@ -44,7 +44,6 @@ Object {
   ],
   "lang": "en",
   "name": "Demo System Status",
-  "publicPath": "/static/",
   "short_name": "System Status",
   "start_url": "/?standalone=true&utm_source=web_app&utm_medium=pwa",
   "theme_color": "#1b1f23",

diff --git a/packages/demo/test/build-generate.spec.js b/packages/demo/test/build-generate.spec.js
@@ -29,10 +29,8 @@ describe('build-generate', () => {
   test('sw.js', async () => {
     const swContent = await fse.readFile(path.resolve(sourceDir, 'dist', 'sw.js'), 'utf-8')
 
-    expect(swContent).toContain("workbox.precaching.precacheAndRoute(['/offline'])")
-    expect(swContent).toContain("workbox.routing.registerRoute(new RegExp('/static/(?!content).*$'), workbox.strategies.cacheFirst({}), 'GET')")
-    expect(swContent).toContain("workbox.routing.registerRoute(new RegExp('(/static/content)?/api/v0/.*'), workbox.strategies.networkFirst({\"cacheName\":\"demo_system_status_api\",\"cacheExpiration\":{\"maxEntries\":10,\"maxAgeSeconds\":300}}), 'GET')")
-    expect(swContent).toContain("caches.match('/offline')")
-    expect(swContent).toContain("\"cacheId\": \"demo_system_status\"")
+    expect(swContent).toContain("workbox.precaching.cleanupOutdatedCaches()")
+    expect(swContent).toContain("workbox.routing.registerRoute(new RegExp('/static/(?!content).*$'), new workbox.strategies.CacheFirst ({}), 'GET')")
+    expect(swContent).toContain("workbox.routing.registerRoute(new RegExp('(/static/content)?/api/v0/.*'), new workbox.strategies.NetworkFirst ({\"cacheName\":\"demo_system_status_api\",\"cacheExpiration\":{\"maxEntries\":10,\"maxAgeSeconds\":300}}), 'GET')")
   })
 })
diff --git a/packages/website/nuxt.config.js b/packages/website/nuxt.config.js
@@ -221,9 +221,6 @@ module.exports = {
     theme_color: mainColor,
     version: pkg.version
   },
-  workbox: {
-    offlinePage: '/offline'
-  },
   /*
    ** Google Analytics configuration
    */

diff --git a/packages/website/package.json b/packages/website/package.json
@@ -21,7 +21,7 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.19",
     "@nuxtjs/axios": "^5.5.4",
     "@nuxtjs/google-analytics": "^2.2.0",
-    "@nuxtjs/pwa": "^2.6.0",
+    "@nuxtjs/pwa": "^3.0.0-beta.16",
     "@nuxtjs/sitemap": "^1.2.0",
     "@statusfy/common": "0.3.2-beta.3",
     "animate.css": "^3.7.2",