Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correctif pour les polices et icônes dsfr #4220

Merged
merged 7 commits into from
Apr 16, 2024
Merged

Correctif pour les polices et icônes dsfr #4220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7de1adf
Copy files during build instead of using symlink
victormours Apr 15, 2024
41311e0
try copying only whitelisted file types and avoid duplicate directory…
victormours Apr 15, 2024
0237659
use bash-compatible syntax
victormours Apr 15, 2024
cc6af3c
Simulate slugignore in build to catch this error earlier
victormours Apr 15, 2024
3c1c262
Simpler is better
victormours Apr 15, 2024
196a7c1
Faking slugignore in build raises errors
victormours Apr 15, 2024
5a55719
don't change slugignore now
victormours Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ coverage/
!/app/assets/builds/.keep

/public/assets/*
/public/fonts/*
/public/icons/*

# Postgres dumps
**/20*.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion public/fonts
View file
Open in desktop

This file was deleted.

Empty file added public/fonts/.gitkeep
View file
Open in desktop
Empty file.
1 change: 0 additions & 1 deletion public/icons
View file
Open in desktop

This file was deleted.

Empty file added public/icons/.gitkeep
View file
Open in desktop
Empty file.