Merge pull request #3011 from StarbirdTech/chore/package-cleanup

chore: fix package exports, hoist types, remove stale lockfiles

apps/mobile/package.json

@@ -67,7 +67,6 @@
     "@babel/core": "^7.26.0",
     "@babel/plugin-transform-runtime": "^7.28.5",
     "@babel/runtime": "^7.28.4",
-    "@types/react": "~19.1.10",
     "babel-preset-expo": "~54.0.0",
     "eslint": "^9.15.0",
     "prettier": "^3.3.3",

core/src/location/manager.rs

@@ -181,7 +181,7 @@ impl LocationManager {
 			accessed_at: Set(None),
 			indexed_at: Set(Some(now)), // Record when location root was created
 			permissions: Set(None),
-			inode: Set(inode.map(|i: i64| i as i64)), // Use extracted inode
+			inode: Set(inode.map(|i| i as i64)), // Use extracted inode
 			parent_id: Set(None),                     // Location root has no parent
 			volume_id: Set(Some(volume_id)),          // Volume is required for all locations
 			..Default::default()

package.json

@@ -6,6 +6,8 @@
     "typecheck": "bun run --filter @sd/tauri typecheck"
   },
   "devDependencies": {
+    "@types/react": "~19.1.10",
+    "@types/react-dom": "~19.1.10",
     "@babel/plugin-syntax-import-assertions": "^7.24.0",
     "@cspell/dict-rust": "^4.0.2",
     "@cspell/dict-typescript": "^3.1.2",
@@ -30,6 +32,8 @@
   "packageManager": "bun@1.3.0",
   "overrides": {
     "@types/node": ">18.18.x",
+    "@types/react": "~19.1.10",
+    "@types/react-dom": "~19.1.10",
     "react": "19.1.0",
     "react-dom": "19.1.0",
     "react-router": "=6.20.1",

packages/assets/package.json

@@ -6,6 +6,19 @@
 		"name": "@spacedriveapp/assets"
 	},
 	"sideEffects": false,
+	"types": "./types.d.ts",
+	"exports": {
+		"./icons": "./icons/index.ts",
+		"./icons/*": "./icons/*",
+		"./images": "./images/index.ts",
+		"./images/*": "./images/*",
+		"./svgs/*": "./svgs/*",
+		"./sounds": "./sounds/index.ts",
+		"./sounds/*": "./sounds/*",
+		"./videos/*": "./videos/*",
+		"./lottie/*": "./lottie/*",
+		"./util": "./util/index.ts"
+	},
 	"files": [
 		"icons",
 		"images",
@@ -13,7 +26,8 @@
 		"sounds",
 		"svgs",
 		"videos",
-		"util"
+		"util",
+		"types.d.ts"
 	],
 	"scripts": {
 		"gen": "node ./scripts/generate.mjs"

packages/assets/types.d.ts

@@ -0,0 +1,42 @@
+// Type declarations for @sd/assets
+
+declare module "@sd/assets/icons/*.png" {
+	const value: number; // React Native uses numeric IDs for local images
+	export default value;
+}
+
+declare module "@sd/assets/icons/*.jpg" {
+	const value: number;
+	export default value;
+}
+
+declare module "@sd/assets/images/*.png" {
+	const value: number;
+	export default value;
+}
+
+declare module "@sd/assets/images/*.jpg" {
+	const value: number;
+	export default value;
+}
+
+declare module "@sd/assets/svgs/*.svg" {
+	import type { FC, SVGProps } from "react";
+	const content: FC<SVGProps<SVGSVGElement>>;
+	export default content;
+}
+
+declare module "@sd/assets/videos/*.mp4" {
+	const value: number;
+	export default value;
+}
+
+declare module "@sd/assets/sounds/*.mp3" {
+	const value: string;
+	export default value;
+}
+
+declare module "@sd/assets/lottie/*.json" {
+	const value: object;
+	export default value;
+}

packages/ts-client/package.json

@@ -13,9 +13,21 @@
 			"types": "./src/generated/types.ts",
 			"default": "./src/generated/types.ts"
 		},
+		"./src/generated/types": {
+			"types": "./src/generated/types.ts",
+			"default": "./src/generated/types.ts"
+		},
 		"./hooks": {
 			"types": "./src/hooks/index.ts",
 			"default": "./src/hooks/index.ts"
+		},
+		"./src/hooks/useClient": {
+			"types": "./src/hooks/useClient.tsx",
+			"default": "./src/hooks/useClient.tsx"
+		},
+		"./src/hooks/useNormalizedQuery": {
+			"types": "./src/hooks/useNormalizedQuery.ts",
+			"default": "./src/hooks/useNormalizedQuery.ts"
 		}
 	},
 	"scripts": {
@@ -46,12 +58,10 @@
 	},
 	"devDependencies": {
 		"@happy-dom/global-registrator": "^15.11.0",
-		"@tanstack/react-query": "^5.62.0",
 		"@testing-library/jest-dom": "^6.0.0",
 		"@testing-library/react": "^16.0.0",
 		"@types/jest": "^29.0.0",
 		"@types/node": "^20.0.0",
-		"@types/react": "^19.0.0",
 		"happy-dom": "^15.11.0",
 		"jest": "^29.0.0",
 		"jest-environment-jsdom": "^29.0.0",
@@ -64,8 +74,6 @@
 		"@sd/assets": "workspace:*",
 		"ws": "^8.0.0",
 		"zustand": "^5.0.8",
-		"react": "^19.0.0",
-		"@tanstack/react-query": "^5.62.0",
 		"ts-deepmerge": "^7.0.1",
 		"tiny-invariant": "^1.3.3",
 		"valibot": "^1.0.0",
@@ -75,4 +83,4 @@
 		"dist/**/*",
 		"src/**/*"
 	]
-}
+}