Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,7 @@ cobertura.xml
.claude
test.db
.sisyphus
tsconfig.tsbuildinfo
tsconfig.tsbuildinfo
/**/.vinext/
/**/dist/
.omo
20 changes: 10 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 12 additions & 17 deletions Dockerfile.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,22 @@ COPY apps/front/package.json ./apps/front/
RUN bun install --ignore-scripts

# Rebuild the source code only when needed
FROM base AS builder
WORKDIR /app
ENV NODE_ENV=production
FROM base AS builder
WORKDIR /app
ENV NODE_ENV=production
COPY --from=deps /app/package.json /app/bun.lock ./
COPY --from=deps /app/node_modules ./node_modules
COPY --from=deps /app/apps/admin/node_modules ./apps/admin/node_modules
COPY --from=deps /app/apps/front/node_modules ./apps/front/node_modules
COPY apps/admin ./apps/admin
COPY apps/front ./apps/front
RUN bun run build
RUN bun run build

RUN set -eu; \
for app in front admin; do \
mkdir -p /out/apps/$app; \
cp -a apps/$app/dist/standalone/. /out/apps/$app/; \
done

# Production image, copy all the files and run next
FROM base AS front-builder
Expand All @@ -33,18 +39,7 @@ WORKDIR /app
# Create ecosystem file
COPY ecosystem.json ./ecosystem.json

COPY --from=builder /app/apps/admin/.next/standalone/node_modules /app/node_modules/
COPY --from=builder /app/apps/front/.next/standalone/node_modules /app/node_modules/
COPY --from=builder /app/apps/admin/public /app/apps/admin/public
COPY --from=builder /app/apps/front/public /app/apps/front/public

WORKDIR /app/apps/admin
COPY --from=builder /app/apps/admin/.next/standalone/apps/admin ./
COPY --from=builder /app/apps/admin/.next/static ./.next/static

WORKDIR /app/apps/front
COPY --from=builder /app/apps/front/.next/standalone/apps/front ./
COPY --from=builder /app/apps/front/.next/static ./.next/static
COPY --from=builder /out/ /app/

WORKDIR /app

Expand Down Expand Up @@ -75,4 +70,4 @@ RUN tar -czf api.tar.gz -C /app/target/release api
FROM alpine AS result
WORKDIR /app
COPY --from=front-builder /app/front.tar.gz ./front.tar.gz
COPY --from=api-builder /app/api.tar.gz ./api.tar.gz
COPY --from=api-builder /app/api.tar.gz ./api.tar.gz
4 changes: 2 additions & 2 deletions apis/api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ edition = "2024"
publish = false

[dependencies]
vespera = "0.3.1"
vespera = "0.4.0"
tokio = { version = "1.53", features = ["full"] }
tower-http = { version = "0.7", features = ["cors"] }
sea-orm = { version = "2.0.2", features = ["runtime-tokio-rustls", "sqlx-postgres", "sqlx-sqlite", "macros", "chrono", "uuid"] }
vespertide = "0.3.0"

[build-dependencies]
vespera = "0.3.1"
vespera = "0.4.0"
14 changes: 0 additions & 14 deletions apps/admin/next.config.ts

This file was deleted.

32 changes: 19 additions & 13 deletions apps/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,34 @@
"type": "module",
"private": true,
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"dev": "vinext dev --port 3001",
"build": "vinext build",
"start": "vinext start",
"test": "bun test"
},
"dependencies": {
"@tanstack/react-query": "^5.102",
"react": "^19.2",
"next": "^16.3",
"@devup-ui/react": "^1",
"@devup-api/fetch": "^0.1",
"@devup-api/react-query": "^0.1",
"@devup-ui/components": "^0.1",
"@devup-ui/react": "^1",
"@devup-ui/reset-css": "^1",
"@devup-api/fetch": "^0.1",
"@devup-api/react-query": "^0.1"
"@tanstack/react-query": "^5.102",
"react": "^19.2",
"react-server-dom-webpack": "19.2.8",
"vinext": "1.0.0-beta.8"
},
"devDependencies": {
"@devup-ui/next-plugin": "^1",
"@devup-api/next-plugin": "^0.1",
"@devup-api/vite-plugin": "0.1.16",
"@devup-ui/vite-plugin": "1.0.69",
"@tanstack/react-query-devtools": "^5.102",
"@types/node": "^26",
"@types/react": "^19",
"@types/react-dom": "19.2.5",
"@vitejs/plugin-react": "6.1.1",
"@vitejs/plugin-rsc": "0.5.34",
"babel-plugin-react-compiler": "^1.0.0",
"typescript": "^6"
"react-dom": "19.2.8",
"typescript": "^6",
"vite": "8.2.2"
}
}
}
10 changes: 1 addition & 9 deletions apps/admin/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
"isolatedModules": true,
"jsx": "react-jsx",
"incremental": true,
"plugins": [
{
"name": "next"
}
],
"paths": {
"@/*": [
"./src/*"
Expand All @@ -44,12 +39,9 @@
}
},
"include": [
"next-env.d.ts",
"**/*.ts",
"**/*.tsx",
".next/types/**/*.ts",
"df/*.d.ts",
".next/dev/types/**/*.ts"
"df/*.d.ts"
],
"exclude": [
"node_modules"
Expand Down
12 changes: 12 additions & 0 deletions apps/admin/vite.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import devupApi from '@devup-api/vite-plugin'
import { DevupUI } from '@devup-ui/vite-plugin'
import vinext from 'vinext'
import { defineConfig } from 'vite'

export default defineConfig({
plugins: [
devupApi(),
DevupUI(),
vinext({ nextConfig: { output: 'standalone' } }),
],
})
14 changes: 0 additions & 14 deletions apps/front/next.config.ts

This file was deleted.

29 changes: 18 additions & 11 deletions apps/front/package.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
{
"name": "front",
"version": "0.1.0",
"type": "module",
"private": true,
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"dev": "vinext dev --port 3000",
"build": "vinext build",
"start": "vinext start",
"test": "bun test"
},
"dependencies": {
"@devup-ui/react": "^1",
"@devup-ui/reset-css": "^1",
"@devup-api/fetch": "^0.1",
"@devup-api/react-query": "^0.1",
"next": "^16",
"react": "^19"
"@devup-ui/react": "^1",
"@devup-ui/reset-css": "^1",
"react": "^19",
"react-server-dom-webpack": "19.2.8",
"vinext": "1.0.0-beta.8"
},
"devDependencies": {
"@devup-ui/next-plugin": "^1",
"@devup-api/next-plugin": "^0.1",
"@devup-api/vite-plugin": "0.1.16",
"@devup-ui/vite-plugin": "1.0.69",
"@types/node": "^26",
"@types/react": "^19",
"@types/react-dom": "19.2.5",
"@vitejs/plugin-react": "6.1.1",
"@vitejs/plugin-rsc": "0.5.34",
"babel-plugin-react-compiler": "^1.0.0",
"typescript": "^6"
"react-dom": "19.2.8",
"typescript": "^6",
"vite": "8.2.2"
}
}
}
16 changes: 4 additions & 12 deletions apps/front/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,7 @@
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "react-jsx",
"incremental": true,
"plugins": [
{
"name": "next"
}
],
"incremental": true,
"paths": {
"@/*": [
"./src/*"
Expand All @@ -44,12 +39,9 @@
}
},
"include": [
"next-env.d.ts",
"**/*.ts",
"**/*.tsx",
".next/types/**/*.ts",
"df/*.d.ts",
".next/dev/types/**/*.ts"
"**/*.ts",
"**/*.tsx",
"df/*.d.ts"
],
"exclude": [
"node_modules"
Expand Down
12 changes: 12 additions & 0 deletions apps/front/vite.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import devupApi from '@devup-api/vite-plugin'
import { DevupUI } from '@devup-ui/vite-plugin'
import vinext from 'vinext'
import { defineConfig } from 'vite'

export default defineConfig({
plugins: [
devupApi(),
DevupUI(),
vinext({ nextConfig: { output: 'standalone' } }),
],
})
Loading