mirror of
https://github.com/catdevnull/preciazo.git
synced 2024-11-26 03:26:19 +00:00
usar node para sitio
bun anda muy mal con sveltekit
This commit is contained in:
parent
48b3f3e436
commit
79a3a6a94a
6 changed files with 37 additions and 20 deletions
BIN
bun.lockb
BIN
bun.lockb
Binary file not shown.
|
@ -1,8 +1,24 @@
|
||||||
FROM docker.io/oven/bun:1-alpine
|
FROM docker.io/oven/bun:1-alpine as build
|
||||||
RUN apk add --no-cache sqlite
|
RUN apk add --no-cache nodejs
|
||||||
COPY build/ .
|
WORKDIR /usr/src/app
|
||||||
RUN bun i
|
COPY . .
|
||||||
EXPOSE 3000
|
WORKDIR /usr/src/app/sitio
|
||||||
|
RUN bun install && \
|
||||||
|
bun run build
|
||||||
|
|
||||||
|
# FROM docker.io/oven/bun:1-alpine as deps
|
||||||
|
# WORKDIR /usr/src/app/sitio
|
||||||
|
# RUN bun init && bun install "better-sqlite3"@"^9.2.2" "chart.js"@"^4.4.1" "chartjs-adapter-dayjs-4"@"^1.0.4" "dayjs"@"^1.11.10" "drizzle-orm"@"^0.29.1"
|
||||||
|
# COPY --from=build /usr/src/app/db-datos node_modules/db-datos
|
||||||
|
|
||||||
|
FROM docker.io/alpine:3.19
|
||||||
|
RUN apk add --no-cache tini nodejs npm jq
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
COPY --from=build /usr/src/app/sitio/package.json package.real.json
|
||||||
|
RUN sh -c 'echo {\"name\":\"sitio\",\"type\":\"module\",\"dependencies\":$(jq .dependencies < package.real.json)} > package.json' && npm install
|
||||||
|
COPY --from=build /usr/src/app/db-datos node_modules/db-datos
|
||||||
|
COPY --from=build /usr/src/app/sitio/build .
|
||||||
|
|
||||||
# https://github.com/gornostay25/svelte-adapter-bun/issues/39
|
# https://github.com/gornostay25/svelte-adapter-bun/issues/39
|
||||||
ENV PROTOCOL_HEADER=x-forwarded-proto
|
ENV PROTOCOL_HEADER=x-forwarded-proto
|
||||||
|
@ -10,5 +26,6 @@ ENV HOST_HEADER=x-forwarded-host
|
||||||
|
|
||||||
VOLUME /db
|
VOLUME /db
|
||||||
ENV DB_PATH=/db/db.db
|
ENV DB_PATH=/db/db.db
|
||||||
|
EXPOSE 3000
|
||||||
|
|
||||||
CMD ["bun", "run", "start"]
|
CMD ["tini", "node", "."]
|
|
@ -5,7 +5,7 @@
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite dev",
|
"dev": "vite dev",
|
||||||
"build": "vite build",
|
"build": "vite build",
|
||||||
"build:container": "bun --bun vite build && podman build -t gitea.nulo.in/nulo/preciazo/sitio .",
|
"build:container": "podman build -t gitea.nulo.in/nulo/preciazo/sitio -f ./Containerfile ..",
|
||||||
"push:container": "bun build:container && podman push gitea.nulo.in/nulo/preciazo/sitio",
|
"push:container": "bun build:container && podman push gitea.nulo.in/nulo/preciazo/sitio",
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
|
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
|
||||||
|
@ -16,7 +16,6 @@
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@sveltejs/kit": "^2.0.0",
|
"@sveltejs/kit": "^2.0.0",
|
||||||
"@sveltejs/vite-plugin-svelte": "^3.0.0",
|
"@sveltejs/vite-plugin-svelte": "^3.0.0",
|
||||||
"@types/bun": "^1.0.0",
|
|
||||||
"autoprefixer": "^10.4.16",
|
"autoprefixer": "^10.4.16",
|
||||||
"db-datos": "workspace:^",
|
"db-datos": "workspace:^",
|
||||||
"postcss": "^8.4.32",
|
"postcss": "^8.4.32",
|
||||||
|
@ -25,18 +24,21 @@
|
||||||
"prettier-plugin-svelte": "^3.1.2",
|
"prettier-plugin-svelte": "^3.1.2",
|
||||||
"prettier-plugin-tailwindcss": "^0.5.9",
|
"prettier-plugin-tailwindcss": "^0.5.9",
|
||||||
"svelte": "^4.2.7",
|
"svelte": "^4.2.7",
|
||||||
"svelte-adapter-bun": "^0.5.1",
|
|
||||||
"svelte-check": "^3.6.0",
|
"svelte-check": "^3.6.0",
|
||||||
"tailwindcss": "^3.3.6",
|
"tailwindcss": "^3.3.6",
|
||||||
"tslib": "^2.4.1",
|
"tslib": "^2.4.1",
|
||||||
"typescript": "^5.0.0",
|
"typescript": "^5.0.0",
|
||||||
"vite": "^5.0.3"
|
"vite": "^5.0.3",
|
||||||
|
"@sveltejs/adapter-node": "^2.0.2",
|
||||||
|
"@types/better-sqlite3": "^7.6.8",
|
||||||
|
"@types/node": "^20.10.6"
|
||||||
},
|
},
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"better-sqlite3": "^9.2.2",
|
||||||
"chart.js": "^4.4.1",
|
"chart.js": "^4.4.1",
|
||||||
"chartjs-adapter-dayjs-4": "^1.0.4",
|
"chartjs-adapter-dayjs-4": "^1.0.4",
|
||||||
"dayjs": "^1.11.10",
|
"dayjs": "^1.11.10",
|
||||||
"drizzle-orm": "^0.29.1"
|
"drizzle-orm": "=0.29.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,10 @@
|
||||||
import Database from "bun:sqlite";
|
import Database from "better-sqlite3";
|
||||||
import { drizzle } from "drizzle-orm/bun-sqlite";
|
import { drizzle } from "drizzle-orm/better-sqlite3";
|
||||||
import * as schema from "db-datos/schema.js";
|
import * as schema from "db-datos/schema.js";
|
||||||
import { migrateDb } from "db-datos/migrate.js";
|
|
||||||
import { env } from "$env/dynamic/private";
|
import { env } from "$env/dynamic/private";
|
||||||
|
|
||||||
migrateDb();
|
|
||||||
|
|
||||||
const sqlite = new Database(env.DB_PATH ?? "../scraper/sqlite.db");
|
const sqlite = new Database(env.DB_PATH ?? "../scraper/sqlite.db");
|
||||||
|
const db = drizzle(sqlite, { schema });
|
||||||
|
|
||||||
export const db = drizzle(sqlite, { schema });
|
export { db };
|
||||||
export * as schema from "db-datos/schema.js";
|
export * as schema from "db-datos/schema.js";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { count, countDistinct, eq, max, sql } from "drizzle-orm";
|
import { countDistinct } from "drizzle-orm";
|
||||||
import type { PageServerLoad } from "./$types";
|
import type { PageServerLoad } from "./$types";
|
||||||
import { db, schema } from "$lib/server/db";
|
import { db, schema } from "$lib/server/db";
|
||||||
const { precios } = schema;
|
const { precios } = schema;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
// import adapter from "@sveltejs/adapter-node";
|
import adapter from "@sveltejs/adapter-node";
|
||||||
import adapter from "svelte-adapter-bun";
|
// import adapter from "svelte-adapter-bun";
|
||||||
import { vitePreprocess } from "@sveltejs/vite-plugin-svelte";
|
import { vitePreprocess } from "@sveltejs/vite-plugin-svelte";
|
||||||
|
|
||||||
/** @type {import('@sveltejs/kit').Config} */
|
/** @type {import('@sveltejs/kit').Config} */
|
||||||
|
|
Loading…
Reference in a new issue