Skip to content

Node.js based forum software built for the modern web

chore: use fontsource-utils/scss to get rid of deprecation warning

Barış Soner Uşaklı44c0413c753f
diff --git a/install/package.json b/install/package.json
index f4a5cad632..7719a9bccd 100644
--- a/install/package.json
+++ b/install/package.json
@@ -29,6 +29,7 @@
},
"dependencies": {
"@adactive/bootstrap-tagsinput": "0.8.2",
+ "@fontsource-utils/scss": "0.2.1",
"@fontsource/inter": "5.2.6",
"@fontsource/poppins": "5.2.6",
"@fortawesome/fontawesome-free": "6.7.2",
diff --git a/public/scss/admin/fonts.scss b/public/scss/admin/fonts.scss
index ba9988154d..d13da2cc7b 100644
--- a/public/scss/admin/fonts.scss
+++ b/public/scss/admin/fonts.scss
@@ -1,20 +1,24 @@
-@use "@fontsource/inter/scss/mixins" as Inter;
-@use "@fontsource/poppins/scss/mixins" as Poppins;
+@use "pkg:@fontsource-utils/scss" as fontsource;
+@use "pkg:@fontsource/inter/scss" as inter;
+@use "pkg:@fontsource/poppins/scss" as poppins;
$weights: $font-weight-light, $font-weight-normal, $font-weight-semibold, $font-weight-bold;
$subsets: (latin, latin-ext);
-@include Inter.faces(
- $weights: $weights,
- $subsets: $subsets,
- $display: fallback,
- $directory: "./plugins/core/inter"
+@include fontsource.faces(
+ $metadata: inter.$metadata,
+ $subsets: $subsets,
+ $weights: $weights,
+ $styles: all,
+ $directory: "./plugins/core/inter"
);
-@include Poppins.faces(
- $weights: $weights,
- $subsets: $subsets,
- $display: fallback,
- $directory: "./plugins/core/poppins"
+
+@include fontsource.faces(
+ $metadata: poppins.$metadata,
+ $subsets: $subsets,
+ $weights: $weights,
+ $styles: all,
+ $directory: "./plugins/core/poppins"
);
.ff-base { font-family: $font-family-base !important; }
diff --git a/src/meta/minifier.js b/src/meta/minifier.js
index 6a617cc45d..5583a8da5a 100644
--- a/src/meta/minifier.js
+++ b/src/meta/minifier.js
@@ -162,6 +162,7 @@ actions.buildCSS = async function buildCSS(data) {
try {
const opts = {
loadPaths: data.paths,
+ importers: [new sass.NodePackageImporter()]
};
if (data.minify) {
opts.silenceDeprecations = [