Merge pull request #44172 from Expensify/Rory-ManualCP44123ToStaging

Manually CP PR #44123 to staging 🍒
Expensify · Jun 21, 2024 · 8519760 · 8519760
2 parents 5b97190 + 80b23e5
commit 8519760
Show file tree

Hide file tree

Showing 32 changed files with 1,155 additions and 678 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,3 +1,5 @@
+const path = require('path');
+
 const restrictedImportPaths = [
     {
         name: 'react-native',
@@ -96,7 +98,7 @@ module.exports = {
     plugins: ['@typescript-eslint', 'jsdoc', 'you-dont-need-lodash-underscore', 'react-native-a11y', 'react', 'testing-library'],
     parser: '@typescript-eslint/parser',
     parserOptions: {
-        project: './tsconfig.json',
+        project: path.resolve(__dirname, './tsconfig.json'),
     },
     env: {
         jest: true,

diff --git a/.github/actions/javascript/authorChecklist/index.js b/.github/actions/javascript/authorChecklist/index.js
@@ -11710,7 +11710,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -17531,27 +17531,27 @@ exports["default"] = arrayDifference;
 
 /***/ }),
 
-/***/ 2877:
+/***/ 9491:
 /***/ ((module) => {
 
-module.exports = eval("require")("encoding");
-
+"use strict";
+module.exports = require("assert");
 
 /***/ }),
 
-/***/ 9491:
+/***/ 6113:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("assert");
+module.exports = require("crypto");
 
 /***/ }),
 
-/***/ 6113:
+/***/ 3975:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("crypto");
+module.exports = require("encoding");
 
 /***/ }),
 

diff --git a/.github/actions/javascript/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js
@@ -7373,7 +7373,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -12796,27 +12796,27 @@ exports["default"] = arrayDifference;
 
 /***/ }),
 
-/***/ 2877:
+/***/ 9491:
 /***/ ((module) => {
 
-module.exports = eval("require")("encoding");
-
+"use strict";
+module.exports = require("assert");
 
 /***/ }),
 
-/***/ 9491:
+/***/ 6113:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("assert");
+module.exports = require("crypto");
 
 /***/ }),
 
-/***/ 6113:
+/***/ 3975:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("crypto");
+module.exports = require("encoding");
 
 /***/ }),
 

diff --git a/.github/actions/javascript/bumpVersion/bumpVersion.ts b/.github/actions/javascript/bumpVersion/bumpVersion.ts
@@ -5,6 +5,7 @@ import type {PackageJson} from 'type-fest';
 import {promisify} from 'util';
 import {generateAndroidVersionCode, updateAndroidVersion, updateiOSVersion} from '@github/libs/nativeVersionUpdater';
 import * as versionUpdater from '@github/libs/versionUpdater';
+import type {SemverLevel} from '@github/libs/versionUpdater';
 
 const exec = promisify(originalExec);
 
@@ -43,7 +44,7 @@ function updateNativeVersions(version: string) {
 }
 
 let semanticVersionLevel = core.getInput('SEMVER_LEVEL', {required: true});
-if (!semanticVersionLevel || !Object.keys(versionUpdater.SEMANTIC_VERSION_LEVELS).includes(semanticVersionLevel)) {
+if (!semanticVersionLevel || !versionUpdater.isValidSemverLevel(semanticVersionLevel)) {
     semanticVersionLevel = versionUpdater.SEMANTIC_VERSION_LEVELS.BUILD;
     console.log(`Invalid input for 'SEMVER_LEVEL': ${semanticVersionLevel}`, `Defaulting to: ${semanticVersionLevel}`);
 }
@@ -53,7 +54,7 @@ if (!previousVersion) {
     core.setFailed('Error: Could not read package.json');
 }
 
-const newVersion = versionUpdater.incrementVersion(previousVersion ?? '', semanticVersionLevel);
+const newVersion = versionUpdater.incrementVersion(previousVersion ?? '', semanticVersionLevel as SemverLevel);
 console.log(`Previous version: ${previousVersion}`, `New version: ${newVersion}`);
 
 updateNativeVersions(newVersion);

diff --git a/.github/actions/javascript/bumpVersion/index.js b/.github/actions/javascript/bumpVersion/index.js
@@ -3473,7 +3473,7 @@ function updateNativeVersions(version) {
     }
 }
 let semanticVersionLevel = core.getInput('SEMVER_LEVEL', { required: true });
-if (!semanticVersionLevel || !Object.keys(versionUpdater.SEMANTIC_VERSION_LEVELS).includes(semanticVersionLevel)) {
+if (!semanticVersionLevel || !versionUpdater.isValidSemverLevel(semanticVersionLevel)) {
     semanticVersionLevel = versionUpdater.SEMANTIC_VERSION_LEVELS.BUILD;
     console.log(`Invalid input for 'SEMVER_LEVEL': ${semanticVersionLevel}`, `Defaulting to: ${semanticVersionLevel}`);
 }
@@ -3589,7 +3589,7 @@ exports.updateiOSVersion = updateiOSVersion;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getPreviousVersion = exports.incrementPatch = exports.incrementMinor = exports.SEMANTIC_VERSION_LEVELS = exports.MAX_INCREMENTS = exports.incrementVersion = exports.getVersionStringFromNumber = exports.getVersionNumberFromString = void 0;
+exports.getPreviousVersion = exports.incrementPatch = exports.incrementMinor = exports.SEMANTIC_VERSION_LEVELS = exports.MAX_INCREMENTS = exports.incrementVersion = exports.getVersionStringFromNumber = exports.getVersionNumberFromString = exports.isValidSemverLevel = void 0;
 const SEMANTIC_VERSION_LEVELS = {
     MAJOR: 'MAJOR',
     MINOR: 'MINOR',
@@ -3599,6 +3599,10 @@ const SEMANTIC_VERSION_LEVELS = {
 exports.SEMANTIC_VERSION_LEVELS = SEMANTIC_VERSION_LEVELS;
 const MAX_INCREMENTS = 99;
 exports.MAX_INCREMENTS = MAX_INCREMENTS;
+function isValidSemverLevel(str) {
+    return Object.keys(SEMANTIC_VERSION_LEVELS).includes(str);
+}
+exports.isValidSemverLevel = isValidSemverLevel;
 /**
  * Transforms a versions string into a number
  */

diff --git a/.github/actions/javascript/checkDeployBlockers/index.js b/.github/actions/javascript/checkDeployBlockers/index.js
@@ -6679,7 +6679,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -12024,27 +12024,27 @@ exports["default"] = arrayDifference;
 
 /***/ }),
 
-/***/ 2877:
+/***/ 9491:
 /***/ ((module) => {
 
-module.exports = eval("require")("encoding");
-
+"use strict";
+module.exports = require("assert");
 
 /***/ }),
 
-/***/ 9491:
+/***/ 6113:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("assert");
+module.exports = require("crypto");
 
 /***/ }),
 
-/***/ 6113:
+/***/ 3975:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("crypto");
+module.exports = require("encoding");
 
 /***/ }),
 

diff --git a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
@@ -9434,7 +9434,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -14401,7 +14401,66 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 const child_process_1 = __nccwpck_require__(2081);
 const CONST_1 = __importDefault(__nccwpck_require__(9873));
 const sanitizeStringForJSONParse_1 = __importDefault(__nccwpck_require__(3902));
-const VERSION_UPDATER = __importStar(__nccwpck_require__(8982));
+const VersionUpdater = __importStar(__nccwpck_require__(8982));
+/**
+ * Check if a tag exists locally or in the remote.
+ */
+function tagExists(tag) {
+    try {
+        // Check if the tag exists locally
+        (0, child_process_1.execSync)(`git show-ref --tags ${tag}`, { stdio: 'ignore' });
+        return true; // Tag exists locally
+    }
+    catch (error) {
+        // Tag does not exist locally, check in remote
+        let shouldRetry = true;
+        let needsRepack = false;
+        let doesTagExist = false;
+        while (shouldRetry) {
+            try {
+                if (needsRepack) {
+                    // We have seen some scenarios where this fixes the git fetch.
+                    // Why? Who knows... https://github.com/Expensify/App/pull/31459
+                    (0, child_process_1.execSync)('git repack -d', { stdio: 'inherit' });
+                }
+                (0, child_process_1.execSync)(`git ls-remote --exit-code --tags origin ${tag}`, { stdio: 'ignore' });
+                doesTagExist = true;
+                shouldRetry = false;
+            }
+            catch (e) {
+                if (!needsRepack) {
+                    console.log('Attempting to repack and retry...');
+                    needsRepack = true;
+                }
+                else {
+                    console.error("Repack didn't help, giving up...");
+                    shouldRetry = false;
+                }
+            }
+        }
+        return doesTagExist;
+    }
+}
+/**
+ * This essentially just calls getPreviousVersion in a loop, until it finds a version for which a tag exists.
+ * It's useful if we manually perform a version bump, because in that case a tag may not exist for the previous version.
+ *
+ * @param tag the current tag
+ * @param level the Semver level to step backward by
+ */
+function getPreviousExistingTag(tag, level) {
+    let previousVersion = VersionUpdater.getPreviousVersion(tag, level);
+    let tagExistsForPreviousVersion = false;
+    while (!tagExistsForPreviousVersion) {
+        if (tagExists(previousVersion)) {
+            tagExistsForPreviousVersion = true;
+            break;
+        }
+        console.log(`Tag for previous version ${previousVersion} does not exist. Checking for an older version...`);
+        previousVersion = VersionUpdater.getPreviousVersion(previousVersion, level);
+    }
+    return previousVersion;
+}
 /**
  * @param [shallowExcludeTag] When fetching the given tag, exclude all history reachable by the shallowExcludeTag (used to make fetch much faster)
  */
@@ -14444,8 +14503,8 @@ function fetchTag(tag, shallowExcludeTag = '') {
  * Get merge logs between two tags (inclusive) as a JavaScript object.
  */
 function getCommitHistoryAsJSON(fromTag, toTag) {
-    // Fetch tags, exclude commits reachable from the previous patch version (i.e: previous checklist), so that we don't have to fetch the full history
-    const previousPatchVersion = VERSION_UPDATER.getPreviousVersion(fromTag, VERSION_UPDATER.SEMANTIC_VERSION_LEVELS.PATCH);
+    // Fetch tags, excluding commits reachable from the previous patch version (i.e: previous checklist), so that we don't have to fetch the full history
+    const previousPatchVersion = getPreviousExistingTag(fromTag, VersionUpdater.SEMANTIC_VERSION_LEVELS.PATCH);
     fetchTag(fromTag, previousPatchVersion);
     fetchTag(toTag, previousPatchVersion);
     console.log('Getting pull requests merged between the following tags:', fromTag, toTag);
@@ -14517,6 +14576,7 @@ async function getPullRequestsMergedBetween(fromTag, toTag) {
     return pullRequestNumbers;
 }
 exports["default"] = {
+    getPreviousExistingTag,
     getValidMergedPRs,
     getPullRequestsMergedBetween,
 };
@@ -15000,7 +15060,7 @@ exports["default"] = sanitizeStringForJSONParse;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getPreviousVersion = exports.incrementPatch = exports.incrementMinor = exports.SEMANTIC_VERSION_LEVELS = exports.MAX_INCREMENTS = exports.incrementVersion = exports.getVersionStringFromNumber = exports.getVersionNumberFromString = void 0;
+exports.getPreviousVersion = exports.incrementPatch = exports.incrementMinor = exports.SEMANTIC_VERSION_LEVELS = exports.MAX_INCREMENTS = exports.incrementVersion = exports.getVersionStringFromNumber = exports.getVersionNumberFromString = exports.isValidSemverLevel = void 0;
 const SEMANTIC_VERSION_LEVELS = {
     MAJOR: 'MAJOR',
     MINOR: 'MINOR',
@@ -15010,6 +15070,10 @@ const SEMANTIC_VERSION_LEVELS = {
 exports.SEMANTIC_VERSION_LEVELS = SEMANTIC_VERSION_LEVELS;
 const MAX_INCREMENTS = 99;
 exports.MAX_INCREMENTS = MAX_INCREMENTS;
+function isValidSemverLevel(str) {
+    return Object.keys(SEMANTIC_VERSION_LEVELS).includes(str);
+}
+exports.isValidSemverLevel = isValidSemverLevel;
 /**
  * Transforms a versions string into a number
  */
@@ -15126,14 +15190,6 @@ function arrayDifference(array1, array2) {
 exports["default"] = arrayDifference;
 
 
-/***/ }),
-
-/***/ 2877:
-/***/ ((module) => {
-
-module.exports = eval("require")("encoding");
-
-
 /***/ }),
 
 /***/ 9491:
@@ -15160,6 +15216,14 @@ module.exports = require("crypto");
 
 /***/ }),
 
+/***/ 3975:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("encoding");
+
+/***/ }),
+
 /***/ 2361:
 /***/ ((module) => {
 

diff --git a/.github/actions/javascript/getArtifactInfo/index.js b/.github/actions/javascript/getArtifactInfo/index.js
@@ -6679,7 +6679,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -11985,27 +11985,27 @@ exports["default"] = arrayDifference;
 
 /***/ }),
 
-/***/ 2877:
+/***/ 9491:
 /***/ ((module) => {
 
-module.exports = eval("require")("encoding");
-
+"use strict";
+module.exports = require("assert");
 
 /***/ }),
 
-/***/ 9491:
+/***/ 6113:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("assert");
+module.exports = require("crypto");
 
 /***/ }),
 
-/***/ 6113:
+/***/ 3975:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("crypto");
+module.exports = require("encoding");
 
 /***/ }),