Fix sw (#342)

* Fix sw * Fix sw #1 * Fix sw #2
sonic16x · Nov 23, 2024 · 5668264 · 5668264
1 parent 88bbf02
commit 5668264
Show file tree

Hide file tree

Showing 13 changed files with 119 additions and 147 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "interslavic",
-  "version": "1.23.2",
+  "version": "1.24.0",
   "description": "Interslavic Dictionary",
   "license": "MIT",
   "author": {

diff --git a/src/404.html.ejs b/src/404.html.ejs
diff --git a/src/components/Pages/About/About.tsx b/src/components/Pages/About/About.tsx
@@ -14,11 +14,6 @@ export const About =
         const worksheetUrl = getTablePublicUrl(tablesData[0].spreadsheetId, tablesData[0].sheetId);
         const email = '[email protected]';
         const source = 'http://steen.free.fr/interslavic';
-        let version = `v${VERSION}`;
-        const trimmedBaseUrl = BASE_URL.replace('/', '');
-        if (trimmedBaseUrl !== '') {
-            version += `-${trimmedBaseUrl}`;
-        }
 
         return (
             <div className="about-page">
@@ -151,7 +146,7 @@ export const About =
                             )}
                         </div>
                     </div>
-                    <div className="about-page__release-date">{version}</div>
+                    <div className="about-page__release-date">v{VERSION}</div>
                 </div>
             </div>
         );

diff --git a/src/components/Router/Router.tsx b/src/components/Router/Router.tsx
@@ -71,7 +71,7 @@ export const Router =
         const onChangeUrl = () => {
             const currentPage = getPageFromPath();
 
-            if (getPathFromPage(page) !== `${BASE_URL}${currentPage}`) {
+            if (getPathFromPage(page) !== `/${currentPage}`) {
                 dispatch(setPageAction(currentPage));
             }
         };

diff --git a/src/index.tsx b/src/index.tsx
@@ -11,9 +11,6 @@ import { store } from './store'
 
 declare global {
     const VERSION: string;
-    const BASE_URL: string;
-    const SW: boolean;
-    const CLIENT: boolean;
     // eslint-disable-next-line
     interface Window {
         __REDUX_DEVTOOLS_EXTENSION__: any;
@@ -22,18 +19,8 @@ declare global {
 
 setInitialPage();
 
-if (SW) {
-    if ('serviceWorker' in navigator) {
-        navigator.serviceWorker.register(`sw.js`)
-            .then((registration) => {
-                // eslint-disable-next-line no-console
-                console.log('Registration successful, scope is:', registration.scope);
-            })
-            .catch((error) => {
-                // eslint-disable-next-line no-console
-                console.log('Service worker registration failed, error:', error);
-            });
-    }
+if ('serviceWorker' in navigator) {
+    navigator.serviceWorker.register(`sw.js`, { scope: '.' });
 }
 
 

diff --git a/src/routing/routing.ts b/src/routing/routing.ts
@@ -10,34 +10,34 @@ export const pages: IPage[] = [
     {
         title: 'dictionaryTitle',
         value: 'dictionary',
-        path: BASE_URL,
+        path: '/',
     },
     {
         title: 'communityTitle',
         value: 'community',
-        path: `${BASE_URL}community`,
+        path: '/community',
         online: true,
     },
     {
         title: 'grammarTitle',
         value: 'grammar',
-        path: `${BASE_URL}grammar`,
+        path: '/grammar',
     },
     {
         title: 'viewerTitle',
         value: 'viewer',
-        path: `${BASE_URL}viewer`,
+        path: '/viewer',
         online: true,
     },
     {
         title: 'settingsTitle',
         value: 'settings',
-        path: `${BASE_URL}settings`,
+        path: '/settings',
     },
     {
         title: 'aboutTitle',
         value: 'about',
-        path: `${BASE_URL}about`,
+        path: '/about',
     },
 ];
 
@@ -61,7 +61,7 @@ export function setInitialPage() {
     const currentPath = window.location.pathname.split('#')[0];
     const page = pages.find(({ path }) => (path === currentPath));
     if (!page) {
-        window.history.replaceState({}, document.title, BASE_URL);
+        window.history.replaceState({}, document.title, '/');
     }
 }
 
@@ -71,5 +71,5 @@ export function getPathFromPage(page: string): string {
         return finded.path;
     }
 
-    return BASE_URL;
+    return '/';
 }
diff --git a/src/serviceWorker/cashUrls.ts b/src/serviceWorker/cashUrls.ts
@@ -0,0 +1,50 @@
+import { addLangs } from 'consts';
+
+export const CASH_URLS = [
+    '/',
+    '/data/basic.json',
+    '/data/translateStatistic.json',
+    ...addLangs.map((lang) => `/data/${lang}.json`),
+    '/grammarComponent.js',
+    '/communityComponent.js',
+    '/index.js',
+    '/sw.js',
+    '/styles/grammarComponent.css',
+    '/styles/communityComponent.css',
+    '/styles/index.css',
+    '/icons/android-icon-36x36.png',
+    '/icons/android-icon-48x48.png',
+    '/icons/android-icon-72x72.png',
+    '/icons/android-icon-96x96.png',
+    '/icons/android-icon-144x144.png',
+    '/icons/android-icon-192x192.png',
+    '/icons/apple-icon.png',
+    '/icons/apple-icon-57x57.png',
+    '/icons/apple-icon-60x60.png',
+    '/icons/apple-icon-72x72.png',
+    '/icons/apple-icon-76x76.png',
+    '/icons/apple-icon-114x114.png',
+    '/icons/apple-icon-120x120.png',
+    '/icons/apple-icon-144x144.png',
+    '/icons/apple-icon-152x152.png',
+    '/icons/apple-icon-180x180.png',
+    '/icons/apple-icon-precomposed.png',
+    '/icons/discord-icon-330x102.png',
+    '/icons/favicon.ico',
+    '/icons/favicon-16x16.png',
+    '/icons/favicon-32x32.png',
+    '/icons/favicon-96x96.png',
+    '/icons/icon-72x72.png',
+    '/icons/icon-96x96.png',
+    '/icons/icon-128x128.png',
+    '/icons/icon-144x144.png',
+    '/icons/icon-152x152.png',
+    '/icons/icon-192x192.png',
+    '/icons/icon-384x384.png',
+    '/icons/icon-512x512.png',
+    '/icons/manifest.json',
+    '/icons/ms-icon-70x70.png',
+    '/icons/ms-icon-144x144.png',
+    '/icons/ms-icon-150x150.png',
+    '/icons/ms-icon-310x310.png',
+];
diff --git a/src/serviceWorker/sw.ts b/src/serviceWorker/sw.ts
@@ -0,0 +1,46 @@
+import { CASH_URLS } from './cashUrls';
+
+self.addEventListener("install", (event: any) => {
+    event.waitUntil(
+        caches
+            .open(`${VERSION}fundamentals`)
+            .then((cache) => cache.addAll(CASH_URLS))
+    );
+});
+
+self.addEventListener("fetch", (event: any) => {
+    if (event.request.method !== 'GET') {
+        return;
+    }
+
+    event.respondWith(
+        caches
+            .match(event.request)
+            .then((cached) => {
+                const networked = fetch(event.request)
+                    .then((response: any) => {
+                        const cacheCopy = response.clone();
+
+                        caches
+                            .open(`${VERSION}pages`)
+                            .then((cache) => cache.put(event.request, cacheCopy))
+
+                        return response;
+                    });
+
+                return cached || networked;
+            })
+    );
+});
+
+self.addEventListener("activate", (event: any) => {
+    event.waitUntil(
+        caches
+            .keys()
+            .then((keys) => Promise.all(
+                keys
+                    .filter((key) => !key.startsWith(VERSION))
+                    .map((key) => caches.delete(key))
+            ))
+    );
+});
diff --git a/src/sw.ts b/src/sw.ts
diff --git a/static/manifest.json b/static/manifest.json
@@ -4,7 +4,7 @@
   "description": "Word dictionary for interslavic language",
   "lang": "en",
   "dir": "ltr",
-  "scope": "https://interslavic-dictionary.com/",
+  "scope": ".",
   "icons": [
     {
       "src": "icons/icon-72x72.png",
@@ -48,11 +48,11 @@
     }
   ],
   "serviceworker": {
-    "src": "sw.prod.js",
-    "scope": "https://interslavic-dictionary.com/",
+    "src": "sw.js",
+    "scope": ".",
     "update_via_cache": "none"
   },
-  "start_url": "https://interslavic-dictionary.com/",
+  "start_url": "/",
   "background_color": "#272727",
   "display": "standalone",
   "orientation": "portrait-primary",

diff --git a/webpack.config.dev.js b/webpack.config.dev.js
@@ -6,15 +6,14 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
 const outputPath = path.resolve(__dirname, 'dist');
 const srcPath = path.resolve(__dirname, 'src');
 const nodeModulesPath = path.resolve(__dirname, 'node_modules/');
-const baseUrl = '/';
 
 module.exports = {
     entry: {
         index: './src/index',
         grammarComponent: './src/components/Pages/Grammar/Grammar',
         viewerComponent: './src/components/Pages/Viewer/Viewer',
         communityComponent: './src/components/Pages/CommunityPage/CommunityPage',
-        sw: './src/sw',
+        sw: './src/serviceWorker/sw',
     },
     output: {
         path: outputPath,
@@ -75,17 +74,10 @@ module.exports = {
             filename: 'index.html',
             path: outputPath,
             excludeChunks: ['sw', 'grammarComponent', 'viewerComponent', 'communityComponent'],
-            env: {
-                BASE_URL: baseUrl,
-            },
         }),
         new webpack.DefinePlugin({
             'process.env.NODE_ENV': JSON.stringify('development'),
-            SW: false,
             IS_COM: true,
-            CLIENT: true,
-            BASE_URL: JSON.stringify(baseUrl),
-            DATE: JSON.stringify(new Date().toISOString()),
             VERSION: JSON.stringify(require('./package.json').version),
         }),
         new CopyWebpackPlugin({