From e5ee476f3f1d9b400c8d1082b55f6d45ef15df15 Mon Sep 17 00:00:00 2001 From: Dan Ditomaso Date: Tue, 27 May 2025 07:58:47 -0400 Subject: [PATCH] reverting vite config --- package.json | 6 +++--- vite.config.ts | 31 ++++++++++--------------------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index f2516d07..15393e75 100644 --- a/package.json +++ b/package.json @@ -34,12 +34,12 @@ }, "homepage": "https://meshtastic.org", "dependencies": { + "@bufbuild/protobuf": "^2.2.5", "@meshtastic/core": "npm:@jsr/meshtastic__core@2.6.2", "@meshtastic/js": "npm:@jsr/meshtastic__js@2.6.0-0", "@meshtastic/transport-http": "npm:@jsr/meshtastic__transport-http", "@meshtastic/transport-web-bluetooth": "npm:@jsr/meshtastic__transport-web-bluetooth", "@meshtastic/transport-web-serial": "npm:@jsr/meshtastic__transport-web-serial", - "@bufbuild/protobuf": "^2.2.5", "@noble/curves": "^1.9.0", "@radix-ui/react-accordion": "^1.2.8", "@radix-ui/react-checkbox": "^1.2.3", @@ -111,7 +111,7 @@ "testing-library": "^0.0.2", "typescript": "^5.8.3", "vite": "^6.3.4", - "vitest": "^3.1.2", - "vite-plugin-pwa": "^1.0.0" + "vite-plugin-pwa": "^1.0.0", + "vitest": "^3.1.2" } } diff --git a/vite.config.ts b/vite.config.ts index 63624730..a49feff5 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,26 +1,15 @@ import { defineConfig } from "vite"; import react from "@vitejs/plugin-react"; import { VitePWA } from "vite-plugin-pwa"; -import { resolve } from "@std/path/resolve"; +import { execSync } from "node:child_process"; +import process from "node:process"; +import path from "node:path"; let hash = ""; try { - const command = new Deno.Command("git", { - args: ["rev-parse", "--short", "HEAD"], - stdout: "piped", - stderr: "piped", - }); - const { code, stdout, stderr } = await command.output(); - - if (code === 0) { - hash = new TextDecoder().decode(stdout).trim(); - } else { - const errorOutput = new TextDecoder().decode(stderr); - console.error("Error getting git hash:", errorOutput); - hash = "DEV"; - } + hash = execSync("git rev-parse --short HEAD", { encoding: "utf8" }).trim(); } catch (error) { - console.error("Failed to execute git command:", error); + console.error("Error getting git hash:", error); hash = "DEV"; } @@ -48,11 +37,11 @@ export default defineConfig({ }, resolve: { alias: { - "@app": resolve(Deno.cwd(), "./src"), - "@pages": resolve(Deno.cwd(), "./src/pages"), - "@components": resolve(Deno.cwd(), "./src/components"), - "@core": resolve(Deno.cwd(), "./src/core"), - "@layouts": resolve(Deno.cwd(), "./src/layouts"), + "@app": path.resolve(process.cwd(), "./src"), + "@pages": path.resolve(process.cwd(), "./src/pages"), + "@components": path.resolve(process.cwd(), "./src/components"), + "@core": path.resolve(process.cwd(), "./src/core"), + "@layouts": path.resolve(process.cwd(), "./src/layouts"), }, }, server: {