diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..e780ac4 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,8 @@ +root = true +charset = utf-8 +end_of_line = lf +tab_width = 2 +indent_size = 2 +indent_style = tab +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a32fa4a..424f65f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,29 +8,9 @@ on: branches: - main -concurrency: - group: ${{ github.ref }} - cancel-in-progress: false - jobs: - lint: - name: Lint - timeout-minutes: 10 - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - uses: oven-sh/setup-bun@v1 - - - name: Install - run: bun install --frozen-lockfile - - - name: Lint - run: bun run lint - test: name: Test - timeout-minutes: 10 runs-on: ubuntu-latest steps: @@ -41,4 +21,4 @@ jobs: run: bun install --frozen-lockfile - name: Test - run: bun run test:cov + run: bun test --coverage diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0c7cc0b..5432776 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,7 +11,6 @@ concurrency: jobs: publish: name: Publish to Firefox AMO - timeout-minutes: 10 runs-on: ubuntu-latest steps: @@ -28,14 +27,14 @@ jobs: run: bun run bundle - name: Bundle source - run: git archive --format=zip ${{ github.event.release.tag_name }} --output out/replace_maps_source.zip + run: git archive --format=zip ${{ github.event.release.tag_name }} --output .out/replace_maps_source.zip - name: Release uses: browser-actions/release-firefox-addon@latest with: addon-id: replace_maps@nobkd.github.io - addon-path: out/replace_maps.zip - source-path: out/replace_maps_source.zip + addon-path: .out/replace_maps.zip + source-path: .out/replace_maps_source.zip approval-note: Follow the instructions in AMO-README.md release-note: ${{ github.event.release.body }} # TODO: convert md to html, h1-6 not allowed... Currently ignoring this problem, as the field is needed for publishing license: MPL-2.0 diff --git a/.gitignore b/.gitignore index 0b9f045..638cbb2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,6 @@ node_modules/ -dist/ -out/ -coverage/ +.dist/ +.out/ + .version-update .env - -public/icons/ diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index 922ee69..0000000 --- a/.prettierignore +++ /dev/null @@ -1,6 +0,0 @@ -package-lock.json -*.md -.github -dist -out -coverage diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index c09556d..0000000 --- a/.prettierrc +++ /dev/null @@ -1,12 +0,0 @@ -{ - "tabWidth": 2, - "useTabs": false, - "endOfLine": "lf", - "bracketSameLine": true, - "bracketSpacing": true, - "semi": false, - "trailingComma": "es5", - "singleQuote": true, - "arrowParens": "always", - "printWidth": 100 -} diff --git a/AMO-README.md b/AMO-README.md index 5064a5d..296ada9 100644 --- a/AMO-README.md +++ b/AMO-README.md @@ -18,4 +18,4 @@ This uses the `package-lock.json` file for installation to avoid package changes bun run build && bun run bundle ``` -This transpiles and minifies the TypeScript, copies static resources and bundles the output to `out/replace_maps.zip`. +This minifies the JavaScript, copies static resources and bundles the output to `.out/replace_maps.zip`. diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..5b72320 --- /dev/null +++ b/build.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# clean & create dir +rm -rf '.dist' +mkdir -p '.dist' + +# copy static resources +cp -r 'public/.' '.dist' +cp 'node_modules/leaflet/dist/images/marker-icon-2x.png' 'node_modules/leaflet/dist/images/marker-shadow.png' '.dist' + +# check if dev / prod, then build +if [[ $1 == 'dev' ]]; then + echo '--watch' +else + echo '--minify' +fi | xargs bun build --experimental-css --experimental-html --outdir '.dist' 'src/bg.html' 'src/map.html' 'src/options.html' diff --git a/bump.js b/bump.js new file mode 100644 index 0000000..3e1be51 --- /dev/null +++ b/bump.js @@ -0,0 +1,6 @@ +import { writeFileSync } from 'node:fs' +import { version } from './package.json' with { type: 'json' } +import manifest from './public/manifest.json' with { type: 'json' } + +manifest.version = version +writeFileSync('./public/manifest.json', JSON.stringify(manifest, null, 2)) diff --git a/bun.lock b/bun.lock new file mode 100644 index 0000000..49f69b3 --- /dev/null +++ b/bun.lock @@ -0,0 +1,283 @@ +{ + "lockfileVersion": 1, + "workspaces": { + "": { + "name": "replace_maps", + "dependencies": { + "leaflet": "^1.9.4", + "leaflet-fullscreen": "^1.0.2", + "webextension-polyfill": "^0.12.0", + }, + "devDependencies": { + "npm-run-all": "^4.1.5", + }, + }, + }, + "packages": { + "ansi-styles": ["ansi-styles@3.2.1", "", { "dependencies": { "color-convert": "^1.9.0" } }, "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="], + + "array-buffer-byte-length": ["array-buffer-byte-length@1.0.2", "", { "dependencies": { "call-bound": "^1.0.3", "is-array-buffer": "^3.0.5" } }, "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw=="], + + "arraybuffer.prototype.slice": ["arraybuffer.prototype.slice@1.0.4", "", { "dependencies": { "array-buffer-byte-length": "^1.0.1", "call-bind": "^1.0.8", "define-properties": "^1.2.1", "es-abstract": "^1.23.5", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6", "is-array-buffer": "^3.0.4" } }, "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ=="], + + "available-typed-arrays": ["available-typed-arrays@1.0.7", "", { "dependencies": { "possible-typed-array-names": "^1.0.0" } }, "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ=="], + + "balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], + + "brace-expansion": ["brace-expansion@1.1.11", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="], + + "call-bind": ["call-bind@1.0.8", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.0", "es-define-property": "^1.0.0", "get-intrinsic": "^1.2.4", "set-function-length": "^1.2.2" } }, "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww=="], + + "call-bind-apply-helpers": ["call-bind-apply-helpers@1.0.1", "", { "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" } }, "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g=="], + + "call-bound": ["call-bound@1.0.3", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.1", "get-intrinsic": "^1.2.6" } }, "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA=="], + + "chalk": ["chalk@2.4.2", "", { "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" } }, "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="], + + "color-convert": ["color-convert@1.9.3", "", { "dependencies": { "color-name": "1.1.3" } }, "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="], + + "color-name": ["color-name@1.1.3", "", {}, "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="], + + "concat-map": ["concat-map@0.0.1", "", {}, "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="], + + "cross-spawn": ["cross-spawn@6.0.6", "", { "dependencies": { "nice-try": "^1.0.4", "path-key": "^2.0.1", "semver": "^5.5.0", "shebang-command": "^1.2.0", "which": "^1.2.9" } }, "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw=="], + + "data-view-buffer": ["data-view-buffer@1.0.2", "", { "dependencies": { "call-bound": "^1.0.3", "es-errors": "^1.3.0", "is-data-view": "^1.0.2" } }, "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ=="], + + "data-view-byte-length": ["data-view-byte-length@1.0.2", "", { "dependencies": { "call-bound": "^1.0.3", "es-errors": "^1.3.0", "is-data-view": "^1.0.2" } }, "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ=="], + + "data-view-byte-offset": ["data-view-byte-offset@1.0.1", "", { "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", "is-data-view": "^1.0.1" } }, "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ=="], + + "define-data-property": ["define-data-property@1.1.4", "", { "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", "gopd": "^1.0.1" } }, "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A=="], + + "define-properties": ["define-properties@1.2.1", "", { "dependencies": { "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" } }, "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg=="], + + "dunder-proto": ["dunder-proto@1.0.1", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", "gopd": "^1.2.0" } }, "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A=="], + + "error-ex": ["error-ex@1.3.2", "", { "dependencies": { "is-arrayish": "^0.2.1" } }, "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="], + + "es-abstract": ["es-abstract@1.23.9", "", { "dependencies": { "array-buffer-byte-length": "^1.0.2", "arraybuffer.prototype.slice": "^1.0.4", "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.8", "call-bound": "^1.0.3", "data-view-buffer": "^1.0.2", "data-view-byte-length": "^1.0.2", "data-view-byte-offset": "^1.0.1", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0", "es-set-tostringtag": "^2.1.0", "es-to-primitive": "^1.3.0", "function.prototype.name": "^1.1.8", "get-intrinsic": "^1.2.7", "get-proto": "^1.0.0", "get-symbol-description": "^1.1.0", "globalthis": "^1.0.4", "gopd": "^1.2.0", "has-property-descriptors": "^1.0.2", "has-proto": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", "internal-slot": "^1.1.0", "is-array-buffer": "^3.0.5", "is-callable": "^1.2.7", "is-data-view": "^1.0.2", "is-regex": "^1.2.1", "is-shared-array-buffer": "^1.0.4", "is-string": "^1.1.1", "is-typed-array": "^1.1.15", "is-weakref": "^1.1.0", "math-intrinsics": "^1.1.0", "object-inspect": "^1.13.3", "object-keys": "^1.1.1", "object.assign": "^4.1.7", "own-keys": "^1.0.1", "regexp.prototype.flags": "^1.5.3", "safe-array-concat": "^1.1.3", "safe-push-apply": "^1.0.0", "safe-regex-test": "^1.1.0", "set-proto": "^1.0.0", "string.prototype.trim": "^1.2.10", "string.prototype.trimend": "^1.0.9", "string.prototype.trimstart": "^1.0.8", "typed-array-buffer": "^1.0.3", "typed-array-byte-length": "^1.0.3", "typed-array-byte-offset": "^1.0.4", "typed-array-length": "^1.0.7", "unbox-primitive": "^1.1.0", "which-typed-array": "^1.1.18" } }, "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA=="], + + "es-define-property": ["es-define-property@1.0.1", "", {}, "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g=="], + + "es-errors": ["es-errors@1.3.0", "", {}, "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="], + + "es-object-atoms": ["es-object-atoms@1.1.1", "", { "dependencies": { "es-errors": "^1.3.0" } }, "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA=="], + + "es-set-tostringtag": ["es-set-tostringtag@2.1.0", "", { "dependencies": { "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6", "has-tostringtag": "^1.0.2", "hasown": "^2.0.2" } }, "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA=="], + + "es-to-primitive": ["es-to-primitive@1.3.0", "", { "dependencies": { "is-callable": "^1.2.7", "is-date-object": "^1.0.5", "is-symbol": "^1.0.4" } }, "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g=="], + + "escape-string-regexp": ["escape-string-regexp@1.0.5", "", {}, "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="], + + "for-each": ["for-each@0.3.3", "", { "dependencies": { "is-callable": "^1.1.3" } }, "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="], + + "function-bind": ["function-bind@1.1.2", "", {}, "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="], + + "function.prototype.name": ["function.prototype.name@1.1.8", "", { "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.3", "define-properties": "^1.2.1", "functions-have-names": "^1.2.3", "hasown": "^2.0.2", "is-callable": "^1.2.7" } }, "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q=="], + + "functions-have-names": ["functions-have-names@1.2.3", "", {}, "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="], + + "get-intrinsic": ["get-intrinsic@1.2.7", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0", "function-bind": "^1.1.2", "get-proto": "^1.0.0", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", "math-intrinsics": "^1.1.0" } }, "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA=="], + + "get-proto": ["get-proto@1.0.1", "", { "dependencies": { "dunder-proto": "^1.0.1", "es-object-atoms": "^1.0.0" } }, "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g=="], + + "get-symbol-description": ["get-symbol-description@1.1.0", "", { "dependencies": { "call-bound": "^1.0.3", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6" } }, "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg=="], + + "globalthis": ["globalthis@1.0.4", "", { "dependencies": { "define-properties": "^1.2.1", "gopd": "^1.0.1" } }, "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ=="], + + "gopd": ["gopd@1.2.0", "", {}, "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg=="], + + "graceful-fs": ["graceful-fs@4.2.11", "", {}, "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="], + + "has-bigints": ["has-bigints@1.1.0", "", {}, "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg=="], + + "has-flag": ["has-flag@3.0.0", "", {}, "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="], + + "has-property-descriptors": ["has-property-descriptors@1.0.2", "", { "dependencies": { "es-define-property": "^1.0.0" } }, "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg=="], + + "has-proto": ["has-proto@1.2.0", "", { "dependencies": { "dunder-proto": "^1.0.0" } }, "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ=="], + + "has-symbols": ["has-symbols@1.1.0", "", {}, "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ=="], + + "has-tostringtag": ["has-tostringtag@1.0.2", "", { "dependencies": { "has-symbols": "^1.0.3" } }, "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw=="], + + "hasown": ["hasown@2.0.2", "", { "dependencies": { "function-bind": "^1.1.2" } }, "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="], + + "hosted-git-info": ["hosted-git-info@2.8.9", "", {}, "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="], + + "internal-slot": ["internal-slot@1.1.0", "", { "dependencies": { "es-errors": "^1.3.0", "hasown": "^2.0.2", "side-channel": "^1.1.0" } }, "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw=="], + + "is-array-buffer": ["is-array-buffer@3.0.5", "", { "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.3", "get-intrinsic": "^1.2.6" } }, "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A=="], + + "is-arrayish": ["is-arrayish@0.2.1", "", {}, "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="], + + "is-async-function": ["is-async-function@2.1.0", "", { "dependencies": { "call-bound": "^1.0.3", "get-proto": "^1.0.1", "has-tostringtag": "^1.0.2", "safe-regex-test": "^1.1.0" } }, "sha512-GExz9MtyhlZyXYLxzlJRj5WUCE661zhDa1Yna52CN57AJsymh+DvXXjyveSioqSRdxvUrdKdvqB1b5cVKsNpWQ=="], + + "is-bigint": ["is-bigint@1.1.0", "", { "dependencies": { "has-bigints": "^1.0.2" } }, "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ=="], + + "is-boolean-object": ["is-boolean-object@1.2.1", "", { "dependencies": { "call-bound": "^1.0.2", "has-tostringtag": "^1.0.2" } }, "sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng=="], + + "is-callable": ["is-callable@1.2.7", "", {}, "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="], + + "is-core-module": ["is-core-module@2.16.1", "", { "dependencies": { "hasown": "^2.0.2" } }, "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w=="], + + "is-data-view": ["is-data-view@1.0.2", "", { "dependencies": { "call-bound": "^1.0.2", "get-intrinsic": "^1.2.6", "is-typed-array": "^1.1.13" } }, "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw=="], + + "is-date-object": ["is-date-object@1.1.0", "", { "dependencies": { "call-bound": "^1.0.2", "has-tostringtag": "^1.0.2" } }, "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg=="], + + "is-finalizationregistry": ["is-finalizationregistry@1.1.1", "", { "dependencies": { "call-bound": "^1.0.3" } }, "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg=="], + + "is-generator-function": ["is-generator-function@1.1.0", "", { "dependencies": { "call-bound": "^1.0.3", "get-proto": "^1.0.0", "has-tostringtag": "^1.0.2", "safe-regex-test": "^1.1.0" } }, "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ=="], + + "is-map": ["is-map@2.0.3", "", {}, "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw=="], + + "is-number-object": ["is-number-object@1.1.1", "", { "dependencies": { "call-bound": "^1.0.3", "has-tostringtag": "^1.0.2" } }, "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw=="], + + "is-regex": ["is-regex@1.2.1", "", { "dependencies": { "call-bound": "^1.0.2", "gopd": "^1.2.0", "has-tostringtag": "^1.0.2", "hasown": "^2.0.2" } }, "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g=="], + + "is-set": ["is-set@2.0.3", "", {}, "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg=="], + + "is-shared-array-buffer": ["is-shared-array-buffer@1.0.4", "", { "dependencies": { "call-bound": "^1.0.3" } }, "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A=="], + + "is-string": ["is-string@1.1.1", "", { "dependencies": { "call-bound": "^1.0.3", "has-tostringtag": "^1.0.2" } }, "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA=="], + + "is-symbol": ["is-symbol@1.1.1", "", { "dependencies": { "call-bound": "^1.0.2", "has-symbols": "^1.1.0", "safe-regex-test": "^1.1.0" } }, "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w=="], + + "is-typed-array": ["is-typed-array@1.1.15", "", { "dependencies": { "which-typed-array": "^1.1.16" } }, "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ=="], + + "is-weakmap": ["is-weakmap@2.0.2", "", {}, "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w=="], + + "is-weakref": ["is-weakref@1.1.0", "", { "dependencies": { "call-bound": "^1.0.2" } }, "sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q=="], + + "is-weakset": ["is-weakset@2.0.4", "", { "dependencies": { "call-bound": "^1.0.3", "get-intrinsic": "^1.2.6" } }, "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ=="], + + "isarray": ["isarray@2.0.5", "", {}, "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="], + + "isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="], + + "json-parse-better-errors": ["json-parse-better-errors@1.0.2", "", {}, "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="], + + "leaflet": ["leaflet@1.9.4", "", {}, "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA=="], + + "leaflet-fullscreen": ["leaflet-fullscreen@1.0.2", "", {}, "sha512-1Yxm8RZg6KlKX25+hbP2H/wnOAphH7hFcvuADJFb4QZTN7uOSN9Hsci5EZpow8vtNej9OGzu59Jxmn+0qKOO9Q=="], + + "load-json-file": ["load-json-file@4.0.0", "", { "dependencies": { "graceful-fs": "^4.1.2", "parse-json": "^4.0.0", "pify": "^3.0.0", "strip-bom": "^3.0.0" } }, "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw=="], + + "math-intrinsics": ["math-intrinsics@1.1.0", "", {}, "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g=="], + + "memorystream": ["memorystream@0.3.1", "", {}, "sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw=="], + + "minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="], + + "nice-try": ["nice-try@1.0.5", "", {}, "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="], + + "normalize-package-data": ["normalize-package-data@2.5.0", "", { "dependencies": { "hosted-git-info": "^2.1.4", "resolve": "^1.10.0", "semver": "2 || 3 || 4 || 5", "validate-npm-package-license": "^3.0.1" } }, "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="], + + "npm-run-all": ["npm-run-all@4.1.5", "", { "dependencies": { "ansi-styles": "^3.2.1", "chalk": "^2.4.1", "cross-spawn": "^6.0.5", "memorystream": "^0.3.1", "minimatch": "^3.0.4", "pidtree": "^0.3.0", "read-pkg": "^3.0.0", "shell-quote": "^1.6.1", "string.prototype.padend": "^3.0.0" }, "bin": { "run-p": "bin/run-p/index.js", "run-s": "bin/run-s/index.js", "npm-run-all": "bin/npm-run-all/index.js" } }, "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ=="], + + "object-inspect": ["object-inspect@1.13.3", "", {}, "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA=="], + + "object-keys": ["object-keys@1.1.1", "", {}, "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="], + + "object.assign": ["object.assign@4.1.7", "", { "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.3", "define-properties": "^1.2.1", "es-object-atoms": "^1.0.0", "has-symbols": "^1.1.0", "object-keys": "^1.1.1" } }, "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw=="], + + "own-keys": ["own-keys@1.0.1", "", { "dependencies": { "get-intrinsic": "^1.2.6", "object-keys": "^1.1.1", "safe-push-apply": "^1.0.0" } }, "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg=="], + + "parse-json": ["parse-json@4.0.0", "", { "dependencies": { "error-ex": "^1.3.1", "json-parse-better-errors": "^1.0.1" } }, "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw=="], + + "path-key": ["path-key@2.0.1", "", {}, "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="], + + "path-parse": ["path-parse@1.0.7", "", {}, "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="], + + "path-type": ["path-type@3.0.0", "", { "dependencies": { "pify": "^3.0.0" } }, "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg=="], + + "pidtree": ["pidtree@0.3.1", "", { "bin": { "pidtree": "bin/pidtree.js" } }, "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA=="], + + "pify": ["pify@3.0.0", "", {}, "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="], + + "possible-typed-array-names": ["possible-typed-array-names@1.0.0", "", {}, "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q=="], + + "read-pkg": ["read-pkg@3.0.0", "", { "dependencies": { "load-json-file": "^4.0.0", "normalize-package-data": "^2.3.2", "path-type": "^3.0.0" } }, "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA=="], + + "reflect.getprototypeof": ["reflect.getprototypeof@1.0.10", "", { "dependencies": { "call-bind": "^1.0.8", "define-properties": "^1.2.1", "es-abstract": "^1.23.9", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0", "get-intrinsic": "^1.2.7", "get-proto": "^1.0.1", "which-builtin-type": "^1.2.1" } }, "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw=="], + + "regexp.prototype.flags": ["regexp.prototype.flags@1.5.4", "", { "dependencies": { "call-bind": "^1.0.8", "define-properties": "^1.2.1", "es-errors": "^1.3.0", "get-proto": "^1.0.1", "gopd": "^1.2.0", "set-function-name": "^2.0.2" } }, "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA=="], + + "resolve": ["resolve@1.22.10", "", { "dependencies": { "is-core-module": "^2.16.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" } }, "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w=="], + + "safe-array-concat": ["safe-array-concat@1.1.3", "", { "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.2", "get-intrinsic": "^1.2.6", "has-symbols": "^1.1.0", "isarray": "^2.0.5" } }, "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q=="], + + "safe-push-apply": ["safe-push-apply@1.0.0", "", { "dependencies": { "es-errors": "^1.3.0", "isarray": "^2.0.5" } }, "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA=="], + + "safe-regex-test": ["safe-regex-test@1.1.0", "", { "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", "is-regex": "^1.2.1" } }, "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw=="], + + "semver": ["semver@5.7.2", "", { "bin": { "semver": "bin/semver" } }, "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="], + + "set-function-length": ["set-function-length@1.2.2", "", { "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", "function-bind": "^1.1.2", "get-intrinsic": "^1.2.4", "gopd": "^1.0.1", "has-property-descriptors": "^1.0.2" } }, "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg=="], + + "set-function-name": ["set-function-name@2.0.2", "", { "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", "functions-have-names": "^1.2.3", "has-property-descriptors": "^1.0.2" } }, "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ=="], + + "set-proto": ["set-proto@1.0.0", "", { "dependencies": { "dunder-proto": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0" } }, "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw=="], + + "shebang-command": ["shebang-command@1.2.0", "", { "dependencies": { "shebang-regex": "^1.0.0" } }, "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg=="], + + "shebang-regex": ["shebang-regex@1.0.0", "", {}, "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="], + + "shell-quote": ["shell-quote@1.8.2", "", {}, "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA=="], + + "side-channel": ["side-channel@1.1.0", "", { "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3", "side-channel-list": "^1.0.0", "side-channel-map": "^1.0.1", "side-channel-weakmap": "^1.0.2" } }, "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw=="], + + "side-channel-list": ["side-channel-list@1.0.0", "", { "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3" } }, "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA=="], + + "side-channel-map": ["side-channel-map@1.0.1", "", { "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.5", "object-inspect": "^1.13.3" } }, "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA=="], + + "side-channel-weakmap": ["side-channel-weakmap@1.0.2", "", { "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.5", "object-inspect": "^1.13.3", "side-channel-map": "^1.0.1" } }, "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A=="], + + "spdx-correct": ["spdx-correct@3.2.0", "", { "dependencies": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" } }, "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA=="], + + "spdx-exceptions": ["spdx-exceptions@2.5.0", "", {}, "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w=="], + + "spdx-expression-parse": ["spdx-expression-parse@3.0.1", "", { "dependencies": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" } }, "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="], + + "spdx-license-ids": ["spdx-license-ids@3.0.21", "", {}, "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg=="], + + "string.prototype.padend": ["string.prototype.padend@3.1.6", "", { "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", "es-abstract": "^1.23.2", "es-object-atoms": "^1.0.0" } }, "sha512-XZpspuSB7vJWhvJc9DLSlrXl1mcA2BdoY5jjnS135ydXqLoqhs96JjDtCkjJEQHvfqZIp9hBuBMgI589peyx9Q=="], + + "string.prototype.trim": ["string.prototype.trim@1.2.10", "", { "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.2", "define-data-property": "^1.1.4", "define-properties": "^1.2.1", "es-abstract": "^1.23.5", "es-object-atoms": "^1.0.0", "has-property-descriptors": "^1.0.2" } }, "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA=="], + + "string.prototype.trimend": ["string.prototype.trimend@1.0.9", "", { "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.2", "define-properties": "^1.2.1", "es-object-atoms": "^1.0.0" } }, "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ=="], + + "string.prototype.trimstart": ["string.prototype.trimstart@1.0.8", "", { "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", "es-object-atoms": "^1.0.0" } }, "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg=="], + + "strip-bom": ["strip-bom@3.0.0", "", {}, "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="], + + "supports-color": ["supports-color@5.5.0", "", { "dependencies": { "has-flag": "^3.0.0" } }, "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="], + + "supports-preserve-symlinks-flag": ["supports-preserve-symlinks-flag@1.0.0", "", {}, "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="], + + "typed-array-buffer": ["typed-array-buffer@1.0.3", "", { "dependencies": { "call-bound": "^1.0.3", "es-errors": "^1.3.0", "is-typed-array": "^1.1.14" } }, "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw=="], + + "typed-array-byte-length": ["typed-array-byte-length@1.0.3", "", { "dependencies": { "call-bind": "^1.0.8", "for-each": "^0.3.3", "gopd": "^1.2.0", "has-proto": "^1.2.0", "is-typed-array": "^1.1.14" } }, "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg=="], + + "typed-array-byte-offset": ["typed-array-byte-offset@1.0.4", "", { "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.8", "for-each": "^0.3.3", "gopd": "^1.2.0", "has-proto": "^1.2.0", "is-typed-array": "^1.1.15", "reflect.getprototypeof": "^1.0.9" } }, "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ=="], + + "typed-array-length": ["typed-array-length@1.0.7", "", { "dependencies": { "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", "is-typed-array": "^1.1.13", "possible-typed-array-names": "^1.0.0", "reflect.getprototypeof": "^1.0.6" } }, "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg=="], + + "unbox-primitive": ["unbox-primitive@1.1.0", "", { "dependencies": { "call-bound": "^1.0.3", "has-bigints": "^1.0.2", "has-symbols": "^1.1.0", "which-boxed-primitive": "^1.1.1" } }, "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw=="], + + "validate-npm-package-license": ["validate-npm-package-license@3.0.4", "", { "dependencies": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" } }, "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="], + + "webextension-polyfill": ["webextension-polyfill@0.12.0", "", {}, "sha512-97TBmpoWJEE+3nFBQ4VocyCdLKfw54rFaJ6EVQYLBCXqCIpLSZkwGgASpv4oPt9gdKCJ80RJlcmNzNn008Ag6Q=="], + + "which": ["which@1.3.1", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "which": "./bin/which" } }, "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="], + + "which-boxed-primitive": ["which-boxed-primitive@1.1.1", "", { "dependencies": { "is-bigint": "^1.1.0", "is-boolean-object": "^1.2.1", "is-number-object": "^1.1.1", "is-string": "^1.1.1", "is-symbol": "^1.1.1" } }, "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA=="], + + "which-builtin-type": ["which-builtin-type@1.2.1", "", { "dependencies": { "call-bound": "^1.0.2", "function.prototype.name": "^1.1.6", "has-tostringtag": "^1.0.2", "is-async-function": "^2.0.0", "is-date-object": "^1.1.0", "is-finalizationregistry": "^1.1.0", "is-generator-function": "^1.0.10", "is-regex": "^1.2.1", "is-weakref": "^1.0.2", "isarray": "^2.0.5", "which-boxed-primitive": "^1.1.0", "which-collection": "^1.0.2", "which-typed-array": "^1.1.16" } }, "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q=="], + + "which-collection": ["which-collection@1.0.2", "", { "dependencies": { "is-map": "^2.0.3", "is-set": "^2.0.3", "is-weakmap": "^2.0.2", "is-weakset": "^2.0.3" } }, "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw=="], + + "which-typed-array": ["which-typed-array@1.1.18", "", { "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.8", "call-bound": "^1.0.3", "for-each": "^0.3.3", "gopd": "^1.2.0", "has-tostringtag": "^1.0.2" } }, "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA=="], + } +} diff --git a/bun.lockb b/bun.lockb deleted file mode 100755 index 23d9bc0..0000000 Binary files a/bun.lockb and /dev/null differ diff --git a/package.json b/package.json index c12cb08..30ca99c 100644 --- a/package.json +++ b/package.json @@ -15,38 +15,21 @@ "url": "git+https://github.com/nobkd/replace-maps.git" }, "scripts": { - "postinstall": "bun build-icons.js", - "lint": "prettier . --check", - "lint:fix": "prettier . --write", - "test": "vitest run", - "test:watch": "vitest", - "test:cov": "vitest run --coverage", + "icons": "bun i --no-save oslllo-svg2 && bun build-icons.js", "dev": "run-p -rl build:dev serve", - "build": "vite build", - "build:dev": "vite build --watch --mode development --minify false", - "serve": "web-ext run -s dist", - "bundle": "web-ext build -s dist -a out --overwrite-dest -n replace_maps.zip", - "release": "release-it" + "build": "sh build.sh", + "build:dev": "sh build.sh dev", + "serve": "bunx web-ext run -s .dist", + "bundle": "bunx web-ext build -s .dist -a .out --overwrite-dest -n replace_maps.zip", + "release": "bun i --no-save release-it release-it-changelogen && release-it" }, "devDependencies": { - "@types/leaflet": "^1.9.12", - "@types/leaflet-fullscreen": "^1.0.9", - "@types/webextension-polyfill": "^0.10.7", - "@vitest/coverage-v8": "^1.6.0", - "npm-run-all": "^4.1.5", - "oslllo-svg2": "^2.0.2", - "prettier": "^3.3.2", - "release-it": "^17.4.0", - "release-it-changelogen": "^0.1.0", - "vite": "^5.3.2", - "vite-plugin-static-copy": "^1.0.5", - "vitest": "^1.6.0", - "web-ext": "^8.2.0", - "webextension-polyfill": "^0.12.0" + "npm-run-all": "^4.1.5" }, "dependencies": { "leaflet": "^1.9.4", - "leaflet-fullscreen": "^1.0.2" + "leaflet-fullscreen": "^1.0.2", + "webextension-polyfill": "^0.12.0" }, "release-it": { "git": { @@ -70,12 +53,11 @@ }, "hooks": { "before:init": [ - "bun run lint", "bun run test", "bun run build" ], "after:bump": [ - "sh scripts/bump.sh" + "bun bump.js" ] } } diff --git a/public/icons/48-icon-grey.png b/public/icons/48-icon-grey.png new file mode 100644 index 0000000..74d89c2 Binary files /dev/null and b/public/icons/48-icon-grey.png differ diff --git a/public/icons/48-icon.png b/public/icons/48-icon.png new file mode 100644 index 0000000..53ea7fc Binary files /dev/null and b/public/icons/48-icon.png differ diff --git a/public/icons/96-icon-grey.png b/public/icons/96-icon-grey.png new file mode 100644 index 0000000..70cfbfb Binary files /dev/null and b/public/icons/96-icon-grey.png differ diff --git a/public/icons/96-icon.png b/public/icons/96-icon.png new file mode 100644 index 0000000..8b73172 Binary files /dev/null and b/public/icons/96-icon.png differ diff --git a/public/manifest.json b/public/manifest.json index edf5c85..76204c5 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -25,7 +25,9 @@ "background": { "page": "bg.html" }, - "web_accessible_resources": ["map.html"], + "web_accessible_resources": [ + "map.html" + ], "browser_action": { "default_icon": { "48": "icons/48-icon.png", @@ -37,4 +39,4 @@ "options_ui": { "page": "options.html" } -} +} \ No newline at end of file diff --git a/scripts/bump.sh b/scripts/bump.sh deleted file mode 100644 index 56c851a..0000000 --- a/scripts/bump.sh +++ /dev/null @@ -1 +0,0 @@ -sed -i -e "s/\"version\": *\"[^\"]*\"/\"version\": $(npm pkg get version)/gi" public/manifest.json diff --git a/src/bg.html b/src/bg.html index 3c545d4..ecc202a 100644 --- a/src/bg.html +++ b/src/bg.html @@ -1,6 +1,6 @@ - + - + diff --git a/src/bg/action.js b/src/bg/action.js index f8295ef..0db2efa 100644 --- a/src/bg/action.js +++ b/src/bg/action.js @@ -1,5 +1,6 @@ -import { browserAction, /*webNavigation,*/ Tabs, tabs } from 'webextension-polyfill' -import { getHostname, invertHostState } from './utils/storage' +import { tabs, browserAction, /*webNavigation*/ } from 'webextension-polyfill' + +import { getHostname, invertHostState } from './utils/storage.js' //import { matcher as mapsUrlMatcher, runtimeMapUrl } from './bg'; //const replacedUrlMatcher = new RegExp(`^${runtimeMapUrl}\?`); @@ -10,7 +11,7 @@ import { getHostname, invertHostState } from './utils/storage' * * Requests all frames from the current tab, filters them for extension Leaflet frames and Maps frames. * Reloads the full tab on extension Leaflet or Maps frame match. - * @param {Tabs.Tab} tab Currently active tab + * @param {browser.Tabs.Tab} tab Currently active tab */ async function actionClick(tab) { if (!tab.url || !tab.id) return diff --git a/src/bg/bg.js b/src/bg/bg.js index 1e14453..3127dfe 100644 --- a/src/bg/bg.js +++ b/src/bg/bg.js @@ -1,7 +1,8 @@ -import { runtime, tabs, windows, webRequest, WebRequest } from 'webextension-polyfill' -import { disabledHosts, getHostname } from './utils/storage' -import { updateActiveTabIcon } from './utils/actionIcon' -import { domainEnds } from './utils/domainEnds' +import { runtime, webRequest, tabs, windows } from 'webextension-polyfill' + +import { disabledHosts, getHostname } from './utils/storage.js' +import { updateActiveTabIcon } from './utils/actionIcon.js' +import domainEnds from './utils/domainEnds.json' with { type: 'json' } const gLocales = domainEnds.join('|') // TODO: collect more locales export const matcher = new RegExp( @@ -14,8 +15,8 @@ export const runtimeMapUrl = runtime.getURL('map.html') * Checks if `frames` send a request to Maps. * If they do and the extension isn't disabled for the current site, then the request is redirected to the extension leaflet map with all URL search params. * Else the request is'nt blocked. - * @param {WebRequest.OnBeforeRequestDetailsType} req Web Request from frame - * @returns {WebRequest.BlockingResponse} Redirect to extension map or pass through if extension disabled for website + * @param {browser.WebRequest.OnBeforeRequestDetailsType} req Web Request from frame + * @returns {browser.WebRequest.BlockingResponse} Redirect to extension map or pass through if extension disabled for website */ function redirect(req) { // TODO: check if originUrl always matches current tab url -> e.g. in frames with subframes diff --git a/src/bg/utils/actionIcon.js b/src/bg/utils/actionIcon.js index ad58e21..1614f4c 100644 --- a/src/bg/utils/actionIcon.js +++ b/src/bg/utils/actionIcon.js @@ -1,5 +1,6 @@ import { browserAction, tabs } from 'webextension-polyfill' -import { disabledHosts, getHostname } from './storage' + +import { disabledHosts, getHostname } from './storage.js' /** * Updates the action icon @@ -9,15 +10,13 @@ export function updateIcon(hostname) { let disabled = disabledHosts.includes(hostname) browserAction.setIcon({ - path: !disabled - ? { - 48: '/icons/48-icon.png', - 96: '/icons/96-icon.png', - } - : { - 48: '/icons/48-icon-grey.png', - 96: '/icons/96-icon-grey.png', - }, + path: !disabled ? { + 48: '/icons/48-icon.png', + 96: '/icons/96-icon.png', + } : { + 48: '/icons/48-icon-grey.png', + 96: '/icons/96-icon-grey.png', + }, }) } diff --git a/src/bg/utils/domainEnds.js b/src/bg/utils/domainEnds.js deleted file mode 100644 index 3903313..0000000 --- a/src/bg/utils/domainEnds.js +++ /dev/null @@ -1,202 +0,0 @@ -// Domain ends of google -export const domainEnds = [ - 'com', - 'ac', - 'ad', - 'ae', - 'com.af', - 'com.ag', - 'com.ai', - 'al', - 'am', - 'co.ao', - 'com.ar', - 'as', - 'at', - 'com.au', - 'az', - 'ba', - 'com.bd', - 'be', - 'bf', - 'bg', - 'com.bh', - 'bi', - 'bj', - 'com.bn', - 'com.bo', - 'com.br', - 'bs', - 'bt', - 'co.bw', - 'by', - 'com.bz', - 'ca', - 'com.kh', - 'cc', - 'cd', - 'cf', - 'cat', - 'cg', - 'ch', - 'ci', - 'co.ck', - 'cl', - 'cm', - 'cn', - 'com.co', - 'co.cr', - 'com.cu', - 'cv', - 'com.cy', - 'cz', - 'de', - 'dj', - 'dk', - 'dm', - 'com.do', - 'dz', - 'com.ec', - 'ee', - 'com.eg', - 'es', - 'com.et', - 'fi', - 'com.fj', - 'fm', - 'fr', - 'ga', - 'ge', - 'gf', - 'gg', - 'com.gh', - 'com.gi', - 'gl', - 'gm', - 'gp', - 'gr', - 'com.gt', - 'gy', - 'com.hk', - 'hn', - 'hr', - 'ht', - 'hu', - 'co.id', - 'iq', - 'ie', - 'co.il', - 'im', - 'co.in', - 'io', - 'is', - 'it', - 'je', - 'com.jm', - 'jo', - 'co.jp', - 'co.ke', - 'ki', - 'kg', - 'co.kr', - 'com.kw', - 'kz', - 'la', - 'com.lb', - 'com.lc', - 'li', - 'lk', - 'co.ls', - 'lt', - 'lu', - 'lv', - 'com.ly', - 'co.ma', - 'md', - 'me', - 'mg', - 'mk', - 'ml', - 'com.mm', - 'mn', - 'ms', - 'com.mt', - 'mu', - 'mv', - 'mw', - 'com.mx', - 'com.my', - 'co.mz', - 'com.na', - 'ne', - 'com.nf', - 'com.ng', - 'com.ni', - 'nl', - 'no', - 'com.np', - 'nr', - 'nu', - 'co.nz', - 'com.om', - 'com.pk', - 'com.pa', - 'com.pe', - 'com.ph', - 'pl', - 'com.pg', - 'pn', - 'com.pr', - 'ps', - 'pt', - 'com.py', - 'com.qa', - 'ro', - 'rs', - 'ru', - 'rw', - 'com.sa', - 'com.sb', - 'sc', - 'se', - 'com.sg', - 'sh', - 'si', - 'sk', - 'com.sl', - 'sn', - 'sm', - 'so', - 'st', - 'sr', - 'com.sv', - 'td', - 'tg', - 'co.th', - 'com.tj', - 'tk', - 'tl', - 'tm', - 'to', - 'tn', - 'com.tr', - 'tt', - 'com.tw', - 'co.tz', - 'com.ua', - 'co.ug', - 'co.uk', - 'com', - 'com.uy', - 'co.uz', - 'com.vc', - 'co.ve', - 'vg', - 'co.vi', - 'com.vn', - 'vu', - 'ws', - 'co.za', - 'co.zm', - 'co.zw', -] diff --git a/src/bg/utils/domainEnds.json b/src/bg/utils/domainEnds.json new file mode 100644 index 0000000..c36200a --- /dev/null +++ b/src/bg/utils/domainEnds.json @@ -0,0 +1,201 @@ +[ + "com", + "ac", + "ad", + "ae", + "com.af", + "com.ag", + "com.ai", + "al", + "am", + "co.ao", + "com.ar", + "as", + "at", + "com.au", + "az", + "ba", + "com.bd", + "be", + "bf", + "bg", + "com.bh", + "bi", + "bj", + "com.bn", + "com.bo", + "com.br", + "bs", + "bt", + "co.bw", + "by", + "com.bz", + "ca", + "com.kh", + "cc", + "cd", + "cf", + "cat", + "cg", + "ch", + "ci", + "co.ck", + "cl", + "cm", + "cn", + "com.co", + "co.cr", + "com.cu", + "cv", + "com.cy", + "cz", + "de", + "dj", + "dk", + "dm", + "com.do", + "dz", + "com.ec", + "ee", + "com.eg", + "es", + "com.et", + "fi", + "com.fj", + "fm", + "fr", + "ga", + "ge", + "gf", + "gg", + "com.gh", + "com.gi", + "gl", + "gm", + "gp", + "gr", + "com.gt", + "gy", + "com.hk", + "hn", + "hr", + "ht", + "hu", + "co.id", + "iq", + "ie", + "co.il", + "im", + "co.in", + "io", + "is", + "it", + "je", + "com.jm", + "jo", + "co.jp", + "co.ke", + "ki", + "kg", + "co.kr", + "com.kw", + "kz", + "la", + "com.lb", + "com.lc", + "li", + "lk", + "co.ls", + "lt", + "lu", + "lv", + "com.ly", + "co.ma", + "md", + "me", + "mg", + "mk", + "ml", + "com.mm", + "mn", + "ms", + "com.mt", + "mu", + "mv", + "mw", + "com.mx", + "com.my", + "co.mz", + "com.na", + "ne", + "com.nf", + "com.ng", + "com.ni", + "nl", + "no", + "com.np", + "nr", + "nu", + "co.nz", + "com.om", + "com.pk", + "com.pa", + "com.pe", + "com.ph", + "pl", + "com.pg", + "pn", + "com.pr", + "ps", + "pt", + "com.py", + "com.qa", + "ro", + "rs", + "ru", + "rw", + "com.sa", + "com.sb", + "sc", + "se", + "com.sg", + "sh", + "si", + "sk", + "com.sl", + "sn", + "sm", + "so", + "st", + "sr", + "com.sv", + "td", + "tg", + "co.th", + "com.tj", + "tk", + "tl", + "tm", + "to", + "tn", + "com.tr", + "tt", + "com.tw", + "co.tz", + "com.ua", + "co.ug", + "co.uk", + "com", + "com.uy", + "co.uz", + "com.vc", + "co.ve", + "vg", + "co.vi", + "com.vn", + "vu", + "ws", + "co.za", + "co.zm", + "co.zw" +] diff --git a/src/bg/utils/storage.js b/src/bg/utils/storage.js index 2613880..2285568 100644 --- a/src/bg/utils/storage.js +++ b/src/bg/utils/storage.js @@ -1,5 +1,6 @@ import { storage } from 'webextension-polyfill' -import { updateIcon } from './actionIcon' + +import { updateIcon } from './actionIcon.js' export const KEY_DISABLED_HOSTS = 'disabled_hosts' diff --git a/src/map.html b/src/map.html index 7ac0c16..85ee737 100644 --- a/src/map.html +++ b/src/map.html @@ -1,15 +1,13 @@ - + - - - - - - + + + + + Leaflet Map -
diff --git a/src/map/map.js b/src/map/map.js index f64dfcf..83fc91c 100644 --- a/src/map/map.js +++ b/src/map/map.js @@ -1,8 +1,8 @@ import L from 'leaflet' import 'leaflet-fullscreen' -import { readPB, readQ, MapData } from './utils/read' -import { tileTypes } from './utils/parsePB' +import { readPB, readQ } from './utils/read.js' +import { tileTypes } from './utils/parsePB.js' /** * @typedef {object} Tile @@ -46,10 +46,10 @@ if (params.has(gZoom)) { mapData.zoom = parseInt(params.get(gZoom)) } -/** @type {L.Map} */ const map = L.map('map', { fullscreenControl: true, - scrollWheelZoom: true, // TODO: on pc allow ctrl + scroll + scrollWheelZoom: true, + touchZoom: true, zoom: mapData.zoom ?? 17, zoomSnap: 0.1, zoomDelta: 0.5, diff --git a/src/map/utils/parsePB.js b/src/map/utils/parsePB.js index 8badc6f..8d225ec 100644 --- a/src/map/utils/parsePB.js +++ b/src/map/utils/parsePB.js @@ -47,7 +47,7 @@ function convertType(item) { val = tileTypes[tileIndex < tileTypes.length && tileIndex >= 0 ? tileIndex : 0] break case 'z': // base64 encoded coords - val = atob(item).replace(/[^\d\s\-\.\'\"\°SNWE]/g, '') + val = Buffer.from(item, 'base64').toString('utf-8') } return [val, type === 'm'] diff --git a/src/map/utils/read.js b/src/map/utils/read.js index 8ad6d18..46ed5ff 100644 --- a/src/map/utils/read.js +++ b/src/map/utils/read.js @@ -1,6 +1,6 @@ -import { TileType, parsePB, tileTypes } from './parsePB' -import { parseDMS } from './parseDMS' -import { getMapZoom } from './zoom' +import { parsePB, tileTypes } from './parsePB.js' +import { parseDMS } from './parseDMS.js' +import { getMapZoom } from './zoom.js' export const nominatimQ = 'https://nominatim.openstreetmap.org/search?limit=1&format=json&q=' const cidMatch = /^0x[\da-f]+:0x[\da-f]+$/i diff --git a/src/options.html b/src/options.html index e7ceb59..503210d 100644 --- a/src/options.html +++ b/src/options.html @@ -1,12 +1,11 @@ - + - - - - - - + + + + + Replace Maps Options @@ -18,8 +17,9 @@ placeholder="(sub.)domain.tld" name="hostname" id="hostname" - required /> - + required + > +
diff --git a/src/options/options.js b/src/options/options.js index 77da5ab..22e493d 100644 --- a/src/options/options.js +++ b/src/options/options.js @@ -1,10 +1,11 @@ import { storage } from 'webextension-polyfill' + import { KEY_DISABLED_HOSTS, disabledHosts, getHostname, invertHostState, -} from '../bg/utils/storage' +} from '../bg/utils/storage.js' const table = document.querySelector('.table') diff --git a/src/styles/options.css b/src/styles/options.css index 7dd5a12..f408b01 100644 --- a/src/styles/options.css +++ b/src/styles/options.css @@ -63,7 +63,7 @@ body > section { .table button::before { display: flex; - content: '✘'; + content: "✘"; align-items: center; justify-content: center; font-size: large; @@ -91,10 +91,10 @@ input { border-style: solid; } -input[type='text'] { +input[type="text"] { width: 80%; } -input[type='submit'] { +input[type="submit"] { width: 20%; text-align: center; } diff --git a/src/test/parseDMS.test.js b/src/test/parseDMS.test.js new file mode 100644 index 0000000..779bcbf --- /dev/null +++ b/src/test/parseDMS.test.js @@ -0,0 +1,14 @@ +import { test, expect } from 'bun:test' +import { parseDMS } from '../map/utils/parseDMS.js' + +test('Parse Degrees Minutes Seconds Direction: Example', () => { + const res = parseDMS(`10°60'36.0"N 10°60'36.0"E`) + + expect(res).toStrictEqual([11.01, 11.01]) +}) + +test('Parse Degrees Minutes Seconds Direction: Negative Example', () => { + const res = parseDMS(`10°60'36.0"S 10°60'36.0"W`) + + expect(res).toStrictEqual([-11.01, -11.01]) +}) diff --git a/src/test/parsePB.test.js b/src/test/parsePB.test.js new file mode 100644 index 0000000..c84387d --- /dev/null +++ b/src/test/parsePB.test.js @@ -0,0 +1,90 @@ +import { test, expect } from 'bun:test' +import { parsePB, tileTypes } from '../map/utils/parsePB.js' + +test('Parse PB: empty list', () => { + const res = parsePB([]) + + expect(res).empty + expect(res).toEqual([]) +}) + +test('Parse PB: contains empty list', () => { + const res = parsePB(['1m0']) + + expect(res).toStrictEqual([[]]) +}) + +test('Parse PB: double', () => { + const res = parsePB(['1d1.1']) + + expect(res[0]).toBeTypeOf('number') + expect(res).toContain(1.1) +}) + +test('Parse PB: float', () => { + const res = parsePB(['1f1.1']) + + expect(res[0]).toBeTypeOf('number') + expect(res).toContain(1.1) +}) + +test('Parse PB: int', () => { + const res = parsePB(['1i1']) + + expect(res[0]).toBeTypeOf('number') + expect(res).toContain(1) +}) + +test('Parse PB: enum roadmap', () => { + const res = parsePB(['1e0'])[0] + + expect(res[0]).toBeTypeOf('string') + expect(res).toContain('roadmap') + expect(res).toContain(tileTypes[0]) +}) + +test('Parse PB: enum satellite', () => { + const res = parsePB(['1e1']) + + expect(res[0]).toBeTypeOf('string') + expect(res).toContain('satellite') + expect(res).toContain(tileTypes[1]) +}) + +test('Parse PB: enum empty', () => { + const res = parsePB(['1e']) + + expect(res[0]).toBeTypeOf('string') + expect(res).toContain('roadmap') + expect(res).toContain(tileTypes[0]) +}) + +test('Parse PB: enum >1', () => { + const res = parsePB(['1e2']) + + expect(res[0]).toBeTypeOf('string') + expect(res).toContain('roadmap') + expect(res).toContain(tileTypes[0]) +}) + +test('Parse PB: base64 encoded coordinates', () => { + const res = parsePB(['1zMTHCsDExJzExLjEiTiAxMcKwMTEnMTEuMSJF'])[0] + + expect(res).toBeTypeOf('string') + expect(res).toBe(`11°11'11.1"N 11°11'11.1"E`) +}) + +test('Parse PB: "real" world example', () => { + const splitted = + '!1m14!1m12!1m3!1d1.1!2d1.1!3d1.1!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!5e0!3m2!1sde!2sde!4v1680097499131!5m2!1sde!2sde' + .split('!') + .slice(1) + const res = parsePB(splitted) + + expect(res).toStrictEqual([ + [[[1.1, 1.1, 1.1], [0, 0, 0], [1024, 768], 13.1], 'roadmap'], + ['de', 'de'], + '1680097499131', + ['de', 'de'], + ]) +}) diff --git a/src/test/read.test.js b/src/test/read.test.js new file mode 100644 index 0000000..50130f1 --- /dev/null +++ b/src/test/read.test.js @@ -0,0 +1,120 @@ +import { test, expect, mock } from 'bun:test' +import { readPB, readQ, nominatimQ } from '../map/utils/read.js' + +globalThis.fetch = mock() + +const input = 'test position' +const result = [{ lat: '1.1', lon: '1.1' }] + +/** + * + * @param {{lat: string; lon: string}} data + * @param {boolean} status + * @returns {Response} + */ +function mockNominatimResponse(data, status) { + return { ok: status, json: () => new Promise((resolve) => resolve(data)) } +} + +test('read pb: read example', async () => { + const res = await readPB( + '!1m14!1m12!1m3!1d1.1!2d1.1!3d1.1!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!5e0!3m2!1sde!2sde!4v1680097499131!5m2!1sde!2sde' + ) + + expect(res).toStrictEqual({ + area: { + lat: 1.1, + lon: 1.1, + }, + markers: [], + tile: 'roadmap', + zoom: 19, + }) +}) + +test('read pb: pb base64 marker', async () => { + const res = await readPB( + '!1m17!1m12!1m3!1d1.1!2d1.1!3d1.1!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m2!1m1!1zMTDCsDYwJzM2LjAiTiAxMMKwNjAnMzYuMCJF!5e0!3m2!1sde!2sde!4v1557583694739!5m2!1sde!2sde' + ) + + expect(res).toStrictEqual({ + area: { + lat: 1.1, + lon: 1.1, + }, + markers: [ + { + label: '11.01 11.01', + lat: 11.01, + lon: 11.01, + }, + ], + tile: 'roadmap', + zoom: 19, + }) +}) + +test('read pb: pb id marker', async () => { + const res = await readPB( + '!1m17!1m12!1m3!1d1.1!2d1.1!3d1.1!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m2!1m1!1s0x0:0x0!5e0!3m2!1sde!2sde!4v1557583694739!5m2!1sde!2sde' + ) + + expect(res).toStrictEqual({ + area: { + lat: 1.1, + lon: 1.1, + }, + markers: [], + tile: 'roadmap', + zoom: 19, + }) +}) + +test('read pb: pb markers to readQ', async () => { + // @ts-ignore + fetch.mockResolvedValue(mockNominatimResponse(result, true)) + + const res = await readPB( + `!1m17!1m12!1m3!1d1.1!2d1.1!3d1.1!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m2!1m1!1s${input}!5e0!3m2!1sde!2sde!4v1557583694739!5m2!1sde!2sde` + ) + + expect(res).toStrictEqual({ + area: { + lat: 1.1, + lon: 1.1, + }, + markers: [ + { + label: input, + lat: parseFloat(result[0].lat), + lon: parseFloat(result[0].lon), + }, + ], + tile: 'roadmap', + zoom: 19, + }) +}) + +test('read query: nominatim request', async () => { + // @ts-ignore + fetch.mockResolvedValue(mockNominatimResponse(result, true)) + + const res = await readQ(input) // TODO: Mocking requests + + expect(fetch).toBeCalledWith(encodeURI(nominatimQ + input)) + + expect(res).toStrictEqual({ + label: input, + lat: parseFloat(result[0].lat), + lon: parseFloat(result[0].lon), + }) +}) + +test('read query: failing nominatim request', async () => { + // @ts-ignore-next + fetch.mockResolvedValue(mockNominatimResponse(result, false)) + + const res = await readQ(input) + + expect(res).null +}) diff --git a/src/test/zoom.test.js b/src/test/zoom.test.js new file mode 100644 index 0000000..ea06e93 --- /dev/null +++ b/src/test/zoom.test.js @@ -0,0 +1,22 @@ +import { test, expect } from 'bun:test' +import { getMapZoom } from '../map/utils/zoom.js' + +test('Zoom levels: zoom > 19', () => { + const res = getMapZoom(1) + + expect(res).toBeTypeOf('number') + expect(res).toBe(19) +}) + +test('Zoom levels: zoom < 0', () => { + const res = getMapZoom(100000000) + + expect(res).toBeTypeOf('number') + expect(res).toBe(0) +}) + +test('Zoom levels: specific zoom', () => { + const res = getMapZoom(1000) + + expect(res).toBe(18.5) +}) diff --git a/test/map/utils/parseDMS.test.js b/test/map/utils/parseDMS.test.js deleted file mode 100644 index 360224d..0000000 --- a/test/map/utils/parseDMS.test.js +++ /dev/null @@ -1,16 +0,0 @@ -import { describe, it, expect } from 'vitest' -import { parseDMS } from '../../../src/map/utils/parseDMS' - -describe('Parse Degrees Minutes Seconds Direction', () => { - it('Example', () => { - const res = parseDMS(`10°60'36.0"N 10°60'36.0"E`) - - expect(res).toStrictEqual([11.01, 11.01]) - }) - - it('Negative Example', () => { - const res = parseDMS(`10°60'36.0"S 10°60'36.0"W`) - - expect(res).toStrictEqual([-11.01, -11.01]) - }) -}) diff --git a/test/map/utils/parsePB.test.js b/test/map/utils/parsePB.test.js deleted file mode 100644 index 17dc955..0000000 --- a/test/map/utils/parsePB.test.js +++ /dev/null @@ -1,98 +0,0 @@ -import { describe, it, expect } from 'vitest' -import { parsePB, tileTypes } from '../../../src/map/utils/parsePB' - -describe('Parse PB', () => { - it('empty list', () => { - const res = parsePB([]) - - expect(res).empty - expect(res).toEqual([]) - }) - - it('contains empty list', () => { - const res = parsePB(['1m0']) - - expect(res).toStrictEqual([[]]) - }) - - it('double', () => { - const res = parsePB(['1d1.1']) - - expect(res[0]).toBeTypeOf('number') - expect(res).toContain(1.1) - }) - - it('float', () => { - const res = parsePB(['1f1.1']) - - expect(res[0]).toBeTypeOf('number') - expect(res).toContain(1.1) - }) - - it('int', () => { - const res = parsePB(['1i1']) - - expect(res[0]).toBeTypeOf('number') - expect(res).toContain(1) - }) - - it('enum roadmap', () => { - const res = parsePB(['1e0'])[0] - - expect(res[0]).toBeTypeOf('string') - expect(res).toContain('roadmap') - expect(res).toContain(tileTypes[0]) - }) - - it('enum satellite', () => { - const res = parsePB(['1e1']) - - expect(res[0]).toBeTypeOf('string') - expect(res).toContain('satellite') - expect(res).toContain(tileTypes[1]) - }) - - it('enum empty', () => { - const res = parsePB(['1e']) - - expect(res[0]).toBeTypeOf('string') - expect(res).toContain('roadmap') - expect(res).toContain(tileTypes[0]) - }) - - it('enum >1', () => { - const res = parsePB(['1e2']) - - expect(res[0]).toBeTypeOf('string') - expect(res).toContain('roadmap') - expect(res).toContain(tileTypes[0]) - }) - - it('wrongly encoded base64', () => { - expect(() => parsePB(['1zM'])).toThrowError( - 'The string to be decoded is not correctly encoded.' - ) - }) - - it('base64 encoded coordinates', () => { - const res = parsePB(['1zMTHCsDExJzExLjEiTiAxMcKwMTEnMTEuMSJF'])[0] - - expect(res).toBeTypeOf('string') - expect(res).toBe(`11°11'11.1"N 11°11'11.1"E`) - }) - - it('"real" world example', () => { - const splitted = - '!1m14!1m12!1m3!1d1.1!2d1.1!3d1.1!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!5e0!3m2!1sde!2sde!4v1680097499131!5m2!1sde!2sde' - .split('!') - .slice(1) - const res = parsePB(splitted) - - expect(res).toStrictEqual([ - [[[1.1, 1.1, 1.1], [0, 0, 0], [1024, 768], 13.1], 'roadmap'], - ['de', 'de'], - '1680097499131', - ['de', 'de'], - ]) - }) -}) diff --git a/test/map/utils/read.test.js b/test/map/utils/read.test.js deleted file mode 100644 index dbb56b4..0000000 --- a/test/map/utils/read.test.js +++ /dev/null @@ -1,124 +0,0 @@ -import { describe, it, expect, vitest } from 'vitest' -import { readPB, readQ, nominatimQ } from '../../../src/map/utils/read' - -globalThis.fetch = vitest.fn() - -const input = 'test position' -const result = [{ lat: '1.1', lon: '1.1' }] - -/** - * - * @param {{lat: string; lon: string}} data - * @param {boolean} status - * @returns {Response} - */ -function mockNominatimResponse(data, status) { - return { ok: status, json: () => new Promise((resolve) => resolve(data)) } -} - -describe('read pb', () => { - it('read example', async () => { - const res = await readPB( - '!1m14!1m12!1m3!1d1.1!2d1.1!3d1.1!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!5e0!3m2!1sde!2sde!4v1680097499131!5m2!1sde!2sde' - ) - - expect(res).toStrictEqual({ - area: { - lat: 1.1, - lon: 1.1, - }, - markers: [], - tile: 'roadmap', - zoom: 19, - }) - }) - - it('pb base64 marker', async () => { - const res = await readPB( - '!1m17!1m12!1m3!1d1.1!2d1.1!3d1.1!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m2!1m1!1zMTDCsDYwJzM2LjAiTiAxMMKwNjAnMzYuMCJF!5e0!3m2!1sde!2sde!4v1557583694739!5m2!1sde!2sde' - ) - - expect(res).toStrictEqual({ - area: { - lat: 1.1, - lon: 1.1, - }, - markers: [ - { - label: '11.01 11.01', - lat: 11.01, - lon: 11.01, - }, - ], - tile: 'roadmap', - zoom: 19, - }) - }) - - it('pb id marker', async () => { - const res = await readPB( - '!1m17!1m12!1m3!1d1.1!2d1.1!3d1.1!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m2!1m1!1s0x0:0x0!5e0!3m2!1sde!2sde!4v1557583694739!5m2!1sde!2sde' - ) - - expect(res).toStrictEqual({ - area: { - lat: 1.1, - lon: 1.1, - }, - markers: [], - tile: 'roadmap', - zoom: 19, - }) - }) - - it('pb markers to readQ', async () => { - // @ts-ignore - fetch.mockResolvedValue(mockNominatimResponse(result, true)) - - const res = await readPB( - `!1m17!1m12!1m3!1d1.1!2d1.1!3d1.1!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m2!1m1!1s${input}!5e0!3m2!1sde!2sde!4v1557583694739!5m2!1sde!2sde` - ) - - expect(res).toStrictEqual({ - area: { - lat: 1.1, - lon: 1.1, - }, - markers: [ - { - label: input, - lat: parseFloat(result[0].lat), - lon: parseFloat(result[0].lon), - }, - ], - tile: 'roadmap', - zoom: 19, - }) - }) -}) - -describe('read query', () => { - it('nominatim request', async () => { - // @ts-ignore - fetch.mockResolvedValue(mockNominatimResponse(result, true)) - - const res = await readQ(input) // TODO: Mocking requests - - expect(fetch).toBeCalledWith(encodeURI(nominatimQ + input)) - - expect(res).toStrictEqual({ - label: input, - lat: parseFloat(result[0].lat), - lon: parseFloat(result[0].lon), - }) - }) - - it('failing nominatim request', async () => { - // @ts-ignore-next - fetch.mockResolvedValue(mockNominatimResponse(result, false)) - - const res = await readQ(input) - - expect(res).null - }) -}) diff --git a/test/map/utils/zoom.test.js b/test/map/utils/zoom.test.js deleted file mode 100644 index be9e1cb..0000000 --- a/test/map/utils/zoom.test.js +++ /dev/null @@ -1,24 +0,0 @@ -import { describe, it, expect } from 'vitest' -import { getMapZoom } from '../../../src/map/utils/zoom' - -describe('Zoom levels', () => { - it('zoom > 19', () => { - const res = getMapZoom(1) - - expect(res).toBeTypeOf('number') - expect(res).toBe(19) - }) - - it('zoom < 0', () => { - const res = getMapZoom(100000000) - - expect(res).toBeTypeOf('number') - expect(res).toBe(0) - }) - - it('specific zoom', () => { - const res = getMapZoom(1000) - - expect(res).toBe(18.5) - }) -}) diff --git a/vite.config.js b/vite.config.js deleted file mode 100644 index c56975f..0000000 --- a/vite.config.js +++ /dev/null @@ -1,59 +0,0 @@ -/// - -import { defineConfig, normalizePath } from 'vite' -import { viteStaticCopy } from 'vite-plugin-static-copy' -import { resolve } from 'path' - -export default defineConfig({ - root: 'src', - publicDir: '../public', - plugins: [ - viteStaticCopy({ - targets: [ - { - src: normalizePath(resolve(__dirname, 'node_modules/leaflet/dist/leaflet.css')), - dest: '.', - }, - { - src: normalizePath(resolve(__dirname, 'node_modules/leaflet/dist/images')), - dest: '.', - }, - { - src: normalizePath( - resolve(__dirname, 'node_modules/leaflet-fullscreen/dist/leaflet.fullscreen.css') - ), - dest: '.', - }, - { - src: normalizePath(resolve(__dirname, 'node_modules/leaflet-fullscreen/dist/*.png')), - dest: '.', - }, - { - src: normalizePath(resolve(__dirname, 'LICENSE')), - dest: '.', - }, - ], - }), - ], - build: { - outDir: '../dist', - emptyOutDir: true, - rollupOptions: { - input: { - bg: normalizePath(resolve(__dirname, 'src/bg.html')), - map: normalizePath(resolve(__dirname, 'src/map.html')), - opt: normalizePath(resolve(__dirname, 'src/options.html')), - }, - }, - }, - esbuild: { - supported: { - 'top-level-await': true, - }, - drop: ['debugger'], - pure: ['console.log', 'console.warn', 'console.error', 'console.debug', 'console.trace'], - }, - test: { - root: '.', - }, -})