Browse Source

Merge branch 'iteration-20250110-last' into dev

lex-xin 5 months ago
parent
commit
405ce6d985
4 changed files with 18 additions and 38 deletions
  1. 5 9
      dev-dist/sw.js
  2. 1 1
      public/version.json
  3. 7 0
      src/App.tsx
  4. 5 28
      vite.config.ts

+ 5 - 9
dev-dist/sw.js

@@ -35,7 +35,7 @@ if (!self.define) {
           resolve();
         }
       }).then(() => {
-        const promise = registry[uri];
+        let promise = registry[uri];
         if (!promise) {
           throw new Error(`Module ${uri} didn’t register its module`);
         }
@@ -68,7 +68,8 @@ if (!self.define) {
     });
   };
 }
-define(['./workbox-88bf3160'], (function (workbox) { 'use strict';
+define(['./workbox-88bf3160'], function (workbox) {
+  'use strict';
 
   self.skipWaiting();
   workbox.clientsClaim();
@@ -86,16 +87,11 @@ define(['./workbox-88bf3160'], (function (workbox) { 'use strict';
       },
       {
         url: 'index.html',
-        revision: '0.3vo3lspd3m'
+        revision: '0.e2ao6l3d16'
       }
     ],
     {}
   );
-
-  /**
-   * https://juejin.cn/post/6844903881189621767
-   * 缓存策略 有5种
-   */
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(
     new workbox.NavigationRoute(workbox.createHandlerBoundToURL('index.html'), {
@@ -111,5 +107,5 @@ define(['./workbox-88bf3160'], (function (workbox) { 'use strict';
     new RegExp('|js'),
     workbox.strategies.networkOnly()
   );
-})
+});
 

+ 1 - 1
public/version.json

@@ -1 +1 @@
-{"version":1736995918188}
+{"version":1736996827297}

+ 7 - 0
src/App.tsx

@@ -229,6 +229,13 @@ export default defineComponent({
         <NModal maskClosable={false} v-model:show={needRefresh.value}>
           <UpdateTips onConfirm={() => updateServiceWorker(true)} />
         </NModal>
+
+        <span style={{ display: 'none' }}>
+          {needRefresh.value ? '新内容可用,点击刷新页面' : '没有新内容'}
+        </span>
+        <span style={{ display: 'none' }}>
+          {offlineReady.value ? '应用已离线可用' : '没有离线'}
+        </span>
         {/* <NModal
           show={showModal.value}
           closeOnEsc={false}

+ 5 - 28
vite.config.ts

@@ -67,38 +67,15 @@ export default defineConfig(() => {
         registerType: 'autoUpdate',
         includeAssets: ['./logo.png'],
         workbox: {
-          skipWaiting: true,
+          skipWaiting: true, // 强制跳过等待
           clientsClaim: true,
-          runtimeCaching: [
-            {
-              urlPattern: ({ url }) =>
-                url.origin === 'https://dev.kt.colexiu.com',
-              handler: 'NetworkFirst',
-              options: {
-                cacheName: 'api-cache'
-              }
-            }
-          ]
           // runtimeCaching: [
           //   {
-          //     urlPattern: /(.*?)\.(js|css|ts|tsx|html)/, // js /css /ts静态资源缓存
-          //     handler: 'NetworkOnly',
-          //     options: {
-          //       cacheName: 'js-css-cache'
-          //     }
-          //   },
-          //   {
-          //     urlPattern: /.*\.html.*/,
-          //     handler: 'NetworkOnly',
+          //     urlPattern: ({ url }) =>
+          //       url.origin === 'https://dev.kt.colexiu.com',
+          //     handler: 'NetworkFirst',
           //     options: {
-          //       cacheName: 'wisbayar-html',
-          //       expiration: {
-          //         maxEntries: 20,
-          //         maxAgeSeconds: 24 * 60 * 60
-          //       },
-          //       cacheableResponse: {
-          //         statuses: [200]
-          //       }
+          //       cacheName: 'api-cache'
           //     }
           //   }
           // ]