update

Author: bichikim

apps/bplan-client/build-hot-fix.mjs

@@ -17,9 +17,9 @@ function getDefaultExportFromNamespaceIfNotNamed (n) {
 }`), 'utf8')
 }
 
-const fixSw = async () => {
-  return nodeFs.promises.rm(nodePath.resolve('public/sw.js'))
-}
+// const fixSw = async () => {
+//   return nodeFs.promises.rm(nodePath.resolve('public/sw.js'))
+// }
 
 fix().then(() => console.info('hot fix done'))
-fixSw().then(() => console.info('hot fix sw done'))
+// fixSw().then(() => console.info('hot fix sw done'))

apps/bplan-client/public/sw.js

@@ -0,0 +1,38 @@
+/* eslint-disable max-nested-callbacks */
+/* eslint-disable unicorn/prefer-global-this */
+const CACHE_NAME = 'coong-cache'
+
+self.addEventListener('install', (event) => {
+  event.waitUntil(self.skipWaiting())
+})
+self.addEventListener('fetch', (event) => {
+  if (event.request.method !== 'GET') {
+    return
+  }
+
+  if (
+    !event.request.url.startsWith('http://') &&
+    !event.request.url.startsWith('https://')
+  ) {
+    return
+  }
+
+  event.respondWith(
+    caches.match(event.request).then((resource) => {
+      if (resource) {
+        return resource
+      }
+
+      // Return cached resource if available
+      return fetch(event.request).then((response) => {
+        return caches.open(CACHE_NAME).then((cache) => {
+          // Store response in cache
+          cache.put(event.request, response.clone())
+
+          // Return response
+          return response
+        })
+      })
+    }),
+  )
+})

apps/bplan-client/src/ReloadPrompt.tsx

@@ -1,32 +1,27 @@
-import {JSX, Show} from 'solid-js'
+import {Accessor, createEffect, createSignal, JSX, Show, Signal} from 'solid-js'
 import {preventGlobalTouchAttrs} from 'src/components/real-button/use-global-touch'
-import {useRegisterSW} from 'virtual:pwa-register/solid'
+import {getWindow} from '@winter-love/utils'
 
 export interface ReloadPromptProps extends JSX.HTMLAttributes<HTMLDivElement> {
   //
 }
 
 export const ReloadPrompt = (props: ReloadPromptProps) => {
-  const {
-    needRefresh: [needRefresh, setNeedRefresh],
-    offlineReady: [offlineReady, setOfflineReady],
-    updateServiceWorker,
-  } = useRegisterSW({
-    immediate: true,
-    onRegisteredSW(swUrl) {
-      console.info(`Service worker at: ${swUrl}`)
-    },
+  const [offlineReady, setOfflineReady] = createSignal(false)
+  const [needRefresh, setNeedRefresh] = createSignal(false)
+
+  createEffect(() => {
   })
 
   const handleClose = () => {
-    setOfflineReady(false)
-    setNeedRefresh(false)
+    // setOfflineReady(false)
+    // setNeedRefresh(false)
   }
 
   const handleUpdateServiceWorker = async () => {
     console.info('handleUpdateServiceWorker')
     handleClose()
-    await updateServiceWorker()
+    // await updateServiceWorker()
   }
 
   return (

apps/bplan-client/src/entry-client.tsx

@@ -1,4 +1,9 @@
+/* eslint-disable n/no-unsupported-features/node-builtins */
 // @refresh reload
 import {mount, StartClient} from '@solidjs/start/client'
 
+if ('serviceWorker' in navigator) {
+  navigator.serviceWorker.register('/sw.js')
+}
+
 mount(() => <StartClient />, document.body)

apps/bplan-client/src/sw.ts

@@ -1,38 +1,14 @@
 import {defineConfig} from '@solidjs/start/config'
-import {VitePWA as vitePwa} from 'vite-plugin-pwa'
+
 import {fileURLToPath, URL} from 'node:url'
 import unoCss from 'unocss/vite'
 
 export default defineConfig({
-  server: {
-    prerender: {
-      routes: ['/'],
-    },
-  },
   vite: {
     // build: {
     //   minify: false,
     // },
-    plugins: [
-      unoCss('../../uno.config.ts'),
-      vitePwa({
-        base: '/',
-        buildBase: '/',
-        filename: 'sw.ts',
-        includeAssets: ['favicon.svg', 'robots.txt', '*.svg', '*.png', '*.html'],
-        injectManifest: {
-          globDirectory: '.vinxi/build/client',
-          globPatterns: ['**/*.{js,css,html,svg,png}'],
-        },
-        injectRegister: null,
-        manifest: false,
-        outDir: './public',
-        registerType: 'autoUpdate',
-        scope: '/',
-        srcDir: 'src',
-        strategies: 'injectManifest',
-      }),
-    ] as any,
+    plugins: [unoCss('../../uno.config.ts')],
     resolve: {
       alias: {
         // fix #start/app is app.tsx only @solid/state error