Skip to content

Commit 63904ab

Browse files
committed
Merge branch 'main' into fix-reopen-keyboard
2 parents 877b75d + 5f668c6 commit 63904ab

File tree

650 files changed

+42612
-25975
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

650 files changed

+42612
-25975
lines changed

.eslintrc.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,5 +163,13 @@ module.exports = {
163163
],
164164
},
165165
},
166+
{
167+
files: ['tests/**/*.{js,jsx,ts,tsx}', '.github/**/*.{js,jsx,ts,tsx}'],
168+
rules: {
169+
'@lwc/lwc/no-async-await': 'off',
170+
'no-await-in-loop': 'off',
171+
'no-restricted-syntax': ['error', 'ForInStatement', 'LabeledStatement', 'WithStatement'],
172+
},
173+
},
166174
],
167175
};

.github/ISSUE_TEMPLATE/DesignDoc.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ labels: Daily, NewFeature
2727
- [ ] Confirm that the doc has the minimum necessary number of reviews before proceeding
2828
- [ ] Email `[email protected]` one last time to let them know the Design Doc is moving into the implementation phase
2929
- [ ] Implement the changes
30+
- [ ] Add regression tests so that QA can test your feature with every deploy ([instructions](https://stackoverflowteams.com/c/expensify/questions/363))
3031
- [ ] Send out a follow up email to `[email protected]` once everything has been implemented and do a **Project Wrap-Up** retrospective that provides:
3132
- Summary of what we accomplished with this project
3233
- What went well?

.github/actions/composite/setupNode/action.yml

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,13 @@ runs:
1616
uses: actions/cache@v3
1717
with:
1818
path: node_modules
19-
key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json') }}
19+
key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json', 'patches/**') }}
2020

2121
- id: cache-desktop-node-modules
2222
uses: actions/cache@v3
2323
with:
2424
path: desktop/node_modules
25-
key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json') }}
26-
27-
- name: Check if patch files changed
28-
id: patchCheck
29-
shell: bash
30-
run: |
31-
set -e
32-
if [[ `git diff main --name-only | grep \.patch` != null ]]; then
33-
echo 'CHANGES_IN_PATCH_FILES=true' >> "$GITHUB_OUTPUT"
34-
else
35-
echo 'CHANGES_IN_PATCH_FILES=false' >> "$GITHUB_OUTPUT"
36-
fi
37-
38-
- name: Patch root project node packages
39-
shell: bash
40-
if: |
41-
steps.patchCheck.outputs.CHANGES_IN_PATCH_FILES == 'true' &&
42-
steps.cache-node-modules.outputs.cache-hit == 'true'
43-
run: npx patch-package
44-
45-
- name: Patch node packages for desktop submodule
46-
shell: bash
47-
if: |
48-
steps.patchCheck.outputs.CHANGES_IN_PATCH_FILES == 'true' &&
49-
steps.cache-desktop-node-modules.outputs.cache-hit == 'true'
50-
run: cd desktop && npx patch-package
25+
key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json', 'desktop/patches/**') }}
5126

5227
- name: Install root project node packages
5328
if: steps.cache-node-modules.outputs.cache-hit != 'true'

0 commit comments

Comments
 (0)