Move global type declarations to types package

solomonhawk · Oct 26, 2024 · a65bdc8 · a65bdc8
1 parent 379a16e
commit a65bdc8
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 2 deletions.
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -19,6 +19,7 @@
     "@manifold/lib": "*",
     "@manifold/router": "*",
     "@manifold/tailwind-config": "*",
+    "@manifold/types": "^0.0.0",
     "@manifold/ui": "*",
     "@manifold/validators": "*",
     "@radix-ui/react-icons": "^1.3.0",

diff --git a/apps/web/src/main.tsx b/apps/web/src/main.tsx
@@ -1,3 +1,4 @@
+import "@manifold/types";
 import "@manifold/ui/globals.css";
 
 import { StrictMode } from "react";

diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
@@ -2,7 +2,6 @@
   "extends": "@manifold/typescript-config/vite.json",
   "include": [
     "src",
-    "../../packages/auth/src/auth.d.ts",
     // Sometimes this is needed for UI auto-imports to work but not always???
     "../../packages/ui/**/*.tsx"
   ],

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/types/README.md b/packages/types/README.md
@@ -0,0 +1 @@
+# `@manifold/types`
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@manifold/types",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "types": "./src/index.d.ts",
+  "exports": {
+    ".": "./src/index.d.ts",
+    "./react": "./src/react.d.ts",
+    "./auth": "./src/auth.d.ts"
+  },
+  "dependencies": {
+    "@auth/core": "^0.37.2"
+  }
+}
diff --git a/packages/auth/src/auth.d.ts → packages/types/src/auth.d.ts b/packages/auth/src/auth.d.ts → packages/types/src/auth.d.ts
@@ -1,6 +1,6 @@
 import type { DefaultSession } from "@auth/core/types";
 
-declare module "@auth/core/types" {
+export declare module "@auth/core/types" {
   interface Session {
     user: {
       id: string;

diff --git a/packages/types/src/index.d.ts b/packages/types/src/index.d.ts
@@ -0,0 +1,2 @@
+export * from "./auth.d.ts";
+export * from "./react.d.ts";
diff --git a/packages/types/src/react.d.ts b/packages/types/src/react.d.ts
@@ -0,0 +1,6 @@
+export declare module "react" {
+  // allow CSS custom properties
+  interface CSSProperties {
+    [varName: `--${string}`]: string | number | undefined;
+  }
+}
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -34,6 +34,7 @@
   "dependencies": {
     "@floating-ui/react": "^0.26.25",
     "@hookform/resolvers": "^3.9.0",
+    "@manifold/types": "*",
     "@manifold/validators": "*",
     "@radix-ui/react-avatar": "^1.1.1",
     "@radix-ui/react-checkbox": "^1.1.2",

diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts
@@ -0,0 +1 @@
+import "@manifold/types/react";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export * from "./auth.d.ts";
		export * from "./react.d.ts";