diff --git a/src/lib/server/address.ts b/src/lib/server/address.ts index bd01336..a62bd18 100644 --- a/src/lib/server/address.ts +++ b/src/lib/server/address.ts @@ -1,4 +1,4 @@ -import * as addresses from '../../../sdk/addresses' +import * as addresses from '$sdk/addresses' export async function getAddresses( env: App.Platform['env'], diff --git a/src/lib/server/routing.ts b/src/lib/server/routing.ts index 9f16a38..572f8f9 100644 --- a/src/lib/server/routing.ts +++ b/src/lib/server/routing.ts @@ -1,4 +1,4 @@ -import * as routing from '../../../sdk/routing' +import * as routing from '$sdk/routing' export async function getRoutingZones( zones: Zone[] | Promise, diff --git a/src/lib/server/rule.ts b/src/lib/server/rule.ts index ebacf4b..584e80a 100644 --- a/src/lib/server/rule.ts +++ b/src/lib/server/rule.ts @@ -1,4 +1,4 @@ -import * as rules from '../../../sdk/rules' +import * as rules from '$sdk/rules' export async function getRules( zones: Zone[] | Promise, diff --git a/src/lib/server/zone.ts b/src/lib/server/zone.ts index 2de3486..5ca39f8 100644 --- a/src/lib/server/zone.ts +++ b/src/lib/server/zone.ts @@ -1,4 +1,4 @@ -import * as zones from '../../../sdk/zones' +import * as zones from '$sdk/zones' export async function getZones(env: App.Platform['env']): Promise> { return zones.list(env) diff --git a/tsconfig.json b/tsconfig.json index 6ae0c8c..c810adf 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,17 +1,24 @@ { - "extends": "./.svelte-kit/tsconfig.json", - "compilerOptions": { - "allowJs": true, - "checkJs": true, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "resolveJsonModule": true, - "skipLibCheck": true, - "sourceMap": true, - "strict": true - } - // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias - // - // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes - // from the referenced tsconfig.json - TypeScript does not merge them in + "extends": "./.svelte-kit/tsconfig.json", + "compilerOptions": { + "allowJs": true, + "checkJs": true, + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "sourceMap": true, + "strict": true, + "paths": { + "$lib": ["./src/lib"], + "$lib/*": ["./src/lib/*"], + "$sdk": ["./sdk"], + "$sdk/*": ["./sdk/*"] + }, + "rootDirs": [".", "./.svelte-kit/types", "./workers"] + } + // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias + // + // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes + // from the referenced tsconfig.json - TypeScript does not merge them in } diff --git a/workers/email.ts b/workers/email.ts index f5b1f94..26cc498 100644 --- a/workers/email.ts +++ b/workers/email.ts @@ -1,6 +1,6 @@ import { Toucan } from 'toucan-js' -import { list as listRules } from 'sdk/rules' +import { list as listRules } from '../sdk/rules' export const email = async ( message: EmailMessage, diff --git a/workers/fetch.ts b/workers/fetch.ts deleted file mode 100644 index 722e372..0000000 --- a/workers/fetch.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { - createRequestHandler, - handleAsset, -} from '@remix-run/cloudflare-workers' -import * as build from '@remix-run/dev/server-build' -import { Toucan } from 'toucan-js' -import { RewriteFrames } from '@sentry/integrations' - -// @ts-ignore -import manifestJSON from '__STATIC_CONTENT_MANIFEST' - -const handleRequest = createRequestHandler({ - build, - getLoadContext: (context) => ({ - ...context.env, - cf: (context.request as any).cf as IncomingRequestCfProperties | undefined, - }), - mode: process.env.NODE_ENV, -}) - -export const fetch = async ( - request: Request, - env: Env, - context: ExecutionContext, -): Promise => { - const sentry = new Toucan({ - dsn: env.SENTRY_DSN, - context, - request, - integrations: [new RewriteFrames({ root: '/' })], - }) - sentry.configureScope((scope) => scope.setExtras(env)) - const event: FetchEvent = { - env, - params: {}, - request, - waitUntil: context.waitUntil, - next: () => { - throw new Error('next() called in Worker') - }, - functionPath: '', - data: undefined, - } - try { - const response = await handleAsset( - event, - build, - env.__STATIC_CONTENT - ? { - ASSET_NAMESPACE: env.__STATIC_CONTENT, - ASSET_MANIFEST: env.__STATIC_CONTENT_MANIFEST || manifestJSON, - } - : undefined, - ) - - if (!response) { - return handleRequest(event) - } - - return response - } catch (err: any) { - sentry.captureException(err) - - return new Response(err.message || err.toString(), { - status: 500, - }) - return new Response('Something went wrong! Team has been notified.', { - status: 500, - }) - } -} diff --git a/workers/scheduled.ts b/workers/scheduled.ts index e3847e8..9968dc4 100644 --- a/workers/scheduled.ts +++ b/workers/scheduled.ts @@ -1,7 +1,7 @@ import { Toucan } from 'toucan-js' -import * as rulesApi from 'sdk/rules' -import * as zonesApi from 'sdk/zones' +import * as rulesApi from '../sdk/rules' +import * as zonesApi from '../sdk/zones' function shouldAct(date: Date | string | undefined): Boolean { return Boolean(date && new Date(date) <= new Date())