From 62cca00a16f416c8f5760be4310b2189257ecd9f Mon Sep 17 00:00:00 2001 From: Bailey Townsend Date: Sun, 2 Aug 2026 13:29:39 -0500 Subject: [PATCH] Added a vite alias --- excalidraw-app/app/oauth-client-metadata.json/route.ts | 4 ++-- excalidraw-app/app/proxy.ts | 6 +++--- excalidraw-app/app/s/[did]/[rkey]/og/[cid].png/route.tsx | 8 ++++---- excalidraw-app/app/s/[did]/[rkey]/page.tsx | 8 ++++---- excalidraw-app/data/atproto/client.ts | 2 +- excalidraw-app/tests/atproto.test.ts | 2 +- excalidraw-app/tests/csp.test.ts | 2 +- excalidraw-app/tests/oauthMetadata.test.ts | 2 +- excalidraw-app/tests/rateLimit.test.ts | 2 +- excalidraw-app/tests/sanitize-name.test.ts | 2 +- excalidraw-app/vite.config.ts | 4 ++++ tsconfig.json | 1 + vitest.config.mts | 4 ++++ 13 files changed, 28 insertions(+), 19 deletions(-) diff --git a/excalidraw-app/app/oauth-client-metadata.json/route.ts b/excalidraw-app/app/oauth-client-metadata.json/route.ts index d87bfe76..8147132a 100644 --- a/excalidraw-app/app/oauth-client-metadata.json/route.ts +++ b/excalidraw-app/app/oauth-client-metadata.json/route.ts @@ -12,8 +12,8 @@ * BrowserOAuthClient same-origin at page load. */ -import { publicOrigin } from "../../lib/config"; -import { buildClientMetadata } from "../../lib/oauth-metadata"; +import { publicOrigin } from "~/lib/config"; +import { buildClientMetadata } from "~/lib/oauth-metadata"; const body = JSON.stringify(buildClientMetadata(publicOrigin)); diff --git a/excalidraw-app/app/proxy.ts b/excalidraw-app/app/proxy.ts index 01702898..fe002faa 100644 --- a/excalidraw-app/app/proxy.ts +++ b/excalidraw-app/app/proxy.ts @@ -14,9 +14,9 @@ import { randomBytes } from "node:crypto"; -import { buildCsp, createNonceInjector } from "../lib/csp"; -import { publicOrigin } from "../lib/config"; -import { clientKeyFromHeaders, createRateLimiter } from "../lib/rate-limit"; +import { buildCsp, createNonceInjector } from "~/lib/csp"; +import { publicOrigin } from "~/lib/config"; +import { clientKeyFromHeaders, createRateLimiter } from "~/lib/rate-limit"; const allowShareRoute = createRateLimiter({ ratePerSecond: 10, burst: 20 }); diff --git a/excalidraw-app/app/s/[did]/[rkey]/og/[cid].png/route.tsx b/excalidraw-app/app/s/[did]/[rkey]/og/[cid].png/route.tsx index 91b59abb..ab8cf1df 100644 --- a/excalidraw-app/app/s/[did]/[rkey]/og/[cid].png/route.tsx +++ b/excalidraw-app/app/s/[did]/[rkey]/og/[cid].png/route.tsx @@ -17,10 +17,10 @@ import { assertValidSceneRef, fetchThumb, lookupScene, -} from "../../../../../../lib/atproto"; -import { publicOrigin } from "../../../../../../lib/config"; -import { renderCard } from "../../../../../../lib/og-card"; -import { sanitizeName } from "../../../../../../lib/sanitize-name"; +} from "~/lib/atproto"; +import { publicOrigin } from "~/lib/config"; +import { renderCard } from "~/lib/og-card"; +import { sanitizeName } from "~/lib/sanitize-name"; import { SEGMENT_PATH } from "./$segment"; diff --git a/excalidraw-app/app/s/[did]/[rkey]/page.tsx b/excalidraw-app/app/s/[did]/[rkey]/page.tsx index 077d9586..7e7c1e9b 100644 --- a/excalidraw-app/app/s/[did]/[rkey]/page.tsx +++ b/excalidraw-app/app/s/[did]/[rkey]/page.tsx @@ -11,9 +11,9 @@ import { getSegmentParams } from "@timber-js/app/server"; import ExcalidrawClient from "../../../excalidraw-client"; -import { assertValidSceneRef, lookupScene } from "../../../../lib/atproto"; -import { publicOrigin } from "../../../../lib/config"; -import { sanitizeName } from "../../../../lib/sanitize-name"; +import { assertValidSceneRef, lookupScene } from "~/lib/atproto"; +import { publicOrigin } from "~/lib/config"; +import { sanitizeName } from "~/lib/sanitize-name"; import { SEGMENT_PATH } from "./$segment"; @@ -23,7 +23,7 @@ import type { Metadata } from "@timber-js/app/server"; const LOOKUP_TIMEOUT_MS = 5_000; /** The card's fixed dimensions — keep in sync with OG_WIDTH/OG_HEIGHT in - * ../../../../lib/og-card.tsx (not imported so this route never pulls the + * ~/lib/og-card.tsx (not imported so this route never pulls the * image renderer and its native binding into its module graph). */ const OG_IMAGE_WIDTH = 1200; const OG_IMAGE_HEIGHT = 630; diff --git a/excalidraw-app/data/atproto/client.ts b/excalidraw-app/data/atproto/client.ts index b6c9faec..f3b07a50 100644 --- a/excalidraw-app/data/atproto/client.ts +++ b/excalidraw-app/data/atproto/client.ts @@ -7,7 +7,7 @@ import { extractAtprotoData, } from "@atproto/oauth-client-browser"; -import { CLIENT_METADATA_PATH, OAUTH_SCOPE } from "../../lib/oauth-metadata"; +import { CLIENT_METADATA_PATH, OAUTH_SCOPE } from "~/lib/oauth-metadata"; import { SIGNUP_PDS } from "./constants"; diff --git a/excalidraw-app/tests/atproto.test.ts b/excalidraw-app/tests/atproto.test.ts index 23e73fc2..2d0d0b06 100644 --- a/excalidraw-app/tests/atproto.test.ts +++ b/excalidraw-app/tests/atproto.test.ts @@ -7,7 +7,7 @@ import { fetchThumb, lookupScene, MalformedSceneRefError, -} from "../lib/atproto.ts"; +} from "~/lib/atproto.ts"; const DID = "did:plc:u5ic7w2ejzeejxwxwy2meen2"; const HANDLE = "giskard.selfhosted.social"; diff --git a/excalidraw-app/tests/csp.test.ts b/excalidraw-app/tests/csp.test.ts index 66c76213..5d792b29 100644 --- a/excalidraw-app/tests/csp.test.ts +++ b/excalidraw-app/tests/csp.test.ts @@ -2,7 +2,7 @@ import assert from "node:assert/strict"; import { test } from "vitest"; -import { buildCsp, createNonceInjector } from "../lib/csp"; +import { buildCsp, createNonceInjector } from "~/lib/csp"; const NONCE = "TESTNONCE+abc123=="; diff --git a/excalidraw-app/tests/oauthMetadata.test.ts b/excalidraw-app/tests/oauthMetadata.test.ts index 69f75e3a..a8402ab2 100644 --- a/excalidraw-app/tests/oauthMetadata.test.ts +++ b/excalidraw-app/tests/oauthMetadata.test.ts @@ -6,7 +6,7 @@ import { buildClientMetadata, CLIENT_METADATA_PATH, OAUTH_SCOPE, -} from "../lib/oauth-metadata.ts"; +} from "~/lib/oauth-metadata.ts"; const PROD = "https://lexidraw.app"; const DEV = "https://dev.lexidraw.app"; diff --git a/excalidraw-app/tests/rateLimit.test.ts b/excalidraw-app/tests/rateLimit.test.ts index e1fc5b1b..72f6d9f8 100644 --- a/excalidraw-app/tests/rateLimit.test.ts +++ b/excalidraw-app/tests/rateLimit.test.ts @@ -2,7 +2,7 @@ import assert from "node:assert/strict"; import { afterEach, beforeEach, test, vi } from "vitest"; -import { clientKeyFromHeaders, createRateLimiter } from "../lib/rate-limit"; +import { clientKeyFromHeaders, createRateLimiter } from "~/lib/rate-limit"; beforeEach(() => { vi.useFakeTimers(); diff --git a/excalidraw-app/tests/sanitize-name.test.ts b/excalidraw-app/tests/sanitize-name.test.ts index 18df4315..0dca16ec 100644 --- a/excalidraw-app/tests/sanitize-name.test.ts +++ b/excalidraw-app/tests/sanitize-name.test.ts @@ -2,7 +2,7 @@ import assert from "node:assert/strict"; import { test } from "vitest"; -import { sanitizeName } from "../lib/sanitize-name.ts"; +import { sanitizeName } from "~/lib/sanitize-name.ts"; test("sanitizeName", () => { const cases: [string, string][] = [ diff --git a/excalidraw-app/vite.config.ts b/excalidraw-app/vite.config.ts index 66c4ab2c..d67bd392 100644 --- a/excalidraw-app/vite.config.ts +++ b/excalidraw-app/vite.config.ts @@ -89,6 +89,10 @@ export default defineConfig(({ mode }) => { // jotai so editor and app share stores. dedupe: ["react", "react-dom", "jotai"], alias: [ + { + find: /^~\/(.*?)/, + replacement: `${appRoot}/$1`, + }, { find: /^@excalidraw\/common$/, replacement: pkg("common/src/index.ts"), diff --git a/tsconfig.json b/tsconfig.json index 252566df..e0b12365 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -25,6 +25,7 @@ "jsx": "react-jsx", "baseUrl": ".", "paths": { + "~/*": ["./excalidraw-app/*"], "@excalidraw/common": ["./packages/common/src/index.ts"], "@excalidraw/common/*": ["./packages/common/src/*"], "@excalidraw/excalidraw": ["./packages/excalidraw/index.tsx"], diff --git a/vitest.config.mts b/vitest.config.mts index eb4031d2..e5ae74b5 100644 --- a/vitest.config.mts +++ b/vitest.config.mts @@ -5,6 +5,10 @@ import { defineConfig } from "vitest/config"; export default defineConfig({ resolve: { alias: [ + { + find: /^~\/(.*?)/, + replacement: path.resolve(__dirname, "./excalidraw-app/$1"), + }, { find: /^@excalidraw\/common$/, replacement: path.resolve(__dirname, "./packages/common/src/index.ts"), -- 2.51.2