Fix Docker and CI builds (#773)
* Fix Docker and CI builds * Fix indentation * Fix release --------- Co-authored-by: philon- <philon-@users.noreply.github.com>
This commit is contained in:
co-authored by
philon-
parent
f04ec36faf
commit
2735c37fad
@@ -1,12 +1,12 @@
|
||||
FROM nginx:1.27-alpine
|
||||
|
||||
RUN rm -r /usr/share/nginx/html \
|
||||
&& mkdir -p /usr/share/nginx/html \
|
||||
&& mkdir -p /etc/nginx/conf.d
|
||||
&& mkdir -p /usr/share/nginx/html \
|
||||
&& mkdir -p /etc/nginx/conf.d
|
||||
|
||||
WORKDIR /usr/share/nginx/html
|
||||
|
||||
ADD dist .
|
||||
ADD ./dist .
|
||||
|
||||
COPY ./infra/default.conf /etc/nginx/conf.d/default.conf
|
||||
|
||||
|
||||
@@ -29,9 +29,9 @@
|
||||
"@bufbuild/protobuf": "^2.6.0",
|
||||
"@hookform/resolvers": "^5.1.1",
|
||||
"@meshtastic/core": "workspace:*",
|
||||
"@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",
|
||||
"@meshtastic/transport-http": "workspace:*",
|
||||
"@meshtastic/transport-web-bluetooth": "workspace:*",
|
||||
"@meshtastic/transport-web-serial": "workspace:*",
|
||||
"@noble/curves": "^1.9.2",
|
||||
"@radix-ui/react-accordion": "^1.2.11",
|
||||
"@radix-ui/react-checkbox": "^1.3.2",
|
||||
|
||||
@@ -1,21 +1,23 @@
|
||||
import path from "node:path";
|
||||
import react from "@vitejs/plugin-react";
|
||||
import { defineConfig } from "vitest/config";
|
||||
|
||||
import process from "node:process";
|
||||
import react from "@vitejs/plugin-react";
|
||||
import { enableMapSet } from "immer";
|
||||
import { defineProject } from "vitest/config";
|
||||
|
||||
enableMapSet();
|
||||
export default defineConfig({
|
||||
export default defineProject({
|
||||
plugins: [react()],
|
||||
resolve: {
|
||||
alias: {
|
||||
"@app": path.resolve(process.cwd(), "./src"),
|
||||
"@public": path.resolve(process.cwd(), "./public"),
|
||||
"@core": path.resolve(process.cwd(), "./src/core"),
|
||||
"@pages": path.resolve(process.cwd(), "./src/pages"),
|
||||
"@components": path.resolve(process.cwd(), "./src/components"),
|
||||
"@layouts": path.resolve(process.cwd(), "./src/layouts"),
|
||||
"@app": path.resolve(process.cwd(), "./packages/web/src"),
|
||||
"@public": path.resolve(process.cwd(), "./packages/web/public"),
|
||||
"@core": path.resolve(process.cwd(), "./packages/web/src/core"),
|
||||
"@pages": path.resolve(process.cwd(), "./packages/web/src/pages"),
|
||||
"@components": path.resolve(
|
||||
process.cwd(),
|
||||
"./packages/web/src/components",
|
||||
),
|
||||
"@layouts": path.resolve(process.cwd(), "./packages/web/src/layouts"),
|
||||
},
|
||||
},
|
||||
test: {
|
||||
@@ -24,7 +26,7 @@ export default defineConfig({
|
||||
mockReset: true,
|
||||
clearMocks: true,
|
||||
restoreMocks: true,
|
||||
root: path.resolve(process.cwd(), "./src"),
|
||||
root: path.resolve(process.cwd(), "./packages/web/src"),
|
||||
include: ["**/*.{test,spec}.{ts,tsx}"],
|
||||
setupFiles: ["./src/tests/setup.ts"],
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user