Skip to content

Commit d33cd39

Browse files
committed
Merge branch 'main' into fix/65314
2 parents 1a41ad9 + 119361a commit d33cd39

1,321 files changed

Lines changed: 53619 additions & 28217 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.

.eslintrc.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const restrictedImportPaths = [
1414
'Text',
1515
'ScrollView',
1616
'Animated',
17+
'findNodeHandle',
1718
],
1819
message: [
1920
'',
@@ -105,6 +106,10 @@ const restrictedImportPaths = [
105106
importNames: ['useOnyx'],
106107
message: "Please use '@hooks/useOnyx' instead.",
107108
},
109+
{
110+
name: '@src/utils/findNodeHandle',
111+
message: "Do not use 'findNodeHandle' as it is no longer supported on web.",
112+
},
108113
];
109114

110115
const restrictedImportPatterns = [
@@ -237,6 +242,7 @@ module.exports = {
237242
'react-native-a11y/has-accessibility-hint': ['off'],
238243
'react/require-default-props': 'off',
239244
'react/prop-types': 'off',
245+
'react/jsx-key': 'error',
240246
'react/jsx-no-constructed-context-values': 'error',
241247
'react-native-a11y/has-valid-accessibility-descriptors': [
242248
'error',

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

Lines changed: 139 additions & 34 deletions
Large diffs are not rendered by default.

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

Lines changed: 141 additions & 30 deletions
Large diffs are not rendered by default.

.github/actions/javascript/bumpVersion/index.js

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3392,13 +3392,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
33923392
}) : function(o, v) {
33933393
o["default"] = v;
33943394
});
3395-
var __importStar = (this && this.__importStar) || function (mod) {
3396-
if (mod && mod.__esModule) return mod;
3397-
var result = {};
3398-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3399-
__setModuleDefault(result, mod);
3400-
return result;
3401-
};
3395+
var __importStar = (this && this.__importStar) || (function () {
3396+
var ownKeys = function(o) {
3397+
ownKeys = Object.getOwnPropertyNames || function (o) {
3398+
var ar = [];
3399+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
3400+
return ar;
3401+
};
3402+
return ownKeys(o);
3403+
};
3404+
return function (mod) {
3405+
if (mod && mod.__esModule) return mod;
3406+
var result = {};
3407+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
3408+
__setModuleDefault(result, mod);
3409+
return result;
3410+
};
3411+
})();
34023412
var __importDefault = (this && this.__importDefault) || function (mod) {
34033413
return (mod && mod.__esModule) ? mod : { "default": mod };
34043414
};
@@ -3437,7 +3447,9 @@ exports["default"] = run;
34373447
"use strict";
34383448

34393449
Object.defineProperty(exports, "__esModule", ({ value: true }));
3440-
exports.getPreviousVersion = exports.incrementPatch = exports.incrementMinor = exports.SEMANTIC_VERSION_LEVELS = exports.MAX_INCREMENTS = exports.incrementVersion = exports.getVersionStringFromNumber = exports.getVersionNumberFromString = exports.isValidSemverLevel = void 0;
3450+
exports.incrementPatch = exports.incrementMinor = exports.SEMANTIC_VERSION_LEVELS = exports.MAX_INCREMENTS = exports.incrementVersion = exports.getVersionStringFromNumber = exports.getVersionNumberFromString = void 0;
3451+
exports.isValidSemverLevel = isValidSemverLevel;
3452+
exports.getPreviousVersion = getPreviousVersion;
34413453
const SEMANTIC_VERSION_LEVELS = {
34423454
MAJOR: 'MAJOR',
34433455
MINOR: 'MINOR',
@@ -3450,7 +3462,6 @@ exports.MAX_INCREMENTS = MAX_INCREMENTS;
34503462
function isValidSemverLevel(str) {
34513463
return Object.keys(SEMANTIC_VERSION_LEVELS).includes(str);
34523464
}
3453-
exports.isValidSemverLevel = isValidSemverLevel;
34543465
/**
34553466
* Transforms a versions string into a number
34563467
*/
@@ -3531,7 +3542,6 @@ function getPreviousVersion(currentVersion, level) {
35313542
}
35323543
return getVersionStringFromNumber(major, minor, patch, build - 1);
35333544
}
3534-
exports.getPreviousVersion = getPreviousVersion;
35353545

35363546

35373547
/***/ }),
@@ -3557,18 +3567,29 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
35573567
}) : function(o, v) {
35583568
o["default"] = v;
35593569
});
3560-
var __importStar = (this && this.__importStar) || function (mod) {
3561-
if (mod && mod.__esModule) return mod;
3562-
var result = {};
3563-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3564-
__setModuleDefault(result, mod);
3565-
return result;
3566-
};
3570+
var __importStar = (this && this.__importStar) || (function () {
3571+
var ownKeys = function(o) {
3572+
ownKeys = Object.getOwnPropertyNames || function (o) {
3573+
var ar = [];
3574+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
3575+
return ar;
3576+
};
3577+
return ownKeys(o);
3578+
};
3579+
return function (mod) {
3580+
if (mod && mod.__esModule) return mod;
3581+
var result = {};
3582+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
3583+
__setModuleDefault(result, mod);
3584+
return result;
3585+
};
3586+
})();
35673587
var __importDefault = (this && this.__importDefault) || function (mod) {
35683588
return (mod && mod.__esModule) ? mod : { "default": mod };
35693589
};
35703590
Object.defineProperty(exports, "__esModule", ({ value: true }));
3571-
exports.generateAndroidVersionCode = exports.updateAndroid = void 0;
3591+
exports.updateAndroid = updateAndroid;
3592+
exports.generateAndroidVersionCode = generateAndroidVersionCode;
35723593
const child_process_1 = __nccwpck_require__(2081);
35733594
const fs_1 = __nccwpck_require__(7147);
35743595
const path_1 = __importDefault(__nccwpck_require__(1017));
@@ -3626,7 +3647,6 @@ function padToTwoDigits(value) {
36263647
function generateAndroidVersionCode(npmVersion, prefix) {
36273648
return ''.concat(prefix, padToTwoDigits((0, major_1.default)(npmVersion) ?? 0), padToTwoDigits((0, minor_1.default)(npmVersion) ?? 0), padToTwoDigits((0, patch_1.default)(npmVersion) ?? 0), padToTwoDigits(Number((0, prerelease_1.default)(npmVersion)) ?? 0));
36283649
}
3629-
exports.generateAndroidVersionCode = generateAndroidVersionCode;
36303650
/**
36313651
* Update the Android native versions in E/App and the Mobile-Expensify submodule.
36323652
*/
@@ -3665,7 +3685,6 @@ async function updateAndroid(version) {
36653685
throw new Error('Error updating Android');
36663686
}
36673687
}
3668-
exports.updateAndroid = updateAndroid;
36693688
/**
36703689
* Update the iOS native versions in E/App and the Mobile-Expensify submodule.
36713690
*/

0 commit comments

Comments
 (0)