Skip to content

Commit 26b57e4

Browse files
committed
build: Fix bundling and use noto
1 parent eec710a commit 26b57e4

5 files changed

Lines changed: 49 additions & 41 deletions

File tree

docusaurus.config.ts

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -274,16 +274,12 @@ const config: Config = {
274274
injectHtmlTags() {
275275
return {};
276276
},
277-
configurePostCss(options) {
278-
options["map"] = true;
279-
return options;
280-
},
281277
configureWebpack(config, isServer, options) {
282278
const matchRule = (r: Configuration["module"]["rules"][0]) => {
283279
if (typeof r === "object") {
284-
if(r.test instanceof RegExp) {
280+
if (r.test instanceof RegExp) {
285281
return !!r.test.exec("custom.sass");
286-
} else if(typeof r.test === "undefined") {
282+
} else if (typeof r.test === "undefined") {
287283
return true;
288284
} else {
289285
// unsupported
@@ -312,16 +308,27 @@ const config: Config = {
312308
throw new Error("Need SASS rule with use[]");
313309
}
314310

315-
const sassLoaderIndex = sassRule.use.findIndex(l => typeof l === "object" && l.loader?.includes('sass-loader'));
311+
const sassLoaderIndex = sassRule.use.findIndex(
312+
(l) => typeof l === "object" && l.loader?.includes("sass-loader")
313+
);
316314
if (sassLoaderIndex === -1) {
317315
throw new Error("Could not find sass-loader in rule");
318316
}
319317

318+
// ensure source-map before resolve-url-loader
319+
const sassLoader = sassRule.use[sassLoaderIndex] as RuleSetRule;
320+
sassLoader.options = {
321+
...((sassLoader.options as object | undefined) ?? {}),
322+
sourceMap: true // force sourcemaps
323+
};
324+
325+
320326
// insert resolve-url-loader before SASS loader to fix relative URLs
321327
sassRule.use.splice(sassLoaderIndex, 0, {
322328
loader: "resolve-url-loader",
323329
});
324330

331+
325332
return {
326333
plugins: [
327334
// Copy the Font and SoundFont Files to the output

package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"@docusaurus/core": "^3.3.2",
2020
"@docusaurus/preset-classic": "^3.3.2",
2121
"@docusaurus/theme-mermaid": "^3.3.2",
22-
"@fontsource/pt-serif": "^5.1.1",
23-
"@fontsource/roboto": "^5.1.1",
22+
"@fontsource/noto-sans": "^5.1.1",
23+
"@fontsource/noto-serif": "^5.1.1",
2424
"@fortawesome/fontawesome-svg-core": "^6.5.2",
2525
"@fortawesome/free-regular-svg-icons": "^6.5.2",
2626
"@fortawesome/free-solid-svg-icons": "^6.5.2",

src/css/custom.scss

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
* work well for content-centric websites.
55
*/
66

7-
@import "@fontsource/roboto";
8-
@import "@fontsource/roboto/300.css";
9-
@import "@fontsource/roboto/500.css";
10-
@import "@fontsource/roboto/700.css";
11-
@import "@fontsource/pt-serif";
12-
@import "@fontsource/pt-serif/700.css";
13-
7+
@import "@fontsource/noto-sans";
8+
@import "@fontsource/noto-sans/300.css";
9+
@import "@fontsource/noto-sans/500.css";
10+
@import "@fontsource/noto-sans/700.css";
11+
@import "@fontsource/noto-serif";
12+
@import "@fontsource/noto-serif/300.css";
13+
@import "@fontsource/noto-serif/500.css";
14+
@import "@fontsource/noto-serif/700.css";
1415

1516
/* You can override the default Infima variables here. */
1617
:root {
@@ -25,7 +26,7 @@
2526
--ifm-z-index-fixed: 2000;
2627
--docusaurus-highlighted-code-line-bg: rgba(0,0,0, 0.20);
2728

28-
--ifm-font-family-base: Roboto;
29+
--ifm-font-family-base: "Noto Sans";
2930
}
3031

3132
/* For readability concerns, you should choose a lighter palette in dark mode. */

src/environment.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ export default {
55
settings.core.fontDirectory = "/font/";
66
settings.player.soundFont = "/soundfont/sonivox.sf3";
77

8-
settings.display.resources.copyrightFont.families = ["Roboto"];
9-
settings.display.resources.titleFont.families = ["PT Serif"];
10-
settings.display.resources.subTitleFont.families = ["PT Serif"];
11-
settings.display.resources.wordsFont.families = ["PT Serif"];
12-
settings.display.resources.effectFont.families = ["PT Serif"];
13-
settings.display.resources.timerFont.families = ["PT Serif"];
14-
settings.display.resources.fretboardNumberFont.families = ["Roboto"];
15-
settings.display.resources.tablatureFont.families = ["Roboto"];
16-
settings.display.resources.graceFont.families = ["Roboto"];
17-
settings.display.resources.barNumberFont.families = ["Roboto"];
18-
settings.display.resources.fingeringFont.families = ["PT Serif"];
19-
settings.display.resources.inlineFingeringFont.families = ["PT Serif"];
20-
settings.display.resources.markerFont.families = ["PT Serif"];
21-
settings.display.resources.directionsFont.families = ["PT Serif"];
22-
settings.display.resources.numberedNotationFont.families = ["Roboto"];
23-
settings.display.resources.numberedNotationGraceFont.families = ["Roboto"];
8+
settings.display.resources.copyrightFont.families = ["Noto Sans"];
9+
settings.display.resources.titleFont.families = ["Noto Serif"];
10+
settings.display.resources.subTitleFont.families = ["Noto Serif"];
11+
settings.display.resources.wordsFont.families = ["Noto Serif"];
12+
settings.display.resources.effectFont.families = ["Noto Serif"];
13+
settings.display.resources.timerFont.families = ["Noto Serif"];
14+
settings.display.resources.fretboardNumberFont.families = ["Noto Sans"];
15+
settings.display.resources.tablatureFont.families = ["Noto Sans"];
16+
settings.display.resources.graceFont.families = ["Noto Sans"];
17+
settings.display.resources.barNumberFont.families = ["Noto Sans"];
18+
settings.display.resources.fingeringFont.families = ["Noto Serif"];
19+
settings.display.resources.inlineFingeringFont.families = ["Noto Serif"];
20+
settings.display.resources.markerFont.families = ["Noto Serif"];
21+
settings.display.resources.directionsFont.families = ["Noto Serif"];
22+
settings.display.resources.numberedNotationFont.families = ["Noto Sans"];
23+
settings.display.resources.numberedNotationGraceFont.families = ["Noto Sans"];
2424
},
2525
};

0 commit comments

Comments
 (0)