Skip to content

Commit

Permalink
Merge pull request #29 from tminaorg/revert-to-node
Browse files Browse the repository at this point in the history
feat(revert): Bun is buggy, node is just as fast for this usecase
  • Loading branch information
aleksasiriski authored Nov 9, 2023
2 parents ec70be0 + dd989d2 commit 05d8661
Show file tree
Hide file tree
Showing 12 changed files with 244 additions and 154 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/dockerci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ jobs:
- run: pnpm install --frozen-lockfile

# build project
- uses: oven-sh/setup-bun@v1
- run: bun run build
- run: npm run build

# setup docker (arm64)
- uses: docker/setup-qemu-action@v3
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/dockerflycd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ jobs:
- run: pnpm install --frozen-lockfile

# build project
- uses: oven-sh/setup-bun@v1
- run: bun run build
- run: npm run build

# setup docker (arm64)
- uses: docker/setup-qemu-action@v3
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/testingci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@ jobs:
cache: 'pnpm'
- run: pnpm install --frozen-lockfile

- uses: oven-sh/setup-bun@v1
- run: bun run build
- run: npm run build
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM oven/bun:1 as base
FROM node:lts-slim

WORKDIR /usr/src/app

Expand All @@ -7,5 +7,5 @@ RUN mv build/* ./

EXPOSE 3000

ENTRYPOINT [ "bun" ]
ENTRYPOINT [ "npm" ]
CMD [ "run", "start" ]
41 changes: 0 additions & 41 deletions docker/local.Dockerfile

This file was deleted.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "prednjica",
"version": "0.2.0",
"version": "0.3.0",
"private": true,
"scripts": {
"start": "bun run index.js",
"start": "node run index.js",
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
Expand All @@ -14,6 +14,7 @@
},
"devDependencies": {
"@sveltejs/adapter-auto": "^2.0.0",
"@sveltejs/adapter-node": "^1.3.1",
"@sveltejs/kit": "^1.20.4",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
Expand All @@ -25,7 +26,6 @@
"prettier": "^2.8.0",
"prettier-plugin-svelte": "^2.10.1",
"svelte": "^4.0.5",
"svelte-adapter-bun": "^0.5.1",
"svelte-check": "^3.4.3",
"tailwindcss": "^3.3.5",
"tslib": "^2.4.1",
Expand Down
Loading

0 comments on commit 05d8661

Please sign in to comment.