From 874c4dd23c0db79a6acad8849c6c51bbdc9cf690 Mon Sep 17 00:00:00 2001
From: Victor Mours <victor.mours@beta.gouv.fr>
Date: Tue, 16 Apr 2024 17:02:03 +0200
Subject: [PATCH] =?UTF-8?q?Correctif=20pour=20les=20polices=20et=20ic?=
 =?UTF-8?q?=C3=B4nes=20dsfr=20(#4220)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Copy files during build instead of using symlink

* try copying only whitelisted file types and avoid duplicate directory name

* use bash-compatible syntax

* Simulate slugignore in build to catch this error earlier

* Simpler is better

* Faking slugignore in build raises errors

* don't change slugignore now
---
 .gitignore            | 2 ++
 package.json          | 2 +-
 public/fonts          | 1 -
 public/fonts/.gitkeep | 0
 public/icons          | 1 -
 public/icons/.gitkeep | 0
 6 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 120000 public/fonts
 create mode 100644 public/fonts/.gitkeep
 delete mode 120000 public/icons
 create mode 100644 public/icons/.gitkeep

diff --git a/.gitignore b/.gitignore
index 9bae0b5905..e662501e7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,8 @@ coverage/
 !/app/assets/builds/.keep
 
 /public/assets/*
+/public/fonts/*
+/public/icons/*
 
 # Postgres dumps
 **/20*.tar.gz
diff --git a/package.json b/package.json
index b5bb4875e5..24b9090bb1 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "lapin",
   "private": true,
   "scripts": {
-    "build": "webpack --config webpack.config.js"
+    "build": "webpack --config webpack.config.js; cp -r node_modules/@gouvfr/dsfr/dist/fonts public; cp -r node_modules/@gouvfr/dsfr/dist/icons public;"
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.1.1",
diff --git a/public/fonts b/public/fonts
deleted file mode 120000
index 75268a6f57..0000000000
--- a/public/fonts
+++ /dev/null
@@ -1 +0,0 @@
-../node_modules/@gouvfr/dsfr/dist/fonts/
\ No newline at end of file
diff --git a/public/fonts/.gitkeep b/public/fonts/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/public/icons b/public/icons
deleted file mode 120000
index 2d3b3ad2ee..0000000000
--- a/public/icons
+++ /dev/null
@@ -1 +0,0 @@
-../node_modules/@gouvfr/dsfr/dist/icons/
\ No newline at end of file
diff --git a/public/icons/.gitkeep b/public/icons/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2