wip

trakt · Feb 12, 2025 · 61e2978 · 61e2978
1 parent 4d17b41
commit 61e2978
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/projects/client/src/lib/features/gateway/handle.ts b/projects/client/src/lib/features/gateway/handle.ts
@@ -4,9 +4,9 @@ import type { Handle } from '@sveltejs/kit';
 export const handle: Handle = async ({ event, resolve }) => {
   const url = new URL(event.request.url);
 
-  if (url.pathname.startsWith(ClientEnvironment.svelte)) {
+  if (url.pathname.startsWith(ClientEnvironment.legacy)) {
     const traktUrl = new URL(
-      url.pathname.replace(ClientEnvironment.svelte, ''),
+      url.pathname.replace(ClientEnvironment.legacy, ''),
       TRAKT_TARGET_ENVIRONMENT,
     );
 

diff --git a/projects/client/src/lib/requests/ClientEnvironment.ts b/projects/client/src/lib/requests/ClientEnvironment.ts
@@ -1,4 +1,5 @@
 export enum ClientEnvironment {
-  svelte = '/_api/trakt',
+  legacy = '/_api/trakt',
+  svelte = '/api/trakt',
   test = 'http://localhost',
 }
diff --git a/projects/client/src/lib/requests/api.ts b/projects/client/src/lib/requests/api.ts
@@ -1,22 +1,22 @@
 import { createAuthenticatedFetch } from '$lib/requests/_internal/createAuthenticatedFetch.ts';
-import { IS_TEST } from '$lib/utils/env/index.ts';
+import { ClientEnvironment } from '$lib/requests/ClientEnvironment.ts';
+import { IS_DEV, IS_PREVIEW, IS_TEST } from '$lib/utils/env/index.ts';
 import { traktApi, type TraktApiOptions } from '@trakt/api';
 
 export type ApiParams = Omit<TraktApiOptions, 'apiKey' | 'environment'> & {
   environment?: HttpsUrl;
 };
 
-enum ClientEnvironment {
-  svelte = '/_api/trakt',
-  test = 'http://localhost',
-}
-
 const ENV = (() => {
+  if (IS_DEV || IS_PREVIEW) {
+    return ClientEnvironment.svelte as unknown as HttpsUrl;
+  }
+
   if (IS_TEST) {
     return ClientEnvironment.test as unknown as HttpsUrl;
   }
 
-  return ClientEnvironment.svelte as unknown as HttpsUrl;
+  return TRAKT_TARGET_ENVIRONMENT as unknown as HttpsUrl;
 })();
 
 export const api = ({

diff --git a/projects/client/vite.config.ts b/projects/client/vite.config.ts
@@ -51,10 +51,10 @@ export default defineConfig(({ mode }) => ({
       allow: [MONOREPO_ROOT],
     },
     proxy: {
-      '/_api': {
+      '/api/trakt': {
         target: TRAKT_TARGET_ENVIRONMENT,
         changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/_api\/trakt/, ''),
+        rewrite: (path) => path.replace(/^\/api\/trakt/, ''),
       },
     },
   },