From 558067bb69ace40f8c5fbadd756e22746d184e5d Mon Sep 17 00:00:00 2001 From: Candid Dauth Date: Sun, 24 Dec 2023 18:39:43 +0100 Subject: [PATCH] Fix icons --- .eslintrc.js | 2 +- leaflet/rollup-icons.ts | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index c4371d32..0e89b915 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -13,7 +13,7 @@ module.exports = { }, rules: { "@typescript-eslint/explicit-module-boundary-types": ["warn", { "allowArgumentsExplicitlyTypedAsAny": true }], - "import/no-unresolved": ["error", { "ignore": [ "geojson", "custom:icons" ], "caseSensitive": true }], + "import/no-unresolved": ["error", { "ignore": [ "geojson", "virtual:icons" ], "caseSensitive": true }], "import/no-extraneous-dependencies": ["error"], "@typescript-eslint/no-unused-vars": ["warn", { "args": "none" }], "import/no-named-as-default": ["warn"], diff --git a/leaflet/rollup-icons.ts b/leaflet/rollup-icons.ts index 30adf4a7..1027a2f5 100644 --- a/leaflet/rollup-icons.ts +++ b/leaflet/rollup-icons.ts @@ -1,7 +1,10 @@ import type { Plugin } from "rollup"; +// eslint-disable-next-line import/no-named-as-default import glob from "fast-glob"; import { readFile } from "fs/promises"; import { createRequire } from "module"; +import { dirname } from "path"; +import { fileURLToPath } from "url"; // https://stackoverflow.com/a/62499498/242365 const require = createRequire(import.meta.url); @@ -17,7 +20,7 @@ export default function iconPlugin(): Plugin { load: async (id) => { if (id === 'virtual:icons') { const icons: Record> = {}; - for (const path of await glob('./assets/icons/*/*.svg')) { + for (const path of await glob(`${dirname(fileURLToPath(import.meta.url))}/assets/icons/*/*.svg`)) { const [set, fname] = path.split("/").slice(-2); if (!icons[set])