From f749472dcdb0981ef179ec8e3f628f9eda2aa46b Mon Sep 17 00:00:00 2001 From: stringsplit <77242831+nbitzz@users.noreply.github.com> Date: Sat, 12 Aug 2023 09:53:53 +0000 Subject: [PATCH] @Jack5079's suggestions (hopefully these work lol) Later I'll use Svelte 4, I guess --- package-lock.json | 37 +++++++++++++++++++++++++++++++++++-- package.json | 3 +++ rollup.config.mjs | 2 +- src/style/_base.scss | 4 +++- 4 files changed, 42 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f0f924..455e4c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,17 @@ { "name": "monofile", - "version": "1.3.0-pa", + "version": "1.3.0-beta", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "monofile", - "version": "1.3.0-pa", + "version": "1.3.0-beta", "license": "Unlicense", "dependencies": { + "@fontsource/fira-code": "^5.0.8", + "@fontsource/inconsolata": "^5.0.8", + "@fontsource/source-sans-pro": "^5.0.8", "@types/body-parser": "^1.19.2", "@types/express": "^4.17.14", "@types/multer": "^1.4.7", @@ -87,6 +90,21 @@ "node": ">=16.9.0" } }, + "node_modules/@fontsource/fira-code": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/@fontsource/fira-code/-/fira-code-5.0.8.tgz", + "integrity": "sha512-kp/tJUVnjaZeLHENMBFTTSgP2B7+/rIboeofuMfoGB40s2U0DKXNqQcOqIF5PtDhJ5QTG1LcviYXMnc1yG6oYQ==" + }, + "node_modules/@fontsource/inconsolata": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/@fontsource/inconsolata/-/inconsolata-5.0.8.tgz", + "integrity": "sha512-KpBU6q1yCovfycaFprVEauh8U5RsWty3konFfUukyRRxZBK4Sf73XmGQc8iJ4CPrOP4dplGfdX2kjbRgdymajA==" + }, + "node_modules/@fontsource/source-sans-pro": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/@fontsource/source-sans-pro/-/source-sans-pro-5.0.8.tgz", + "integrity": "sha512-5U2UvIYRkCMozZ388gCE73PEpa2MFgN/0t9O4a1FF7bGT/MIneQWSL1XpWZ8iMVYdh6ntxRf3iFA6slCIuFgkg==" + }, "node_modules/@rollup/plugin-node-resolve": { "version": "15.0.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.1.tgz", @@ -1732,6 +1750,21 @@ "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-0.1.0.tgz", "integrity": "sha512-e7d+PaTLVQav6rOc2tojh2y6FE8S7REkqLldq1XF4soCx74XB/DIjbVbVLtBemf0nLW77ntz0v+o5DytKwFNLQ==" }, + "@fontsource/fira-code": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/@fontsource/fira-code/-/fira-code-5.0.8.tgz", + "integrity": "sha512-kp/tJUVnjaZeLHENMBFTTSgP2B7+/rIboeofuMfoGB40s2U0DKXNqQcOqIF5PtDhJ5QTG1LcviYXMnc1yG6oYQ==" + }, + "@fontsource/inconsolata": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/@fontsource/inconsolata/-/inconsolata-5.0.8.tgz", + "integrity": "sha512-KpBU6q1yCovfycaFprVEauh8U5RsWty3konFfUukyRRxZBK4Sf73XmGQc8iJ4CPrOP4dplGfdX2kjbRgdymajA==" + }, + "@fontsource/source-sans-pro": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/@fontsource/source-sans-pro/-/source-sans-pro-5.0.8.tgz", + "integrity": "sha512-5U2UvIYRkCMozZ388gCE73PEpa2MFgN/0t9O4a1FF7bGT/MIneQWSL1XpWZ8iMVYdh6ntxRf3iFA6slCIuFgkg==" + }, "@rollup/plugin-node-resolve": { "version": "15.0.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.1.tgz", diff --git a/package.json b/package.json index b6e9585..22d9fd8 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,9 @@ "node": ">=v18" }, "dependencies": { + "@fontsource/fira-code": "^5.0.8", + "@fontsource/inconsolata": "^5.0.8", + "@fontsource/source-sans-pro": "^5.0.8", "@types/body-parser": "^1.19.2", "@types/express": "^4.17.14", "@types/multer": "^1.4.7", diff --git a/rollup.config.mjs b/rollup.config.mjs index 8b2bdb5..b8f64fd 100644 --- a/rollup.config.mjs +++ b/rollup.config.mjs @@ -10,7 +10,7 @@ export default [ sourcemap:true }, plugins: [ - resolve(), + resolve({ browser: true }), svelte({}) ] } diff --git a/src/style/_base.scss b/src/style/_base.scss index 82554d5..6bd4aa0 100644 --- a/src/style/_base.scss +++ b/src/style/_base.scss @@ -3,7 +3,9 @@ from the server but it's fine for now */ -@import url('https://fonts.googleapis.com/css2?family=Fira+Code&family=Inconsolata&family=Source+Sans+Pro:wght@300;400;600;700;900&display=swap'); +@import '~@fontsource/fira-code'; +@import '~@fontsource/inconsolata'; +@import '~@fontsource/source-sans-pro'; $FallbackFonts: -apple-system,