diff --git a/embed-migrations.ts b/embed-migrations.ts index 2d2cc2c..af91f06 100644 --- a/embed-migrations.ts +++ b/embed-migrations.ts @@ -4,7 +4,6 @@ import { z } from 'zod' const JOURNAL = './drizzle/meta/_journal.json' const OUTPUT = './src/server/db/migrations.gen.ts' -const SQL_RELATIVE_FROM_OUTPUT = '../../../drizzle' const journalEntrySchema = z.object({ idx: z.number().int().nonnegative(), @@ -28,7 +27,7 @@ const main = async () => { const entries = await readJournalEntries() const imports = entries - .map((e) => `import sql_${e.idx} from '${SQL_RELATIVE_FROM_OUTPUT}/${e.tag}.sql' with { type: 'text' }`) + .map((e) => `import sql_${e.idx} from '#drizzle/${e.tag}.sql' with { type: 'text' }`) .join('\n') const arrayBody = entries.length diff --git a/package.json b/package.json index 70d3dcd..0b3df9a 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,10 @@ "version": "1.0.0", "private": true, "type": "module", + "imports": { + "#package": "./package.json", + "#drizzle/*.sql": "./drizzle/*.sql" + }, "scripts": { "build": "bunx --bun vite build", "cli": "bun bin.ts", diff --git a/src/routes/__root.tsx b/src/routes/__root.tsx index a26a840..500251e 100644 --- a/src/routes/__root.tsx +++ b/src/routes/__root.tsx @@ -4,7 +4,7 @@ import { ReactQueryDevtoolsPanel } from '@tanstack/react-query-devtools' import { createRootRouteWithContext, HeadContent, Scripts } from '@tanstack/react-router' import { TanStackRouterDevtoolsPanel } from '@tanstack/react-router-devtools' import type { ReactNode } from 'react' -import { name } from '@/../package.json' +import { name } from '#package' import { ErrorComponent } from '@/components/Error' import { NotFoundComponent } from '@/components/NotFound' import appCss from '@/styles.css?url' diff --git a/src/routes/api/$.ts b/src/routes/api/$.ts index 5246b3d..a81858b 100644 --- a/src/routes/api/$.ts +++ b/src/routes/api/$.ts @@ -3,7 +3,7 @@ import { OpenAPIReferencePlugin } from '@orpc/openapi/plugins' import { onError } from '@orpc/server' import { ZodToJsonSchemaConverter } from '@orpc/zod/zod4' import { createFileRoute } from '@tanstack/react-router' -import { name, version } from '@/../package.json' +import { name, version } from '#package' import { handleValidationError, logError } from '@/server/api/interceptors' import { router } from '@/server/api/routers' diff --git a/src/server/db/migrations.gen.ts b/src/server/db/migrations.gen.ts index da9d10a..4df2dfd 100644 --- a/src/server/db/migrations.gen.ts +++ b/src/server/db/migrations.gen.ts @@ -1,5 +1,5 @@ // AUTO-GENERATED by `bun run db:embed`. Do not edit. -import sql_0 from '../../../drizzle/0000_loving_thunderbird.sql' with { type: 'text' } +import sql_0 from '#drizzle/0000_loving_thunderbird.sql' with { type: 'text' } export type EmbeddedMigration = { tag: string; sql: string; when: number; breakpoints: boolean }