Merge branch 'master' into refactor/replace-turf

1 year ago · a202b317e5
3 changed files with 44 additions and 123 deletions
--- a/README.md
+++ b/README.md
@ -24,10 +24,10 @@ The base image used is [Nginx 1.27](https://hub.docker.com/_/nginx)

 ```bash
 # With Docker
-docker run -d -p 8080:80 --restart always --name Meshtastic-Web ghcr.io/meshtastic/web
+docker run -d -p 8080:8080 --restart always --name Meshtastic-Web ghcr.io/meshtastic/web

 #With Podman
-podman run -d -p 8080:80 --restart always --name Meshtastic-Web ghcr.io/meshtastic/web
+podman run -d -p 8080:8080 --restart always --name Meshtastic-Web ghcr.io/meshtastic/web
 ```

 ## Development & Building
--- a/package.json
+++ b/package.json
@ -6,12 +6,16 @@
  "license": "GPL-3.0-only",
  "scripts": {
    "build": "pnpm check && rsbuild build",
-    "check": "biome check .",
-    "check:fix": "pnpm check --write",
+    "check": "biome check src/",
+    "check:fix": "pnpm check --write src/",
+    "format": "biome format --write src/",
    "dev": "rsbuild dev --open",
-    "format": "biome format --write",
    "preview": "rsbuild preview",
-    "package": "gzipper c -i html,js,css,png,ico,svg,webmanifest,txt dist dist/output && tar -cvf dist/build.tar -C ./dist/output/ $(ls ./dist/output/)"
+    "package": "gzipper c -i html,js,css,png,ico,svg,webmanifest,txt dist dist/output && tar -cvf dist/build.tar -C ./dist/output/ $(ls ./dist/output/)",
+    "postinstall": "npx simple-git-hooks"
+  },
+  "simple-git-hooks": {
+    "pre-commit": "npm run check:fix && npm run format"
  },
  "repository": {
    "type": "git",
@ -41,7 +45,6 @@
    "@radix-ui/react-toast": "^1.2.1",
    "@radix-ui/react-tooltip": "^1.1.1",
    "base64-js": "^1.5.1",
-    "class-transformer": "^0.5.1",
    "class-validator": "^0.14.1",
    "class-variance-authority": "^0.7.0",
    "clsx": "^2.1.1",
@ -58,15 +61,12 @@
    "react-map-gl": "7.1.7",
    "react-qrcode-logo": "^2.10.0",
    "rfc4648": "^1.5.3",
-    "tailwind-merge": "^2.3.0",
-    "tailwindcss-animate": "^1.0.7",
    "timeago-react": "^3.0.6",
    "vite-plugin-node-polyfills": "^0.22.0",
    "zustand": "4.5.2"
  },
  "devDependencies": {
    "@biomejs/biome": "^1.8.2",
-    "@buf/meshtastic_protobufs.bufbuild_es": "1.10.0-20240906232734-3da561588c55.1",
    "@rsbuild/core": "^1.0.10",
    "@rsbuild/plugin-react": "^1.0.3",
    "@types/chrome": "^0.0.263",
@ -79,10 +79,11 @@
    "autoprefixer": "^10.4.19",
    "gzipper": "^7.2.0",
    "postcss": "^8.4.38",
-    "rollup-plugin-visualizer": "^5.12.0",
+    "simple-git-hooks": "^2.11.1",
+    "tailwind-merge": "^2.3.0",
    "tailwindcss": "^3.4.4",
+    "tailwindcss-animate": "^1.0.7",
    "tar": "^6.2.1",
-    "tslib": "^2.6.3",
    "typescript": "^5.5.2"
  },
  "packageManager": "[email protected]"
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -65,9 +65,6 @@ importers:
      base64-js:
        specifier: ^1.5.1
        version: 1.5.1
-      class-transformer:
-        specifier: ^0.5.1
-        version: 0.5.1
      class-validator:
        specifier: ^0.14.1
        version: 0.14.1
@ -116,12 +113,6 @@ importers:
      rfc4648:
        specifier: ^1.5.3
        version: 1.5.3
-      tailwind-merge:
-        specifier: ^2.3.0
-        version: 2.3.0
-      tailwindcss-animate:
-        specifier: ^1.0.7
-        version: 1.0.7([email protected])
      timeago-react:
        specifier: ^3.0.6
        version: 3.0.6([email protected])
@ -135,9 +126,6 @@ importers:
      '@biomejs/biome':
        specifier: ^1.8.2
        version: 1.8.2
-      '@buf/meshtastic_protobufs.bufbuild_es':
-        specifier: 1.10.0-20240906232734-3da561588c55.1
-        version: 1.10.0-20240906232734-3da561588c55.1(@bufbuild/[email protected])
      '@rsbuild/core':
        specifier: ^1.0.10
        version: 1.0.10
@ -174,18 +162,21 @@ importers:
      postcss:
        specifier: ^8.4.38
        version: 8.4.38
-      rollup-plugin-visualizer:
-        specifier: ^5.12.0
-        version: 5.12.0([email protected])
+      simple-git-hooks:
+        specifier: ^2.11.1
+        version: 2.11.1
+      tailwind-merge:
+        specifier: ^2.3.0
+        version: 2.3.0
      tailwindcss:
        specifier: ^3.4.4
        version: 3.4.4
+      tailwindcss-animate:
+        specifier: ^1.0.7
+        version: 1.0.7([email protected])
      tar:
        specifier: ^6.2.1
        version: 6.2.1
-      tslib:
-        specifier: ^2.6.3
-        version: 2.6.3
      typescript:
        specifier: ^5.5.2
        version: 5.5.2
@ -253,11 +244,6 @@ packages:
    cpu: [x64]
    os: [win32]

-  '@buf/meshtastic_protobufs.bufbuild_es@1.10.0-20240906232734-3da561588c55.1':
-    resolution: {tarball: https://buf.build/gen/npm/v1/@buf/meshtastic_protobufs.bufbuild_es/-/meshtastic_protobufs.bufbuild_es-1.10.0-20240906232734-3da561588c55.1.tgz}
-    peerDependencies:
-      '@bufbuild/protobuf': ^1.10.0
-
  '@bufbuild/[email protected]':
    resolution: {integrity: sha512-QDdVFLoN93Zjg36NoQPZfsVH9tZew7wKDKyV5qRdj8ntT4wQCOradQjRaTdwMhWUYsgKsvCINKKm87FdEk96Ag==}

@ -1578,19 +1564,12 @@ packages:
  [email protected]:
    resolution: {integrity: sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==}

-  [email protected]:
-    resolution: {integrity: sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==}
-
  [email protected]:
    resolution: {integrity: sha512-2VEG9JICxIqTpoK1eMzZqaV+u/EiwEJkMGzTrZf6sU/fwsnOITVgYJ8yojSy6CaXtO9V0Cc6ZQZ8h8m4UBuLwQ==}

  [email protected]:
    resolution: {integrity: sha512-jFI8IQw4hczaL4ALINxqLEXQbWcNjoSkloa4IaufXCJr6QawJyw7tuRysRsrE8w2p/4gGaxKIt/hX3qz/IbD1A==}

-  [email protected]:
-    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
-    engines: {node: '>=12'}
-
  [email protected]:
    resolution: {integrity: sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==}
    engines: {node: '>=6'}
@ -1683,10 +1662,6 @@ packages:
    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
    engines: {node: '>= 0.4'}

-  [email protected]:
-    resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
-    engines: {node: '>=8'}
-
  [email protected]:
    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
    engines: {node: '>= 0.4'}
@ -1830,10 +1805,6 @@ packages:
  [email protected]:
    resolution: {integrity: sha512-AV9ROqlNqoZEIJGfm1ncNjEXfkz2hdFlZf0qkVfmkwdKa8vj7H16YUOT81rJw1rdFhyEDlN2Tds91p/glzbl5A==}

-  [email protected]:
-    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
-    engines: {node: 6.* || 8.* || >= 10.*}
-
  [email protected]:
    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
    engines: {node: '>= 0.4'}
@ -1973,11 +1944,6 @@ packages:
    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
    engines: {node: '>= 0.4'}

-  [email protected]:
-    resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}
-    engines: {node: '>=8'}
-    hasBin: true
-
  [email protected]:
    resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
    engines: {node: '>=0.10.0'}
@ -2054,10 +2020,6 @@ packages:
    resolution: {integrity: sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==}
    engines: {node: '>= 0.4'}

-  [email protected]:
-    resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
-    engines: {node: '>=8'}
-
  [email protected]:
    resolution: {integrity: sha512-ZA5lvshKAl8z30dX7saXLpVhpsq3d2EHK9uf7qtUjnOtdw4XBpAoWb2RvZ5kyoaebdoidnGI0g2hn9Z7ObPbww==}

@ -2255,10 +2217,6 @@ packages:
  [email protected]:
    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}

-  [email protected]:
-    resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==}
-    engines: {node: '>=12'}
-
  [email protected]:
    resolution: {integrity: sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==}

@ -2544,10 +2502,6 @@ packages:
    resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==}
    engines: {node: '>= 0.4'}

-  [email protected]:
-    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
-    engines: {node: '>=0.10.0'}
-
  [email protected]:
    resolution: {integrity: sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==}

@ -2575,6 +2529,12 @@ packages:
      rollup:
        optional: true

+  [email protected]:
+    resolution: {integrity: sha512-l4NwboJM74Ilm4VKfbAtFeGq7aEjWL+5kVFcmgFA2MrdnQWx9iE/tUGvxY5HyMI7o/WpSIUFLbC5fbeaHgSCYg==}
+
+  [email protected]:
+    resolution: {integrity: sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==}
+
  [email protected]:
    resolution: {integrity: sha512-RaJ45M/kmJUzSWDs1Nnd5DdV4eerC98idtUOVr6FfKcgxqvjwHmxc5upLF9qZU9EpsVzzhleFahrT3shLuJzIw==}
    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
@ -2634,6 +2594,10 @@ packages:
    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
    engines: {node: '>=14'}

+  [email protected]:
+    resolution: {integrity: sha512-tgqwPUMDcNDhuf1Xf6KTUsyeqGdgKMhzaH4PAZZuzguOgTl5uuyeYe/8mWgAr6IBxB5V06uqEf6Dy37gIWDtDg==}
+    hasBin: true
+
  [email protected]:
    resolution: {integrity: sha512-kGYEvT33M5XfyQvvW4wxl3eKcWbdbCc1V7OZzuElnaXft0qbVzoIIXHXiCm3JCUki+MZKKmvjl8p2VGLJc5Y/A==}

@ -2661,6 +2625,9 @@ packages:
    resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==}
    engines: {node: '>= 8'}

+  [email protected]:
+    resolution: {integrity: sha512-4OM2BJgC5UzrhVnnJA4BkHKGtjXNzzUfpQjCO8I05xYPsfS/VuQDwjCGGMi8rYQilHEV4j8NBqTFbls/PZEE7A==}
+
  [email protected]:
    resolution: {integrity: sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==}
    engines: {node: '>=0.10.0'}
@ -2944,10 +2911,6 @@ packages:
    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
    engines: {node: '>=0.4'}

-  [email protected]:
-    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
-    engines: {node: '>=10'}
-
  [email protected]:
    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}

@ -2956,14 +2919,6 @@ packages:
    engines: {node: '>= 14'}
    hasBin: true

-  [email protected]:
-    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
-    engines: {node: '>=12'}
-
-  [email protected]:
-    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
-    engines: {node: '>=12'}
-
  [email protected]:
    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
    engines: {node: '>=10'}
@ -3026,10 +2981,6 @@ snapshots:
  '@biomejs/[email protected]':
    optional: true

-  '@buf/meshtastic_protobufs.bufbuild_es@1.10.0-20240906232734-3da561588c55.1(@bufbuild/[email protected])':
-    dependencies:
-      '@bufbuild/protobuf': 1.10.0
-
  '@bufbuild/[email protected]': {}

  '@emeraldpay/[email protected]':
@ -4310,8 +4261,6 @@ snapshots:
      inherits: 2.0.4
      safe-buffer: 5.2.1

-  [email protected]: {}
-
  [email protected]:
    dependencies:
      '@types/validator': 13.12.0
@ -4322,12 +4271,6 @@ snapshots:
    dependencies:
      clsx: 2.0.0

-  [email protected]:
-    dependencies:
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wrap-ansi: 7.0.0
-
  [email protected]: {}

  [email protected]: {}
@ -4443,8 +4386,6 @@ snapshots:
      es-errors: 1.3.0
      gopd: 1.0.1

-  [email protected]: {}
-
  [email protected]:
    dependencies:
      define-data-property: 1.1.4
@ -4622,8 +4563,6 @@ snapshots:

  [email protected]: {}

-  [email protected]: {}
-
  [email protected]:
    dependencies:
      es-errors: 1.3.0
@ -4772,8 +4711,6 @@ snapshots:
    dependencies:
      has-tostringtag: 1.0.2

-  [email protected]: {}
-
  [email protected]: {}

  [email protected]:
@ -4839,10 +4776,6 @@ snapshots:
      call-bind: 1.0.7
      get-intrinsic: 1.2.4

-  [email protected]:
-    dependencies:
-      is-docker: 2.2.1
-
  [email protected]: {}

  [email protected]: {}
@ -5077,12 +5010,6 @@ snapshots:
    dependencies:
      wrappy: 1.0.2

-  [email protected]:
-    dependencies:
-      define-lazy-prop: 2.0.0
-      is-docker: 2.2.1
-      is-wsl: 2.2.0
-
  [email protected]: {}

  [email protected]: {}
@ -5368,8 +5295,6 @@ snapshots:
      es-errors: 1.3.0
      set-function-name: 2.0.2

-  [email protected]: {}
-
  [email protected]:
    dependencies:
      protocol-buffers-schema: 3.6.0
@ -5398,6 +5323,10 @@ snapshots:
    optionalDependencies:
      rollup: 4.29.1

+  [email protected]: {}
+
+  [email protected]: {}
+
  [email protected]:
    dependencies:
      '@types/estree': 1.0.6
@ -5484,6 +5413,8 @@ snapshots:

  [email protected]: {}

+  [email protected]: {}
+
  [email protected]:
    dependencies:
      is-zst: 1.0.0
@ -5510,6 +5441,9 @@ snapshots:

  [email protected]: {}

+  [email protected]: {}
+
+
  [email protected]:
    dependencies:
      extend-shallow: 3.0.2
@ -5816,24 +5750,10 @@ snapshots:

  [email protected]: {}

-  [email protected]: {}
-
  [email protected]: {}

  [email protected]: {}

-  [email protected]: {}
-
-  [email protected]:
-    dependencies:
-      cliui: 8.0.1
-      escalade: 3.1.2
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      string-width: 4.2.3
-      y18n: 5.0.8
-      yargs-parser: 21.1.1
-
  [email protected]: {}

  [email protected](@types/[email protected])([email protected])([email protected]):