Merge remote-tracking branch 'origin/releases/v2' into update-v1.1.19-f5d217be

# Conflicts:
#	package-lock.json
#	package.json

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "2.1.18",
+  "version": "2.1.19",
   "private": true,
   "description": "CodeQL action",
   "scripts": {
@@ -22,6 +22,7 @@
   "license": "MIT",
   "dependencies": {
     "@actions/artifact": "^1.0.0",
+    "@actions/cache": "^3.0.0",
     "@actions/core": "^1.4.0",
     "@actions/exec": "^1.1.0",
     "@actions/github": "^4.0.0",
@@ -30,12 +31,14 @@
     "@chrisgavin/safe-which": "^1.0.2",
     "@octokit/plugin-retry": "^3.0.9",
     "@octokit/types": "^6.21.1",
+    "adm-zip": "^0.5.9",
     "commander": "^8.1.0",
     "console-log-level": "^1.4.1",
     "del": "^6.0.0",
     "fast-deep-equal": "^3.1.3",
     "file-url": "^3.0.0",
     "fs": "0.0.1-security",
+    "get-folder-size": "^2.0.1",
     "github-linguist": "^2.4.4",
     "glob": "^8.0.1",
     "js-yaml": "^4.1.0",
@@ -53,9 +56,16 @@
   ],
   "devDependencies": {
     "@ava/typescript": "3.0.1",
+    "@types/adm-zip": "^0.5.0",
+    "@types/get-folder-size": "^2.0.0",
     "@types/js-yaml": "^4.0.5",
+<<<<<<< HEAD
     "@types/long": "4.0.1",
     "@types/node": "12.12",
+=======
+    "@types/long": "5.0.0",
+    "@types/node": "16.11.22",
+>>>>>>> origin/releases/v2
     "@types/semver": "^7.3.8",
     "@types/sinon": "^10.0.2",
     "@typescript-eslint/parser": "^5.0.0",