Browse Source

cleanup & update

pull/149/head
Sacha Weatherstone 3 years ago
parent
commit
bfc8271372
Failed to extract signature
  1. 22
      package.json
  2. 2600
      pnpm-lock.yaml
  3. 1
      src/components/Form/FormWrapper.tsx
  4. 8
      src/core/utils/toMGRS.ts
  5. 20
      tailwind.config.cjs
  6. 15
      vite.config.ts

22
package.json

@ -21,10 +21,7 @@
"homepage": "https://meshtastic.org", "homepage": "https://meshtastic.org",
"dependencies": { "dependencies": {
"@emeraldpay/hashicon-react": "^0.5.2", "@emeraldpay/hashicon-react": "^0.5.2",
"@hookform/error-message": "^2.0.1",
"@hookform/resolvers": "^3.3.2",
"@meshtastic/meshtasticjs": "2.2.16-0", "@meshtastic/meshtasticjs": "2.2.16-0",
"@preact/signals-react": "^1.3.8",
"@radix-ui/react-accordion": "^1.1.2", "@radix-ui/react-accordion": "^1.1.2",
"@radix-ui/react-checkbox": "^1.0.4", "@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-dialog": "^1.0.5", "@radix-ui/react-dialog": "^1.0.5",
@ -39,7 +36,6 @@
"@radix-ui/react-tabs": "^1.0.4", "@radix-ui/react-tabs": "^1.0.4",
"@radix-ui/react-toast": "^1.1.5", "@radix-ui/react-toast": "^1.1.5",
"@radix-ui/react-tooltip": "^1.0.7", "@radix-ui/react-tooltip": "^1.0.7",
"@tailwindcss/typography": "^0.5.10",
"@turf/turf": "^6.5.0", "@turf/turf": "^6.5.0",
"base64-js": "^1.5.1", "base64-js": "^1.5.1",
"class-transformer": "^0.5.1", "class-transformer": "^0.5.1",
@ -47,29 +43,24 @@
"class-variance-authority": "^0.7.0", "class-variance-authority": "^0.7.0",
"clsx": "^2.0.0", "clsx": "^2.0.0",
"cmdk": "^0.2.0", "cmdk": "^0.2.0",
"esptool-js": "^0.3.2",
"geodesy": "^2.4.0",
"immer": "^10.0.3", "immer": "^10.0.3",
"jszip": "^3.10.1", "lucide-react": "^0.302.0",
"lucide-react": "^0.298.0",
"mapbox-gl": "npm:empty-npm-package@^1.0.0", "mapbox-gl": "npm:empty-npm-package@^1.0.0",
"maplibre-gl": "3.6.2", "maplibre-gl": "3.6.2",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-hook-form": "^7.49.2", "react-hook-form": "^7.49.2",
"react-map-gl": "7.1.6", "react-map-gl": "7.1.7",
"react-qrcode-logo": "^2.9.0", "react-qrcode-logo": "^2.9.0",
"rfc4648": "^1.5.3", "rfc4648": "^1.5.3",
"tailwind-merge": "^2.1.0", "tailwind-merge": "^2.2.0",
"tailwindcss-animate": "^1.0.7", "tailwindcss-animate": "^1.0.7",
"timeago-react": "^3.0.6", "timeago-react": "^3.0.6",
"zustand": "4.4.7" "zustand": "4.4.7"
}, },
"devDependencies": { "devDependencies": {
"@tailwindcss/forms": "^0.5.7",
"@types/chrome": "^0.0.254", "@types/chrome": "^0.0.254",
"@types/geodesy": "^2.2.7", "@types/node": "^20.10.5",
"@types/node": "^20.10.4",
"@types/react": "^18.2.45", "@types/react": "^18.2.45",
"@types/react-dom": "^18.2.18", "@types/react-dom": "^18.2.18",
"@types/w3c-web-serial": "^1.0.6", "@types/w3c-web-serial": "^1.0.6",
@ -80,12 +71,11 @@
"gzipper": "^7.2.0", "gzipper": "^7.2.0",
"postcss": "^8.4.32", "postcss": "^8.4.32",
"rollup-plugin-visualizer": "^5.11.0", "rollup-plugin-visualizer": "^5.11.0",
"tailwindcss": "^3.3.6", "tailwindcss": "^3.4.0",
"tar": "^6.2.0", "tar": "^6.2.0",
"tslib": "^2.6.2", "tslib": "^2.6.2",
"typescript": "^5.3.3", "typescript": "^5.3.3",
"vite": "^5.0.10", "vite": "^5.0.10",
"vite-plugin-environment": "^1.1.3", "vite-plugin-environment": "^1.1.3"
"vite-plugin-pwa": "^0.17.4"
} }
} }

2600
pnpm-lock.yaml

File diff suppressed because it is too large

1
src/components/Form/FormWrapper.tsx

@ -1,5 +1,4 @@
import { Label } from "@components/UI/Label.js"; import { Label } from "@components/UI/Label.js";
import { ErrorMessage } from "@hookform/error-message";
export interface FieldWrapperProps { export interface FieldWrapperProps {
label: string; label: string;

8
src/core/utils/toMGRS.ts

@ -1,8 +0,0 @@
import { LatLon } from "geodesy/mgrs.js";
export const toMGRS = (lat?: number, lng?: number) => {
if (lat && lng && lat !== 0 && lng !== 0) {
return new LatLon(lat / 1e7, lng / 1e7).toUtm().toMgrs().toString();
}
return "No Fix.";
};

20
tailwind.config.cjs

@ -8,21 +8,21 @@ module.exports = {
extend: { extend: {
fontFamily: { fontFamily: {
mono: ["Cascadia Code", ...fontFamily.mono], mono: ["Cascadia Code", ...fontFamily.mono],
sans: ["Inter var", ...fontFamily.sans] sans: ["Inter var", ...fontFamily.sans],
}, },
keyframes: { keyframes: {
"accordion-down": { "accordion-down": {
from: { height: 0 }, from: { height: 0 },
to: { height: "var(--radix-accordion-content-height)" } to: { height: "var(--radix-accordion-content-height)" },
}, },
"accordion-up": { "accordion-up": {
from: { height: "var(--radix-accordion-content-height)" }, from: { height: "var(--radix-accordion-content-height)" },
to: { height: 0 } to: { height: 0 },
} },
}, },
animation: { animation: {
"accordion-down": "accordion-down 0.2s ease-out", "accordion-down": "accordion-down 0.2s ease-out",
"accordion-up": "accordion-up 0.2s ease-out" "accordion-up": "accordion-up 0.2s ease-out",
}, },
colors: { colors: {
backgroundPrimary: "var(--backgroundPrimary)", backgroundPrimary: "var(--backgroundPrimary)",
@ -31,14 +31,14 @@ module.exports = {
accentMuted: "var(--accentMuted)", accentMuted: "var(--accentMuted)",
textPrimary: "var(--textPrimary)", textPrimary: "var(--textPrimary)",
textSecondary: "var(--textSecondary)", textSecondary: "var(--textSecondary)",
link: "var(--link)" link: "var(--link)",
}, },
brightness: { brightness: {
hover: "var(--brighnessHover)", hover: "var(--brighnessHover)",
press: "var(--brightnessPress)", press: "var(--brightnessPress)",
disabled: "var(--brightnessDisabled)" disabled: "var(--brightnessDisabled)",
} },
} },
}, },
plugins: [require("@tailwindcss/forms"), require("tailwindcss-animate")] plugins: [require("tailwindcss-animate")],
}; };

15
vite.config.ts

@ -3,7 +3,6 @@ import { resolve } from "path";
import { visualizer } from "rollup-plugin-visualizer"; import { visualizer } from "rollup-plugin-visualizer";
import { defineConfig } from "vite"; import { defineConfig } from "vite";
import EnvironmentPlugin from "vite-plugin-environment"; import EnvironmentPlugin from "vite-plugin-environment";
import { VitePWA } from "vite-plugin-pwa";
import react from "@vitejs/plugin-react"; import react from "@vitejs/plugin-react";
@ -19,8 +18,8 @@ export default defineConfig({
plugins: [ plugins: [
react(), react(),
EnvironmentPlugin({ EnvironmentPlugin({
COMMIT_HASH: hash COMMIT_HASH: hash,
}) }),
// VitePWA({ // VitePWA({
// registerType: "autoUpdate", // registerType: "autoUpdate",
// devOptions: { // devOptions: {
@ -32,8 +31,8 @@ export default defineConfig({
target: "esnext", target: "esnext",
assetsDir: "", assetsDir: "",
rollupOptions: { rollupOptions: {
plugins: [visualizer()] plugins: [visualizer()],
} },
}, },
resolve: { resolve: {
alias: { alias: {
@ -41,7 +40,7 @@ export default defineConfig({
"@pages": resolve(__dirname, "./src/pages"), "@pages": resolve(__dirname, "./src/pages"),
"@components": resolve(__dirname, "./src/components"), "@components": resolve(__dirname, "./src/components"),
"@core": resolve(__dirname, "./src/core"), "@core": resolve(__dirname, "./src/core"),
"@layouts": resolve(__dirname, "./src/layouts") "@layouts": resolve(__dirname, "./src/layouts"),
} },
} },
}); });

Loading…
Cancel
Save