diff --git a/apps/api/src/db/seed-area.ts b/apps/api/src/db/seed-area.ts index 6637be7..b828581 100644 --- a/apps/api/src/db/seed-area.ts +++ b/apps/api/src/db/seed-area.ts @@ -7,7 +7,7 @@ import { areas } from './schema.js' const __dirname = dirname(fileURLToPath(import.meta.url)) const AREA_JSON_PATH = - process.env.AREA_JSON_PATH ?? resolve(__dirname, '../../../../../area.json') + process.env.AREA_JSON_PATH ?? resolve(__dirname, '../../../../area.json') interface AreaJson { name: string diff --git a/apps/api/src/db/seed-vessel1.ts b/apps/api/src/db/seed-vessel1.ts index 7cafe7d..064bfbc 100644 --- a/apps/api/src/db/seed-vessel1.ts +++ b/apps/api/src/db/seed-vessel1.ts @@ -16,7 +16,7 @@ const __dirname = dirname(fileURLToPath(import.meta.url)) // Default: vessel1.json at repo root, two directories above apps/api/ const VESSEL1_PATH = - process.env.VESSEL1_JSON_PATH ?? resolve(__dirname, '../../../../../vessel1.json') + process.env.VESSEL1_JSON_PATH ?? resolve(__dirname, '../../../../vessel1.json') interface Vessel1Json { name: string diff --git a/apps/web/package.json b/apps/web/package.json index 660b1aa..00639e5 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -19,7 +19,7 @@ "leaflet": "^1.9.4", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-leaflet": "^5.0.0", + "react-leaflet": "4", "zustand": "^5.0.0" }, "devDependencies": { diff --git a/docker-compose.yml b/docker-compose.yml index 5772b72..3c37a89 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,11 +14,11 @@ services: ports: - "3000:3000" volumes: - - ymir_db:/app/apps/api + - ymir_db:/app/data environment: PORT: "3000" HOST: "0.0.0.0" - DB_PATH: "/app/apps/api/ymir.db" + DB_PATH: "/app/data/ymir.db" web: build: diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile index 44c0c68..7c95a20 100644 --- a/docker/api/Dockerfile +++ b/docker/api/Dockerfile @@ -23,5 +23,6 @@ COPY apps/api/package.json ./apps/api/ RUN pnpm install --frozen-lockfile --prod COPY --from=builder /app/packages/types/dist/ ./packages/types/dist/ COPY --from=builder /app/apps/api/dist/ ./apps/api/dist/ +COPY area.json vessel1.json ./ EXPOSE 3000 CMD ["node", "apps/api/dist/index.js"] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 61c1403..529107c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -67,8 +67,8 @@ importers: specifier: ^18.3.1 version: 18.3.1(react@18.3.1) react-leaflet: - specifier: ^5.0.0 - version: 5.0.0(leaflet@1.9.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: '4' + version: 4.2.1(leaflet@1.9.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) zustand: specifier: ^5.0.0 version: 5.0.14(@types/react@18.3.31)(react@18.3.1) @@ -915,12 +915,12 @@ packages: engines: {node: '>=18'} hasBin: true - '@react-leaflet/core@3.0.0': - resolution: {integrity: sha512-3EWmekh4Nz+pGcr+xjf0KNyYfC3U2JjnkWsh0zcqaexYqmmB5ZhH37kz41JXGmKzpaMZCnPofBBm64i+YrEvGQ==} + '@react-leaflet/core@2.1.0': + resolution: {integrity: sha512-Qk7Pfu8BSarKGqILj4x7bCSZ1pjuAPZ+qmRwH5S7mDS91VSbVVsJSrW4qA+GPrro8t69gFYVMWb1Zc4yFmPiVg==} peerDependencies: leaflet: ^1.9.0 - react: ^19.0.0 - react-dom: ^19.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 '@rolldown/pluginutils@1.0.0-beta.27': resolution: {integrity: sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==} @@ -1825,12 +1825,12 @@ packages: react-is@17.0.2: resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==} - react-leaflet@5.0.0: - resolution: {integrity: sha512-CWbTpr5vcHw5bt9i4zSlPEVQdTVcML390TjeDG0cK59z1ylexpqC6M1PJFjV8jD7CF+ACBFsLIDs6DRMoLEofw==} + react-leaflet@4.2.1: + resolution: {integrity: sha512-p9chkvhcKrWn/H/1FFeVSqLdReGwn2qmiobOQGO3BifX+/vV/39qhY8dGqbdcPh1e6jxh/QHriLXr7a4eLFK4Q==} peerDependencies: leaflet: ^1.9.0 - react: ^19.0.0 - react-dom: ^19.0.0 + react: ^18.0.0 + react-dom: ^18.0.0 react-refresh@0.17.0: resolution: {integrity: sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==} @@ -2698,7 +2698,7 @@ snapshots: dependencies: playwright: 1.61.1 - '@react-leaflet/core@3.0.0(leaflet@1.9.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@react-leaflet/core@2.1.0(leaflet@1.9.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: leaflet: 1.9.4 react: 18.3.1 @@ -3576,9 +3576,9 @@ snapshots: react-is@17.0.2: {} - react-leaflet@5.0.0(leaflet@1.9.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + react-leaflet@4.2.1(leaflet@1.9.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - '@react-leaflet/core': 3.0.0(leaflet@1.9.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@react-leaflet/core': 2.1.0(leaflet@1.9.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) leaflet: 1.9.4 react: 18.3.1 react-dom: 18.3.1(react@18.3.1)