Merge pull request #56 from Resgrid/develop

Develop

Author: ucswift

.DS_Store

@@ -40,7 +40,7 @@ env:
 jobs:
   check-skip:
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
     steps:
       - name: Skip CI check
         run: echo "Proceeding with workflow"
@@ -52,44 +52,42 @@ jobs:
       - name: 🏗 Checkout repository
         uses: actions/checkout@v4
 
+      - name: pnpm-setup
+        uses: pnpm/action-setup@v2
+
       - name: 🏗 Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
-          cache: "yarn"
-
-      - name: 📦 Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+          node-version: "24"
+          cache: "pnpm"
 
-      - name: 📦 Setup yarn cache
+      - name: 📦 Setup pnpm cache
         uses: actions/cache@v3
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-yarn-
+            ${{ runner.os }}-pnpm-
 
       - name: 📦 Install dependencies
-        run: yarn install
+        run: pnpm install
 
       - name: 🧪 Run TypeScript check
-        run: yarn tsc
+        run: pnpm tsc
 
       - name: 🧹 Run ESLint
-        run: yarn lint
+        run: pnpm lint
 
       - name: 🎨 Run Prettier check
-        run: yarn format:check
+        run: pnpm format:check
 
       - name: 🧪 Run Jest Tests
-        run: yarn test
+        run: pnpm test
 
       - name: 🧪 Run React Native Testing Library Tests
-        run: yarn test:rntl
+        run: pnpm test:rntl
 
   build-and-deploy:
-    needs: test
     if: (github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')) || github.event_name == 'workflow_dispatch'
     strategy:
       matrix:
@@ -102,28 +100,27 @@ jobs:
       - name: 🏗 Checkout repository
         uses: actions/checkout@v4
 
+      - name: pnpm-setup
+        uses: pnpm/action-setup@v2
+
       - name: 🏗 Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
-          cache: "yarn"
-
-      - name: 📦 Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+          node-version: "24"
+          cache: "pnpm"
 
-      - name: 📦 Setup yarn cache
+      - name: 📦 Setup pnpm cache
         uses: actions/cache@v3
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-yarn-
+            ${{ runner.os }}-pnpm-
 
       - name: 📦 Install dependencies
         run: |
-          yarn install
-          yarn global add eas-cli@latest
+          pnpm install
+          pnpm add -g eas-cli@latest
 
       - name: 📱 Setup EAS build cache
         uses: actions/cache@v3

.github/workflows/ci-build.yml

@@ -28,6 +28,7 @@
     "Flashlist",
     "Gluestack",
     "Lato",
+    "nativewind",
     "Resgrid"
   ],
   "i18n-ally.localesPaths": ["src/translations/"],

.github/workflows/react-native-cicd.yml

@@ -1,10 +1,7 @@
 module.exports = function (api) {
   api.cache(true);
   return {
-    presets: [
-      ['babel-preset-expo', { jsxImportSource: 'nativewind' }],
-      'nativewind/babel',
-    ],
+    presets: [['babel-preset-expo', { jsxImportSource: 'nativewind' }], 'nativewind/babel'],
     plugins: [
       [
         'module-resolver',
@@ -16,20 +13,9 @@ module.exports = function (api) {
             '@unitools/image': '@unitools/image-expo',
             '@unitools/router': '@unitools/router-expo',
             '@unitools/link': '@unitools/link-expo',
-            'tailwind.config': './tailwind.config.js',
+            '@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',

.vscode/settings.json

@@ -12,8 +12,9 @@ module.exports = {
     '!**/cli/**',
   ],
   moduleFileExtensions: ['js', 'ts', 'tsx'],
+  moduleDirectories: ['node_modules', '<rootDir>/'],
   transformIgnorePatterns: [
-    `node_modules/(?!(?:.pnpm/)?((jest-)?react-native|@react-native(-community)?|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|@react-navigation/.*|@unimodules/.*|unimodules|@sentry/.*|native-base|react-native-svg))`,
+    `node_modules/(?!(?:.pnpm/)?((jest-)?react-native|@react-native(-community)?|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|@react-navigation/.*|@unimodules/.*|unimodules|@sentry/.*|native-base|react-native-svg|@gluestack-ui/.*|lucide-react-native|@tanstack/.*|moti|nativewind|tailwind-variants|@react-native-aria/.*))`,
   ],
   coverageReporters: ['json-summary', ['text', { file: 'coverage.txt' }]],
   reporters: [

babel.config.js

@@ -1,7 +1,7 @@
 /* eslint-env node */
 
 const { getSentryExpoConfig } = require('@sentry/react-native/metro');
-const { getDefaultConfig } = require('expo/metro-config');
+//const { getDefaultConfig } = require('expo/metro-config');
 const path = require('path');
 const { withNativeWind } = require('nativewind/metro');
 
@@ -25,4 +25,4 @@ config.resolver.extraNodeModules = {
   '@assets': path.resolve(__dirname, 'assets'),
 };
 
-module.exports = withNativeWind(config, { input: './global.css' });
+module.exports = withNativeWind(config, { input: './global.css', inlineRem: 16 });

jest.config.js

@@ -49,25 +49,25 @@
     "@gluestack-ui/alert": "^0.1.15",
     "@gluestack-ui/alert-dialog": "^0.1.30",
     "@gluestack-ui/avatar": "^0.1.17",
-    "@gluestack-ui/button": "^1.0.7",
+    "@gluestack-ui/button": "^1.0.14",
     "@gluestack-ui/checkbox": "^0.1.31",
     "@gluestack-ui/divider": "^0.1.9",
     "@gluestack-ui/fab": "^0.1.21",
     "@gluestack-ui/form-control": "^0.1.18",
-    "@gluestack-ui/icon": "^0.1.25",
+    "@gluestack-ui/icon": "^0.1.27",
     "@gluestack-ui/image": "^0.1.10",
-    "@gluestack-ui/input": "^0.1.31",
+    "@gluestack-ui/input": "^0.1.38",
     "@gluestack-ui/link": "^0.1.22",
-    "@gluestack-ui/menu": "^0.2.36",
+    "@gluestack-ui/menu": "^0.2.43",
     "@gluestack-ui/modal": "^0.1.35",
     "@gluestack-ui/nativewind-utils": "^1.0.26",
     "@gluestack-ui/overlay": "^0.1.16",
-    "@gluestack-ui/popover": "^0.1.37",
+    "@gluestack-ui/popover": "^0.1.49",
     "@gluestack-ui/pressable": "^0.1.16",
     "@gluestack-ui/progress": "^0.1.16",
-    "@gluestack-ui/radio": "^0.1.32",
-    "@gluestack-ui/select": "^0.1.29",
-    "@gluestack-ui/slider": "^0.1.25",
+    "@gluestack-ui/radio": "^0.1.40",
+    "@gluestack-ui/select": "^0.1.31",
+    "@gluestack-ui/slider": "^0.1.32",
     "@gluestack-ui/spinner": "^0.1.14",
     "@gluestack-ui/switch": "^0.1.22",
     "@gluestack-ui/textarea": "^0.1.23",
@@ -155,7 +155,6 @@
     "@types/jest": "^29.5.12",
     "@types/lodash.memoize": "^4.1.9",
     "@types/react": "~18.3.12",
-    "@types/react-native": "^0.73.0",
     "@types/react-native-base64": "^0.2.2",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",