fix: imports in commerce website server

Yokaito · Nov 22, 2023 · 229429c · 229429c
1 parent 477a246
commit 229429c
Show file tree

Hide file tree

Showing 8 changed files with 2,554 additions and 6,289 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -13,6 +13,7 @@
   ],
   "cSpell.words": [
     "healthcheck",
+    "quixer",
     "Quixer",
     "shopify",
     "superjson",

diff --git a/apps/commerce/next.config.js b/apps/commerce/next.config.js
@@ -4,7 +4,7 @@ const nextConfig = {
     ppr: true
   },
   reactStrictMode: true,
-  transpilePackages: ['ui', 'server'],
+  transpilePackages: ['ui', '@quixer/server'],
   images: {
     formats: ['image/avif', 'image/webp'],
     remotePatterns: [

diff --git a/apps/commerce/package.json b/apps/commerce/package.json
@@ -35,7 +35,7 @@
     "next": "14.0.3-canary.9",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "server": "workspace:*",
+    "@quixer/server": "workspace:*",
     "server-only": "^0.0.1",
     "superjson": "^2.2.1",
     "tailwind-merge": "^2.0.0",

diff --git a/apps/commerce/src/app/api/trpc/[trpc]/route.ts b/apps/commerce/src/app/api/trpc/[trpc]/route.ts
@@ -1,7 +1,7 @@
 import env from '@/sdk/env';
+import { appRouter, createTRPCContext, integrations } from '@quixer/server';
 import { fetchRequestHandler } from '@trpc/server/adapters/fetch';
 import { type NextRequest } from 'next/server';
-import { appRouter, createTRPCContext, integrations } from 'server';
 
 const handler = (req: NextRequest) =>
   fetchRequestHandler({

diff --git a/apps/commerce/src/sdk/lib/trpc/react.tsx b/apps/commerce/src/sdk/lib/trpc/react.tsx
@@ -6,7 +6,7 @@ import { loggerLink, unstable_httpBatchStreamLink } from '@trpc/client';
 import { createTRPCReact } from '@trpc/react-query';
 import { useMemo } from 'react';
 
-import { type AppRouter } from 'server';
+import { type AppRouter } from '@quixer/server';
 import { getUrl, transformer } from './shared';
 
 export const api = createTRPCReact<AppRouter>();

diff --git a/apps/commerce/src/sdk/lib/trpc/server.ts b/apps/commerce/src/sdk/lib/trpc/server.ts
@@ -1,8 +1,8 @@
 import 'server-only'; // Make sure you can't import this on client
 
 import env from '@/sdk/env';
+import { appRouter, createTRPCContext, integrations } from '@quixer/server';
 import { headers } from 'next/headers';
-import { appRouter, createTRPCContext, integrations } from 'server';
 
 type Caller = ReturnType<typeof appRouter.createCaller>;
 

diff --git a/apps/commerce/src/sdk/lib/trpc/shared.ts b/apps/commerce/src/sdk/lib/trpc/shared.ts
@@ -1,7 +1,7 @@
 import { type inferRouterInputs, type inferRouterOutputs } from '@trpc/server';
 import superjson from 'superjson';
 
-import { type AppRouter } from 'server';
+import { type AppRouter } from '@quixer/server';
 
 export const transformer = superjson;