Skip to content

Commit ede1767

Browse files
MelvinBotmkhutornyi
MelvinBot
and
mkhutornyi
committed
Merge main into claude-migrateGroupMembersTable
Resolve import conflict in DynamicReportParticipantsPage (keep the migrated Table-based imports; drop the old SelectionListWithModal imports main still had). Also address review feedback: remove the redundant 'Build participants list' comment and reword the RHP selection test comment to describe current behavior instead of the past bug. Reformat the PR's changed files with oxfmt (main adopted oxfmt), which only regroups imports. Co-authored-by: mkhutornyi <mkhutornyi@users.noreply.github.com>
2 parents 8620236 + 6bea206 commit ede1767

5,873 files changed

Lines changed: 38268 additions & 13983 deletions

File tree

Some content is hidden

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

‎.claude/settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"hooks": [
77
{
88
"type": "command",
9-
"command": "FILE=$(jq -r '.tool_input.file_path') && [ -f \"$FILE\" ] && ./node_modules/.bin/prettier --experimental-cli --no-cache --write --ignore-unknown \"$FILE\""
9+
"command": "FILE=$(jq -r '.tool_input.file_path') && [ -f \"$FILE\" ] && ./node_modules/.bin/oxfmt --write --no-error-on-unmatched-pattern \"$FILE\""
1010
}
1111
]
1212
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Set up Node
33

44
inputs:
55
IS_HYBRID_BUILD:
6-
description: "Indicates if node is set up for hybrid app"
6+
description: 'Indicates if node is set up for hybrid app'
77
required: false
88
default: 'false'
99

@@ -33,7 +33,7 @@ runs:
3333
with:
3434
path: node_modules
3535
key: ${{ inputs.IS_HYBRID_BUILD == 'true' && format('{0}-node-modules-{1}', runner.os, hashFiles('package-lock.json', 'patches/**', 'Mobile-Expensify/patches/**')) || format('{0}-node-modules-{1}', runner.os, hashFiles('package-lock.json', 'patches/**'))}}
36-
36+
3737
- id: cache-old-dot-node-modules
3838
if: inputs.IS_HYBRID_BUILD == 'true'
3939
# v5.0.1
@@ -48,9 +48,9 @@ runs:
4848
run: rm -rf node_modules
4949

5050
- name: Install root project node packages
51-
if: steps.cache-node-modules.outputs.cache-hit != 'true' || (inputs.IS_HYBRID_BUILD == 'true' && steps.cache-old-dot-node-modules.outputs.cache-hit != 'true')
51+
if: steps.cache-node-modules.outputs.cache-hit != 'true' || (inputs.IS_HYBRID_BUILD == 'true' && steps.cache-old-dot-node-modules.outputs.cache-hit != 'true')
5252
uses: nick-fields/retry@ad984534de44a9489a53aefd81eb77f87c70dc60 # v4
5353
with:
5454
timeout_minutes: 30
5555
max_attempts: 3
56-
command: npm ci
56+
command: npm ci

‎.github/actions/javascript/authorChecklist/authorChecklist.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
import CONST from '@github/libs/CONST';
2+
import GithubUtils from '@github/libs/GithubUtils';
3+
14
/* eslint-disable @typescript-eslint/naming-convention */
25
import * as core from '@actions/core';
36
import * as github from '@actions/github';
47
import escapeRegExp from 'lodash/escapeRegExp';
5-
import CONST from '@github/libs/CONST';
6-
import GithubUtils from '@github/libs/GithubUtils';
8+
79
import newComponentCategory from './categories/newComponentCategory';
810

911
const pathToAuthorChecklist = `https://raw.githubusercontent.com/${CONST.GITHUB_OWNER}/${CONST.APP_REPO}/main/.github/PULL_REQUEST_TEMPLATE.md`;

‎.github/actions/javascript/authorChecklist/categories/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type Category from './Category';
2+
23
import newComponent from './newComponentCategory';
34

45
const categories: Category[] = [newComponent];

‎.github/actions/javascript/authorChecklist/categories/newComponentCategory.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
import * as github from '@actions/github';
2-
import type {WebhookPayload} from '@actions/github/lib/interfaces';
3-
import {parse} from '@babel/parser';
4-
import traverse from '@babel/traverse';
51
import CONST from '@github/libs/CONST';
62
import GithubUtils from '@github/libs/GithubUtils';
73
import promiseSome from '@github/libs/promiseSome';
4+
5+
import type {WebhookPayload} from '@actions/github/lib/interfaces';
6+
7+
import * as github from '@actions/github';
8+
import {parse} from '@babel/parser';
9+
import traverse from '@babel/traverse';
10+
811
import type Category from './Category';
912

1013
type SuperClassType = {superClass: {name?: string; object: {name: string}; property: {name: string}} | null; name: string};

‎.github/actions/javascript/authorChecklist/index.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15276,12 +15276,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
1527615276
return (mod && mod.__esModule) ? mod : { "default": mod };
1527715277
};
1527815278
Object.defineProperty(exports, "__esModule", ({ value: true }));
15279+
const CONST_1 = __importDefault(__nccwpck_require__(9873));
15280+
const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
1527915281
/* eslint-disable @typescript-eslint/naming-convention */
1528015282
const core = __importStar(__nccwpck_require__(2186));
1528115283
const github = __importStar(__nccwpck_require__(5438));
1528215284
const escapeRegExp_1 = __importDefault(__nccwpck_require__(8415));
15283-
const CONST_1 = __importDefault(__nccwpck_require__(9873));
15284-
const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
1528515285
const newComponentCategory_1 = __importDefault(__nccwpck_require__(9032));
1528615286
const pathToAuthorChecklist = `https://raw.githubusercontent.com/${CONST_1.default.GITHUB_OWNER}/${CONST_1.default.APP_REPO}/main/.github/PULL_REQUEST_TEMPLATE.md`;
1528715287
const checklistStartsWith = '### PR Author Checklist';
@@ -15463,12 +15463,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
1546315463
};
1546415464
Object.defineProperty(exports, "__esModule", ({ value: true }));
1546515465
exports.detectReactComponent = detectReactComponent;
15466-
const github = __importStar(__nccwpck_require__(5438));
15467-
const parser_1 = __nccwpck_require__(5026);
15468-
const traverse_1 = __importDefault(__nccwpck_require__(1380));
1546915466
const CONST_1 = __importDefault(__nccwpck_require__(9873));
1547015467
const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
1547115468
const promiseSome_1 = __importDefault(__nccwpck_require__(8534));
15469+
const github = __importStar(__nccwpck_require__(5438));
15470+
const parser_1 = __nccwpck_require__(5026);
15471+
const traverse_1 = __importDefault(__nccwpck_require__(1380));
1547215472
const items = [
1547315473
"I verified that similar component doesn't exist in the codebase",
1547415474
'I verified that all props are defined accurately and each prop has a `/** comment above it */`',

‎.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
/* eslint-disable @typescript-eslint/naming-convention */
2-
import lodashThrottle from 'lodash/throttle';
31
import {getStringInput} from '@github/libs/ActionUtils';
42
import CONST from '@github/libs/CONST';
53
import GitHubUtils from '@github/libs/GithubUtils';
64
import {promiseDoWhile} from '@github/libs/promiseWhile';
75

6+
/* eslint-disable @typescript-eslint/naming-convention */
7+
import lodashThrottle from 'lodash/throttle';
8+
89
type CurrentStagingDeploys = Awaited<ReturnType<typeof GitHubUtils.octokit.actions.listWorkflowRuns>>['data']['workflow_runs'];
910

1011
function run() {

‎.github/actions/javascript/awaitStagingDeploys/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12197,12 +12197,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
1219712197
return (mod && mod.__esModule) ? mod : { "default": mod };
1219812198
};
1219912199
Object.defineProperty(exports, "__esModule", ({ value: true }));
12200-
/* eslint-disable @typescript-eslint/naming-convention */
12201-
const throttle_1 = __importDefault(__nccwpck_require__(2891));
1220212200
const ActionUtils_1 = __nccwpck_require__(6981);
1220312201
const CONST_1 = __importDefault(__nccwpck_require__(9873));
1220412202
const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
1220512203
const promiseWhile_1 = __nccwpck_require__(9438);
12204+
/* eslint-disable @typescript-eslint/naming-convention */
12205+
const throttle_1 = __importDefault(__nccwpck_require__(2891));
1220612206
function run() {
1220712207
const tag = (0, ActionUtils_1.getStringInput)('TAG', { required: false });
1220812208
let currentStagingDeploys = [];

‎.github/actions/javascript/bumpVersion/action.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: Bump npm version
22
description: Increase the application version (JS and native), based on git tags
33
inputs:
4-
SEMVER_LEVEL:
5-
description: Semantic Versioning Level
6-
required: true
4+
SEMVER_LEVEL:
5+
description: Semantic Versioning Level
6+
required: true
77
outputs:
8-
NEW_VERSION:
9-
description: The new semver version of the application, updated in the JS and native layers.
8+
NEW_VERSION:
9+
description: The new semver version of the application, updated in the JS and native layers.
1010
runs:
11-
using: node24
12-
main: ./index.js
11+
using: node24
12+
main: ./index.js

‎.github/actions/javascript/bumpVersion/bumpVersion.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import * as core from '@actions/core';
21
import * as versionUpdater from '@github/libs/versionUpdater';
2+
33
import bumpVersion from '@scripts/bumpVersion';
44

5+
import * as core from '@actions/core';
6+
57
async function run() {
68
try {
79
const semverLevel = core.getInput('SEMVER_LEVEL', {required: true});

0 commit comments

Comments
 (0)