Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update dependencies #44

Merged
merged 7 commits into from
Mar 22, 2024
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
9 changes: 4 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'

- name: Cache pnpm modules
uses: actions/cache@v3
Expand All @@ -35,9 +35,8 @@ jobs:
version: 8
run_install: true

# TODO: enable again
# - name: Typecheck
# run: pnpm run typecheck
- name: Typecheck
run: pnpm run typecheck

check-format:
name: Check format
Expand All @@ -51,7 +50,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'

- name: Cache pnpm modules
uses: actions/cache@v3
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18-alpine as builder
FROM node:20-alpine as builder
WORKDIR /app
COPY package.json pnpm-lock.yaml .npmrc ./
RUN corepack enable
Expand All @@ -7,7 +7,7 @@ COPY . .
RUN pnpm build
RUN pnpm tsx contrib/build-migrate.ts

FROM node:18-alpine as overmind
FROM node:20-alpine as overmind
WORKDIR /app
RUN apk add --update curl gzip
RUN curl https://github.com/DarthSim/overmind/releases/download/v2.4.0/overmind-v2.4.0-linux-amd64.gz -L -o overmind.gz
Expand Down
49 changes: 48 additions & 1 deletion app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,58 @@ export default defineAppConfig({
size: 'lg',
},
},

button: {
default: {
size: 'lg',
},
},
card: {
background: 'bg-white dark:bg-zinc-900',
ring: 'ring-1 ring-zinc-200 dark:ring-zinc-800',
divide: 'divide-y divide-zinc-200 dark:divide-zinc-800',
},
popover: {
background: 'bg-white dark:bg-zinc-900',
ring: 'ring-1 ring-zinc-200 dark:ring-zinc-800',
},
table: {
divide: 'divide-y divide-zinc-300 dark:divide-zinc-700',
tbody: 'divide-y divide-zinc-200 dark:divide-zinc-800',
tr: {
selected: 'bg-zinc-50 dark:bg-zinc-800/50',
active: 'hover:bg-zinc-50 dark:hover:bg-zinc-800/50 cursor-pointer',
},
th: {
color: 'text-zinc-900 dark:text-white',
},
td: {
color: 'text-zinc-500 dark:text-zinc-400',
},
loadingState: {
label: 'text-sm text-center text-zinc-900 dark:text-white',
icon: 'w-6 h-6 mx-auto text-zinc-400 dark:text-zinc-500 mb-4 animate-spin',
},
emptyState: {
label: 'text-sm text-center text-zinc-900 dark:text-white',
icon: 'w-6 h-6 mx-auto text-zinc-400 dark:text-zinc-500 mb-4',
},
},
dropdown: {
background: 'bg-white dark:bg-zinc-800',
ring: 'ring-1 ring-zinc-200 dark:ring-zinc-700',
divide: 'divide-y divide-zinc-200 dark:divide-zinc-700',
item: {
active: 'bg-zinc-100 dark:bg-zinc-900 text-zinc-900 dark:text-white',
inactive: 'text-zinc-700 dark:text-zinc-200',
icon: {
active: 'text-zinc-500 dark:text-zinc-400',
inactive: 'text-zinc-400 dark:text-zinc-500',
},
},
},
notification: {
background: 'bg-white dark:bg-zinc-900',
ring: 'ring-1 ring-zinc-200 dark:ring-zinc-800',
},
},
});
4 changes: 2 additions & 2 deletions stores/forges.store.ts → composables/forges.store.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export const useForgesStore = async () => {
export async function useForgesStore() {
const { data: forges, refresh: reloadForges } = await useFetch('/api/user/forges');

return { forges, reloadForges };
};
}
1 change: 0 additions & 1 deletion drizzle.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ export default {
url: 'data/code_captain.db',
},
driver: 'better-sqlite',
breakpoints: true,
} satisfies Config;
8 changes: 4 additions & 4 deletions nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// https://nuxt.com/docs/api/configuration/nuxt-config
export default defineNuxtConfig({
modules: ['nuxt-icon', '@nuxthq/ui'],
modules: ['nuxt-icon', '@nuxt/ui'],
runtimeConfig: {
ai: {
url: 'http://localhost:8000',
Expand All @@ -14,9 +14,6 @@ export default defineNuxtConfig({
APP_URL: 'http://localhost:3000',
},
},
imports: {
dirs: ['stores'],
},
ignore: ['data/**/*'],
ui: {
icons: ['mdi', 'simple-icons', 'heroicons', 'ion'],
Expand All @@ -30,4 +27,7 @@ export default defineNuxtConfig({
],
},
},
typescript: {
strict: true,
},
});
62 changes: 28 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,50 +8,44 @@
"preview": "nuxt preview",
"postinstall": "nuxt prepare",
"db:generate-migration": "drizzle-kit generate:sqlite",
"db:drop": "drizzle-kit drop",
"db:push": "drizzle-kit push:sqlite",
"db:explorer": "drizzle-kit studio",
"db:up": "tsx contrib/migrate.ts",
"clean": "rm -rf dist/ node_modules/ .eslintcache",
"format:check": "prettier --check .",
"format:fix": "prettier --write .",
"typecheck": "tsc --noEmit"
"typecheck": "nuxi typecheck"
},
"devDependencies": {
"@iconify/json": "^2.2.106",
"@iconify/json": "^2.2.195",
"@nuxt/devtools": "latest",
"@nuxthq/ui": "^2.7.0",
"@nuxtjs/tailwindcss": "^6.8.0",
"@types/better-sqlite3": "^7.6.4",
"@types/jsonwebtoken": "^9.0.2",
"@types/markdown-it": "^13.0.2",
"@types/node": "^18",
"better-sqlite3": "^8.5.0",
"dotenv": "^16.3.1",
"drizzle-kit": "^0.19.12",
"esbuild": "^0.19.2",
"@nuxt/ui": "^2.14.2",
"@nuxtjs/tailwindcss": "^6.11.4",
"@types/better-sqlite3": "^7.6.9",
"@types/jsonwebtoken": "^9.0.6",
"@types/markdown-it": "^13.0.7",
"@types/node": "^20.11.30",
"better-sqlite3": "^9.4.3",
"dotenv": "^16.4.5",
"drizzle-kit": "^0.20.14",
"esbuild": "^0.20.2",
"esbuild-plugin-copy": "^2.1.1",
"nuxt": "^3.6.5",
"prettier": "^3.0.1",
"tsx": "^3.12.7",
"typescript": "^5.1.6"
"nuxt": "^3.11.1",
"prettier": "^3.2.5",
"tsx": "^4.7.1",
"typescript": "^5.1.6",
"vue-tsc": "^1"
},
"dependencies": {
"@gitbeaker/core": "^39.10.3",
"@gitbeaker/rest": "^39.10.3",
"better-sqlite3": "^8.5.0",
"drizzle-orm": "^0.28.5",
"jsonwebtoken": "^9.0.1",
"jwt-decode": "^3.1.2",
"nuxt-icon": "^0.4.1",
"octokit": "^2.1.0",
"simple-git": "^3.19.1",
"vue-markdown-render": "^2.0.1",
"zod": "^3.22.2"
},
"pnpm": {
"overrides": {
"node-fetch-native": "1.2.0"
}
"@gitbeaker/core": "^40.0.1",
"@gitbeaker/rest": "^40.0.1",
"better-sqlite3": "^9.4.3",
"drizzle-orm": "^0.30.4",
"jsonwebtoken": "^9.0.2",
"jwt-decode": "^4.0.0",
"nuxt-icon": "^0.6.10",
"octokit": "^3.1.2",
"simple-git": "^3.23.0",
"vue-markdown-render": "^2.1.1",
"zod": "^3.22.4"
}
}
2 changes: 1 addition & 1 deletion pages/settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<NuxtLink v-for="forge in forges" :key="forge.id" :to="`/forges/${forge.id}`" :title="forge.host">
<Card>
<div class="flex flex-col items-center justify-between p-2 h-full gap-2 w-64">
<span class="font-bold font-semibold text-2xl mt-2 w-full truncate text-center">{{ forge.host }}</span>
<span class="font-semibold text-2xl mt-2 w-full truncate text-center">{{ forge.host }}</span>
<UButton size="md" icon="i-heroicons-pencil-square" variant="outline" class="mt-8" label="Edit" />
</div>
</Card>
Expand Down
Loading
Loading