Merge branch addon

12 files changed, 28 insertions, 38 deletions

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/DEVELOPING.md b/DEVELOPING.md
index 687e389..65052c5 100644
--- a/DEVELOPING.md
+++ b/DEVELOPING.md
@@ -8,13 +8,13 @@ The minimum requirements are:
 - Git
 - Node.js (version 16 and above)
 
-To install the project dependencies run
+To install the project dependencies, run
 
 ```sh
 # install dependencies
 npm install
 
-# install rollup or use npx
+# install linting and building tools
 npm install -g rollup standard
 ```
 
@@ -32,7 +32,7 @@ npm run lint
 
 ```sh
 # without code minified
-npm build
+npm run build
 
 # with code minified
 PRODUCTION=true npm build
@@ -40,12 +40,12 @@ PRODUCTION=true npm build
 
 ## Firefox Addon
 
-1. To build addon(after `dist/` is generated from `npm build`), run
+1. To build addon(after `dist/` is generated from `npm run build`), run
 
 ```sh
 npm run addon
 ```
 
-2. Then go to `about:debugging` page in Firfox Browser, then press `This Firefox` for extension page
+1. Then Firefox Browser, go to `about:debugging` page. Press `This Firefox` for extension page
 
-3. Press `Load Temporary Add-on...`, then select `manifest.json` in `addon/`
+1. Press `Load Temporary Add-on...`, then select `manifest.json` in `addon/`
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..8654505 100644
--- a/addon/manifest.json
+++ b/addon/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "MapInline",
-  "version": "1.0",
+  "version": "0.1.1",
 
   "description": "Add Interatctive Map",
 
@@ -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