Merge branch 'main' into war-in/enable-hybrid-app-copilot

# Conflicts: # src/libs/actions/Session/index.ts
Expensify · Jan 14, 2025 · 672ec4d · 672ec4d
2 parents cf0e4b3 + 328ca8a
commit 672ec4d
Show file tree

Hide file tree

Showing 489 changed files with 44,298 additions and 15,608 deletions.
diff --git a/.eslintrc.changed.js b/.eslintrc.changed.js
@@ -7,15 +7,24 @@ module.exports = {
     rules: {
         'deprecation/deprecation': 'error',
         'rulesdir/no-default-id-values': 'error',
+        'no-restricted-syntax': [
+            'error',
+            {
+                selector: 'ImportNamespaceSpecifier[parent.source.value=/^@libs/]',
+                message: 'Namespace imports from @libs are not allowed. Use named imports instead. Example: import { method } from "@libs/module"',
+            },
+            {
+                selector: 'ImportNamespaceSpecifier[parent.source.value=/^@userActions/]',
+                message: 'Namespace imports from @userActions are not allowed. Use named imports instead. Example: import { action } from "@userActions/module"',
+            },
+        ],
     },
     overrides: [
         {
             files: [
                 'src/libs/actions/IOU.ts',
                 'src/libs/actions/Report.ts',
-                'src/libs/actions/Task.ts',
                 'src/libs/OptionsListUtils.ts',
-                'src/libs/TransactionUtils/index.ts',
                 'src/pages/home/ReportScreen.tsx',
                 'src/pages/workspace/WorkspaceInitialPage.tsx',
                 'src/pages/home/report/PureReportActionItem.tsx',
@@ -24,5 +33,21 @@ module.exports = {
                 'rulesdir/no-default-id-values': 'off',
             },
         },
+        {
+            files: ['**/libs/**/*.{ts,tsx}'],
+            rules: {
+                'no-restricted-syntax': [
+                    'error',
+                    {
+                        selector: 'ImportNamespaceSpecifier[parent.source.value=/^\\.\\./]',
+                        message: 'Namespace imports are not allowed. Use named imports instead. Example: import { method } from "../libs/module"',
+                    },
+                    {
+                        selector: 'ImportNamespaceSpecifier[parent.source.value=/^\\./]',
+                        message: 'Namespace imports are not allowed. Use named imports instead. Example: import { method } from "./libs/module"',
+                    },
+                ],
+            },
+        },
     ],
 };
diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
@@ -2,6 +2,7 @@
 self-hosted-runner:
   labels:
     - ubuntu-latest-xl
-    - macos-13-large
-    - macos-13-xlarge
+    - macos-15-large
+    - macos-15-xlarge
     - ubuntu-latest-reassure-tests
+    - macos-12
diff --git a/.github/actions/composite/setupNode/action.yml b/.github/actions/composite/setupNode/action.yml
@@ -1,6 +1,12 @@
 name: Set up Node
 description: Set up Node
 
+inputs:
+  IS_HYBRID_BUILD:
+    description: "Indicates if node is set up for hybrid app"
+    required: false
+    default: 'false'
+
 outputs:
   cache-hit:
     description: Was there a cache hit on the main node_modules?
@@ -27,14 +33,26 @@ runs:
         path: node_modules
         key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json', 'patches/**') }}
 
+    - id: cache-old-dot-node-modules
+      if: inputs.IS_HYBRID_BUILD == 'true'
+      uses: actions/cache@v4
+      with:
+        path: Mobile-Expensify/node_modules
+        key: ${{ runner.os }}-node-modules-${{ hashFiles('Mobile-Expensify/package-lock.json', 'Mobile-Expensify/patches/**') }}
+
     - id: cache-desktop-node-modules
       uses: actions/cache@v4
       with:
         path: desktop/node_modules
         key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json', 'desktop/patches/**') }}
 
+    - name: Remove ND node_modules if needed for hybrid app build
+      if: inputs.IS_HYBRID_BUILD == 'true' && steps.cache-node-modules.outputs.cache-hit == 'true' && steps.cache-old-dot-node-modules.outputs.cache-hit != 'true'
+      shell: bash
+      run: rm -rf node_modules
+
     - name: Install root project node packages
-      if: steps.cache-node-modules.outputs.cache-hit != 'true'
+      if:  steps.cache-node-modules.outputs.cache-hit != 'true' || (inputs.IS_HYBRID_BUILD == 'true' && steps.cache-old-dot-node-modules.outputs.cache-hit != 'true')
       uses: nick-fields/retry@3f757583fb1b1f940bc8ef4bf4734c8dc02a5847
       with:
         timeout_minutes: 30