From 68e1c6dff0e289787f890cd55d87b94a6b7c5951 Mon Sep 17 00:00:00 2001
From: Andreas Richter <708186+richtera@users.noreply.github.com>
Date: Wed, 30 Oct 2024 05:22:05 -0400
Subject: [PATCH 1/5] fix: Add provide('swHasUpgrade', hasUpgrade) and prevent
 automatic upgrade and reload of service worker

---
 app.vue              | 27 ++++++++++++++++++++++-----
 service-worker/sw.ts | 13 +++++++++----
 tsconfig.json        |  1 +
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/app.vue b/app.vue
index d79a9bff..c76fc320 100644
--- a/app.vue
+++ b/app.vue
@@ -216,12 +216,29 @@ useHead({
       return bodyClass.join(' ')
     }),
   },
-  script: [
-    {
-      innerHTML: `if('serviceWorker' in navigator){window.addEventListener('load', () => {navigator.serviceWorker.register('/sw.js', { scope: '/' })})}`,
-    },
-  ],
 })
+const hasUpgrade = ref<boolean>(false)
+if ('serviceWorker' in navigator) {
+  navigator.serviceWorker.register('/sw.js').then(registration => {
+    // Listen for updates
+    registration.addEventListener('updatefound', () => {
+      const newWorker = registration.installing
+      if (newWorker) {
+        newWorker.addEventListener('statechange', () => {
+          if (newWorker.state === 'activated') {
+            // Notify the user that an update is available
+            console.log('A new version is available. Please refresh.')
+            hasUpgrade.value = true
+            // Optionally, prompt the user for a refresh, or defer it to a better time.
+          }
+        })
+      }
+    })
+  })
+}
+// Make the service worker update available to the rest of the app
+// any view can use
+provide('swHasUpgrade', hasUpgrade)
 </script>
 
 <template>
diff --git a/service-worker/sw.ts b/service-worker/sw.ts
index 886e81e9..20a3b375 100644
--- a/service-worker/sw.ts
+++ b/service-worker/sw.ts
@@ -1,5 +1,4 @@
 import { keccak256 } from 'js-sha3'
-import { clientsClaim } from 'workbox-core'
 /// <reference lib="WebWorker" />
 /// <reference types="vite/client" />
 import { cleanupOutdatedCaches, precacheAndRoute } from 'workbox-precaching'
@@ -57,6 +56,12 @@ registerRoute(
 )
 // registerRoute(new NavigationRoute(createHandlerBoundToURL('/'), { allowlist }))
 
-// @ts-ignore
-self.skipWaiting()
-clientsClaim()
+self.addEventListener('install', () => {
+  self.skipWaiting() // Skip waiting to activate the new SW immediately
+})
+
+self.addEventListener('activate', event => {
+  event.waitUntil(
+    self.clients.claim() // Ensure the SW controls the clients
+  )
+})
diff --git a/tsconfig.json b/tsconfig.json
index 2e85f557..23028336 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,6 +2,7 @@
   // https://nuxt.com/docs/guide/concepts/typescript
   "extends": "./.nuxt/tsconfig.json",
   "compilerOptions": {
+    "lib": ["webworker", "dom", "esnext"],
     "paths": {
       "@/*": [
         "./*"

From 0e734815e6a9d7cadc5cc17d071855146b14c099 Mon Sep 17 00:00:00 2001
From: Andreas Richter <708186+richtera@users.noreply.github.com>
Date: Wed, 30 Oct 2024 07:13:28 -0400
Subject: [PATCH 2/5] fix: Repair source maps

---
 nuxt.config.ts | 89 +++++++++++++++++++++++++++++++++++++++++---------
 package.json   |  2 +-
 2 files changed, 74 insertions(+), 17 deletions(-)

diff --git a/nuxt.config.ts b/nuxt.config.ts
index 05868240..502d07a9 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -21,6 +21,37 @@ export default defineNuxtConfig({
   app: {
     head: siteMeta,
   },
+  components: {
+    dirs: [
+      // Use this to find all the dirs `find . -name "*.vue" -exec dirname {} \; | sort -u`
+      { path: '~/components', sourcemap: true }, // Enable source map generation for components
+      { path: '~/pages', sourcemap: true }, // Enable source map generation for components
+      {
+        path: '~/node_modules/vue-instantsearch/src/components',
+        sourcemap: true,
+      }, // Enable source map generation for components
+      {
+        path: '~/node_modules/vite-plugin-vue-inspector/src',
+        sourcemap: true,
+      }, // Enable source map generation for components
+      {
+        path: '~/node_modules/@vite-pwa/nuxt/dist/runtime/components',
+        sourcemap: true,
+      }, // Enable source map generation for components
+      {
+        path: '~/domains/rpc/components',
+        sourcemap: true,
+      }, // Enable source map generation for components
+      {
+        path: '~/domains/graph/components',
+        sourcemap: true,
+      }, // Enable source map generation for components
+      {
+        path: '~/layouts',
+        sourcemap: true,
+      }, // Enable source map generation for components
+    ],
+  },
   typescript: {
     strict: true,
   },
@@ -65,16 +96,20 @@ export default defineNuxtConfig({
         nodePolyfills({
           include: ['node_modules/**/*.js', /node_modules\/.vite\/.*js/],
         }),
-      sentryVitePlugin({
-        authToken: process.env.NUXT_PUBLIC_SENTRY_AUTH_TOKEN,
-        debug: true,
-        org: 'lukso',
-        project: 'universalprofile-cloud',
-        sourcemaps: {
-          assets: ['./.nuxt/dist/client/**'],
-        },
-        telemetry: false,
-      }),
+      ...(process.env.NUXT_PUBLIC_SENTRY_AUTH_TOKEN
+        ? [
+            sentryVitePlugin({
+              authToken: process.env.NUXT_PUBLIC_SENTRY_AUTH_TOKEN,
+              debug: true,
+              org: 'lukso',
+              project: 'universalprofile-cloud',
+              sourcemaps: {
+                assets: ['./.nuxt/dist/client/**'],
+              },
+              telemetry: false,
+            }),
+          ]
+        : []),
     ],
     build: {
       rollupOptions: {
@@ -82,9 +117,25 @@ export default defineNuxtConfig({
           // ↓ Needed for build
           nodePolyfills(),
         ],
+        output: {
+          sourcemap: true,
+        },
+        onwarn(warning, warn) {
+          // If we can't show which files have bad source map then we might as well not show the error/warning
+          if (warning.message.includes('Sourcemap is likely to be incorrect')) {
+            if (warning.loc?.file || warning.id) {
+              console.warn(
+                `${warning.message} ${warning.loc?.file || warning.id || 'unknown file'}`
+              )
+            }
+            return
+          }
+          warn(warning) // Default behavior
+        },
       },
       commonjsOptions: {
         transformMixedEsModules: true,
+        sourceMap: true,
       },
       sourcemap: true,
     },
@@ -100,7 +151,10 @@ export default defineNuxtConfig({
       },
     },
     optimizeDeps: {
+      // Don't generate source maps for vue files in node_modules.
+      exclude: ['node_modules/**/*.vue'],
       esbuildOptions: {
+        sourcemap: true,
         // Node.js global to browser globalThis
         define: {
           global: 'globalThis',
@@ -117,6 +171,7 @@ export default defineNuxtConfig({
   },
   vue: {
     compilerOptions: {
+      sourceMap: true,
       isCustomElement: (tag: string) => {
         return tag.startsWith('lukso-')
       },
@@ -166,12 +221,13 @@ export default defineNuxtConfig({
     injectManifest: {
       globPatterns: ['**/*.{js,css,html,png,svg,ico}'],
     },
-    client: {
-      installPrompt: true,
-      // you don't need to include this: only for testing purposes
-      // if enabling periodic sync for update use 1 hour or so (periodicSyncForUpdates: 3600)
-      // periodicSyncForUpdates: 20,
-    },
+    // We don't actually use the client stub at all.
+    // client: {
+    //   installPrompt: true,
+    //   // you don't need to include this: only for testing purposes
+    //   // if enabling periodic sync for update use 1 hour or so (periodicSyncForUpdates: 3600)
+    //   // periodicSyncForUpdates: 20,
+    // },
     resolve: {
       alias: {
         process: 'process/browser',
@@ -200,6 +256,7 @@ export default defineNuxtConfig({
         target: 'esnext',
       },
     },
+    sourceMaps: true,
   },
   'graphql-client': {
     watch: true,
diff --git a/package.json b/package.json
index 96867d38..8d7d9519 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "build": "nuxt build",
+    "build": "cross-env NODE_ENV=production nuxt build",
     "dev": "nuxt dev",
     "generate": "nuxt generate",
     "preview": "nuxt preview",

From 6a3e6b0cd48dfc0cb865d4c86401f4733d71ff27 Mon Sep 17 00:00:00 2001
From: Andreas Richter <708186+richtera@users.noreply.github.com>
Date: Thu, 31 Oct 2024 08:40:35 -0400
Subject: [PATCH 3/5] fix: Make changes as per review comments

---
 app.vue        | 14 ++++++--------
 nuxt.config.ts |  7 -------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/app.vue b/app.vue
index c76fc320..ba7d7edc 100644
--- a/app.vue
+++ b/app.vue
@@ -23,6 +23,11 @@ const { cacheValue } = useCache()
 const { currencyList } = storeToRefs(useCurrencyStore())
 const { initProvider, reconnect } = useWalletConnectProvider()
 const { formatMessage } = useIntl()
+const swHasUpgrade = ref<boolean>(false)
+
+// Make the service worker update available to the rest of the app
+// any view can use inject('swHasUpgrade') to access this value
+provide('swHasUpgrade', swHasUpgrade)
 
 const setupTranslations = () => {
   useIntl().setupIntl(defaultConfig)
@@ -217,7 +222,6 @@ useHead({
     }),
   },
 })
-const hasUpgrade = ref<boolean>(false)
 if ('serviceWorker' in navigator) {
   navigator.serviceWorker.register('/sw.js').then(registration => {
     // Listen for updates
@@ -226,19 +230,13 @@ if ('serviceWorker' in navigator) {
       if (newWorker) {
         newWorker.addEventListener('statechange', () => {
           if (newWorker.state === 'activated') {
-            // Notify the user that an update is available
-            console.log('A new version is available. Please refresh.')
-            hasUpgrade.value = true
-            // Optionally, prompt the user for a refresh, or defer it to a better time.
+            swHasUpgrade.value = true
           }
         })
       }
     })
   })
 }
-// Make the service worker update available to the rest of the app
-// any view can use
-provide('swHasUpgrade', hasUpgrade)
 </script>
 
 <template>
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 502d07a9..6dd5d4fa 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -221,13 +221,6 @@ export default defineNuxtConfig({
     injectManifest: {
       globPatterns: ['**/*.{js,css,html,png,svg,ico}'],
     },
-    // We don't actually use the client stub at all.
-    // client: {
-    //   installPrompt: true,
-    //   // you don't need to include this: only for testing purposes
-    //   // if enabling periodic sync for update use 1 hour or so (periodicSyncForUpdates: 3600)
-    //   // periodicSyncForUpdates: 20,
-    // },
     resolve: {
       alias: {
         process: 'process/browser',

From 959d2aa8c6895ce133bde0578c5f5fa6f2773842 Mon Sep 17 00:00:00 2001
From: Andreas Richter <708186+richtera@users.noreply.github.com>
Date: Fri, 1 Nov 2024 05:18:17 -0400
Subject: [PATCH 4/5] fix: Remove some of the source maps.

---
 nuxt.config.ts | 9 ---------
 package.json   | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/nuxt.config.ts b/nuxt.config.ts
index 6dd5d4fa..4e1f8e28 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -25,19 +25,10 @@ export default defineNuxtConfig({
     dirs: [
       // Use this to find all the dirs `find . -name "*.vue" -exec dirname {} \; | sort -u`
       { path: '~/components', sourcemap: true }, // Enable source map generation for components
-      { path: '~/pages', sourcemap: true }, // Enable source map generation for components
       {
         path: '~/node_modules/vue-instantsearch/src/components',
         sourcemap: true,
       }, // Enable source map generation for components
-      {
-        path: '~/node_modules/vite-plugin-vue-inspector/src',
-        sourcemap: true,
-      }, // Enable source map generation for components
-      {
-        path: '~/node_modules/@vite-pwa/nuxt/dist/runtime/components',
-        sourcemap: true,
-      }, // Enable source map generation for components
       {
         path: '~/domains/rpc/components',
         sourcemap: true,
diff --git a/package.json b/package.json
index 8d7d9519..5828e7ce 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "generate": "nuxt generate",
     "preview": "nuxt preview",
     "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:{eslint,css,fmt,types,biome}\"",
+    "lint": "npm-run-all -l --aggregate-output --continue-on-error --parallel \"lint:{eslint,css,fmt,types,biome}\"",
     "lint:eslint": "eslint --ext '.js,.vue,.ts' .",
     "lint:eslint:fix": "eslint --ext '.js,.vue,.ts' . --fix",
     "lint:css": "stylelint \"**/*.{scss,css,vue}\"",

From e2ccbc51b0e815d6c6150962ffbc2625be287bd8 Mon Sep 17 00:00:00 2001
From: Andreas Richter <708186+richtera@users.noreply.github.com>
Date: Fri, 1 Nov 2024 05:19:20 -0400
Subject: [PATCH 5/5] fix: Remove unnecessary comments

---
 nuxt.config.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nuxt.config.ts b/nuxt.config.ts
index 4e1f8e28..86091581 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -28,19 +28,19 @@ export default defineNuxtConfig({
       {
         path: '~/node_modules/vue-instantsearch/src/components',
         sourcemap: true,
-      }, // Enable source map generation for components
+      },
       {
         path: '~/domains/rpc/components',
         sourcemap: true,
-      }, // Enable source map generation for components
+      },
       {
         path: '~/domains/graph/components',
         sourcemap: true,
-      }, // Enable source map generation for components
+      },
       {
         path: '~/layouts',
         sourcemap: true,
-      }, // Enable source map generation for components
+      },
     ],
   },
   typescript: {