dnum-mi · beryl-koller · Mar 29, 2022 · Mar 29, 2022 · Mar 29, 2022 · Mar 29, 2022
@@ -5,8 +5,12 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="/favicon.ico">
-    <link rel="manifest" href="/manifest.json">
     <title>Basegun</title>
+    <meta name="description" content="Basegun">
+    <link rel="alternate icon" href="/favicon.ico" type="image/png" sizes="16x16">
+    <link rel="apple-touch-icon" href="/apple-touch-icon.png" sizes="180x180">
+    <link rel="mask-icon" href="/pwa-512x512.png" color="#FFFFFF">
+    <meta name="theme-color" content="#000091">
   </head>
   <body>
     <noscript>

@@ -14,17 +14,16 @@
     "@vue/compat": "^3.1.0",
     "axios": "^0.21.4",
     "bootstrap": "^5.1.0",
-    "register-service-worker": "^1.7.2",
     "vite": "^2.5.4",
     "vue": "^3.1.0",
     "vue-router": "^4.0.5",
     "vuex": "^3.6.2",
     "vuex-persistedstate": "^4.0.0"
   },
   "devDependencies": {
-    "@vue/cli-plugin-pwa": "^4.5.15",
     "eslint": "^8.10.0",
-    "eslint-plugin-vue": "^8.5.0"
+    "eslint-plugin-vue": "^8.5.0",
+    "vite-plugin-pwa": "^0.11.13"
   },
   "eslintConfig": {
     "root": true,

@@ -1,2 +1,2 @@
 User-agent: *
-Disallow:
+Allow: /
@@ -3,12 +3,14 @@ import axios from 'axios';
 import { createApp } from 'vue';
 import App from './App.vue';
 import router from './router';
-import './registerServiceWorker.js'
 
 import VueDsfr from '@laruiss/vue-dsfr'
 import '@laruiss/vue-dsfr/dist/vue-dsfr.css'
 import '@laruiss/vue-dsfr/dist/vue-dsfr-fonts.css'
 
+import { registerSW } from 'virtual:pwa-register'
+
+
 axios.defaults.withCredentials = true;
 
 // the FastAPI backend
@@ -18,5 +20,7 @@ if (process.env.NODE_ENV == 'production') {
   axios.defaults.baseURL = 'http://localhost:5000/';
 }
 
+registerSW({ immediate: true })
+
 const app = createApp(App)
 app.use(router).use(VueDsfr).mount('#app')
@@ -1,11 +1,47 @@
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
+import { VitePWA } from 'vite-plugin-pwa'
 
 const path = require("path");
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [vue()],
+  plugins: [
+    vue(),
+    VitePWA({
+      includeAssets: ['favicon.svg', 'favicon.ico', 'robots.txt', 'apple-touch-icon.png'],  
+      base: "/",
+      srcDir: "src",
+      manifest: {
+        name: 'Basegun',
+        short_name: 'Basegun',
+        description: 'Identification des armes à feu',
+        theme_color: '#000091',
+        icons: [
+          {
+            src: 'pwa-192x192.png',
+            sizes: '192x192',
+            type: 'image/png',
+          },
+          {
+            src: 'pwa-512x512.png',
+            sizes: '512x512',
+            type: 'image/png',
+          },
+          {
+            src: 'pwa-512x512.png',
+            sizes: '512x512',
+            type: 'image/png',
+            purpose: 'any maskable',
+          }
+        ]
+      },
+      registerType: 'autoUpdate',
+      devOptions: {
+        enabled: true
+      }
+    })
+  ],
   resolve: {
     alias: {
       "@": path.resolve(__dirname, "./src"),

@@ -21,9 +21,6 @@ module.exports = {
         watchOptions: {
             ignored: ['node_modules', /public/],
         },
-    },
-
-    pwa: {
     }
 
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,9 +21,6 @@ module.exports = { @@
             watchOptions: {
                 ignored: ['node_modules', /public/],
             },
-        },
-        pwa: {
         }
     };