Merge pull request #76 from Resgrid/develop

CU-868cu9311 Working on fixing build resolvers

Author: ucswift

.yarnrc

@@ -0,0 +1 @@
+ignore-engines pnpm

babel.config.js

@@ -16,6 +16,17 @@ module.exports = function (api) {
             '@tailwind.config': './tailwind.config.js',
             '@assets': './assets',
           },
+          extensions: [
+            '.ios.ts',
+            '.android.ts',
+            '.ts',
+            '.ios.tsx',
+            '.android.tsx',
+            '.tsx',
+            '.jsx',
+            '.js',
+            '.json',
+          ],
         },
       ],
       'react-native-reanimated/plugin',

metro.config.js

@@ -2,27 +2,22 @@
 
 const { getSentryExpoConfig } = require('@sentry/react-native/metro');
 //const { getDefaultConfig } = require('expo/metro-config');
-const path = require('path');
+//const path = require('path');
 const { withNativeWind } = require('nativewind/metro');
 
-const projectRoot = __dirname;
-//const config = getDefaultConfig(projectRoot, {
-//  isCSSEnabled: true,
-//});
-
 const config = getSentryExpoConfig(__dirname, {
   isCSSEnabled: true,
 });
 
 // 1. Watch all files within the monorepo
 // 2. Let Metro know where to resolve packages and in what order
-config.resolver.nodeModulesPaths = [path.resolve(projectRoot, 'node_modules')];
+//config.resolver.nodeModulesPaths = [path.resolve(__dirname, 'node_modules')];
 
 // Configure path aliases
-config.resolver.extraNodeModules = {
-  '@': path.resolve(__dirname, 'src'),
-  '@env': path.resolve(__dirname, 'src/lib/env.js'),
-  '@assets': path.resolve(__dirname, 'assets'),
-};
+//config.resolver.extraNodeModules = {
+//  '@': path.resolve(__dirname, 'src'),
+//  '@env': path.resolve(__dirname, 'src/lib/env.js'),
+//  '@assets': path.resolve(__dirname, 'assets'),
+//};
 
 module.exports = withNativeWind(config, { input: './global.css', inlineRem: 16 });

package.json

@@ -86,6 +86,7 @@
     "@tanstack/react-query": "~5.52.1",
     "app-icon-badge": "~0.1.2",
     "axios": "~1.7.5",
+    "babel-plugin-module-resolver": "^5.0.2",
     "buffer": "~6.0.3",
     "expo": "~52.0.46",
     "expo-asset": "~11.0.5",
@@ -161,7 +162,6 @@
     "@typescript-eslint/eslint-plugin": "~5.62.0",
     "@typescript-eslint/parser": "~5.62.0",
     "babel-jest": "~30.0.0",
-    "babel-plugin-module-resolver": "^5.0.2",
     "cross-env": "~7.0.3",
     "dotenv": "~16.4.5",
     "eslint": "~8.57.0",

src/app/login/login-form.tsx

@@ -37,7 +37,7 @@ export type LoginFormProps = {
   error?: string;
 };
 
-export const LoginForm = ({ onSubmit = () => {}, isLoading = false, error = undefined }: LoginFormProps) => {
+export const LoginForm = ({ onSubmit = () => { }, isLoading = false, error = undefined }: LoginFormProps) => {
   const { colorScheme } = useColorScheme();
   const { t } = useTranslation();
   const {

tsconfig.json

@@ -17,7 +17,7 @@
     "paths": {
       "@/*": ["./src/*"],
       "@env": ["./src/lib/env.js"],
-      "@/assets/*": ["./assets/*"],
+      "@assets/*": ["./assets/*"],
       "tailwind.config": ["./tailwind.config.js"]
     },
     "esModuleInterop": true,