diff --git a/src/public/app/services/library_loader.ts b/src/public/app/services/library_loader.ts index 04cfa4ff6..cbc8771cb 100644 --- a/src/public/app/services/library_loader.ts +++ b/src/public/app/services/library_loader.ts @@ -42,10 +42,6 @@ const CODE_MIRROR: Library = { css: ["node_modules/codemirror/lib/codemirror.css", "node_modules/codemirror/addon/lint/lint.css"] }; -const CALENDAR_WIDGET: Library = { - css: ["stylesheets/calendar.css"] -}; - const KATEX: Library = { js: ["node_modules/katex/dist/katex.min.js", "node_modules/katex/dist/contrib/mhchem.min.js", "node_modules/katex/dist/contrib/auto-render.min.js"], css: ["node_modules/katex/dist/katex.min.css"] @@ -162,7 +158,6 @@ export default { loadHighlightingTheme, CKEDITOR, CODE_MIRROR, - CALENDAR_WIDGET, KATEX, HIGHLIGHT_JS }; diff --git a/src/public/app/widgets/buttons/calendar.ts b/src/public/app/widgets/buttons/calendar.ts index 131d176bf..11e9092bc 100644 --- a/src/public/app/widgets/buttons/calendar.ts +++ b/src/public/app/widgets/buttons/calendar.ts @@ -1,5 +1,4 @@ import { t } from "../../services/i18n.js"; -import libraryLoader from "../../services/library_loader.js"; import utils from "../../services/utils.js"; import dateNoteService from "../../services/date_notes.js"; import server from "../../services/server.js"; @@ -9,6 +8,7 @@ import toastService from "../../services/toast.js"; import options from "../../services/options.js"; import { Dropdown } from "bootstrap"; import type { EventData } from "../../components/app_context.js"; +import "../../../stylesheets/calendar.css"; const MONTHS = [ t("calendar.january"), @@ -188,7 +188,6 @@ export default class CalendarWidget extends RightDropdownButtonWidget { } async dropdownShown() { - await libraryLoader.requireLibrary(libraryLoader.CALENDAR_WIDGET); this.init(appContext.tabManager.getActiveContextNote()?.getOwnedLabelValue("dateNote") ?? null); } diff --git a/webpack.config.ts b/webpack.config.ts index f51df96ab..2258bc580 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -56,7 +56,10 @@ const config: Configuration = { loader: miniCssExtractPlugin.loader }, { - loader: "css-loader" + loader: "css-loader", + options: { + esModule: true + } }, { loader: "postcss-loader", @@ -99,6 +102,9 @@ const config: Configuration = { ".js": [".js", ".ts"], ".cjs": [".cjs", ".cts"], ".mjs": [".mjs", ".mts"] + }, + alias: { + stylesheets: path.resolve(rootDir, "src/public/stylesheets") } }, devtool: "nosources-source-map",