Merge branch 'main' of github.com:Expensify/App into chore/16221-migr…

…ate-with-keybaord-state-file-to-function-component
Expensify · Sep 26, 2023 · 5a35d74 · 5a35d74
2 parents b47ed17 + 3486648
commit 5a35d74
Show file tree

Hide file tree

Showing 1,208 changed files with 68,700 additions and 34,206 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -24,7 +24,7 @@ const restrictedImportPatterns = [
 ];
 
 module.exports = {
-    extends: ['expensify', 'plugin:storybook/recommended', 'plugin:react-hooks/recommended', 'prettier', 'plugin:react-native-a11y/basic'],
+    extends: ['expensify', 'plugin:storybook/recommended', 'plugin:react-hooks/recommended', 'plugin:react-native-a11y/basic', 'prettier'],
     plugins: ['react-hooks', 'react-native-a11y'],
     parser: 'babel-eslint',
     ignorePatterns: ['!.*', 'src/vendor', '.github/actions/**/index.js', 'desktop/dist/*.js', 'dist/*.js', 'node_modules/.bin/**', 'node_modules/.cache/**', '.git/**'],
@@ -75,6 +75,7 @@ module.exports = {
                         patterns: restrictedImportPatterns,
                     },
                 ],
+                curly: 'error',
             },
         },
         {
@@ -161,6 +162,15 @@ module.exports = {
                         patterns: restrictedImportPatterns,
                     },
                 ],
+                curly: 'error',
+            },
+        },
+        {
+            files: ['workflow_tests/**/*.{js,jsx,ts,tsx}', 'tests/**/*.{js,jsx,ts,tsx}', '.github/**/*.{js,jsx,ts,tsx}'],
+            rules: {
+                '@lwc/lwc/no-async-await': 'off',
+                'no-await-in-loop': 'off',
+                'no-restricted-syntax': ['error', 'ForInStatement', 'LabeledStatement', 'WithStatement'],
             },
         },
     ],

diff --git a/.github/ISSUE_TEMPLATE/Accessibility.md b/.github/ISSUE_TEMPLATE/Accessibility.md
@@ -34,7 +34,7 @@ What can we do to fix the issue?
 <!--- 
 Check off any platforms that are affected by this issue
 --->
-Which of our officially supported platforms is this issue occurring on?
+Which of our officially supported platforms is this issue occurring on? Please only tick the box if you have provided a screen-recording in the thread for each platform:
 - [ ] Android / native
 - [ ] Android / Chrome
 - [ ] iOS / native

diff --git a/.github/ISSUE_TEMPLATE/DesignDoc.md b/.github/ISSUE_TEMPLATE/DesignDoc.md
@@ -27,6 +27,7 @@ labels: Daily, NewFeature
 - [ ] Confirm that the doc has the minimum necessary number of reviews before proceeding
 - [ ] Email `strategy@expensify.com` one last time to let them know the Design Doc is moving into the implementation phase
 - [ ] Implement the changes
+- [ ] Add regression tests so that QA can test your feature with every deploy ([instructions](https://stackoverflowteams.com/c/expensify/questions/363))
 - [ ] Send out a follow up email to `strategy@expensify.com` once everything has been implemented and do a **Project Wrap-Up** retrospective that provides:
     - Summary of what we accomplished with this project
     - What went well?

diff --git a/.github/actions/composite/setupNode/action.yml b/.github/actions/composite/setupNode/action.yml
@@ -16,38 +16,13 @@ runs:
       uses: actions/cache@v3
       with:
         path: node_modules
-        key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json') }}
+        key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json', 'patches/**') }}
 
     - id: cache-desktop-node-modules
       uses: actions/cache@v3
       with:
         path: desktop/node_modules
-        key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json') }}
-
-    - name: Check if patch files changed
-      id: patchCheck
-      shell: bash
-      run: |
-        set -e
-        if [[ `git diff main --name-only | grep \.patch` != null ]]; then 
-          echo 'CHANGES_IN_PATCH_FILES=true' >> "$GITHUB_OUTPUT"
-        else 
-          echo 'CHANGES_IN_PATCH_FILES=false' >> "$GITHUB_OUTPUT"
-        fi
-
-    - name: Patch root project node packages
-      shell: bash
-      if: | 
-        steps.patchCheck.outputs.CHANGES_IN_PATCH_FILES == 'true' && 
-        steps.cache-node-modules.outputs.cache-hit == 'true'
-      run: npx patch-package
-
-    - name: Patch node packages for desktop submodule
-      shell: bash
-      if: | 
-        steps.patchCheck.outputs.CHANGES_IN_PATCH_FILES == 'true' && 
-        steps.cache-desktop-node-modules.outputs.cache-hit == 'true'
-      run: cd desktop && npx patch-package
+        key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json', 'desktop/patches/**') }}
 
     - name: Install root project node packages
       if: steps.cache-node-modules.outputs.cache-hit != 'true'