Merged main and fixed conflicts.

Expensify · Aug 31, 2023 · 145a0d1 · 145a0d1
2 parents a87f0b5 + c20c387
commit 145a0d1
Show file tree

Hide file tree

Showing 81 changed files with 33,642 additions and 21,197 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -163,5 +163,13 @@ module.exports = {
                 ],
             },
         },
+        {
+            files: ['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'],
+            },
+        },
     ],
 };