fix: package export path for tsconfig (RSSNext#1690)

* fix: update package.json paths and enable composite in tsconfig * fix: add tsconfig.tsbuildinfo to .gitignore * fix: enable composite in main * fix: update AppType import path * chore: clean tsup
pengzhang018 · Nov 22, 2024 · 00826ae · 00826ae
1 parent 1353d4b
commit 00826ae
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ vite.config.*.mjs
 
 .generated
 .turbo
+tsconfig.tsbuildinfo
diff --git a/apps/main/package.json b/apps/main/package.json
@@ -11,13 +11,13 @@
   },
   "exports": {
     ".": {
-      "types": "./dist/export.d.ts",
-      "import": "./dist/export.js"
+      "types": "./export.d.ts",
+      "import": "./export.js"
     }
   },
   "main": "./src/index.ts",
   "scripts": {
-    "build": "tsup",
+    "build": "tsc",
     "test": "vitest",
     "typecheck": "tsc --noEmit"
   },

diff --git a/apps/main/src/lib/api-client.ts b/apps/main/src/lib/api-client.ts
@@ -1,9 +1,9 @@
+import type { AppType } from "@follow/shared"
 import { env } from "@follow/shared/env"
 import PKG from "@pkg"
 import { hc } from "hono/client"
 import { ofetch } from "ofetch"
 
-import type { AppType } from "../../../../packages/shared/src/hono"
 import { logger } from "../logger"
 import { getAuthSessionToken, getUser } from "./user"
 

diff --git a/apps/main/tsconfig.json b/apps/main/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "extends": "@electron-toolkit/tsconfig/tsconfig.node.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "dist",
     "types": ["electron-vite/node"],
     "moduleResolution": "Bundler",

diff --git a/apps/main/tsup.config.ts b/apps/main/tsup.config.ts
diff --git a/apps/renderer/tsconfig.json b/apps/renderer/tsconfig.json
@@ -17,5 +17,6 @@
       "@pkg": ["../../package.json"],
       "@locales/*": ["../../locales/*"]
     }
-  }
+  },
+  "references": [{ "path": "../main" }]
 }
diff --git a/package.json b/package.json
@@ -101,7 +101,6 @@
     "tailwindcss": "3.4.14",
     "tailwindcss-animate": "1.0.7",
     "tailwindcss-motion": "0.3.0-beta",
-    "tsup": "8.3.5",
     "tsx": "4.19.2",
     "turbo": "2.2.3",
     "typescript": "5.6.3",

diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
@@ -1 +1,2 @@
 export * from "./constants"
+export type { AppType } from "./hono"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,3 +20,4 @@ vite.config.*.mjs

		.generated
		.turbo
		tsconfig.tsbuildinfo
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export * from "./constants"
		export type { AppType } from "./hono"