diff --git a/astro.config.mjs b/astro.config.mjs index 00c6c749..5263c603 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -10,6 +10,8 @@ import node from "@astrojs/node"; // https://astro.build/config import mdx from "@astrojs/mdx"; +import { fileURLToPath } from "url"; + // https://astro.build/config export default defineConfig({ integrations: [svelte(), tailwind(), mdx()], @@ -18,6 +20,16 @@ export default defineConfig({ vite: { optimizeDeps: { exclude: ["@ibcornelsen/api", "@ibcornelsen/database"] + }, + resolve: { + alias: { + "#": fileURLToPath(new URL("./src", import.meta.url)) + } + }, + build: { + commonjsOptions: { + transformMixedEsModules: true + } } }, adapter: node({ diff --git a/build.sh b/build.sh index 8b0ab89c..38495dd5 100644 --- a/build.sh +++ b/build.sh @@ -29,8 +29,14 @@ bun install cd ../$APP_NAME -# Als erstes linken wir das package mit bun, damit wir z.B. in online-energieausweis darauf zugreifen können. -bun link +# Als erstes linken wir das package mit yalc, damit wir z.B. in online-energieausweis darauf zugreifen können. +cd ../database +bunx yalc push --scripts +cd ../api +bunx yalc push --scripts +cd ../$APP_NAME +bunx yalc add @ibcornelsen/database +bunx yalc add @ibcornelsen/api # Dann installieren wir noch einmal alle dependencies, das ist besonders wichtig # falls wir lokal verlinkte Projekte haben, sonst werden die nicht in unser # docker image übernommen diff --git a/docker-compose.yml b/docker-compose.yml index fab66329..8aa3088b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,7 +20,7 @@ services: extends: file: ../api/docker-compose.yml service: ibcornelsen-api - ibcornelsen-database: + database: extends: file: ../database/docker-compose.yml - service: ibcornelsen-database \ No newline at end of file + service: database \ No newline at end of file diff --git a/package.json b/package.json index c8c8a383..c71995af 100644 --- a/package.json +++ b/package.json @@ -25,49 +25,37 @@ "@ibcornelsen/database": "link:@ibcornelsen/database", "@ibcornelsen/ui": "^0.0.2", "@mollie/api-client": "^3.7.0", - "@pdfme/common": "^3.2.3", - "@pdfme/generator": "^3.2.3", + "@pdfme/common": "^4.3.2", + "@pdfme/generator": "^4.3.2", "@pdfme/ui": "^3.2.3", "@trpc/client": "^10.45.0", "@trpc/server": "^10.45.0", "astro": "^2.5.1", "astro-i18next": "1.0.0-beta.21", - "astro-spa": "^1.3.9", "body-scroll-lock": "^4.0.0-beta.0", "buffer": "^6.0.3", "bun": "^1.0.2", - "cookiejs": "^2.1.2", "csvtojson": "^2.0.10", - "esbuild": "^0.18.17", "express": "^4.18.2", "flag-icons": "^6.9.2", "fontkit": "^2.0.2", "i18next": "^23.4.1", "i18next-fs-backend": "^2.1.5", "i18next-http-backend": "^2.2.1", - "jimp": "^0.22.8", "js-cookie": "^3.0.5", "js-interpolate": "^1.0.1", - "jwt-simple": "^0.5.6", "katex": "^0.16.7", - "knex": "^2.4.2", "moment": "^2.29.4", "moment-timezone": "^0.5.45", - "pg": "^8.11.0", "radix-svelte-icons": "^1.0.0", - "remark-frontmatter": "^5.0.0", "sass": "^1.62.1", "svelte": "^3.59.1", "svelte-dialogs": "^1.2.2", - "svelte-katex": "^0.1.2", "svelte-preprocess": "^5.0.3", "svelte-ripple-action": "^1.0.5", - "svelte-tabs": "^1.1.0", "tailwindcss": "^3.3.2", "trpc-openapi": "^1.2.0", "uuid": "^9.0.0", - "uuid-validate": "^0.0.3", - "vite-tsconfig-paths": "^4.2.0", "zod": "^3.22.4" }, "devDependencies": { diff --git a/src/components/Header.astro b/src/components/Header.astro index 0b93b711..13957a8b 100644 --- a/src/components/Header.astro +++ b/src/components/Header.astro @@ -1,5 +1,5 @@ --- -import { validateAccessTokenServer } from "src/server/lib/validateAccessToken"; +import { validateAccessTokenServer } from "#server/lib/validateAccessToken"; import ThemeController from "./ThemeController.svelte"; const valid = await validateAccessTokenServer(Astro) diff --git a/src/layouts/UserLayout.astro b/src/layouts/UserLayout.astro index b622f06f..5c013bc7 100644 --- a/src/layouts/UserLayout.astro +++ b/src/layouts/UserLayout.astro @@ -5,7 +5,7 @@ import "../style/global.scss"; import "../../svelte-dialogs.config" import "svelte-ripple-action/ripple.css" import DashboardSidebar from "../components/Dashboard/DashboardSidebar.svelte" -import { validateAccessTokenServer } from "src/server/lib/validateAccessToken"; +import { validateAccessTokenServer } from "#server/lib/validateAccessToken"; import { createCaller } from "#lib/caller"; const valid = validateAccessTokenServer(Astro) diff --git a/src/pages/404.astro b/src/pages/404.astro index d932d590..515902c0 100644 --- a/src/pages/404.astro +++ b/src/pages/404.astro @@ -1,9 +1,6 @@ --- -import { BoxWithHeading } from "@ibcornelsen/ui"; -import Widget from "#components/Widget.svelte"; import Layout from "#layouts/Layout.astro"; -import FeatureCard from "#components/FeatureCard.svelte"; --- diff --git a/src/pages/auth/login.astro b/src/pages/auth/login.astro index 2ed46b13..06b10d13 100644 --- a/src/pages/auth/login.astro +++ b/src/pages/auth/login.astro @@ -1,6 +1,6 @@ --- import LoginModule from "../../modules/LoginModule.svelte"; -import { validateAccessTokenServer } from "src/server/lib/validateAccessToken"; +import { validateAccessTokenServer } from "#server/lib/validateAccessToken"; import MinimalLayout from "#layouts/MinimalLayout.astro"; const valid = await validateAccessTokenServer(Astro) diff --git a/src/pages/auth/passwort-vergessen.astro b/src/pages/auth/passwort-vergessen.astro index e6ae737d..b46e6661 100644 --- a/src/pages/auth/passwort-vergessen.astro +++ b/src/pages/auth/passwort-vergessen.astro @@ -1,6 +1,6 @@ --- import PasswortVergessenModule from "../../modules/Auth/PasswortVergessenModule.svelte"; -import { validateAccessTokenServer } from "src/server/lib/validateAccessToken"; +import { validateAccessTokenServer } from "#server/lib/validateAccessToken"; import MinimalLayout from "#layouts/MinimalLayout.astro"; const valid = await validateAccessTokenServer(Astro) diff --git a/src/pages/auth/passwort-zuruecksetzen.astro b/src/pages/auth/passwort-zuruecksetzen.astro index bb47ede4..b5908dd9 100644 --- a/src/pages/auth/passwort-zuruecksetzen.astro +++ b/src/pages/auth/passwort-zuruecksetzen.astro @@ -1,6 +1,6 @@ --- import PasswortZuruecksetzenModule from "../../modules/Auth/PasswortZuruecksetzenModule.svelte"; -import { validateAccessTokenServer } from "src/server/lib/validateAccessToken"; +import { validateAccessTokenServer } from "#server/lib/validateAccessToken"; import MinimalLayout from "#layouts/MinimalLayout.astro"; const valid = await validateAccessTokenServer(Astro) diff --git a/src/pages/auth/signup.astro b/src/pages/auth/signup.astro index 502bffef..d8a797a5 100644 --- a/src/pages/auth/signup.astro +++ b/src/pages/auth/signup.astro @@ -1,7 +1,7 @@ --- import RegisterModule from "../../modules/RegisterModule.svelte"; import MinimalLayout from "#layouts/MinimalLayout.astro"; -import { validateAccessTokenServer } from "src/server/lib/validateAccessToken"; +import { validateAccessTokenServer } from "#server/lib/validateAccessToken"; const valid = await validateAccessTokenServer(Astro) diff --git a/src/pages/dashboard/admin/ausweise-pruefen.astro b/src/pages/dashboard/admin/ausweise-pruefen.astro index 644df3c9..10505f2c 100644 --- a/src/pages/dashboard/admin/ausweise-pruefen.astro +++ b/src/pages/dashboard/admin/ausweise-pruefen.astro @@ -1,6 +1,6 @@ --- import UserLayout from "../../../layouts/UserLayout.astro"; -import { validateAccessTokenServer } from "src/server/lib/validateAccessToken"; +import { validateAccessTokenServer } from "#server/lib/validateAccessToken"; import DashboardAusweisePruefenModule from "#modules/Dashboard/DashboardAusweisePruefenModule.svelte"; import { prisma } from "@ibcornelsen/database/server"; import { createCaller } from "#lib/caller"; diff --git a/src/pages/dashboard/ausweise/index.astro b/src/pages/dashboard/ausweise/index.astro index e0e34f16..ef3bf0b2 100644 --- a/src/pages/dashboard/ausweise/index.astro +++ b/src/pages/dashboard/ausweise/index.astro @@ -2,7 +2,7 @@ import UserLayout from "../../../layouts/UserLayout.astro"; import DashboardAusweiseModule from "#modules/Dashboard/DashboardAusweiseModule.svelte"; -import { validateAccessTokenServer } from "src/server/lib/validateAccessToken"; +import { validateAccessTokenServer } from "#server/lib/validateAccessToken"; import { createCaller } from "#lib/caller"; const accessTokenValid = await validateAccessTokenServer(Astro); diff --git a/src/pages/dashboard/einstellungen/index.astro b/src/pages/dashboard/einstellungen/index.astro index 74cb5b3e..1715daf9 100644 --- a/src/pages/dashboard/einstellungen/index.astro +++ b/src/pages/dashboard/einstellungen/index.astro @@ -2,7 +2,7 @@ import UserLayout from "#layouts/UserLayout.astro"; import { createCaller } from "#lib/caller"; import DashboardEinstellungenModule from "#modules/Dashboard/DashboardEinstellungenModule.svelte"; -import { validateAccessTokenServer } from "src/server/lib/validateAccessToken"; +import { validateAccessTokenServer } from "#server/lib/validateAccessToken"; const valid = await validateAccessTokenServer(Astro); diff --git a/src/pages/dashboard/index.astro b/src/pages/dashboard/index.astro index 438bc769..220a2ca5 100644 --- a/src/pages/dashboard/index.astro +++ b/src/pages/dashboard/index.astro @@ -1,7 +1,7 @@ --- import { createCaller } from "#lib/caller"; import UserLayout from "../../layouts/UserLayout.astro"; -import { validateAccessTokenServer } from "src/server/lib/validateAccessToken"; +import { validateAccessTokenServer } from "#server/lib/validateAccessToken"; import DashboardModule from "#modules/Dashboard/DashboardModule.svelte"; const accessTokenValid = await validateAccessTokenServer(Astro); diff --git a/tsconfig.json b/tsconfig.json index 6308706c..abf900d1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -25,8 +25,8 @@ "#components/*": ["./src/components/*"], "#layouts/*": ["./src/layouts/*"], "#modules/*": ["./src/modules/*"], - "#client/*": ["./src/modules/*"], - "#server/*": ["./src/modules/*"], + "#client/*": ["./src/client/*"], + "#server/*": ["./src/server/*"], }, "types": ["cypress", "cypress-file-upload", "bun-types"] }