From fa1f8164e121508f40889edf622b0734f047714a Mon Sep 17 00:00:00 2001
From: Tony Xiao <tonyx.ca@gmail.com>
Date: Sun, 26 Nov 2023 15:44:36 -0800
Subject: [PATCH] chore: switching to the same pattern with connect

---
 apps/web/app/connect/callback/CallbackEffect.tsx | 3 +--
 apps/web/tsconfig.json                           | 7 +------
 kits/connect/index.ts                            | 3 +++
 tsconfig.json                                    | 7 +------
 4 files changed, 6 insertions(+), 14 deletions(-)
 create mode 100644 kits/connect/index.ts

diff --git a/apps/web/app/connect/callback/CallbackEffect.tsx b/apps/web/app/connect/callback/CallbackEffect.tsx
index 43575c76..b63f9365 100644
--- a/apps/web/app/connect/callback/CallbackEffect.tsx
+++ b/apps/web/app/connect/callback/CallbackEffect.tsx
@@ -2,8 +2,7 @@
 
 import {Loader2} from 'lucide-react'
 import React from 'react'
-
-import type {FrameMessage} from '@usevenice/connect/common'
+import type {FrameMessage} from '@usevenice/connect'
 
 export function CallbackEffect(props: {
   msg: FrameMessage | null
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
index 347b92f2..6f83a739 100644
--- a/apps/web/tsconfig.json
+++ b/apps/web/tsconfig.json
@@ -15,12 +15,7 @@
     "jsx": "preserve",
     "strictNullChecks": true,
     "plugins": [{"name": "next"}],
-    "paths": {
-      "@/*": ["./*"],
-      // Override because we don't want to use ./dist unnecessarily
-      "@usevenice/connect": ["../../kits/connect/src/index.ts"],
-      "@usevenice/connect/*": ["../../kits/connect/src/*"]
-    }
+    "paths": {"@/*": ["./*"]}
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
   "exclude": ["node_modules"]
diff --git a/kits/connect/index.ts b/kits/connect/index.ts
new file mode 100644
index 00000000..5240d4cb
--- /dev/null
+++ b/kits/connect/index.ts
@@ -0,0 +1,3 @@
+// Do not but any other logic in this file, which is only used to re-export from
+// src/index so that vscode jump to definition works inside the monorepo
+export * from './src/index'
diff --git a/tsconfig.json b/tsconfig.json
index d4734ed1..6dde5f1e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -19,12 +19,7 @@
     // In practice no module outside apps/web should use the `@/` alias ever
     // In addition to opening the door to invalid imports this also prevents us
     // from two separate next.js apps in the same monorepo which might be relevant for future
-    "paths": {
-      "@/*": ["./apps/web/*"],
-      // Override because we don't want to use ./dist unnecessarily
-      "@usevenice/connect": ["./kits/connect/src/index.ts"],
-      "@usevenice/connect/*": ["./kits/connect/src/*"]
-    }
+    "paths": {"@/*": ["./apps/web/*"]}
   },
   "include": ["env.d.ts", "**/*.ts", "**/*.tsx"],
   "exclude": ["node_modules"]