Merge pull request 'Delete extra fonts' (#13) from ecoindex_optimization into master

Reviewed-on: #13

package.json

@@ -8,11 +8,11 @@
     "@11ty/eleventy": "^3.0.0",
     "@11ty/eleventy-plugin-rss": "^2.0.2",
     "@11ty/eleventy-plugin-syntaxhighlight": "^2.0.3",
-    "jsdom": "^24.0.0",
     "bootstrap": "^5.1.3",
     "concurrently": "^7.0.0",
     "html-minifier-terser": "^7.2.0",
     "image-size": "^0.8.3",
+    "jsdom": "^24.0.0",
     "json-to-scss": "^1.3.1",
     "leaflet": "^1.7.1",
     "sass": "^1.26.3",
@@ -26,6 +26,7 @@
     "copyfiles": "^2.4.1",
     "cross-env": "^5.2.1",
     "ftp-deploy": "^2.3.7",
+    "go-webp": "^1.3.1",
     "make-dir-cli": "^3.0.0",
     "prettier": "^1.19.1",
     "rimraf": "^3.0.2",
@@ -44,9 +45,10 @@
     "vendor:css": "copyfiles node_modules/leaflet/dist/leaflet.css node_modules/bootstrap/dist/css/bootstrap.min.css -f dist/vendor/css",
     "vendor:js": "copyfiles node_modules/leaflet/dist/leaflet.js node_modules/bootstrap/dist/js/bootstrap.min.js -f dist/vendor/js",
     "vendor": "npm run clean && npm run vendor:css && npm run vendor:js",
+    "webp": "go-webp excludeFolders=\"src/fonts,members-data,src/images/profiles\" excludeFiles=\"images/*.svg,images/astrolabe/favicon.png\"",
     "start": "concurrently \"npm run vendor\" \"npm run sass:process -- --watch\" \"npm run serve\"",
     "serve": "cross-env ELEVENTY_ENV=development npx eleventy --serve",
-    "prod": "cross-env ELEVENTY_ENV=prod npm run vendor && npm run sass:process && npx eleventy",
+    "prod": "cross-env ELEVENTY_ENV=prod npm run vendor && npm run webp && npm run sass:process && npx eleventy",
     "deploy-preprod": "npm run prod && node deploy-preprod",
     "deploy-prod": "npm run prod && node deploy-prod"
   },

src/_includes/layouts/base.njk

@@ -8,8 +8,8 @@
   <link rel="icon" href="{{ site.faviconPath }}" type="image/png" />
   {% include "partials/global/meta-info.njk" %}
   <script>document.documentElement.classList.remove('no-js');</script>
-  <link rel = "stylesheet" href="/vendor/css/leaflet.css"/>
+  <link rel = "stylesheet" href="/vendor/css/leaflet.css" media="print" onload="this.media='all'"/>
-  <link rel = "stylesheet" href="/vendor/css/bootstrap.min.css"/>
+  <link rel = "stylesheet" href="/vendor/css/bootstrap.min.css" media="print" onload="this.media='all'"/>
   <style>{% include "assets/css/global.css" %}</style>
   {% block head %}
   {% endblock %}

src/customers/biocoop-lacanopee.md

@@ -1,5 +1,5 @@
 ---
 name: 'Biocoop La Canopée'
-thumbnail: '/images/customers/logo-biocoop-lacanopee.png'
+thumbnail: '/images/customers/logo-biocoop-lacanopee.webp'
 url: 'https://www.biocoopbesancon.fr/'
 ---

src/customers/builddata.md

@@ -1,5 +1,5 @@
 ---
 name: 'Build Data'
-thumbnail: '/images/customers/logo-builddata.png'
+thumbnail: '/images/customers/logo-builddata.webp'
 url: 'https://www.build-data.fr/'
 ---

src/customers/deltadore.md

@@ -1,5 +1,5 @@
 ---
 name: 'Delta Dore'
-thumbnail: '/images/customers/logo-deltadore.png'
+thumbnail: '/images/customers/logo-deltadore.webp'
 url: 'https://www.deltadore.fr'
 ---

src/customers/epv.md

@@ -1,5 +1,5 @@
 ---
 name: 'Énergies citoyennes en Pays de Vilaine'
-thumbnail: '/images/customers/logo-epv.png'
+thumbnail: '/images/customers/logo-epv.webp'
 url: 'https://www.enr-citoyennes.fr/'
 ---

src/customers/smardtv.md

@@ -1,5 +1,5 @@
 ---
 name: 'SmarDTV'
-thumbnail: '/images/customers/logo-smardtv.png'
+thumbnail: '/images/customers/logo-smardtv.webp'
 url: 'https://www.smardtv.com/'
 ---

src/customers/vantiva.md

@@ -1,5 +1,5 @@
 ---
 name: 'Vantiva'
-thumbnail: '/images/customers/logo-vantiva.png'
+thumbnail: '/images/customers/logo-vantiva.webp'
 url: 'https://www.vantiva.com/'
 ---

src/customers/wiztivi.md

@@ -1,5 +1,5 @@
 ---
 name: 'WIZTIVI'
-thumbnail: '/images/customers/logo-wiztivi.png'
+thumbnail: '/images/customers/logo-wiztivi.webp'
 url: 'https://www.wiztivi.com/'
 ---

src/customers/workadventure.md

@@ -1,5 +1,5 @@
 ---
 name: 'Work Adventure'
-thumbnail: '/images/customers/logo-workadventure.png'
+thumbnail: '/images/customers/logo-workadventure.webp'
 url: 'https://workadventu.re/'
 ---