Skip to content

Commit 2a2901e

Browse files
authored
Merge pull request #3011 from StarbirdTech/chore/package-cleanup
chore: fix package exports, hoist types, remove stale lockfiles
2 parents 9f7edb5 + abedb6a commit 2a2901e

9 files changed

Lines changed: 75 additions & 7666 deletions

File tree

apps/mobile/modules/sd-mobile-core/package-lock.json

Lines changed: 0 additions & 3638 deletions
This file was deleted.

apps/mobile/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
"@babel/core": "^7.26.0",
6868
"@babel/plugin-transform-runtime": "^7.28.5",
6969
"@babel/runtime": "^7.28.4",
70-
"@types/react": "~19.1.10",
7170
"babel-preset-expo": "~54.0.0",
7271
"eslint": "^9.15.0",
7372
"prettier": "^3.3.3",

core/src/location/manager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ impl LocationManager {
181181
accessed_at: Set(None),
182182
indexed_at: Set(Some(now)), // Record when location root was created
183183
permissions: Set(None),
184-
inode: Set(inode.map(|i: i64| i as i64)), // Use extracted inode
184+
inode: Set(inode.map(|i| i as i64)), // Use extracted inode
185185
parent_id: Set(None), // Location root has no parent
186186
volume_id: Set(Some(volume_id)), // Volume is required for all locations
187187
..Default::default()

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
"typecheck": "bun run --filter @sd/tauri typecheck"
77
},
88
"devDependencies": {
9+
"@types/react": "~19.1.10",
10+
"@types/react-dom": "~19.1.10",
911
"@babel/plugin-syntax-import-assertions": "^7.24.0",
1012
"@cspell/dict-rust": "^4.0.2",
1113
"@cspell/dict-typescript": "^3.1.2",
@@ -30,6 +32,8 @@
3032
"packageManager": "bun@1.3.0",
3133
"overrides": {
3234
"@types/node": ">18.18.x",
35+
"@types/react": "~19.1.10",
36+
"@types/react-dom": "~19.1.10",
3337
"react": "19.1.0",
3438
"react-dom": "19.1.0",
3539
"react-router": "=6.20.1",

packages/assets/package.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,28 @@
66
"name": "@spacedriveapp/assets"
77
},
88
"sideEffects": false,
9+
"types": "./types.d.ts",
10+
"exports": {
11+
"./icons": "./icons/index.ts",
12+
"./icons/*": "./icons/*",
13+
"./images": "./images/index.ts",
14+
"./images/*": "./images/*",
15+
"./svgs/*": "./svgs/*",
16+
"./sounds": "./sounds/index.ts",
17+
"./sounds/*": "./sounds/*",
18+
"./videos/*": "./videos/*",
19+
"./lottie/*": "./lottie/*",
20+
"./util": "./util/index.ts"
21+
},
922
"files": [
1023
"icons",
1124
"images",
1225
"lottie",
1326
"sounds",
1427
"svgs",
1528
"videos",
16-
"util"
29+
"util",
30+
"types.d.ts"
1731
],
1832
"scripts": {
1933
"gen": "node ./scripts/generate.mjs"

packages/assets/types.d.ts

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// Type declarations for @sd/assets
2+
3+
declare module "@sd/assets/icons/*.png" {
4+
const value: number; // React Native uses numeric IDs for local images
5+
export default value;
6+
}
7+
8+
declare module "@sd/assets/icons/*.jpg" {
9+
const value: number;
10+
export default value;
11+
}
12+
13+
declare module "@sd/assets/images/*.png" {
14+
const value: number;
15+
export default value;
16+
}
17+
18+
declare module "@sd/assets/images/*.jpg" {
19+
const value: number;
20+
export default value;
21+
}
22+
23+
declare module "@sd/assets/svgs/*.svg" {
24+
import type { FC, SVGProps } from "react";
25+
const content: FC<SVGProps<SVGSVGElement>>;
26+
export default content;
27+
}
28+
29+
declare module "@sd/assets/videos/*.mp4" {
30+
const value: number;
31+
export default value;
32+
}
33+
34+
declare module "@sd/assets/sounds/*.mp3" {
35+
const value: string;
36+
export default value;
37+
}
38+
39+
declare module "@sd/assets/lottie/*.json" {
40+
const value: object;
41+
export default value;
42+
}

0 commit comments

Comments
 (0)