Merge branch 'api-refactor' into shigusegubu-themes3

build/sw_plugin.js

@@ -102,8 +102,12 @@ export const buildSwPlugin = ({ swSrc, swDest }) => {
           },
         })
 
-        const swBundle = await build(config)
-        return swBundle.output[0]
+        try {
+          const swBundle = await build(config)
+          return swBundle.output[0]
+        } catch (e) {
+          console.error('Error building ServiceWorker:' , e)
+        }
       },
     },
     closeBundle: {
@@ -112,7 +116,11 @@ export const buildSwPlugin = ({ swSrc, swDest }) => {
       async handler() {
         if (process.env.VITEST) return
         console.info('Building service worker for production')
-        await build(config)
+        try {
+          await build(config)
+        } catch (e) {
+          console.error('Error building ServiceWorker:' , e)
+        }
       },
     },
   }

src/components/who_to_follow/who_to_follow.js

@@ -1,5 +1,4 @@
 import FollowCard from 'src/components/follow_card/follow_card.vue'
-import apiService from '../../services/api/api.service.js'
 
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'

src/services/notification_utils/notification_utils.js

@@ -1,8 +1,6 @@
 import { showDesktopNotification } from '../desktop_notification_utils/desktop_notification_utils.js'
 import { muteFilterHits } from '../status_parser/status_parser.js'
 
-import { useAnnouncementsStore } from 'src/stores/announcements.js'
-
 import FaviconService from 'src/services/favicon_service/favicon_service.js'
 
 export const ACTIONABLE_NOTIFICATION_TYPES = new Set([

src/sw.js

@@ -1,7 +1,5 @@
 /* eslint-env serviceworker */
 
-import 'virtual:pleroma-fe/service_worker_env'
-
 import { createI18n } from 'vue-i18n'
 
 import { storage } from 'src/lib/storage.js'