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

FontAwesome : bye bye CDN, welcome npm package #6605

Merged
merged 1 commit into from
Apr 17, 2024
Merged

FontAwesome : bye bye CDN, welcome npm package #6605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion Gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 })
Expand All @@ -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 })
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 1 addition & 4 deletions templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" %}">
Expand Down
5 changes: 5 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down