Merge pull request #20 from nobkd/refactor

mini refactor

Author: nobkd

.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

.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

.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: [email protected]
-          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

.gitignore

@@ -1,8 +1,6 @@
 node_modules/
-dist/
-out/
-coverage/
+.dist/
+.out/
+
 .version-update
 .env
-
-public/icons/

.prettierignore

@@ -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`.

.prettierrc

@@ -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'

AMO-README.md

@@ -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))