put mobile in pnpm workspace

.npmrc

@@ -0,0 +1 @@
+node-linker=hoisted

apps/mobile/.npmrc

@@ -1,3 +1,3 @@
 strict-peer-dependencies = false
 ignore-workspace-root-check = true
-shamefully-hoist = true
+; shamefully-hoist = true

apps/mobile/ios/Podfile.lock

@@ -9,11 +9,11 @@ PODS:
     - ExpoModulesCore
   - EXFont (10.2.1):
     - ExpoModulesCore
-  - Expo (46.0.15):
+  - Expo (46.0.16):
     - ExpoModulesCore
   - ExpoKeepAwake (10.2.0):
     - ExpoModulesCore
-  - ExpoModulesCore (0.11.7):
+  - ExpoModulesCore (0.11.8):
     - React-Core
     - ReactCommon/turbomodule/core
   - EXSplashScreen (0.16.2):
@@ -376,14 +376,14 @@ PODS:
 DEPENDENCIES:
   - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
-  - "EXApplication (from `../node_modules/.pnpm/expo-application@4.2.2_expo@46.0.15/node_modules/expo-application/ios`)"
-  - "EXConstants (from `../node_modules/.pnpm/expo-constants@13.2.4_expo@46.0.15/node_modules/expo-constants/ios`)"
-  - "EXFileSystem (from `../node_modules/.pnpm/expo-file-system@14.1.0_expo@46.0.15/node_modules/expo-file-system/ios`)"
-  - "EXFont (from `../node_modules/.pnpm/expo-font@10.2.1_expo@46.0.15/node_modules/expo-font/ios`)"
-  - "Expo (from `../node_modules/.pnpm/expo@46.0.15_@babel+core@7.19.3/node_modules/expo`)"
-  - "ExpoKeepAwake (from `../node_modules/.pnpm/expo-keep-awake@10.2.0_expo@46.0.15/node_modules/expo-keep-awake/ios`)"
-  - "ExpoModulesCore (from `../node_modules/.pnpm/expo-modules-core@0.11.7/node_modules/expo-modules-core/ios`)"
-  - "EXSplashScreen (from `../node_modules/.pnpm/expo-splash-screen@0.16.2_expo@46.0.15/node_modules/expo-splash-screen/ios`)"
+  - EXApplication (from `../../../node_modules/expo-application/ios`)
+  - EXConstants (from `../../../node_modules/expo-constants/ios`)
+  - EXFileSystem (from `../../../node_modules/expo-file-system/ios`)
+  - EXFont (from `../../../node_modules/expo-font/ios`)
+  - Expo (from `../../../node_modules/expo`)
+  - ExpoKeepAwake (from `../../../node_modules/expo-keep-awake/ios`)
+  - ExpoModulesCore (from `../../../node_modules/expo-modules-core/ios`)
+  - EXSplashScreen (from `../../../node_modules/expo-splash-screen/ios`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
@@ -439,21 +439,21 @@ EXTERNAL SOURCES:
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
   EXApplication:
-    :path: "../node_modules/.pnpm/expo-application@4.2.2_expo@46.0.15/node_modules/expo-application/ios"
+    :path: "../../../node_modules/expo-application/ios"
   EXConstants:
-    :path: "../node_modules/.pnpm/expo-constants@13.2.4_expo@46.0.15/node_modules/expo-constants/ios"
+    :path: "../../../node_modules/expo-constants/ios"
   EXFileSystem:
-    :path: "../node_modules/.pnpm/expo-file-system@14.1.0_expo@46.0.15/node_modules/expo-file-system/ios"
+    :path: "../../../node_modules/expo-file-system/ios"
   EXFont:
-    :path: "../node_modules/.pnpm/expo-font@10.2.1_expo@46.0.15/node_modules/expo-font/ios"
+    :path: "../../../node_modules/expo-font/ios"
   Expo:
-    :path: "../node_modules/.pnpm/expo@46.0.15_@babel+core@7.19.3/node_modules/expo"
+    :path: "../../../node_modules/expo"
   ExpoKeepAwake:
-    :path: "../node_modules/.pnpm/expo-keep-awake@10.2.0_expo@46.0.15/node_modules/expo-keep-awake/ios"
+    :path: "../../../node_modules/expo-keep-awake/ios"
   ExpoModulesCore:
-    :path: "../node_modules/.pnpm/expo-modules-core@0.11.7/node_modules/expo-modules-core/ios"
+    :path: "../../../node_modules/expo-modules-core/ios"
   EXSplashScreen:
-    :path: "../node_modules/.pnpm/expo-splash-screen@0.16.2_expo@46.0.15/node_modules/expo-splash-screen/ios"
+    :path: "../../../node_modules/expo-splash-screen/ios"
   FBLazyVector:
     :path: "../node_modules/react-native/Libraries/FBLazyVector"
   FBReactNativeSpec:
@@ -542,12 +542,12 @@ SPEC CHECKSUMS:
   EXConstants: 7c44785d41d8e959d527d23d29444277a4d1ee73
   EXFileSystem: 927e0a8885aa9c49e50fc38eaba2c2389f2f1019
   EXFont: 06df627203afcb8a3b3152ec06eb2f11f46f0cff
-  Expo: 7e821e708a35d2720ef6baa658e224dd91c4821e
+  Expo: 7ac824960a6059d6c68e73f432c8e6bf6d92a0ef
   ExpoKeepAwake: 0e8f18142e71bbf2c7f6aa66ebed249ba1420320
-  ExpoModulesCore: 2d60ec04c49641afb55fee3faac86fb108c68fe0
+  ExpoModulesCore: 39ec590ce622289c060183aba57f77b1e73b4e11
   EXSplashScreen: 799bece80089219b2c989c1082d70f3b00995cda
   FBLazyVector: c71b8c429a8af2aff1013934a7152e9d9d0c937d
-  FBReactNativeSpec: 3cc5cff7d792e74a875be91e56d6242335016f50
+  FBReactNativeSpec: cb0df4f0084281b394f76bb9b4d1d9540f35963f
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a
   hermes-engine: 761a544537e62df2a37189389b9d2654dc1f75af

apps/mobile/metro.config.js

@@ -6,24 +6,29 @@ const [SDAssetsPath, SDAssetsPathExclude] = resolveUniqueModule('@sd/assets', '.
 const [babelRuntimePath, babelRuntimeExclude] = resolveUniqueModule('@babel/runtime');
 const [reactPath, reactExclude] = resolveUniqueModule('react');
 
+const path = require('path');
+
 // Needed for transforming svgs from @sd/assets
 const [reactSVGPath, reactSVGExclude] = resolveUniqueModule('react-native-svg');
 
 const { getDefaultConfig } = require('expo/metro-config');
 const expoDefaultConfig = getDefaultConfig(__dirname);
 
+const projectRoot = __dirname;
+const workspaceRoot = path.resolve(projectRoot, '../..');
+
 const metroConfig = makeMetroConfig({
-	projectRoot: __dirname,
+	projectRoot,
+	watchFolders: [workspaceRoot],
 	resolver: {
 		...expoDefaultConfig.resolver,
-		resolveRequest: MetroSymlinksResolver(),
+		// resolveRequest: MetroSymlinksResolver(),
 		extraNodeModules: {
 			'@babel/runtime': babelRuntimePath,
 			'@sd/assets': SDAssetsPath,
 			'react': reactPath,
 			'react-native-svg': reactSVGPath
 		},
-
 		blockList: exclusionList([
 			babelRuntimeExclude,
 			SDAssetsPathExclude,
@@ -31,7 +36,12 @@ const metroConfig = makeMetroConfig({
 			reactSVGExclude
 		]),
 		sourceExts: [...expoDefaultConfig.resolver.sourceExts, 'svg'],
-		assetExts: expoDefaultConfig.resolver.assetExts.filter((ext) => ext !== 'svg')
+		assetExts: expoDefaultConfig.resolver.assetExts.filter((ext) => ext !== 'svg'),
+		disableHierarchicalLookup: true,
+		nodeModulesPaths: [
+			path.resolve(projectRoot, 'node_modules'),
+			path.resolve(workspaceRoot, 'node_modules')
+		]
 	},
 	transformer: {
 		// Metro default is "uglify-es" but terser should be faster and has better defaults.

apps/mobile/package.json

@@ -7,6 +7,7 @@
 		"start": "expo start --dev-client",
 		"android": "expo run:android",
 		"ios": "expo run:ios",
+		"xcode": "open ios/spacedrive.xcworkspace",
 		"lint": "eslint src/**/*.{ts,tsx} && tsc --noEmit"
 	},
 	"dependencies": {
@@ -19,7 +20,8 @@
 		"@react-navigation/stack": "^6.2.3",
 		"@rspc/client": "^0.1.2",
 		"@rspc/react": "^0.1.2",
-		"@sd/assets": "file:../../packages/assets",
+		"@sd/assets": "workspace:*",
+		"@sd/client": "workspace:*",
 		"@tanstack/react-query": "^4.2.3",
 		"byte-size": "^8.1.0",
 		"class-variance-authority": "^0.2.3",

apps/mobile/src/App.tsx

@@ -1,6 +1,7 @@
 import { BottomSheetModalProvider } from '@gorhom/bottom-sheet';
 import { DefaultTheme, NavigationContainer, Theme } from '@react-navigation/native';
 import { createClient } from '@rspc/client';
+import * as sdclient from '@sd/client';
 import { StatusBar } from 'expo-status-bar';
 import { useEffect } from 'react';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';

apps/mobile/src/components/file/FileItem.tsx

@@ -1,5 +1,4 @@
 import { useNavigation } from '@react-navigation/native';
-import React from 'react';
 import { Pressable, Text, View } from 'react-native';
 import { useSnapshot } from 'valtio';
 

apps/mobile/src/components/modals/FileModal.tsx

@@ -1,6 +1,6 @@
 import { BottomSheetModal, BottomSheetScrollView } from '@gorhom/bottom-sheet';
 import dayjs from 'dayjs';
-import React, { useRef } from 'react';
+import { useRef } from 'react';
 import { Button, Pressable, Text, View } from 'react-native';
 import { ChevronLeftIcon } from 'react-native-heroicons/outline';
 import { useSnapshot } from 'valtio';

apps/mobile/tsconfig.json

@@ -1,9 +1,12 @@
 {
-	"extends": "expo/tsconfig.base",
-	"compilerOptions": {
-		"baseUrl": "src",
-		"paths": {
-			"~/*": ["*"]
-		}
-	}
+  "extends": "expo/tsconfig.base",
+  "compilerOptions": {
+    "baseUrl": "src",
+    "paths": {
+      "~/*": [
+        "*"
+      ]
+    },
+    "jsx": "react-jsx"
+  }
 }

pnpm-workspace.yaml

@@ -1,7 +1,6 @@
 packages:
   - 'packages/*'
   - 'apps/*'
-  - '!apps/mobile'
   - 'core'
   - 'crates/sync/example'
   - 'docs'