diff --git a/Dockerfile b/Dockerfile index 95e2a3b4..dfa45a94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,17 @@ -FROM node:20-alpine +FROM oven/bun:alpine WORKDIR /app COPY package.json ./ -RUN npm install +RUN bun install EXPOSE 3000 COPY . . -RUN ADAPTER=node npm run build +RUN ADAPTER=bun bun run build -USER node +USER bun -CMD ["npm", "run", "start"] +CMD ["bun", "run", "bunstart"] diff --git a/bun.lockb b/bun.lockb new file mode 100755 index 00000000..26e7bf01 Binary files /dev/null and b/bun.lockb differ diff --git a/package.json b/package.json index 3a5c4535..e3d33834 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "1.26.0", + "version": "1.27.0", "private": true, "scripts": { "dev": "vite dev", @@ -8,10 +8,12 @@ "test": "vitest", "preview": "vite preview", "start": "node build/index.js", + "bunstart": "bun build/index.js", "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch" }, "devDependencies": { + "@catdadcode/svelte-adapter-bun": "^0.5.7", "@sveltejs/adapter-auto": "^2.1.1", "@sveltejs/adapter-node": "^1.3.1", "@sveltejs/kit": "^1.24.0", @@ -46,5 +48,8 @@ "markdown-it": "^13.0.1", "mono-svelte": "^1.4.5" }, + "overrides": { + "@rollup/plugin-node-resolve": "^15.2.3" + }, "type": "module" } diff --git a/svelte.config.js b/svelte.config.js index ef3b8511..7152844a 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,5 +1,6 @@ import auto from '@sveltejs/adapter-auto'; import node from '@sveltejs/adapter-node'; +import bun from '@catdadcode/svelte-adapter-bun' import { vitePreprocess } from '@sveltejs/kit/vite'; /** @type {import('@sveltejs/kit').Config} */ @@ -12,7 +13,7 @@ const config = { // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list. // If your environment is not supported or you settled on a specific environment, switch out the adapter. // See https://kit.svelte.dev/docs/adapters for more information about adapters. - adapter: process.env.ADAPTER == 'node' ? node() : auto(), + adapter: process.env.ADAPTER == 'node' ? node() : process.env.ADAPTER == 'bun' ? bun() : auto(), // csp: { // directives: { // 'script-src': ['self'],