Skip to content

Commit 4c7346b

Browse files
authored
Merge pull request #494 from BeAPI/fix/node-modules-import
Enhance SCSS imports and update loaders configuration to support package-style imports
2 parents 0cf4d4a + 0bf1b40 commit 4c7346b

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

config/loaders.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ module.exports = {
9292
let obj = {
9393
quietDeps: true,
9494
sourceMap: true,
95+
// Resolve package-style imports (e.g. @fontsource-variable/...) like Node does
96+
loadPaths: [nodeModulesPath],
9597
}
9698

9799
if (isProduction && isEditor(loaderContext)) {

src/scss/03-base/_fonts.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
*
1818
* 2 - Declare font-face :
1919
* // For Classic font
20-
* @use "../../../node_modules/@fontsource-utils/scss/src/mixins" as fontsource;
21-
* @use "../../../node_modules/@fontsource/myFont/scss/mixins" as MyFont;
20+
* @use "@fontsource-utils/scss/src/mixins" as fontsource;
21+
* @use "@fontsource/myFont/scss/mixins" as MyFont;
2222
* @include fontsource.faces($metadata: MyFont.$metadata, $weights: (400, 700));
2323
* ...
2424
*
2525
* // For Variable font
26-
* @use "../../../node_modules/@fontsource-utils/scss/src/mixins" as fontsource;
27-
* @use "../../../node_modules/@fontsource-variable/myFont/scss/mixins" as MyFont;
26+
* @use "@fontsource-utils/scss/src/mixins" as fontsource;
27+
* @use "@fontsource-variable/myFont/scss/mixins" as MyFont;
2828
* @include fontsource.faces($metadata: MyFont.$metadata, $axes: wght);
2929
* ...
3030
*/
3131

32-
@use "../../../node_modules/@fontsource-utils/scss/src/mixins" as fontsource;
33-
@use "../../../node_modules/@fontsource/poppins/scss/mixins" as Poppins;
32+
@use "@fontsource-utils/scss/src/mixins" as fontsource;
33+
@use "@fontsource/poppins/scss/mixins" as Poppins;
3434

3535
@include fontsource.faces($metadata: Poppins.$metadata, $weights: (300, 400, 500, 700), $styles: normal);
3636
@include fontsource.faces($metadata: Poppins.$metadata, $weights: (300, 400, 500, 700), $styles: italic);

0 commit comments

Comments
 (0)