diff --git a/packages/attache/tsconfig.json b/packages/attache/tsconfig.json index 8da9238..2d958c5 100644 --- a/packages/attache/tsconfig.json +++ b/packages/attache/tsconfig.json @@ -25,11 +25,6 @@ // Some stricter flags (disabled by default) "noUnusedLocals": false, "noUnusedParameters": false, - "noPropertyAccessFromIndexSignature": false, - - "baseUrl": ".", - "paths": { - "@/*": ["./src/*"] - } + "noPropertyAccessFromIndexSignature": false } } diff --git a/packages/http/src/routes/index.tsx b/packages/http/src/routes/index.tsx index f201e58..7b860ce 100644 --- a/packages/http/src/routes/index.tsx +++ b/packages/http/src/routes/index.tsx @@ -1,4 +1,4 @@ -import { subdomainPackageInfo } from "@/orchestrator" +import { subdomainPackageInfo } from "../orchestrator" import type { LoaderProps } from "@workshop/nano-remix" export const loader = async (_req: Request) => { diff --git a/packages/http/src/server.tsx b/packages/http/src/server.tsx index 39d996f..de6ed4a 100644 --- a/packages/http/src/server.tsx +++ b/packages/http/src/server.tsx @@ -1,4 +1,4 @@ -import { startSubdomainServers } from "@/orchestrator" +import { startSubdomainServers } from "./orchestrator" import { nanoRemix } from "@workshop/nano-remix" import { join } from "node:path" @@ -35,8 +35,8 @@ const startServer = (portMap: Record) => { const targetPort = subdomain && portMap[subdomain] if (!targetPort) { - const routePath = join(import.meta.dir, "routes") - return nanoRemix(req, { routePath }) + const routesDir = join(import.meta.dir, "routes") + return nanoRemix(req, { routesDir }) } try { diff --git a/packages/http/tsconfig.json b/packages/http/tsconfig.json index 99c91e3..545396c 100644 --- a/packages/http/tsconfig.json +++ b/packages/http/tsconfig.json @@ -25,11 +25,6 @@ // Some stricter flags (disabled by default) "noUnusedLocals": false, "noUnusedParameters": false, - "noPropertyAccessFromIndexSignature": false, - - "baseUrl": ".", - "paths": { - "@/*": ["./src/*"] - } + "noPropertyAccessFromIndexSignature": false } } diff --git a/packages/nano-remix/package.json b/packages/nano-remix/package.json index f5fca66..2706711 100644 --- a/packages/nano-remix/package.json +++ b/packages/nano-remix/package.json @@ -1,8 +1,11 @@ { "name": "@workshop/nano-remix", "type": "module", - "module": "src/main.ts", "types": "src/main.ts", + "exports": { + ".": "./src/main.ts", + "./*": "./src/*.ts" + }, "prettier": { "printWidth": 110, "semi": false diff --git a/packages/nano-remix/src/clientHelpers.tsx b/packages/nano-remix/src/clientHelpers.tsx index e03a461..e6ce5f1 100644 --- a/packages/nano-remix/src/clientHelpers.tsx +++ b/packages/nano-remix/src/clientHelpers.tsx @@ -1,5 +1,5 @@ import { type FC, useEffect, useState, type JSX } from "hono/jsx" -import type { Action } from "@/main" +import type { Action } from "./main" type ActionData Promise> = Exclude>, Response> diff --git a/packages/nano-remix/src/main.ts b/packages/nano-remix/src/main.ts index a1bfe9f..4dfab00 100644 --- a/packages/nano-remix/src/main.ts +++ b/packages/nano-remix/src/main.ts @@ -1,5 +1,5 @@ -export { Form, useAction, wrapComponentWithLoader, submitAction } from "@/clientHelpers" -export { nanoRemix } from "@/nanoRemix" +export { Form, useAction, wrapComponentWithLoader, submitAction } from "./clientHelpers" +export { nanoRemix } from "./nanoRemix" export type Loader = ( req: Request, diff --git a/packages/nano-remix/src/nanoRemix.ts b/packages/nano-remix/src/nanoRemix.ts index 0423e93..26928db 100644 --- a/packages/nano-remix/src/nanoRemix.ts +++ b/packages/nano-remix/src/nanoRemix.ts @@ -1,21 +1,42 @@ -import { renderServer } from "@/renderServer" +import { renderServer } from "./renderServer" import { buildRoute } from "./buildRoute" import { join, extname } from "node:path" +import { stat } from "node:fs/promises" type Options = { routesDir?: string distDir?: string + publicDir?: string disableCache?: boolean } + +let defaultPublicDir: string | undefined +try { + const publicDir = join(process.cwd(), "public") + const statInfo = await stat(publicDir) + if (statInfo.isDirectory()) { + defaultPublicDir = publicDir + } +} catch (error) {} + export const nanoRemix = async (req: Request, options: Options = {}) => { + const defaultRoutesDir = join(process.cwd(), "src", "routes") const nanoRemixDir = join(process.cwd(), ".nano-remix") const defaultDistDir = join(nanoRemixDir, "dist") - const defaultRoutesDir = "./src/routes" + const publicDir = options.publicDir || defaultPublicDir + const url = new URL(req.url) + + if (publicDir) { + const filePath = join(publicDir, url.pathname) + const file = Bun.file(filePath) + if (await file.exists()) { + return new Response(file) + } + } const routesDir = options.routesDir || defaultRoutesDir const distDir = options.distDir || defaultDistDir const router = new Bun.FileSystemRouter({ style: "nextjs", dir: routesDir }) - const url = new URL(req.url) // I want to request the css and js files directly, so we detect the extension const ext = extname(url.pathname) diff --git a/packages/nano-remix/src/renderServer.tsx b/packages/nano-remix/src/renderServer.tsx index c8b9ca1..e752e5f 100644 --- a/packages/nano-remix/src/renderServer.tsx +++ b/packages/nano-remix/src/renderServer.tsx @@ -1,4 +1,4 @@ -import type { Action, Loader } from "@/main" +import type { Action, Loader } from "./main" export const renderServer = async (req: Request, route: Bun.MatchedRoute) => { const contentType = req.headers.get("Content-Type") diff --git a/packages/nano-remix/tsconfig.json b/packages/nano-remix/tsconfig.json index 9051506..e208679 100644 --- a/packages/nano-remix/tsconfig.json +++ b/packages/nano-remix/tsconfig.json @@ -25,11 +25,6 @@ // Some stricter flags (disabled by default) "noUnusedLocals": false, "noUnusedParameters": false, - "noPropertyAccessFromIndexSignature": false, - - "baseUrl": ".", - "paths": { - "@/*": ["./src/*"] - } + "noPropertyAccessFromIndexSignature": false } } diff --git a/packages/project-whiteboard/public/whiteboard.jpeg b/packages/project-whiteboard/public/whiteboard.jpeg index d58dbd9..50d06f3 100644 Binary files a/packages/project-whiteboard/public/whiteboard.jpeg and b/packages/project-whiteboard/public/whiteboard.jpeg differ diff --git a/packages/project-whiteboard/src/server.ts b/packages/project-whiteboard/src/server.ts index 51e37b8..18bd265 100644 --- a/packages/project-whiteboard/src/server.ts +++ b/packages/project-whiteboard/src/server.ts @@ -1,14 +1,10 @@ import { nanoRemix } from "@workshop/nano-remix" -import { join } from "path" Bun.serve({ routes: { - "/": { + "/*": { GET: (req) => { - return nanoRemix(req, { - routePath: join(import.meta.dir, "routes"), - publicDir: join(import.meta.dir, "..", "public"), - }) + return nanoRemix(req) }, }, }, diff --git a/packages/project-whiteboard/tsconfig.json b/packages/project-whiteboard/tsconfig.json index 4410a1d..16bb5e0 100644 --- a/packages/project-whiteboard/tsconfig.json +++ b/packages/project-whiteboard/tsconfig.json @@ -25,11 +25,6 @@ // Some stricter flags (disabled by default) "noUnusedLocals": false, "noUnusedParameters": false, - "noPropertyAccessFromIndexSignature": false, - - "baseUrl": ".", - "paths": { - "@/*": ["./src/*"] - } + "noPropertyAccessFromIndexSignature": false } } diff --git a/packages/project-whitespace/src/server.ts b/packages/project-whitespace/src/server.ts deleted file mode 100644 index e69de29..0000000 diff --git a/packages/shared/src/kv.ts b/packages/shared/src/kv.ts index c129662..2d7ff3b 100644 --- a/packages/shared/src/kv.ts +++ b/packages/shared/src/kv.ts @@ -1,7 +1,7 @@ import { mkdir } from "node:fs/promises" import { dirname, join } from "node:path" -import type { Reminder } from "@/reminders" -import { timeBomb } from "@/utils" +import type { Reminder } from "./reminders" +import { timeBomb } from "./utils" export interface Keys { threads: Record // threadId: previousResponseId diff --git a/packages/shared/src/reminders.ts b/packages/shared/src/reminders.ts index 4d71961..cc88ef0 100644 --- a/packages/shared/src/reminders.ts +++ b/packages/shared/src/reminders.ts @@ -1,6 +1,6 @@ import { DateTime } from "luxon" -import KV from "@/kv" -import { ensure, zone } from "@/utils.ts" +import KV from "./kv" +import { ensure, zone } from "./utils.ts" export type Reminder = { id: string diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json index dd311f4..bfa0fea 100644 --- a/packages/shared/tsconfig.json +++ b/packages/shared/tsconfig.json @@ -24,11 +24,6 @@ // Some stricter flags (disabled by default) "noUnusedLocals": false, "noUnusedParameters": false, - "noPropertyAccessFromIndexSignature": false, - - "baseUrl": ".", - "paths": { - "@/*": ["./src/*"] - } + "noPropertyAccessFromIndexSignature": false } } diff --git a/packages/spike/src/ai.ts b/packages/spike/src/ai.ts index 8381d71..aee0bc9 100644 --- a/packages/spike/src/ai.ts +++ b/packages/spike/src/ai.ts @@ -4,8 +4,8 @@ import { highPersonality, injectPersonality, lowPersonality, -} from "@/instructions" -import { tools } from "@/tools" +} from "./instructions" +import { tools } from "./tools" import { Agent, InputGuardrailTripwireTriggered, run, user, system } from "@openai/agents" import type { AgentInputItem, InputGuardrail } from "@openai/agents-core" import { currentLocalTime } from "@workshop/shared/utils" diff --git a/packages/spike/src/cli/index.ts b/packages/spike/src/cli/index.ts index 3c0cb09..6a5b508 100644 --- a/packages/spike/src/cli/index.ts +++ b/packages/spike/src/cli/index.ts @@ -1,4 +1,4 @@ -import { buildInstructions, shouldReplyInstructions } from "@/instructions" +import { buildInstructions, shouldReplyInstructions } from "../instructions" import { Agent, type AgentInputItem, diff --git a/packages/spike/src/discord/cron.ts b/packages/spike/src/discord/cron.ts index ff8540e..535acb4 100644 --- a/packages/spike/src/discord/cron.ts +++ b/packages/spike/src/discord/cron.ts @@ -1,8 +1,8 @@ import { getPendingReminders, updateReminder } from "@workshop/shared/reminders" import { DateTime } from "luxon" import { Client } from "discord.js" -import { buildInstructions } from "@/instructions" -import { respondToSystemMessage } from "@/ai" +import { buildInstructions } from "../instructions" +import { respondToSystemMessage } from "../ai" import { ensure } from "@workshop/shared/utils" const channelId = process.env.CHANNEL_ID ?? "1382121375619223594" diff --git a/packages/spike/src/discord/events.ts b/packages/spike/src/discord/events.ts index 055dd59..e10ba62 100644 --- a/packages/spike/src/discord/events.ts +++ b/packages/spike/src/discord/events.ts @@ -1,5 +1,5 @@ -import { respondToUserMessage } from "@/ai" -import { storeEvaluation } from "@/eval" +import { respondToUserMessage } from "../ai" +import { storeEvaluation } from "../eval" import { ActivityType, type Client } from "discord.js" export const listenForEvents = (client: Client) => { diff --git a/packages/spike/src/discord/index.ts b/packages/spike/src/discord/index.ts index a9a32b1..bb5fd1d 100644 --- a/packages/spike/src/discord/index.ts +++ b/packages/spike/src/discord/index.ts @@ -1,7 +1,7 @@ import { Client, GatewayIntentBits, Partials } from "discord.js" -import { listenForEvents } from "@/discord/events" -import { runCronJobs } from "@/discord/cron" -import { alertAboutCrashLog, logCrash } from "@/discord/crash" +import { listenForEvents } from "./events" +import { runCronJobs } from "./cron" +import { alertAboutCrashLog, logCrash } from "./crash" const client = new Client({ intents: [ diff --git a/packages/spike/src/instructions.ts b/packages/spike/src/instructions.ts index 3f6191a..753831f 100644 --- a/packages/spike/src/instructions.ts +++ b/packages/spike/src/instructions.ts @@ -1,4 +1,4 @@ -import type { UserContext } from "@/ai" +import type { UserContext } from "./ai" export const buildInstructions = (context: UserContext) => { return ` diff --git a/packages/spike/tsconfig.json b/packages/spike/tsconfig.json index 99c91e3..545396c 100644 --- a/packages/spike/tsconfig.json +++ b/packages/spike/tsconfig.json @@ -25,11 +25,6 @@ // Some stricter flags (disabled by default) "noUnusedLocals": false, "noUnusedParameters": false, - "noPropertyAccessFromIndexSignature": false, - - "baseUrl": ".", - "paths": { - "@/*": ["./src/*"] - } + "noPropertyAccessFromIndexSignature": false } } diff --git a/packages/todo/src/autoTodoOnNewline.ts b/packages/todo/src/autoTodoOnNewline.ts index aa6f528..31ab88f 100644 --- a/packages/todo/src/autoTodoOnNewline.ts +++ b/packages/todo/src/autoTodoOnNewline.ts @@ -1,4 +1,4 @@ -import { checkboxRegex } from "@/todo" +import { checkboxRegex } from "./todo" import { EditorView } from "@codemirror/view" export const autoTodoOnNewline = EditorView.updateListener.of((update) => { diff --git a/packages/todo/src/main.ts b/packages/todo/src/main.ts index f010d96..9129953 100644 --- a/packages/todo/src/main.ts +++ b/packages/todo/src/main.ts @@ -1,3 +1,3 @@ -export { TodoEditor } from "@/todoEditor" -export { Todo, type TodoJSON } from "@/todo" -export { todoListToString, type TodoList } from "@/todoList" +export { TodoEditor } from "./todoEditor" +export { Todo, type TodoJSON } from "./todo" +export { todoListToString, type TodoList } from "./todoList" diff --git a/packages/todo/src/server.tsx b/packages/todo/src/server.tsx index 81e2c21..89b8080 100644 --- a/packages/todo/src/server.tsx +++ b/packages/todo/src/server.tsx @@ -6,8 +6,8 @@ const server = serve({ port: parseInt(process.env.PORT || "3000"), routes: { "/*": (req) => { - const routePath = join(import.meta.dir, "routes") - return nanoRemix(req, { routePath }) + const routesDir = join(import.meta.dir, "routes") + return nanoRemix(req, { routesDir }) }, }, diff --git a/packages/todo/src/todo.test.ts b/packages/todo/src/todo.test.ts index ea08ed3..95632e2 100644 --- a/packages/todo/src/todo.test.ts +++ b/packages/todo/src/todo.test.ts @@ -1,5 +1,5 @@ import { DateTime } from "luxon" -import { Todo } from "@/todo" +import { Todo } from "./todo" import { test, expect } from "bun:test" test("parsing valid todos", () => { diff --git a/packages/todo/src/todoClickHandler.ts b/packages/todo/src/todoClickHandler.ts index c3194d6..5d12d56 100644 --- a/packages/todo/src/todoClickHandler.ts +++ b/packages/todo/src/todoClickHandler.ts @@ -1,5 +1,5 @@ import { EditorView } from "@codemirror/view" -import { Todo } from "@/todo" +import { Todo } from "./todo" import { triggerTodoCompletionEffect } from "./todoCompletion" export const todoClickHandler = EditorView.domEventHandlers({ diff --git a/packages/todo/src/todoCompletion.ts b/packages/todo/src/todoCompletion.ts index 79a8bc0..8d2d8ce 100644 --- a/packages/todo/src/todoCompletion.ts +++ b/packages/todo/src/todoCompletion.ts @@ -1,4 +1,4 @@ -import { completionAnimationEffect } from "@/todoDecorations" +import { completionAnimationEffect } from "./todoDecorations" import { EditorView } from "@codemirror/view" export const triggerTodoCompletionEffect = async (view: EditorView, pos: number) => { diff --git a/packages/todo/src/todoDecorations.ts b/packages/todo/src/todoDecorations.ts index 27f5966..03d73f0 100644 --- a/packages/todo/src/todoDecorations.ts +++ b/packages/todo/src/todoDecorations.ts @@ -1,4 +1,4 @@ -import { Todo } from "@/todo" +import { Todo } from "./todo" import { RangeSetBuilder, StateEffect } from "@codemirror/state" import { EditorView, Decoration, ViewPlugin, ViewUpdate, WidgetType } from "@codemirror/view" import { type RefObject } from "hono/jsx" diff --git a/packages/todo/src/todoEditor.tsx b/packages/todo/src/todoEditor.tsx index ef1d8d1..4707b51 100644 --- a/packages/todo/src/todoEditor.tsx +++ b/packages/todo/src/todoEditor.tsx @@ -3,12 +3,12 @@ import { defaultKeymap, history, historyKeymap } from "@codemirror/commands" import { EditorState } from "@codemirror/state" import { EditorView, lineNumbers, keymap } from "@codemirror/view" import { foldGutter, foldKeymap } from "@codemirror/language" -import { refreshFilterEffect, todoDecorations } from "@/todoDecorations" -import { autoTodoOnNewline } from "@/autoTodoOnNewline" -import { buildKeyBindings, todoKeymap } from "@/todoKeymap" -import { todoClickHandler } from "@/todoClickHandler" -import { dateAutocompletion } from "@/dateAutocompletion" -import { todoTimer } from "@/todoTimer" +import { refreshFilterEffect, todoDecorations } from "./todoDecorations" +import { autoTodoOnNewline } from "./autoTodoOnNewline" +import { buildKeyBindings, todoKeymap } from "./todoKeymap" +import { todoClickHandler } from "./todoClickHandler" +import { dateAutocompletion } from "./dateAutocompletion" +import { todoTimer } from "./todoTimer" import { DateTime } from "luxon" import { searchKeymap } from "@codemirror/search" diff --git a/packages/todo/src/todoKeymap.ts b/packages/todo/src/todoKeymap.ts index 962cfa6..a8723bc 100644 --- a/packages/todo/src/todoKeymap.ts +++ b/packages/todo/src/todoKeymap.ts @@ -2,7 +2,7 @@ import { indentMore, indentLess } from "@codemirror/commands" import { EditorView, keymap, type KeyBinding } from "@codemirror/view" import { Todo } from "./todo" import { type RefObject } from "hono/jsx" -import { parseTodoList, todoListToString } from "@/todoList" +import { parseTodoList, todoListToString } from "./todoList" import { todoTimer } from "./todoTimer" import { triggerTodoCompletionEffect } from "./todoCompletion" import { selectNextOccurrence } from "@codemirror/search" diff --git a/packages/todo/src/todoList.test.ts b/packages/todo/src/todoList.test.ts index 20eee53..773fb75 100644 --- a/packages/todo/src/todoList.test.ts +++ b/packages/todo/src/todoList.test.ts @@ -1,4 +1,4 @@ -import { parseTodoList, todoListToString, type TodoList } from "@/todoList" +import { parseTodoList, todoListToString, type TodoList } from "./todoList" import { test, expect } from "bun:test" test("todoListToString", () => { diff --git a/packages/todo/src/todoList.ts b/packages/todo/src/todoList.ts index fc1bee8..185747e 100644 --- a/packages/todo/src/todoList.ts +++ b/packages/todo/src/todoList.ts @@ -1,4 +1,4 @@ -import { Todo, type TodoJSON } from "@/todo" +import { Todo, type TodoJSON } from "./todo" import { ensure } from "@workshop/shared/utils" type TodoHeader = { diff --git a/packages/todo/src/todoTimer.ts b/packages/todo/src/todoTimer.ts index 71e1ae9..b2a8e29 100644 --- a/packages/todo/src/todoTimer.ts +++ b/packages/todo/src/todoTimer.ts @@ -1,6 +1,6 @@ import { EditorView, ViewPlugin, ViewUpdate, WidgetType, Decoration } from "@codemirror/view" import { RangeSetBuilder } from "@codemirror/state" -import { Todo } from "@/todo" +import { Todo } from "./todo" class CountdownWidget extends WidgetType { duration: number diff --git a/packages/todo/tsconfig.json b/packages/todo/tsconfig.json index 4410a1d..16bb5e0 100644 --- a/packages/todo/tsconfig.json +++ b/packages/todo/tsconfig.json @@ -25,11 +25,6 @@ // Some stricter flags (disabled by default) "noUnusedLocals": false, "noUnusedParameters": false, - "noPropertyAccessFromIndexSignature": false, - - "baseUrl": ".", - "paths": { - "@/*": ["./src/*"] - } + "noPropertyAccessFromIndexSignature": false } } diff --git a/packages/werewolf-ui/src/examples/cards.tsx b/packages/werewolf-ui/src/examples/cards.tsx index 235f30a..061b81a 100644 --- a/packages/werewolf-ui/src/examples/cards.tsx +++ b/packages/werewolf-ui/src/examples/cards.tsx @@ -1,11 +1,11 @@ -import { HStack, VStack } from "@/lib/stack" -import Placeholder from "@/lib/placeholder" -import { Icon, IconLink, IconName } from "@/lib/icon" -import { Button } from "@/lib/button" -import { Input } from "@/lib/input" -import { Select } from "@/lib/select" -import { Grid } from "@/lib/grid" -import { Divider } from "@/lib/divider" +import { HStack, VStack } from "../lib/stack" +import Placeholder from "../lib/placeholder" +import { Icon, IconLink, IconName } from "../lib/icon" +import { Button } from "../lib/button" +import { Input } from "../lib/input" +import { Select } from "../lib/select" +import { Grid } from "../lib/grid" +import { Divider } from "../lib/divider" export const Cards = () => { return ( diff --git a/packages/werewolf-ui/src/lib/grid.tsx b/packages/werewolf-ui/src/lib/grid.tsx index 2048bd3..58cc443 100644 --- a/packages/werewolf-ui/src/lib/grid.tsx +++ b/packages/werewolf-ui/src/lib/grid.tsx @@ -1,4 +1,4 @@ -import { TailwindSize } from "@/types" +import { TailwindSize } from "../types" import "hono/jsx" import { FC, PropsWithChildren } from "hono/jsx" diff --git a/packages/werewolf-ui/src/lib/icon.tsx b/packages/werewolf-ui/src/lib/icon.tsx index 8d5e5e0..57c3f50 100644 --- a/packages/werewolf-ui/src/lib/icon.tsx +++ b/packages/werewolf-ui/src/lib/icon.tsx @@ -1,4 +1,4 @@ -import { TailwindSize } from "@/types" +import { TailwindSize } from "../types" import "hono/jsx" import { FC } from "hono/jsx" import * as icons from "lucide-static" diff --git a/packages/werewolf-ui/src/lib/placeholder.tsx b/packages/werewolf-ui/src/lib/placeholder.tsx index 78be2ab..f67ef18 100644 --- a/packages/werewolf-ui/src/lib/placeholder.tsx +++ b/packages/werewolf-ui/src/lib/placeholder.tsx @@ -1,6 +1,6 @@ import "hono/jsx" -import { Avatar, AvatarProps } from "@/lib/avatar" -import { Image, ImageProps } from "@/lib/image" +import { Avatar, AvatarProps } from "./avatar" +import { Image, ImageProps } from "./image" export const Placeholder = { Avatar(props: PlaceholderAvatarProps) { diff --git a/packages/werewolf-ui/src/lib/stack.tsx b/packages/werewolf-ui/src/lib/stack.tsx index b5aee9b..333eb88 100644 --- a/packages/werewolf-ui/src/lib/stack.tsx +++ b/packages/werewolf-ui/src/lib/stack.tsx @@ -1,4 +1,4 @@ -import { TailwindSize } from "@/types" +import { TailwindSize } from "../types" import "hono/jsx" import { FC, PropsWithChildren } from "hono/jsx" diff --git a/packages/werewolf-ui/src/routes/examples/[example].tsx b/packages/werewolf-ui/src/routes/examples/[example].tsx index 4217242..25e2677 100644 --- a/packages/werewolf-ui/src/routes/examples/[example].tsx +++ b/packages/werewolf-ui/src/routes/examples/[example].tsx @@ -1,6 +1,6 @@ -import { LoaderProps } from "@workshop/nano-remix" -import "@/index.css" -import { Cards } from "@/examples/cards" +import type { LoaderProps } from "@workshop/nano-remix" +import "../../index.css" +import { Cards } from "../../examples/cards" export const loader = async (req: Request) => { const exampleName = req.url.split("/").pop() || "" diff --git a/packages/werewolf-ui/src/routes/index.tsx b/packages/werewolf-ui/src/routes/index.tsx index 9f3595e..d46cc11 100644 --- a/packages/werewolf-ui/src/routes/index.tsx +++ b/packages/werewolf-ui/src/routes/index.tsx @@ -1,8 +1,8 @@ -import { LoaderProps } from "@workshop/nano-remix" +import type { LoaderProps } from "@workshop/nano-remix" import "../index.css" import { readdir } from "node:fs/promises" import { join, basename } from "node:path" -import { VStack } from "@/lib/stack" +import { VStack } from "../lib/stack" export const loader = async (req: Request) => { const examples = await readdir(join(import.meta.dir, "../examples")) diff --git a/packages/werewolf-ui/src/routes/tests/[test].tsx b/packages/werewolf-ui/src/routes/tests/[test].tsx index 8c09168..97ded12 100644 --- a/packages/werewolf-ui/src/routes/tests/[test].tsx +++ b/packages/werewolf-ui/src/routes/tests/[test].tsx @@ -1,15 +1,15 @@ -import { LoaderProps } from "@workshop/nano-remix" -import "@/index.css" -import { Test as AvatarTest } from "@/lib/avatar" -import { Test as DividerTest } from "@/lib/divider" -import { Test as ButtonTest } from "@/lib/button" -import { Test as GridTest } from "@/lib/grid" -import { Test as IconTest } from "@/lib/icon" -import { Test as ImageTest } from "@/lib/image" -import { Test as InputTest } from "@/lib/input" -import { Test as PlaceholderTest } from "@/lib/placeholder" -import { Test as SelectTest } from "@/lib/select" -import { Test as StackTest } from "@/lib/stack" +import type { LoaderProps } from "@workshop/nano-remix" +import "../../index.css" +import { Test as AvatarTest } from "../../lib/avatar" +import { Test as DividerTest } from "../../lib/divider" +import { Test as ButtonTest } from "../../lib/button" +import { Test as GridTest } from "../../lib/grid" +import { Test as IconTest } from "../../lib/icon" +import { Test as ImageTest } from "../../lib/image" +import { Test as InputTest } from "../../lib/input" +import { Test as PlaceholderTest } from "../../lib/placeholder" +import { Test as SelectTest } from "../../lib/select" +import { Test as StackTest } from "../../lib/stack" export const loader = async (req: Request) => { const testName = req.url.split("/").pop() || "" diff --git a/packages/werewolf-ui/src/server.tsx b/packages/werewolf-ui/src/server.tsx index 81e2c21..89b8080 100644 --- a/packages/werewolf-ui/src/server.tsx +++ b/packages/werewolf-ui/src/server.tsx @@ -6,8 +6,8 @@ const server = serve({ port: parseInt(process.env.PORT || "3000"), routes: { "/*": (req) => { - const routePath = join(import.meta.dir, "routes") - return nanoRemix(req, { routePath }) + const routesDir = join(import.meta.dir, "routes") + return nanoRemix(req, { routesDir }) }, }, diff --git a/packages/werewolf-ui/tsconfig.json b/packages/werewolf-ui/tsconfig.json index 4410a1d..16bb5e0 100644 --- a/packages/werewolf-ui/tsconfig.json +++ b/packages/werewolf-ui/tsconfig.json @@ -25,11 +25,6 @@ // Some stricter flags (disabled by default) "noUnusedLocals": false, "noUnusedParameters": false, - "noPropertyAccessFromIndexSignature": false, - - "baseUrl": ".", - "paths": { - "@/*": ["./src/*"] - } + "noPropertyAccessFromIndexSignature": false } }