From d238a6397045df37862c93cc6303fdd25d80f3c6 Mon Sep 17 00:00:00 2001
From: Situphen <situphen@gmail.com>
Date: Wed, 17 Apr 2024 00:22:13 +0200
Subject: [PATCH] FontAwesome : bye bye CDN, welcome npm package

---
 Gulpfile.js         | 16 +++++++++++++++-
 package.json        |  1 +
 templates/base.html |  5 +----
 yarn.lock           |  5 +++++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Gulpfile.js b/Gulpfile.js
index 92d1c651df..ab181d0895 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -72,6 +72,14 @@ function customSassError(error) {
   // TODO: https://github.com/A-312/gulp-terser-js#can-i-use-terser-to-format-error-of-an-other-gulp-module-
 }
 
+/* Get CSS minified files from packages
+ * Get also sourcemaps for all CSS files, required by Django's ManifestStaticFilesStorage since 4.1 (see
+ * https://docs.djangoproject.com/fr/4.2/ref/contrib/staticfiles/#manifeststaticfilesstorage) */
+function cssPackages() {
+  return gulp.src(require.resolve('@fortawesome/fontawesome-free/css/all.min.css'), { sourcemaps: true })
+    .pipe(gulp.dest('dist/css/', { sourcemaps: '.' }))
+}
+
 // Generates CSS for the website and the ebooks
 function css() {
   return gulp.src(['assets/scss/main.scss', 'assets/scss/zmd.scss'], { sourcemaps: true })
@@ -81,6 +89,12 @@ function css() {
     .pipe(gulp.dest('dist/css/', { sourcemaps: '.' }))
 }
 
+// Get webfonts files from packages
+function webfontsPackages() {
+  return gulp.src(path.resolve('node_modules/@fortawesome/fontawesome-free/webfonts/*'))
+    .pipe(gulp.dest('dist/webfonts/'))
+}
+
 // Generates CSS for the static error pages in the folder `errors/`
 function errors() {
   return gulp.src('errors/scss/main.scss', { sourcemaps: true })
@@ -212,7 +226,7 @@ function watch() {
 }
 
 // Build the front
-const build = gulp.parallel(prepareZmd, prepareEasyMde, jsPackages, js, images, errors, gulp.series(spriteCss, gulp.parallel(css, spriteImages)))
+const build = gulp.parallel(prepareZmd, prepareEasyMde, jsPackages, js, images, errors, gulp.series(spriteCss, gulp.parallel(cssPackages, css, spriteImages)), webfontsPackages)
 
 exports.build = build
 exports.watch = gulp.series(build, watch)
diff --git a/package.json b/package.json
index 015efbcafc..8a450e207f 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
   },
   "homepage": "https://github.com/zestedesavoir/zds-site",
   "dependencies": {
+    "@fortawesome/fontawesome-free": "5.12.1",
     "autoprefixer": "10.4.18",
     "chart.js": "3.9.1",
     "chartjs-adapter-moment": "1.0.1",
diff --git a/templates/base.html b/templates/base.html
index 670922f3c1..d3713044e3 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -85,10 +85,7 @@
     {% block DCMI_cards %}{% endblock %}
 
     {# Stylesheets #}
-    <link rel="stylesheet"
-        href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/all.min.css"
-        integrity="sha384-v8BU367qNbs/aIZIxuivaU55N5GPF89WBerHoGA4QTcbUjYiLQtKdrfXnqAcXyTv"
-        crossorigin="anonymous">
+    <link rel="stylesheet" href="{% static "css/all.min.css" %}"><!-- FontAwesome -->
     <link rel="stylesheet" href="{% static "css/easymde.min.css" %}">
     <link rel="stylesheet" href="{% static "css/katex.min.css" %}">
     <link rel="stylesheet" href="{% static "css/main.css" %}">
diff --git a/yarn.lock b/yarn.lock
index 7773f03023..b526e729ea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -48,6 +48,11 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
   integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
 
+"@fortawesome/fontawesome-free@5.12.1":
+  version "5.12.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.1.tgz#2a98fea9fbb8a606ddc79a4680034e9d5591c550"
+  integrity sha512-ZtjIIFplxncqxvogq148C3hBLQE+W3iJ8E4UvJ09zIJUgzwLcROsWwFDErVSXY2Plzao5J9KUYNHKHMEUYDMKw==
+
 "@humanwhocodes/config-array@^0.11.14":
   version "0.11.14"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"