From c04eff2711d690087d2306e318e03bfcebece5a1 Mon Sep 17 00:00:00 2001
From: Hsieh Chin Fan <pham@topo.tw>
Date: Fri, 8 Nov 2024 17:40:23 +0800
Subject: fix: redeclaration, use IIFE to load modules

* put bundled scripts into scripts/, this make gitignore easier
---
 .gitignore                         |  6 +-----
 addon/index.js                     |  3 ++-
 addon/manifest.json                | 14 +++++---------
 addon/src/dumbymap.mjs             |  1 +
 addon/src/leaflet.mjs              |  3 +++
 addon/src/maplibre.mjs             |  3 +++
 addon/src/openlayers.mjs           |  3 +++
 addon/src/renderers/leaflet.mjs    |  4 ----
 addon/src/renderers/maplibre.mjs   |  4 ----
 addon/src/renderers/openlayers.mjs |  4 ----
 scripts/addon.sh                   |  7 +++----
 11 files changed, 21 insertions(+), 31 deletions(-)
 create mode 100644 addon/src/leaflet.mjs
 create mode 100644 addon/src/maplibre.mjs
 create mode 100644 addon/src/openlayers.mjs
 delete mode 100644 addon/src/renderers/leaflet.mjs
 delete mode 100644 addon/src/renderers/maplibre.mjs
 delete mode 100644 addon/src/renderers/openlayers.mjs

diff --git a/.gitignore b/.gitignore
index 84e6d3f..f4142e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,12 +10,8 @@ docs/
 
 # addon
 addon.zip
-addon/**js
-addon/renderers/**js
+addon/scripts/**js
 addon/**css
-!addon/index**
-!addon/background**
-!addon/src
 
 # others
 doc-coverage/
diff --git a/addon/index.js b/addon/index.js
index 47d9853..fcc0cc7 100644
--- a/addon/index.js
+++ b/addon/index.js
@@ -21,6 +21,7 @@ const contentSelectors = {
   'www.ptt.cc': '#main-content',
   'prosemirror.net': '.ProseMirror',
   'www.openstreetmap.org': '.content-body',
+  'markdown-it.github.io': '.result-html',
 }
 const contentSelector = contentSelectors[url.host]
 
@@ -31,7 +32,7 @@ const simpleRender = globalThis.renderWith(config => ({
   XYZ: 'https://tile.openstreetmap.jp/styles/osm-bright/512/{z}/{x}/{y}.png',
   ...config,
   aliases: {
-    use: globalThis.mapclayRenderer,
+    use: globalThis.mapclayRenderers,
     ...(config.aliases ?? {}),
   },
 }))
diff --git a/addon/manifest.json b/addon/manifest.json
index 1b89ccf..243eb81 100644
--- a/addon/manifest.json
+++ b/addon/manifest.json
@@ -18,17 +18,13 @@
   "content_scripts": [
     {
       "matches": [
-        "*://developer.mozilla.org/*",
-        "*://hackmd.io/*",
-        "*://*.ptt.cc/*",
-        "https://prosemirror.net/examples/*",
-        "https://www.openstreetmap.org/*"
+        "<all_urls>"
       ],
       "js": [
-        "renderers/leaflet.js",
-        "renderers/maplibre.js",
-        "renderers/openlayers.js",
-        "dumbymap.js",
+        "scripts/dumbymap.js",
+        "scripts/leaflet.js",
+        "scripts/maplibre.js",
+        "scripts/openlayers.js",
         "index.js"
       ],
       "css": [
diff --git a/addon/src/dumbymap.mjs b/addon/src/dumbymap.mjs
index 07af342..dd19c8d 100644
--- a/addon/src/dumbymap.mjs
+++ b/addon/src/dumbymap.mjs
@@ -3,3 +3,4 @@ import { renderWith } from '../../node_modules/mapclay/dist/mapclay.mjs'
 
 globalThis.generateMaps = generateMaps
 globalThis.renderWith = renderWith
+globalThis.mapclayRenderers = {}
diff --git a/addon/src/leaflet.mjs b/addon/src/leaflet.mjs
new file mode 100644
index 0000000..d9c8617
--- /dev/null
+++ b/addon/src/leaflet.mjs
@@ -0,0 +1,3 @@
+import { default as Leaflet } from '../../node_modules/mapclay/dist/renderers/leaflet.mjs'
+
+globalThis.mapclayRenderers.Leaflet = Leaflet
diff --git a/addon/src/maplibre.mjs b/addon/src/maplibre.mjs
new file mode 100644
index 0000000..d0e3b3f
--- /dev/null
+++ b/addon/src/maplibre.mjs
@@ -0,0 +1,3 @@
+import { default as Maplibre } from '../../node_modules/mapclay/dist/renderers/maplibre.mjs'
+
+globalThis.mapclayRenderers.Maplibre = Maplibre
diff --git a/addon/src/openlayers.mjs b/addon/src/openlayers.mjs
new file mode 100644
index 0000000..be690b2
--- /dev/null
+++ b/addon/src/openlayers.mjs
@@ -0,0 +1,3 @@
+import { default as Openlayers } from '../../node_modules/mapclay/dist/renderers/openlayers.mjs'
+
+globalThis.mapclayRenderers.Openlayers = Openlayers
diff --git a/addon/src/renderers/leaflet.mjs b/addon/src/renderers/leaflet.mjs
deleted file mode 100644
index 8e056f9..0000000
--- a/addon/src/renderers/leaflet.mjs
+++ /dev/null
@@ -1,4 +0,0 @@
-import { default as Leaflet } from '../../../node_modules/mapclay/dist/renderers/leaflet.mjs'
-
-if (!globalThis.mapclayRenderers) globalThis.mapclayRenderers = {}
-globalThis.mapclayRenderers.Leaflet = Leaflet
diff --git a/addon/src/renderers/maplibre.mjs b/addon/src/renderers/maplibre.mjs
deleted file mode 100644
index 753af86..0000000
--- a/addon/src/renderers/maplibre.mjs
+++ /dev/null
@@ -1,4 +0,0 @@
-import { default as Maplibre } from '../../../node_modules/mapclay/dist/renderers/maplibre.mjs'
-
-if (!globalThis.mapclayRenderers) globalThis.mapclayRenderers = {}
-globalThis.mapclayRenderers.Maplibre = Maplibre
diff --git a/addon/src/renderers/openlayers.mjs b/addon/src/renderers/openlayers.mjs
deleted file mode 100644
index 2c42757..0000000
--- a/addon/src/renderers/openlayers.mjs
+++ /dev/null
@@ -1,4 +0,0 @@
-import { default as Openlayers } from '../../../node_modules/mapclay/dist/renderers/openlayers.mjs'
-
-if (!globalThis.mapclayRenderers) globalThis.mapclayRenderers = {}
-globalThis.mapclayRenderers.Openlayers = Openlayers
diff --git a/scripts/addon.sh b/scripts/addon.sh
index 3b7bf3b..1f89db2 100755
--- a/scripts/addon.sh
+++ b/scripts/addon.sh
@@ -3,7 +3,6 @@
 mkdir -p addon/css
 ln -f src/css/dumbymap.css addon/css/dumbymap.css
 
-mkdir -p addon/renderers/
-rollup addon/src/renderers/* --dir addon/renderers
-
-rollup addon/src/dumbymap.mjs --file addon/dumbymap.js
+mkdir -p addon/scripts
+rollup --format=iife addon/src/dumbymap.mjs --dir addon/scripts
+ls addon/src/* | xargs -i rollup --format=iife {} --dir addon/scripts
-- 
cgit v1.2.3-70-g09d2