chore: resolve merge conflicts

.github/ISSUE_TEMPLATE/NewLibraryRequest.md

@@ -5,6 +5,8 @@ labels: Weekly, AutoAssignerAppLibraryReview
 ---
 In order to properly evaluate if a new library can be added to `package.json`, please fill out this request form. It will be automatically assigned someone from our review team that will go through and vet the library.
 
+*In order to add any new production dependency, it must be approved by the App Deployer team. They will evaluate the library and decide if it's something we want to move forward with or if other alternatives should be explored.*
+
 Note: This is only for production dependencies. While we don't want people to add packages to dev-dependencies willy-nilly, we recognize that there isn't as great of a need there to secure them.
 
 # Name of library:

.github/actions/composite/buildAndroidE2EAPK/action.yml

@@ -5,6 +5,11 @@ inputs:
   ARTIFACT_NAME:
     description: The name of the workflow artifact where the APK should be uploaded
     required: true
+  ARTIFACT_RETENTION_DAYS:
+    description: The number of days to retain the artifact
+    required: false
+    # Thats github default:
+    default: "90"
   PACKAGE_SCRIPT_NAME:
     description: The name of the npm script to run to build the APK
     required: true
@@ -69,7 +74,8 @@ runs:
       shell: bash
 
     - name: Upload APK
-      uses: actions/upload-artifact@65d862660abb392b8c4a3d1195a2108db131dd05
+      uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
       with:
         name: ${{ inputs.ARTIFACT_NAME }}
         path: ${{ inputs.APP_OUTPUT_PATH }}
+        retention-days: ${{ inputs.ARTIFACT_RETENTION_DAYS }}

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

@@ -1,6 +1,11 @@
 name: Set up Node
 description: Set up Node
 
+outputs:
+  cache-hit:
+    description: Was there a cache hit on the main node_modules?
+    value: ${{ steps.cache-node-modules.outputs.cache-hit }}
+
 runs:
   using: composite
   steps:

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

@@ -557,6 +557,14 @@ class GithubUtils {
             .then((events) => _.filter(events, (event) => event.event === 'closed'))
             .then((closedEvents) => lodashGet(_.last(closedEvents), 'actor.login', ''));
     }
+
+    static getArtifactByName(artefactName) {
+        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
+            owner: CONST.GITHUB_OWNER,
+            repo: CONST.APP_REPO,
+            per_page: 100,
+        }).then((artifacts) => _.findWhere(artifacts, {name: artefactName}));
+    }
 }
 
 module.exports = GithubUtils;

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

@@ -669,6 +669,14 @@ class GithubUtils {
             .then((events) => _.filter(events, (event) => event.event === 'closed'))
             .then((closedEvents) => lodashGet(_.last(closedEvents), 'actor.login', ''));
     }
+
+    static getArtifactByName(artefactName) {
+        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
+            owner: CONST.GITHUB_OWNER,
+            repo: CONST.APP_REPO,
+            per_page: 100,
+        }).then((artifacts) => _.findWhere(artifacts, {name: artefactName}));
+    }
 }
 
 module.exports = GithubUtils;

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

@@ -104,8 +104,20 @@ exports.updateiOSVersion = function updateiOSVersion(version) {
 /***/ }),
 
 /***/ 8007:
-/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+/***/ ((__unused_webpack_module, __webpack_exports__, __nccwpck_require__) => {
 
+"use strict";
+__nccwpck_require__.r(__webpack_exports__);
+/* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
+/* harmony export */   "MAX_INCREMENTS": () => (/* binding */ MAX_INCREMENTS),
+/* harmony export */   "SEMANTIC_VERSION_LEVELS": () => (/* binding */ SEMANTIC_VERSION_LEVELS),
+/* harmony export */   "getPreviousVersion": () => (/* binding */ getPreviousVersion),
+/* harmony export */   "getVersionNumberFromString": () => (/* binding */ getVersionNumberFromString),
+/* harmony export */   "getVersionStringFromNumber": () => (/* binding */ getVersionStringFromNumber),
+/* harmony export */   "incrementMinor": () => (/* binding */ incrementMinor),
+/* harmony export */   "incrementPatch": () => (/* binding */ incrementPatch),
+/* harmony export */   "incrementVersion": () => (/* binding */ incrementVersion)
+/* harmony export */ });
 const _ = __nccwpck_require__(5067);
 
 const SEMANTIC_VERSION_LEVELS = {
@@ -173,8 +185,8 @@ const incrementPatch = (major, minor, patch) => {
 /**
  * Increments a build version
  *
- * @param {Number} version
- * @param {Number} level
+ * @param {String} version
+ * @param {String} level
  * @returns {String}
  */
 const incrementVersion = (version, level) => {
@@ -235,18 +247,7 @@ function getPreviousVersion(currentVersion, level) {
     return getVersionStringFromNumber(major, minor, patch, build - 1);
 }
 
-module.exports = {
-    getVersionNumberFromString,
-    getVersionStringFromNumber,
-    incrementVersion,
-
-    // For tests
-    MAX_INCREMENTS,
-    SEMANTIC_VERSION_LEVELS,
-    incrementMinor,
-    incrementPatch,
-    getPreviousVersion,
-};
+
 
 
 /***/ }),
@@ -5954,6 +5955,34 @@ module.exports = underscoreNodeF._;
 /******/ 	}
 /******/ 	
 /************************************************************************/
+/******/ 	/* webpack/runtime/define property getters */
+/******/ 	(() => {
+/******/ 		// define getter functions for harmony exports
+/******/ 		__nccwpck_require__.d = (exports, definition) => {
+/******/ 			for(var key in definition) {
+/******/ 				if(__nccwpck_require__.o(definition, key) && !__nccwpck_require__.o(exports, key)) {
+/******/ 					Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
+/******/ 				}
+/******/ 			}
+/******/ 		};
+/******/ 	})();
+/******/ 	
+/******/ 	/* webpack/runtime/hasOwnProperty shorthand */
+/******/ 	(() => {
+/******/ 		__nccwpck_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
+/******/ 	})();
+/******/ 	
+/******/ 	/* webpack/runtime/make namespace object */
+/******/ 	(() => {
+/******/ 		// define __esModule on exports
+/******/ 		__nccwpck_require__.r = (exports) => {
+/******/ 			if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 				Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 			}
+/******/ 			Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 		};
+/******/ 	})();
+/******/ 	
 /******/ 	/* webpack/runtime/compat */
 /******/ 	
 /******/ 	if (typeof __nccwpck_require__ !== 'undefined') __nccwpck_require__.ab = __dirname + "/";

.github/actions/javascript/checkDeployBlockers/index.js

@@ -636,6 +636,14 @@ class GithubUtils {
             .then((events) => _.filter(events, (event) => event.event === 'closed'))
             .then((closedEvents) => lodashGet(_.last(closedEvents), 'actor.login', ''));
     }
+
+    static getArtifactByName(artefactName) {
+        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
+            owner: CONST.GITHUB_OWNER,
+            repo: CONST.APP_REPO,
+            per_page: 100,
+        }).then((artifacts) => _.findWhere(artifacts, {name: artefactName}));
+    }
 }
 
 module.exports = GithubUtils;

.github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js

@@ -4,7 +4,7 @@ const _ = require('underscore');
 const core = require('@actions/core');
 const CONST = require('../../../libs/CONST');
 const GithubUtils = require('../../../libs/GithubUtils');
-const GitUtils = require('../../../libs/GitUtils');
+const GitUtils = require('../../../libs/GitUtils').default;
 
 async function run() {
     // Note: require('package.json').version does not work because ncc will resolve that to a plain string at compile time