GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-11-06 12:47:11 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Fix legacy editable styles

Browse source
This commit is contained in:
Abdo 2025-10-18 06:45:17 +03:00
parent a305665bf6
commit 33a1b32095
2 changed files with 41 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ts/bundle_svelte.mjs
View file

@ -42,6 +42,16 @@ if (!sourcemap) {
];
}
const ignoreCssUrlPlugin = {
name: "ignore-css-url",
setup(build) {
// This works around esbuild unconditionally resolving CSS imports that uses Vite's `?url` syntax in the editor
build.onResolve({ filter: /.*?\.scss\?url$/ }, (args) => {
return { path: args.path, external: true };
});
},
};
build({
bundle: true,
entryPoints: [entrypoint],
@ -51,6 +61,7 @@ build({
loader: { ".svg": "text" },
preserveSymlinks: true,
sourcemap: sourcemap ? "inline" : false,
plugins: [
sassPlugin({ loadPaths: ["node_modules"] }),
sveltePlugin({
@ -59,6 +70,7 @@ build({
// let us focus on errors; we can see the warnings with svelte-check
filterWarnings: (_warning) => false,
}),
ignoreCssUrlPlugin,
],
target,
// logLevel: "info",

61
ts/routes/editor/rich-text-input/RichTextStyles.svelte
View file

@ -7,9 +7,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
import type { StyleLinkType, StyleObject } from "./CustomStyles.svelte";
import CustomStyles from "./CustomStyles.svelte";
import editableBaseCSS from "$lib/editable/editable-base.scss?url";
import contentEditableCSS from "$lib/editable/content-editable.scss?url";
import mathjaxCSS from "$lib/editable/mathjax.scss?url";
import { mount } from "svelte";
@ -49,36 +46,36 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
$: setStyling("fontSize", fontSize + "px");
$: setStyling("direction", direction);
let styles: StyleLinkType[];
if (isLegacy) {
styles = [
{
id: "rootStyle",
type: "link",
href: "./_anki/css/editable.css",
},
];
} else {
styles = [
{
id: "editableBaseStyle",
type: "link",
href: editableBaseCSS,
},
{
id: "contentEditableStyle",
type: "link",
href: contentEditableCSS,
},
{
id: "mathjaxStyle",
type: "link",
href: mathjaxCSS,
},
];
}
function attachToShadow(element: Element) {
async function attachToShadow(element: Element) {
let styles: StyleLinkType[];
if (isLegacy) {
styles = [
{
id: "rootStyle",
type: "link",
href: "./_anki/css/editable.css",
},
];
} else {
styles = [
{
id: "editableBaseStyle",
type: "link",
href: (await import("$lib/editable/editable-base.scss?url")).default,
},
{
id: "contentEditableStyle",
type: "link",
href: (await import("$lib/editable/content-editable.scss?url")).default,
},
{
id: "mathjaxStyle",
type: "link",
href: (await import("$lib/editable/mathjax.scss?url")).default,
},
];
}
const customStyles = mount(CustomStyles, {
target: element.shadowRoot!,
props: { styles },