From 5950d63cd0b4c4fee74a476e5c0779a02c16e447 Mon Sep 17 00:00:00 2001 From: dwyfrequency Date: Wed, 12 Oct 2022 15:00:40 -0400 Subject: [PATCH 1/8] Update prettier dependency --- package.json | 2 +- repo-scripts/prune-dts/package.json | 4 ++-- yarn.lock | 15 +++++---------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 79894677063..9237c00c4fa 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "npm-run-all": "4.1.5", "nyc": "15.1.0", "ora": "5.4.1", - "prettier": "2.6.2", + "prettier": "2.7.1", "protractor": "5.4.2", "request": "2.88.2", "semver": "7.3.7", diff --git a/repo-scripts/prune-dts/package.json b/repo-scripts/prune-dts/package.json index 2215aad67f0..6e293130951 100644 --- a/repo-scripts/prune-dts/package.json +++ b/repo-scripts/prune-dts/package.json @@ -15,7 +15,7 @@ "dependencies": { "eslint": "7.32.0", "eslint-plugin-unused-imports": "2.0.0", - "prettier": "2.6.2" + "prettier": "2.7.1" }, "repository": { "directory": "repo-scripts/prune-dts", @@ -33,7 +33,7 @@ }, "devDependencies": { "@types/eslint": "7.29.0", - "@types/prettier": "2.6.0", + "@types/prettier": "2.7.1", "mocha": "9.2.2" } } diff --git a/yarn.lock b/yarn.lock index 63e868fce9c..2f09e7974f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3291,10 +3291,10 @@ resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== -"@types/prettier@2.6.0": - version "2.6.0" - resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.0.tgz#efcbd41937f9ae7434c714ab698604822d890759" - integrity sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw== +"@types/prettier@2.7.1": + version "2.7.1" + resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.1.tgz#dfd20e2dc35f027cdd6c1908e80a5ddc7499670e" + integrity sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow== "@types/prettier@^2.1.5": version "2.3.2" @@ -13736,12 +13736,7 @@ prepend-http@^2.0.0: resolved "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= -prettier@2.6.2: - version "2.6.2" - resolved "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032" - integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew== - -prettier@^2.7.1: +prettier@2.7.1, prettier@^2.7.1: version "2.7.1" resolved "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== From a76aa6f29e2396cf36763ce285684ed981ed6586 Mon Sep 17 00:00:00 2001 From: dwyfrequency Date: Wed, 12 Oct 2022 15:05:08 -0400 Subject: [PATCH 2/8] Update memfs dep --- repo-scripts/size-analysis/package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/repo-scripts/size-analysis/package.json b/repo-scripts/size-analysis/package.json index c80e43f13a2..587272bcf3b 100644 --- a/repo-scripts/size-analysis/package.json +++ b/repo-scripts/size-analysis/package.json @@ -30,7 +30,7 @@ "@types/webpack": "5.28.0", "webpack-virtual-modules": "0.4.5", "child-process-promise": "2.2.1", - "memfs": "3.4.1", + "memfs": "3.4.7", "tmp": "0.2.1", "typescript": "4.2.2", "terser": "5.14.2", diff --git a/yarn.lock b/yarn.lock index 2f09e7974f6..86d004106af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8349,7 +8349,7 @@ fs-mkdirp-stream@^1.0.0: graceful-fs "^4.1.11" through2 "^2.0.3" -fs-monkey@1.0.3: +fs-monkey@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== @@ -11827,12 +11827,12 @@ media-typer@0.3.0: resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -memfs@3.4.1: - version "3.4.1" - resolved "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305" - integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw== +memfs@3.4.7: + version "3.4.7" + resolved "https://registry.npmjs.org/memfs/-/memfs-3.4.7.tgz#e5252ad2242a724f938cb937e3c4f7ceb1f70e5a" + integrity sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw== dependencies: - fs-monkey "1.0.3" + fs-monkey "^1.0.3" memoizee@0.4.X, memoizee@^0.4.15: version "0.4.15" From 10e27a9572966f87c44667aa84389b23d3bd8cd9 Mon Sep 17 00:00:00 2001 From: dwyfrequency Date: Wed, 12 Oct 2022 15:09:45 -0400 Subject: [PATCH 3/8] Update yargs --- package.json | 4 ++-- repo-scripts/size-analysis/package.json | 2 +- yarn.lock | 27 ++++++++++++++++--------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 9237c00c4fa..ddbc857de7a 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "@types/sinon": "9.0.11", "@types/sinon-chai": "3.2.8", "@types/tmp": "0.2.3", - "@types/yargs": "17.0.10", + "@types/yargs": "17.0.13", "@types/js-yaml": "4.0.5", "@types/request": "2.48.8", "@typescript-eslint/eslint-plugin": "4.33.0", @@ -153,6 +153,6 @@ "typescript": "4.2.2", "watch": "1.0.2", "webpack": "4.46.0", - "yargs": "17.4.1" + "yargs": "17.6.0" } } diff --git a/repo-scripts/size-analysis/package.json b/repo-scripts/size-analysis/package.json index 587272bcf3b..864babc772a 100644 --- a/repo-scripts/size-analysis/package.json +++ b/repo-scripts/size-analysis/package.json @@ -34,7 +34,7 @@ "tmp": "0.2.1", "typescript": "4.2.2", "terser": "5.14.2", - "yargs": "17.4.1", + "yargs": "17.6.0", "@firebase/util": "1.7.1", "gzip-size": "6.0.0", "glob": "7.2.0" diff --git a/yarn.lock b/yarn.lock index 86d004106af..0350f323f4f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3434,10 +3434,10 @@ resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129" integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw== -"@types/yargs@17.0.10": - version "17.0.10" - resolved "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz#591522fce85d8739bca7b8bb90d048e4478d186a" - integrity sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA== +"@types/yargs@17.0.13": + version "17.0.13" + resolved "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76" + integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg== dependencies: "@types/yargs-parser" "*" @@ -5683,6 +5683,15 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + clone-buffer@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" @@ -17777,12 +17786,12 @@ yargs@16.2.0, yargs@^16.1.1, yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" -yargs@17.4.1: - version "17.4.1" - resolved "https://registry.npmjs.org/yargs/-/yargs-17.4.1.tgz#ebe23284207bb75cee7c408c33e722bfb27b5284" - integrity sha512-WSZD9jgobAg3ZKuCQZSa3g9QOJeCCqLoLAykiWgmXnDo9EPnn4RPf5qVTtzgOx66o6/oqhcA5tHtJXpG8pMt3g== +yargs@17.6.0: + version "17.6.0" + resolved "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz#e134900fc1f218bc230192bdec06a0a5f973e46c" + integrity sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g== dependencies: - cliui "^7.0.2" + cliui "^8.0.1" escalade "^3.1.1" get-caller-file "^2.0.5" require-directory "^2.1.1" From f00598b24f94e5f0cf0165e7689cd25246896fae Mon Sep 17 00:00:00 2001 From: dwyfrequency Date: Thu, 13 Oct 2022 11:20:33 -0400 Subject: [PATCH 4/8] Update ts-node --- package.json | 2 +- packages/firestore-compat/package.json | 2 +- packages/firestore/package.json | 2 +- yarn.lock | 37 ++++++++++++++------------ 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index ddbc857de7a..0a65b161283 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "source-map-loader": "1.1.3", "terser": "5.14.2", "ts-loader": "8.4.0", - "ts-node": "10.7.0", + "ts-node": "10.9.1", "tslint": "6.1.3", "typedoc": "0.16.11", "typescript": "4.2.2", diff --git a/packages/firestore-compat/package.json b/packages/firestore-compat/package.json index e48b1fbf10f..295a4841cb2 100644 --- a/packages/firestore-compat/package.json +++ b/packages/firestore-compat/package.json @@ -57,7 +57,7 @@ "rollup-plugin-terser": "7.0.2", "rollup-plugin-typescript2": "0.31.2", "@rollup/plugin-node-resolve": "13.3.0", - "ts-node": "10.7.0", + "ts-node": "10.9.1", "typescript": "4.2.2" }, "license": "Apache-2.0", diff --git a/packages/firestore/package.json b/packages/firestore/package.json index 241a882fcd7..51f9b439a82 100644 --- a/packages/firestore/package.json +++ b/packages/firestore/package.json @@ -110,7 +110,7 @@ "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", "rollup-plugin-typescript2": "0.31.2", - "ts-node": "10.7.0", + "ts-node": "10.9.1", "typescript": "4.2.2" }, "repository": { diff --git a/yarn.lock b/yarn.lock index 0350f323f4f..1d0df3aac84 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1483,17 +1483,12 @@ resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@cspotcode/source-map-consumer@0.8.0": - version "0.8.0" - resolved "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b" - integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg== - -"@cspotcode/source-map-support@0.7.0": - version "0.7.0" - resolved "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz#4789840aa859e46d2f3173727ab707c66bf344f5" - integrity sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA== +"@cspotcode/source-map-support@^0.8.0": + version "0.8.1" + resolved "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" + integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw== dependencies: - "@cspotcode/source-map-consumer" "0.8.0" + "@jridgewell/trace-mapping" "0.3.9" "@dabh/diagnostics@^2.0.2": version "2.0.2" @@ -1747,6 +1742,14 @@ resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec" integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg== +"@jridgewell/trace-mapping@0.3.9": + version "0.3.9" + resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" + integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping@^0.3.0": version "0.3.4" resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3" @@ -16444,12 +16447,12 @@ ts-loader@8.4.0: micromatch "^4.0.0" semver "^7.3.4" -ts-node@10.7.0: - version "10.7.0" - resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.7.0.tgz#35d503d0fab3e2baa672a0e94f4b40653c2463f5" - integrity sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A== +ts-node@10.9.1: + version "10.9.1" + resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b" + integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw== dependencies: - "@cspotcode/source-map-support" "0.7.0" + "@cspotcode/source-map-support" "^0.8.0" "@tsconfig/node10" "^1.0.7" "@tsconfig/node12" "^1.0.7" "@tsconfig/node14" "^1.0.0" @@ -16460,7 +16463,7 @@ ts-node@10.7.0: create-require "^1.1.0" diff "^4.0.1" make-error "^1.1.1" - v8-compile-cache-lib "^3.0.0" + v8-compile-cache-lib "^3.0.1" yn "3.1.1" tsconfig-paths@^3.14.1: @@ -17051,7 +17054,7 @@ uuid@^8.0.0, uuid@^8.3.2: resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -v8-compile-cache-lib@^3.0.0: +v8-compile-cache-lib@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== From 5aafa979e85aaaeeec8ce4c4be4a4e91d1e958a4 Mon Sep 17 00:00:00 2001 From: dwyfrequency Date: Fri, 14 Oct 2022 13:01:17 -0400 Subject: [PATCH 5/8] Fix conflict --- packages/analytics-compat/package.json | 7 ++- packages/analytics/package.json | 4 +- packages/app-check-compat/package.json | 7 ++- packages/app-check/package.json | 7 ++- packages/app-compat/package.json | 4 +- packages/app/package.json | 4 +- packages/auth-compat/demo/package.json | 4 +- packages/auth-compat/package.json | 4 +- packages/auth/cordova/demo/package.json | 2 +- packages/auth/demo/package.json | 4 +- packages/auth/package.json | 4 +- packages/component/package.json | 4 +- packages/database/package.json | 6 +++ packages/firebase/package.json | 4 +- packages/firestore-compat/package.json | 4 +- packages/firestore/package.json | 4 +- packages/functions-compat/package.json | 7 ++- packages/functions/package.json | 7 ++- packages/installations-compat/package.json | 7 ++- packages/installations/package.json | 7 ++- packages/logger/package.json | 4 +- packages/messaging-compat/package.json | 2 +- packages/messaging/package.json | 6 +++ packages/performance-compat/package.json | 4 +- packages/performance/package.json | 7 ++- packages/remote-config-compat/package.json | 4 +- packages/remote-config/package.json | 6 +++ packages/rules-unit-testing/package.json | 4 +- packages/storage-compat/package.json | 8 ++- packages/storage/package.json | 8 ++- packages/template/package.json | 6 +++ packages/util/package.json | 4 +- packages/webchannel-wrapper/package.json | 4 +- repo-scripts/size-analysis/package.json | 4 +- yarn.lock | 62 ++++------------------ 35 files changed, 135 insertions(+), 99 deletions(-) diff --git a/packages/analytics-compat/package.json b/packages/analytics-compat/package.json index 2136d28bcbe..60f597705c8 100644 --- a/packages/analytics-compat/package.json +++ b/packages/analytics-compat/package.json @@ -24,10 +24,15 @@ "@firebase/app-compat": "0.x" }, "devDependencies": { +<<<<<<< HEAD "@firebase/app-compat": "0.1.37", "rollup": "2.72.1", +======= + "@firebase/app-compat": "0.1.36", + "rollup": "2.79.1", +>>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-json": "4.1.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "repository": { diff --git a/packages/analytics/package.json b/packages/analytics/package.json index 1958e69705b..1b0aaf5535c 100644 --- a/packages/analytics/package.json +++ b/packages/analytics/package.json @@ -49,11 +49,11 @@ "license": "Apache-2.0", "devDependencies": { "@firebase/app": "0.8.2", - "rollup": "2.72.1", + "rollup": "2.79.1", "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "repository": { diff --git a/packages/app-check-compat/package.json b/packages/app-check-compat/package.json index 654c1420d6a..25622222326 100644 --- a/packages/app-check-compat/package.json +++ b/packages/app-check-compat/package.json @@ -44,12 +44,17 @@ }, "license": "Apache-2.0", "devDependencies": { +<<<<<<< HEAD "@firebase/app-compat": "0.1.37", "rollup": "2.72.1", +======= + "@firebase/app-compat": "0.1.36", + "rollup": "2.79.1", +>>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "repository": { diff --git a/packages/app-check/package.json b/packages/app-check/package.json index 5e9ae8be9a3..7785ca3c8fc 100644 --- a/packages/app-check/package.json +++ b/packages/app-check/package.json @@ -45,12 +45,17 @@ }, "license": "Apache-2.0", "devDependencies": { +<<<<<<< HEAD "@firebase/app": "0.8.2", "rollup": "2.72.1", +======= + "@firebase/app": "0.8.1", + "rollup": "2.79.1", +>>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "repository": { diff --git a/packages/app-compat/package.json b/packages/app-compat/package.json index 6217f1f7b3c..62a0483621e 100644 --- a/packages/app-compat/package.json +++ b/packages/app-compat/package.json @@ -47,10 +47,10 @@ "tslib": "^2.1.0" }, "devDependencies": { - "rollup": "2.72.1", + "rollup": "2.79.1", "@rollup/plugin-json": "4.1.0", "rollup-plugin-replace": "2.2.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "repository": { diff --git a/packages/app/package.json b/packages/app/package.json index dbb874f18c9..a97bd303b1c 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -47,9 +47,9 @@ "license": "Apache-2.0", "devDependencies": { "@rollup/plugin-json": "4.1.0", - "rollup": "2.72.1", + "rollup": "2.79.1", "rollup-plugin-replace": "2.2.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "repository": { diff --git a/packages/auth-compat/demo/package.json b/packages/auth-compat/demo/package.json index c2f15a95bac..aa7eb50a6b2 100644 --- a/packages/auth-compat/demo/package.json +++ b/packages/auth-compat/demo/package.json @@ -29,10 +29,10 @@ "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", - "rollup": "2.72.1", + "rollup": "2.79.1", "rollup-plugin-replace": "2.2.0", "rollup-plugin-sourcemaps": "0.6.3", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "rollup-plugin-uglify": "6.0.4", "typescript": "4.2.2" }, diff --git a/packages/auth-compat/package.json b/packages/auth-compat/package.json index 15d3aa466af..1ca459ddd50 100644 --- a/packages/auth-compat/package.json +++ b/packages/auth-compat/package.json @@ -58,9 +58,9 @@ "devDependencies": { "@firebase/app-compat": "0.1.37", "@rollup/plugin-json": "4.1.0", - "rollup": "2.72.1", + "rollup": "2.79.1", "rollup-plugin-replace": "2.2.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "repository": { diff --git a/packages/auth/cordova/demo/package.json b/packages/auth/cordova/demo/package.json index 75c6d03fc34..9ece12f5dfb 100644 --- a/packages/auth/cordova/demo/package.json +++ b/packages/auth/cordova/demo/package.json @@ -14,7 +14,7 @@ "cordova-ios": "6.2.0", "cordova-plugin-whitelist": "1.3.5", "cordova-universal-links-plugin": "1.2.1", - "rollup": "2.72.1" + "rollup": "2.79.1" }, "cordova": { "plugins": { diff --git a/packages/auth/demo/package.json b/packages/auth/demo/package.json index 6b6dc71f85d..f9e047528df 100644 --- a/packages/auth/demo/package.json +++ b/packages/auth/demo/package.json @@ -26,11 +26,11 @@ "license": "Apache-2.0", "devDependencies": { "@rollup/plugin-strip": "2.1.0", - "rollup": "2.72.1", + "rollup": "2.79.1", "@rollup/plugin-json": "4.1.0", "rollup-plugin-replace": "2.2.0", "rollup-plugin-terser": "7.0.2", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "rollup-plugin-uglify": "6.0.4", "@rollup/plugin-node-resolve": "13.3.0", "lerna": "4.0.0" diff --git a/packages/auth/package.json b/packages/auth/package.json index e161b4541b8..2c137e55d37 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -115,9 +115,9 @@ "@rollup/plugin-json": "4.1.0", "@rollup/plugin-strip": "2.1.0", "chromedriver": "98.0.1", - "rollup": "2.72.1", + "rollup": "2.79.1", "rollup-plugin-sourcemaps": "0.6.3", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "repository": { diff --git a/packages/component/package.json b/packages/component/package.json index 0a682340000..36774736576 100644 --- a/packages/component/package.json +++ b/packages/component/package.json @@ -37,8 +37,8 @@ }, "license": "Apache-2.0", "devDependencies": { - "rollup": "2.72.1", - "rollup-plugin-typescript2": "0.31.2", + "rollup": "2.79.1", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "repository": { diff --git a/packages/database/package.json b/packages/database/package.json index bcc4ae90abf..8c40661d496 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -53,9 +53,15 @@ "tslib": "^2.1.0" }, "devDependencies": { +<<<<<<< HEAD "@firebase/app": "0.8.2", "rollup": "2.72.1", "rollup-plugin-typescript2": "0.31.2", +======= + "@firebase/app": "0.8.1", + "rollup": "2.79.1", + "rollup-plugin-typescript2": "0.34.1", +>>>>>>> f51379262 (Update rollup deps) "typescript": "4.2.2" }, "repository": { diff --git a/packages/firebase/package.json b/packages/firebase/package.json index 3a84f065fbe..926dec27681 100644 --- a/packages/firebase/package.json +++ b/packages/firebase/package.json @@ -289,12 +289,12 @@ "@firebase/util": "1.7.2" }, "devDependencies": { - "rollup": "2.72.1", + "rollup": "2.79.1", "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-node-resolve": "13.3.0", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "rollup-plugin-uglify": "6.0.4", "gulp": "4.0.2", "gulp-sourcemaps": "3.0.0", diff --git a/packages/firestore-compat/package.json b/packages/firestore-compat/package.json index 1c3d6d40a82..3b8a5912611 100644 --- a/packages/firestore-compat/package.json +++ b/packages/firestore-compat/package.json @@ -52,10 +52,10 @@ "devDependencies": { "@firebase/app-compat": "0.1.37", "@types/eslint": "7.29.0", - "rollup": "2.72.1", + "rollup": "2.79.1", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "@rollup/plugin-node-resolve": "13.3.0", "ts-node": "10.9.1", "typescript": "4.2.2" diff --git a/packages/firestore/package.json b/packages/firestore/package.json index 9aeb7070695..2f67b792f76 100644 --- a/packages/firestore/package.json +++ b/packages/firestore/package.json @@ -103,13 +103,13 @@ "chai-exclude": "2.1.0", "json-stable-stringify": "1.0.1", "protobufjs": "6.11.3", - "rollup": "2.72.1", + "rollup": "2.79.1", "rollup-plugin-copy": "3.4.0", "rollup-plugin-copy-assets": "2.0.3", "rollup-plugin-replace": "2.2.0", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "ts-node": "10.9.1", "typescript": "4.2.2" }, diff --git a/packages/functions-compat/package.json b/packages/functions-compat/package.json index 2a23101182f..9bb135bf8dd 100644 --- a/packages/functions-compat/package.json +++ b/packages/functions-compat/package.json @@ -27,10 +27,15 @@ "@firebase/app-compat": "0.x" }, "devDependencies": { +<<<<<<< HEAD "@firebase/app-compat": "0.1.37", "rollup": "2.72.1", +======= + "@firebase/app-compat": "0.1.36", + "rollup": "2.79.1", +>>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-json": "4.1.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "repository": { diff --git a/packages/functions/package.json b/packages/functions/package.json index 65237092bcc..1d18e751cc5 100644 --- a/packages/functions/package.json +++ b/packages/functions/package.json @@ -46,10 +46,15 @@ "@firebase/app": "0.x" }, "devDependencies": { +<<<<<<< HEAD "@firebase/app": "0.8.2", "rollup": "2.72.1", +======= + "@firebase/app": "0.8.1", + "rollup": "2.79.1", +>>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-json": "4.1.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "repository": { diff --git a/packages/installations-compat/package.json b/packages/installations-compat/package.json index e6beb2d0f33..62d6eb62f1c 100644 --- a/packages/installations-compat/package.json +++ b/packages/installations-compat/package.json @@ -45,12 +45,17 @@ "url": "https://github.com/firebase/firebase-js-sdk/issues" }, "devDependencies": { +<<<<<<< HEAD "@firebase/app-compat": "0.1.37", "rollup": "2.72.1", +======= + "@firebase/app-compat": "0.1.36", + "rollup": "2.79.1", +>>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "rollup-plugin-uglify": "6.0.4", "typescript": "4.2.2" }, diff --git a/packages/installations/package.json b/packages/installations/package.json index 6915c17808f..1c8557dfef5 100644 --- a/packages/installations/package.json +++ b/packages/installations/package.json @@ -50,12 +50,17 @@ "url": "https://github.com/firebase/firebase-js-sdk/issues" }, "devDependencies": { +<<<<<<< HEAD "@firebase/app": "0.8.2", "rollup": "2.72.1", +======= + "@firebase/app": "0.8.1", + "rollup": "2.79.1", +>>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "rollup-plugin-uglify": "6.0.4", "typescript": "4.2.2" }, diff --git a/packages/logger/package.json b/packages/logger/package.json index 017335c71ea..d7a2c1b16d6 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -36,8 +36,8 @@ "tslib": "^2.1.0" }, "devDependencies": { - "rollup": "2.72.1", - "rollup-plugin-typescript2": "0.31.2", + "rollup": "2.79.1", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "repository": { diff --git a/packages/messaging-compat/package.json b/packages/messaging-compat/package.json index ac9604d8ea6..b3773456617 100644 --- a/packages/messaging-compat/package.json +++ b/packages/messaging-compat/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@firebase/app-compat": "0.1.37", "@rollup/plugin-json": "4.1.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "ts-essentials": "9.3.0", "typescript": "4.2.2" }, diff --git a/packages/messaging/package.json b/packages/messaging/package.json index 85e9c0b61fd..212d7bec4dd 100644 --- a/packages/messaging/package.json +++ b/packages/messaging/package.json @@ -62,9 +62,15 @@ "tslib": "^2.1.0" }, "devDependencies": { +<<<<<<< HEAD "@firebase/app": "0.8.2", "rollup": "2.72.1", "rollup-plugin-typescript2": "0.31.2", +======= + "@firebase/app": "0.8.1", + "rollup": "2.79.1", + "rollup-plugin-typescript2": "0.34.1", +>>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-json": "4.1.0", "ts-essentials": "9.3.0", "typescript": "4.2.2" diff --git a/packages/performance-compat/package.json b/packages/performance-compat/package.json index 8c9fe514d15..c4a508b8a47 100644 --- a/packages/performance-compat/package.json +++ b/packages/performance-compat/package.json @@ -47,10 +47,10 @@ "tslib": "^2.1.0" }, "devDependencies": { - "rollup": "2.72.1", + "rollup": "2.79.1", "@rollup/plugin-json": "4.1.0", "rollup-plugin-replace": "2.2.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2", "@firebase/app-compat": "0.1.37" }, diff --git a/packages/performance/package.json b/packages/performance/package.json index cbd5eae905f..cd03d5d0716 100644 --- a/packages/performance/package.json +++ b/packages/performance/package.json @@ -47,10 +47,15 @@ }, "license": "Apache-2.0", "devDependencies": { +<<<<<<< HEAD "@firebase/app": "0.8.2", "rollup": "2.72.1", +======= + "@firebase/app": "0.8.1", + "rollup": "2.79.1", +>>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-json": "4.1.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "repository": { diff --git a/packages/remote-config-compat/package.json b/packages/remote-config-compat/package.json index 1af4e74df59..91a85ddf12b 100644 --- a/packages/remote-config-compat/package.json +++ b/packages/remote-config-compat/package.json @@ -46,10 +46,10 @@ "tslib": "^2.1.0" }, "devDependencies": { - "rollup": "2.72.1", + "rollup": "2.79.1", "@rollup/plugin-json": "4.1.0", "rollup-plugin-replace": "2.2.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2", "@firebase/app-compat": "0.1.37" }, diff --git a/packages/remote-config/package.json b/packages/remote-config/package.json index 27d267ad404..f5c339bb48c 100644 --- a/packages/remote-config/package.json +++ b/packages/remote-config/package.json @@ -49,9 +49,15 @@ }, "license": "Apache-2.0", "devDependencies": { +<<<<<<< HEAD "@firebase/app": "0.8.2", "rollup": "2.72.1", "rollup-plugin-typescript2": "0.31.2", +======= + "@firebase/app": "0.8.1", + "rollup": "2.79.1", + "rollup-plugin-typescript2": "0.34.1", +>>>>>>> f51379262 (Update rollup deps) "typescript": "4.2.2" }, "repository": { diff --git a/packages/rules-unit-testing/package.json b/packages/rules-unit-testing/package.json index 593e2b7a7fc..0a908ef63bc 100644 --- a/packages/rules-unit-testing/package.json +++ b/packages/rules-unit-testing/package.json @@ -34,8 +34,8 @@ }, "license": "Apache-2.0", "devDependencies": { - "rollup": "2.72.1", - "rollup-plugin-typescript2": "0.31.2" + "rollup": "2.79.1", + "rollup-plugin-typescript2": "0.34.1" }, "peerDependencies": { "firebase": "^9.0.0" diff --git a/packages/storage-compat/package.json b/packages/storage-compat/package.json index 24e14aa8393..d852c3750ae 100644 --- a/packages/storage-compat/package.json +++ b/packages/storage-compat/package.json @@ -45,11 +45,17 @@ "tslib": "^2.1.0" }, "devDependencies": { +<<<<<<< HEAD "@firebase/app-compat": "0.1.37", "@firebase/auth-compat": "0.2.23", "rollup": "2.72.1", +======= + "@firebase/app-compat": "0.1.36", + "@firebase/auth-compat": "0.2.22", + "rollup": "2.79.1", +>>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-json": "4.1.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "files": [ diff --git a/packages/storage/package.json b/packages/storage/package.json index 389ff0f5003..bd85d2f5ed9 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -51,12 +51,18 @@ "@firebase/app": "0.x" }, "devDependencies": { +<<<<<<< HEAD "@firebase/app": "0.8.2", "@firebase/auth": "0.20.10", "rollup": "2.72.1", +======= + "@firebase/app": "0.8.1", + "@firebase/auth": "0.20.9", + "rollup": "2.79.1", +>>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-alias": "3.1.9", "@rollup/plugin-json": "4.1.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "repository": { diff --git a/packages/template/package.json b/packages/template/package.json index 3b08a8772f5..0e7c78633a4 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -45,9 +45,15 @@ }, "license": "Apache-2.0", "devDependencies": { +<<<<<<< HEAD "@firebase/app": "0.8.2", "rollup": "2.72.1", "rollup-plugin-typescript2": "0.31.2", +======= + "@firebase/app": "0.8.1", + "rollup": "2.79.1", + "rollup-plugin-typescript2": "0.34.1", +>>>>>>> f51379262 (Update rollup deps) "typescript": "4.2.2" }, "repository": { diff --git a/packages/util/package.json b/packages/util/package.json index 1943087a89f..6d9d60c9907 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -42,8 +42,8 @@ "tslib": "^2.1.0" }, "devDependencies": { - "rollup": "2.72.1", - "rollup-plugin-typescript2": "0.31.2", + "rollup": "2.79.1", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "repository": { diff --git a/packages/webchannel-wrapper/package.json b/packages/webchannel-wrapper/package.json index 50b34c2bf86..65e674c3edf 100644 --- a/packages/webchannel-wrapper/package.json +++ b/packages/webchannel-wrapper/package.json @@ -31,9 +31,9 @@ "google-closure-library": "20220301.0.0", "gulp": "4.0.2", "gulp-sourcemaps": "3.0.0", - "rollup": "2.72.1", + "rollup": "2.79.1", "rollup-plugin-sourcemaps": "0.6.3", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" }, "repository": { diff --git a/repo-scripts/size-analysis/package.json b/repo-scripts/size-analysis/package.json index 4372c7765f3..fb300b74a18 100644 --- a/repo-scripts/size-analysis/package.json +++ b/repo-scripts/size-analysis/package.json @@ -19,12 +19,12 @@ "build": "rollup -c" }, "dependencies": { - "rollup": "2.72.1", + "rollup": "2.79.1", "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", "rollup-plugin-replace": "2.2.0", - "rollup-plugin-typescript2": "0.31.2", + "rollup-plugin-typescript2": "0.34.1", "@rollup/plugin-virtual": "2.1.0", "webpack": "4.46.0", "@types/webpack": "5.28.0", diff --git a/yarn.lock b/yarn.lock index 1d0df3aac84..7e60fcd705a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3817,15 +3817,6 @@ resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -"@yarn-tool/resolve-package@^1.0.40": - version "1.0.46" - resolved "https://registry.npmjs.org/@yarn-tool/resolve-package/-/resolve-package-1.0.46.tgz#db7354380e5ca7682294af59e5ab0f7fce640ac1" - integrity sha512-RJcBGTVywUqYGRtGkPSgJC/ozf0wK/xjUy66tXkbpL35U0o1oef4S0v23euxA/CiukqBWr2fRGtGY6FidESdTg== - dependencies: - pkg-dir "< 6 >= 5" - tslib "^2.3.1" - upath2 "^3.1.12" - JSONStream@^1.0.4: version "1.3.5" resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" @@ -13510,13 +13501,6 @@ path-is-inside@^1.0.1: resolved "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= -path-is-network-drive@^1.0.13: - version "1.0.13" - resolved "https://registry.npmjs.org/path-is-network-drive/-/path-is-network-drive-1.0.13.tgz#c9aa0183eb72c328aa83f43def93ddcb9d7ec4d4" - integrity sha512-Hg74mRN6mmXV+gTm3INjFK40ncAmC/Lo4qoQaSZ+GT3hZzlKdWQSqAjqyPeW0SvObP2W073WyYEBWY9d3wOm3A== - dependencies: - tslib "^2.3.1" - path-key@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" @@ -13544,13 +13528,6 @@ path-root@^0.1.1: dependencies: path-root-regex "^0.1.0" -path-strip-sep@^1.0.10: - version "1.0.10" - resolved "https://registry.npmjs.org/path-strip-sep/-/path-strip-sep-1.0.10.tgz#2be4e789406b298af8709ff79af716134b733b98" - integrity sha512-JpCy+8LAJQQTO1bQsb/84s1g+/Stm3h39aOpPRBQ/paMUGVPPZChLTOTKHoaCkc/6sKuF7yVsnq5Pe1S6xQGcA== - dependencies: - tslib "^2.3.1" - path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -13669,13 +13646,6 @@ pirates@^4.0.5: resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== -"pkg-dir@< 6 >= 5": - version "5.0.0" - resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760" - integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA== - dependencies: - find-up "^5.0.0" - pkg-dir@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" @@ -14775,17 +14745,16 @@ rollup-plugin-terser@7.0.2: serialize-javascript "^4.0.0" terser "^5.0.0" -rollup-plugin-typescript2@0.31.2: - version "0.31.2" - resolved "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.31.2.tgz#463aa713a7e2bf85b92860094b9f7fb274c5a4d8" - integrity sha512-hRwEYR1C8xDGVVMFJQdEVnNAeWRvpaY97g5mp3IeLnzhNXzSVq78Ye/BJ9PAaUfN4DXa/uDnqerifMOaMFY54Q== +rollup-plugin-typescript2@0.34.1: + version "0.34.1" + resolved "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.34.1.tgz#c457f155a71d133c142689213fce78694e30d0be" + integrity sha512-P4cHLtGikESmqi1CA+tdMDUv8WbQV48mzPYt77TSTOPJpERyZ9TXdDgjSDix8Fkqce6soYz3+fa4lrC93IEkcw== dependencies: "@rollup/pluginutils" "^4.1.2" - "@yarn-tool/resolve-package" "^1.0.40" find-cache-dir "^3.3.2" fs-extra "^10.0.0" - resolve "^1.20.0" - tslib "^2.3.1" + semver "^7.3.7" + tslib "^2.4.0" rollup-plugin-uglify@6.0.4: version "6.0.4" @@ -14804,10 +14773,10 @@ rollup-pluginutils@^2.6.0: dependencies: estree-walker "^0.6.1" -rollup@2.72.1: - version "2.72.1" - resolved "https://registry.npmjs.org/rollup/-/rollup-2.72.1.tgz#861c94790537b10008f0ca0fbc60e631aabdd045" - integrity sha512-NTc5UGy/NWFGpSqF1lFY8z9Adri6uhyMLI6LvPAXdBKoPRFhIIiBUpt+Qg2awixqO3xvzSijjhnb4+QEZwJmxA== +rollup@2.79.1: + version "2.79.1" + resolved "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" + integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== optionalDependencies: fsevents "~2.3.2" @@ -16486,7 +16455,7 @@ tslib@^2.0.1, tslib@^2.1.0: resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== -tslib@^2.3.1: +tslib@^2.3.1, tslib@^2.4.0: version "2.4.0" resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== @@ -16901,15 +16870,6 @@ unzipper@^0.10.10: readable-stream "~2.3.6" setimmediate "~1.0.4" -upath2@^3.1.12: - version "3.1.12" - resolved "https://registry.npmjs.org/upath2/-/upath2-3.1.12.tgz#441b3dfbadde21731017bd1b7beb169498efd0a9" - integrity sha512-yC3eZeCyCXFWjy7Nu4pgjLhXNYjuzuUmJiRgSSw6TJp8Emc+E4951HGPJf+bldFC5SL7oBLeNbtm1fGzXn2gxw== - dependencies: - path-is-network-drive "^1.0.13" - path-strip-sep "^1.0.10" - tslib "^2.3.1" - upath@^1.1.1: version "1.2.0" resolved "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" From 44b2761cb3bb0a970190b486a9038c43cea85f1f Mon Sep 17 00:00:00 2001 From: dwyfrequency Date: Fri, 14 Oct 2022 13:07:23 -0400 Subject: [PATCH 6/8] Fix merge conflicts --- packages/analytics-compat/package.json | 5 ----- packages/app-check-compat/package.json | 5 ----- packages/app-check/package.json | 5 ----- packages/messaging/package.json | 6 ------ packages/performance/package.json | 5 ----- packages/remote-config/package.json | 6 ------ packages/storage-compat/package.json | 6 ------ packages/storage/package.json | 6 ------ packages/template/package.json | 6 ------ 9 files changed, 50 deletions(-) diff --git a/packages/analytics-compat/package.json b/packages/analytics-compat/package.json index 60f597705c8..93b67d2cc40 100644 --- a/packages/analytics-compat/package.json +++ b/packages/analytics-compat/package.json @@ -24,13 +24,8 @@ "@firebase/app-compat": "0.x" }, "devDependencies": { -<<<<<<< HEAD "@firebase/app-compat": "0.1.37", - "rollup": "2.72.1", -======= - "@firebase/app-compat": "0.1.36", "rollup": "2.79.1", ->>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-json": "4.1.0", "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" diff --git a/packages/app-check-compat/package.json b/packages/app-check-compat/package.json index 25622222326..d3bebcddd7f 100644 --- a/packages/app-check-compat/package.json +++ b/packages/app-check-compat/package.json @@ -44,13 +44,8 @@ }, "license": "Apache-2.0", "devDependencies": { -<<<<<<< HEAD "@firebase/app-compat": "0.1.37", - "rollup": "2.72.1", -======= - "@firebase/app-compat": "0.1.36", "rollup": "2.79.1", ->>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", diff --git a/packages/app-check/package.json b/packages/app-check/package.json index 7785ca3c8fc..c8ed6356761 100644 --- a/packages/app-check/package.json +++ b/packages/app-check/package.json @@ -45,13 +45,8 @@ }, "license": "Apache-2.0", "devDependencies": { -<<<<<<< HEAD "@firebase/app": "0.8.2", - "rollup": "2.72.1", -======= - "@firebase/app": "0.8.1", "rollup": "2.79.1", ->>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", diff --git a/packages/messaging/package.json b/packages/messaging/package.json index 212d7bec4dd..51806f488e3 100644 --- a/packages/messaging/package.json +++ b/packages/messaging/package.json @@ -62,15 +62,9 @@ "tslib": "^2.1.0" }, "devDependencies": { -<<<<<<< HEAD "@firebase/app": "0.8.2", - "rollup": "2.72.1", - "rollup-plugin-typescript2": "0.31.2", -======= - "@firebase/app": "0.8.1", "rollup": "2.79.1", "rollup-plugin-typescript2": "0.34.1", ->>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-json": "4.1.0", "ts-essentials": "9.3.0", "typescript": "4.2.2" diff --git a/packages/performance/package.json b/packages/performance/package.json index cd03d5d0716..7436a7571ea 100644 --- a/packages/performance/package.json +++ b/packages/performance/package.json @@ -47,13 +47,8 @@ }, "license": "Apache-2.0", "devDependencies": { -<<<<<<< HEAD "@firebase/app": "0.8.2", - "rollup": "2.72.1", -======= - "@firebase/app": "0.8.1", "rollup": "2.79.1", ->>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-json": "4.1.0", "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" diff --git a/packages/remote-config/package.json b/packages/remote-config/package.json index f5c339bb48c..2db089824b9 100644 --- a/packages/remote-config/package.json +++ b/packages/remote-config/package.json @@ -49,15 +49,9 @@ }, "license": "Apache-2.0", "devDependencies": { -<<<<<<< HEAD "@firebase/app": "0.8.2", - "rollup": "2.72.1", - "rollup-plugin-typescript2": "0.31.2", -======= - "@firebase/app": "0.8.1", "rollup": "2.79.1", "rollup-plugin-typescript2": "0.34.1", ->>>>>>> f51379262 (Update rollup deps) "typescript": "4.2.2" }, "repository": { diff --git a/packages/storage-compat/package.json b/packages/storage-compat/package.json index d852c3750ae..ceb7a112ff1 100644 --- a/packages/storage-compat/package.json +++ b/packages/storage-compat/package.json @@ -45,15 +45,9 @@ "tslib": "^2.1.0" }, "devDependencies": { -<<<<<<< HEAD "@firebase/app-compat": "0.1.37", "@firebase/auth-compat": "0.2.23", - "rollup": "2.72.1", -======= - "@firebase/app-compat": "0.1.36", - "@firebase/auth-compat": "0.2.22", "rollup": "2.79.1", ->>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-json": "4.1.0", "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" diff --git a/packages/storage/package.json b/packages/storage/package.json index bd85d2f5ed9..4d52a310302 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -51,15 +51,9 @@ "@firebase/app": "0.x" }, "devDependencies": { -<<<<<<< HEAD "@firebase/app": "0.8.2", "@firebase/auth": "0.20.10", - "rollup": "2.72.1", -======= - "@firebase/app": "0.8.1", - "@firebase/auth": "0.20.9", "rollup": "2.79.1", ->>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-alias": "3.1.9", "@rollup/plugin-json": "4.1.0", "rollup-plugin-typescript2": "0.34.1", diff --git a/packages/template/package.json b/packages/template/package.json index 0e7c78633a4..15da06066fb 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -45,15 +45,9 @@ }, "license": "Apache-2.0", "devDependencies": { -<<<<<<< HEAD "@firebase/app": "0.8.2", - "rollup": "2.72.1", - "rollup-plugin-typescript2": "0.31.2", -======= - "@firebase/app": "0.8.1", "rollup": "2.79.1", "rollup-plugin-typescript2": "0.34.1", ->>>>>>> f51379262 (Update rollup deps) "typescript": "4.2.2" }, "repository": { From a85a34aa63eab1f4451e07fbaeff40b3de103a7a Mon Sep 17 00:00:00 2001 From: dwyfrequency Date: Fri, 14 Oct 2022 13:13:26 -0400 Subject: [PATCH 7/8] Final merge fix --- packages/database/package.json | 6 - packages/functions-compat/package.json | 5 - packages/functions/package.json | 5 - packages/installations-compat/package.json | 5 - packages/installations/package.json | 5 - .../rules-unit-testing/functions/yarn.lock | 394 +++++++----------- 6 files changed, 156 insertions(+), 264 deletions(-) diff --git a/packages/database/package.json b/packages/database/package.json index 8c40661d496..9dcb9fa36b4 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -53,15 +53,9 @@ "tslib": "^2.1.0" }, "devDependencies": { -<<<<<<< HEAD "@firebase/app": "0.8.2", - "rollup": "2.72.1", - "rollup-plugin-typescript2": "0.31.2", -======= - "@firebase/app": "0.8.1", "rollup": "2.79.1", "rollup-plugin-typescript2": "0.34.1", ->>>>>>> f51379262 (Update rollup deps) "typescript": "4.2.2" }, "repository": { diff --git a/packages/functions-compat/package.json b/packages/functions-compat/package.json index 9bb135bf8dd..9dfeb6299a4 100644 --- a/packages/functions-compat/package.json +++ b/packages/functions-compat/package.json @@ -27,13 +27,8 @@ "@firebase/app-compat": "0.x" }, "devDependencies": { -<<<<<<< HEAD "@firebase/app-compat": "0.1.37", - "rollup": "2.72.1", -======= - "@firebase/app-compat": "0.1.36", "rollup": "2.79.1", ->>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-json": "4.1.0", "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" diff --git a/packages/functions/package.json b/packages/functions/package.json index 1d18e751cc5..2af992f46de 100644 --- a/packages/functions/package.json +++ b/packages/functions/package.json @@ -46,13 +46,8 @@ "@firebase/app": "0.x" }, "devDependencies": { -<<<<<<< HEAD "@firebase/app": "0.8.2", - "rollup": "2.72.1", -======= - "@firebase/app": "0.8.1", "rollup": "2.79.1", ->>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-json": "4.1.0", "rollup-plugin-typescript2": "0.34.1", "typescript": "4.2.2" diff --git a/packages/installations-compat/package.json b/packages/installations-compat/package.json index 62d6eb62f1c..e39d1f17036 100644 --- a/packages/installations-compat/package.json +++ b/packages/installations-compat/package.json @@ -45,13 +45,8 @@ "url": "https://github.com/firebase/firebase-js-sdk/issues" }, "devDependencies": { -<<<<<<< HEAD "@firebase/app-compat": "0.1.37", - "rollup": "2.72.1", -======= - "@firebase/app-compat": "0.1.36", "rollup": "2.79.1", ->>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", diff --git a/packages/installations/package.json b/packages/installations/package.json index 1c8557dfef5..947efdea67d 100644 --- a/packages/installations/package.json +++ b/packages/installations/package.json @@ -50,13 +50,8 @@ "url": "https://github.com/firebase/firebase-js-sdk/issues" }, "devDependencies": { -<<<<<<< HEAD "@firebase/app": "0.8.2", - "rollup": "2.72.1", -======= - "@firebase/app": "0.8.1", "rollup": "2.79.1", ->>>>>>> f51379262 (Update rollup deps) "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", diff --git a/packages/rules-unit-testing/functions/yarn.lock b/packages/rules-unit-testing/functions/yarn.lock index 9e92f7cc1d8..4585bfa2989 100644 --- a/packages/rules-unit-testing/functions/yarn.lock +++ b/packages/rules-unit-testing/functions/yarn.lock @@ -2,43 +2,55 @@ # yarn lockfile v1 +"@fastify/busboy@^1.1.0": + version "1.1.0" + resolved "https://registry.npmjs.org/@fastify/busboy/-/busboy-1.1.0.tgz#4472f856e2bb5a9ee34ad64b93891b73b73537ca" + integrity sha512-Fv854f94v0CzIDllbY3i/0NJPNBRNLDawf3BTYVGCe9VrIIs3Wi7AFx24F9NzCxdf0wyx/x0Q9kEVnvDOPnlxA== + dependencies: + text-decoding "^1.0.0" + "@firebase/app-types@0.7.0": version "0.7.0" resolved "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.7.0.tgz#c9e16d1b8bed1a991840b8d2a725fb58d0b5899f" integrity sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg== +"@firebase/app-types@0.8.0": + version "0.8.0" + resolved "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.8.0.tgz#50a539a0a20bef8c50494d0615592fe2a384851f" + integrity sha512-Lec3VVquUwXPn2UReGSsfTxuMBVRmzGIwA/CJnF0LQuPgv9kOmXk9mVqsDMfHxHtqjai0n6wWHR2TqjdVV/bYA== + "@firebase/auth-interop-types@0.1.6": version "0.1.6" resolved "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz#5ce13fc1c527ad36f1bb1322c4492680a6cf4964" integrity sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g== -"@firebase/component@0.5.13": - version "0.5.13" - resolved "https://registry.npmjs.org/@firebase/component/-/component-0.5.13.tgz#65a382e83bddd109380c9aa1f280791b1b4567c4" - integrity sha512-hxhJtpD8Ppf/VU2Rlos6KFCEV77TGIGD5bJlkPK1+B/WUe0mC6dTjW7KhZtXTc+qRBp9nFHWcsIORnT8liHP9w== +"@firebase/component@0.5.20": + version "0.5.20" + resolved "https://registry.npmjs.org/@firebase/component/-/component-0.5.20.tgz#52165b5f7d25c4ac9c679e4e48d6f7fa7bf722cf" + integrity sha512-wP51tQBlPFprfAWxWjzC/56hG4APhl43jFsgwuqCl3bhVbiKcr278QbrbGNmIXDeGKo4sGZLAnH9whl2apeCmA== dependencies: - "@firebase/util" "1.5.2" + "@firebase/util" "1.7.2" tslib "^2.1.0" -"@firebase/database-compat@^0.1.8": - version "0.1.8" - resolved "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.1.8.tgz#ab627f2bdbe94367f515d5bded880c86886bbd28" - integrity sha512-dhXr5CSieBuKNdU96HgeewMQCT9EgOIkfF1GNy+iRrdl7BWLxmlKuvLfK319rmIytSs/vnCzcD9uqyxTeU/A3A== +"@firebase/database-compat@^0.2.0": + version "0.2.9" + resolved "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.2.9.tgz#a1b4ecf94e11eadfc21aa48121b3ba7ea18a57ae" + integrity sha512-zzyFM3+jW/qYtHojiQirHXGXYyElbqVngEEn/i2gXoSzcK0Y2AL5oHAqGYXLaaW0+t4Zwnssh3HnQJM8C1D0fw== dependencies: - "@firebase/component" "0.5.13" - "@firebase/database" "0.12.8" - "@firebase/database-types" "0.9.7" - "@firebase/logger" "0.3.2" - "@firebase/util" "1.5.2" + "@firebase/component" "0.5.20" + "@firebase/database" "0.13.9" + "@firebase/database-types" "0.9.16" + "@firebase/logger" "0.3.3" + "@firebase/util" "1.7.2" tslib "^2.1.0" -"@firebase/database-types@0.9.7": - version "0.9.7" - resolved "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.9.7.tgz#c5ee0ea9bb2703a13c1c47fe880fc577d5ce7f33" - integrity sha512-EFhgL89Fz6DY3kkB8TzdHvdu8XaqqvzcF2DLVOXEnQ3Ms7L755p5EO42LfxXoJqb9jKFvgLpFmKicyJG25WFWw== +"@firebase/database-types@0.9.16": + version "0.9.16" + resolved "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.9.16.tgz#4f7f612c00346641a641ac689005857190e91ebc" + integrity sha512-dK/uFgHisrVijSoHf9RLJ7NwvlOul2rO/z9ufOSbGd8/TqFVASXz+19mynhDIoSEnyQtJC/NTyBzSPfjz0w61w== dependencies: - "@firebase/app-types" "0.7.0" - "@firebase/util" "1.5.2" + "@firebase/app-types" "0.8.0" + "@firebase/util" "1.7.2" "@firebase/database-types@^0.9.7": version "0.9.8" @@ -48,29 +60,22 @@ "@firebase/app-types" "0.7.0" "@firebase/util" "1.6.0" -"@firebase/database@0.12.8": - version "0.12.8" - resolved "https://registry.npmjs.org/@firebase/database/-/database-0.12.8.tgz#11a1b6752ba0614892af15c71958e00ce16f5824" - integrity sha512-JBQVfFLzfhxlQbl4OU6ov9fdsddkytBQdtSSR49cz48homj38ccltAhK6seum+BI7f28cV2LFHF9672lcN+qxA== +"@firebase/database@0.13.9": + version "0.13.9" + resolved "https://registry.npmjs.org/@firebase/database/-/database-0.13.9.tgz#8cf8c77fb837ed1a6fa85565ac8c28864b0957fb" + integrity sha512-raQEBgQQybaEoMloJL8wWHQywGQ9mF2VbitvHydsbSNn+KL/xRDjXeQZPuuSbRjkYV6mR8jvQB7gpnzQQNE8Qg== dependencies: "@firebase/auth-interop-types" "0.1.6" - "@firebase/component" "0.5.13" - "@firebase/logger" "0.3.2" - "@firebase/util" "1.5.2" + "@firebase/component" "0.5.20" + "@firebase/logger" "0.3.3" + "@firebase/util" "1.7.2" faye-websocket "0.11.4" tslib "^2.1.0" -"@firebase/logger@0.3.2": - version "0.3.2" - resolved "https://registry.npmjs.org/@firebase/logger/-/logger-0.3.2.tgz#5046ffa8295c577846d54b6ca95645a03809800e" - integrity sha512-lzLrcJp9QBWpo40OcOM9B8QEtBw2Fk1zOZQdvv+rWS6gKmhQBCEMc4SMABQfWdjsylBcDfniD1Q+fUX1dcBTXA== - dependencies: - tslib "^2.1.0" - -"@firebase/util@1.5.2": - version "1.5.2" - resolved "https://registry.npmjs.org/@firebase/util/-/util-1.5.2.tgz#bdd2bc11c956a8a6a0fa25fbd752a13e033558bc" - integrity sha512-YvBH2UxFcdWG2HdFnhxZptPl2eVFlpOyTH66iDo13JPEYraWzWToZ5AMTtkyRHVmu7sssUpQlU9igy1KET7TOw== +"@firebase/logger@0.3.3": + version "0.3.3" + resolved "https://registry.npmjs.org/@firebase/logger/-/logger-0.3.3.tgz#0f724b1e0b166d17ac285aac5c8ec14d136beed4" + integrity sha512-POTJl07jOKTOevLXrTvJD/VZ0M6PnJXflbAh5J9VGkmtXPXNG6MdZ9fmRgqYhXKTaDId6AQenQ262uwgpdtO0Q== dependencies: tslib "^2.1.0" @@ -81,10 +86,17 @@ dependencies: tslib "^2.1.0" -"@google-cloud/firestore@^4.15.1": - version "4.15.1" - resolved "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-4.15.1.tgz#ed764fc76823ce120e68fe8c27ef1edd0650cd93" - integrity sha512-2PWsCkEF1W02QbghSeRsNdYKN1qavrHBP3m72gPDMHQSYrGULOaTi7fSJquQmAtc4iPVB2/x6h80rdLHTATQtA== +"@firebase/util@1.7.2": + version "1.7.2" + resolved "https://registry.npmjs.org/@firebase/util/-/util-1.7.2.tgz#dbdb259f141b5025a7faaaa38e2ea5df0be36ff5" + integrity sha512-P3aTihYEMoz2QQlcn0T7av7HLEK9gsTc1ZiN9VA8wnUtEJscUNemCmTmP3RRysqEb3Z+tVVoycztY8f6R36rRw== + dependencies: + tslib "^2.1.0" + +"@google-cloud/firestore@^5.0.2": + version "5.0.2" + resolved "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-5.0.2.tgz#36923fde45987f928a220d347f341c5602f9e340" + integrity sha512-xlGcNYaW0nvUMzNn2+pLfbEBVt6oysVqtM89faMgZWkWfEtvIQGS0h5PRdLlcqufNzRCX3yIGv29Pb+03ys+VA== dependencies: fast-deep-equal "^3.1.1" functional-red-black-tree "^1.0.1" @@ -99,46 +111,39 @@ arrify "^2.0.0" extend "^3.0.2" -"@google-cloud/projectify@^2.0.0": - version "2.1.1" - resolved "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.1.tgz#ae6af4fee02d78d044ae434699a630f8df0084ef" - integrity sha512-+rssMZHnlh0twl122gXY4/aCrk0G1acBqkHFfYddtsqpYXGxA29nj9V5V9SfC+GyOG00l650f6lG9KL+EpFEWQ== +"@google-cloud/projectify@^3.0.0": + version "3.0.0" + resolved "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-3.0.0.tgz#302b25f55f674854dce65c2532d98919b118a408" + integrity sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA== -"@google-cloud/promisify@^2.0.0": - version "2.0.4" - resolved "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.4.tgz#9d8705ecb2baa41b6b2673f3a8e9b7b7e1abc52a" - integrity sha512-j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA== +"@google-cloud/promisify@^3.0.0": + version "3.0.1" + resolved "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-3.0.1.tgz#8d724fb280f47d1ff99953aee0c1669b25238c2e" + integrity sha512-z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA== -"@google-cloud/storage@^5.18.3": - version "5.19.3" - resolved "https://registry.npmjs.org/@google-cloud/storage/-/storage-5.19.3.tgz#0624f57a7ed5a4e3e0e23d5aaab849cb015f903a" - integrity sha512-l+8X0BoA7rg9jyZaS4p2DwMg1Ivju+VAL6PeQZE1u2q52LQ0KemrZmdQWhtrplHYo8UdYtqpbj4A6Fc5fKDZdg== +"@google-cloud/storage@^6.1.0": + version "6.5.2" + resolved "https://registry.npmjs.org/@google-cloud/storage/-/storage-6.5.2.tgz#0db4eebb947256925db06365cfdab412062b504b" + integrity sha512-n4HVE5bGGFdXlPUN2tP+wEnVH2XbYnv9PVrHirbAJPHk8EM7bm1G86+IhLha8KH4PpHLhjCPML173Sr6PWCXIQ== dependencies: "@google-cloud/paginator" "^3.0.7" - "@google-cloud/projectify" "^2.0.0" - "@google-cloud/promisify" "^2.0.0" + "@google-cloud/projectify" "^3.0.0" + "@google-cloud/promisify" "^3.0.0" abort-controller "^3.0.0" arrify "^2.0.0" async-retry "^1.3.3" compressible "^2.0.12" - configstore "^5.0.0" - date-and-time "^2.0.0" duplexify "^4.0.0" ent "^2.2.0" extend "^3.0.2" - gaxios "^4.0.0" - get-stream "^6.0.0" - google-auth-library "^7.14.1" - hash-stream-validation "^0.2.2" + gaxios "^5.0.0" + google-auth-library "^8.0.1" mime "^3.0.0" mime-types "^2.0.8" p-limit "^3.0.1" - pumpify "^2.0.0" - retry-request "^4.2.2" - snakeize "^0.1.0" - stream-events "^1.0.4" - teeny-request "^7.1.3" - xdg-basedir "^4.0.0" + retry-request "^5.0.0" + teeny-request "^8.0.0" + uuid "^8.0.0" "@grpc/grpc-js@~1.3.0": version "1.3.7" @@ -432,18 +437,6 @@ compressible@^2.0.12: dependencies: mime-db ">= 1.43.0 < 2" -configstore@^5.0.0: - version "5.0.1" - resolved "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" - integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== - dependencies: - dot-prop "^5.2.0" - graceful-fs "^4.1.2" - make-dir "^3.0.0" - unique-string "^2.0.0" - write-file-atomic "^3.0.0" - xdg-basedir "^4.0.0" - content-disposition@0.5.3: version "0.5.3" resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" @@ -474,16 +467,6 @@ cors@^2.8.5: object-assign "^4" vary "^1" -crypto-random-string@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" - integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== - -date-and-time@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/date-and-time/-/date-and-time-2.0.0.tgz#99f5fb6b6c7bcd4d1f6dcbeb37553dc0ff797b65" - integrity sha512-HJSzj25iPm8E01nt+rSmCIlwjsmjvKfUivG/kXBglpymcHF1FolWAqWwTEV4FvN1Lx5UjPf0J1W4H8yQsVBfFg== - debug@2.6.9: version "2.6.9" resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -508,21 +491,7 @@ destroy@~1.0.4: resolved "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= -dicer@^0.3.0: - version "0.3.0" - resolved "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz#eacd98b3bfbf92e8ab5c2fdb71aaac44bb06b872" - integrity sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA== - dependencies: - streamsearch "0.1.2" - -dot-prop@^5.2.0: - version "5.3.0" - resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" - integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== - dependencies: - is-obj "^2.0.0" - -duplexify@^4.0.0, duplexify@^4.1.1: +duplexify@^4.0.0: version "4.1.2" resolved "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz#18b4f8d28289132fa0b9573c898d9f903f81c7b0" integrity sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw== @@ -554,7 +523,7 @@ encodeurl@~1.0.2: resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -end-of-stream@^1.1.0, end-of-stream@^1.4.1: +end-of-stream@^1.4.1: version "1.4.4" resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== @@ -657,27 +626,27 @@ finalhandler@~1.1.2: statuses "~1.5.0" unpipe "~1.0.0" -firebase-admin@10.2.0: - version "10.2.0" - resolved "https://registry.npmjs.org/firebase-admin/-/firebase-admin-10.2.0.tgz#e5a97d35819b5872e3e29384b48f67dab59ede04" - integrity sha512-6ehn5J9UEFgi4+naqYvozmGpnZae3cJLdwSkSsDc8/Y0eTBjVMFdf9N2ft7N81UNHA0N5DknOyXhlsdAdyBLCA== +firebase-admin@11.0.0: + version "11.0.0" + resolved "https://registry.npmjs.org/firebase-admin/-/firebase-admin-11.0.0.tgz#b10355cd9b142cf305fcb7842b51f918d3745a11" + integrity sha512-x56u+Q1P8QDvQKaYRe29ZUM/3f829cP8tsKCDXOhaIX/GbGfgcdjRhPmCafzlwgCWP5wW9NkOgIhnrw94zucvw== dependencies: - "@firebase/database-compat" "^0.1.8" + "@fastify/busboy" "^1.1.0" + "@firebase/database-compat" "^0.2.0" "@firebase/database-types" "^0.9.7" "@types/node" ">=12.12.47" - dicer "^0.3.0" jsonwebtoken "^8.5.1" jwks-rsa "^2.0.2" node-forge "^1.3.1" uuid "^8.3.2" optionalDependencies: - "@google-cloud/firestore" "^4.15.1" - "@google-cloud/storage" "^5.18.3" + "@google-cloud/firestore" "^5.0.2" + "@google-cloud/storage" "^6.1.0" -firebase-functions@3.21.0: - version "3.21.0" - resolved "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.21.0.tgz#46b4c771781891929408bd4424959fe552d6cd6c" - integrity sha512-Xl0EFV05+RSB9hJHlo12LguoRqAmpSXmBnpI0MANeNj07dGW0QCWPHtaAewxYEzRS3RfSCL8WH12rjvo0PPKGw== +firebase-functions@3.22.0: + version "3.22.0" + resolved "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.22.0.tgz#d1b6c190551e29705d91819d8369a752ba5e061a" + integrity sha512-d1BxBpT95MhvVqXkpLWDvWbyuX7e2l69cFAiqG3U1XQDaMV88bM9S+Zg7H8i9pitEGFr+76ErjKgrY0n+g3ZDA== dependencies: "@types/cors" "^2.8.5" "@types/express" "4.17.3" @@ -712,6 +681,16 @@ gaxios@^4.0.0: is-stream "^2.0.0" node-fetch "^2.6.1" +gaxios@^5.0.0, gaxios@^5.0.1: + version "5.0.2" + resolved "https://registry.npmjs.org/gaxios/-/gaxios-5.0.2.tgz#ca3a40e851c728d31d7001c2357062d46bf966d1" + integrity sha512-TjtV2AJOZoMQqRYoy5eM8cCQogYwazWNYLQ72QB0kwa6vHHruYkGmhhyrlzbmgNHK1dNnuP2WSH81urfzyN2Og== + dependencies: + extend "^3.0.2" + https-proxy-agent "^5.0.0" + is-stream "^2.0.0" + node-fetch "^2.6.7" + gcp-metadata@^4.2.0: version "4.3.1" resolved "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.3.1.tgz#fb205fe6a90fef2fd9c85e6ba06e5559ee1eefa9" @@ -720,20 +699,23 @@ gcp-metadata@^4.2.0: gaxios "^4.0.0" json-bigint "^1.0.0" +gcp-metadata@^5.0.0: + version "5.0.1" + resolved "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.0.1.tgz#8d1e785ee7fad554bc2a80c1f930c9a9518d2b00" + integrity sha512-jiRJ+Fk7e8FH68Z6TLaqwea307OktJpDjmYnU7/li6ziwvVvU2RlrCyQo5vkdeP94chm0kcSCOOszvmuaioq3g== + dependencies: + gaxios "^5.0.0" + json-bigint "^1.0.0" + get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - -google-auth-library@^7.14.1: - version "7.14.1" - resolved "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.14.1.tgz#e3483034162f24cc71b95c8a55a210008826213c" - integrity sha512-5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA== +google-auth-library@^7.6.1: + version "7.9.2" + resolved "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.9.2.tgz#c11c1b4d4cc50e85ea7c8a01f6d4ec2fbed1aed1" + integrity sha512-HjxbJt660a+YUTYAgYor87JCuBZvjUSNBExk4bXTEaMuCn8IHSDeHmFxKqThuDPrLCiKJp8blk/Ze8f7SI4N6g== dependencies: arrify "^2.0.0" base64-js "^1.3.0" @@ -745,18 +727,18 @@ google-auth-library@^7.14.1: jws "^4.0.0" lru-cache "^6.0.0" -google-auth-library@^7.6.1: - version "7.9.2" - resolved "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.9.2.tgz#c11c1b4d4cc50e85ea7c8a01f6d4ec2fbed1aed1" - integrity sha512-HjxbJt660a+YUTYAgYor87JCuBZvjUSNBExk4bXTEaMuCn8IHSDeHmFxKqThuDPrLCiKJp8blk/Ze8f7SI4N6g== +google-auth-library@^8.0.1: + version "8.5.2" + resolved "https://registry.npmjs.org/google-auth-library/-/google-auth-library-8.5.2.tgz#bcdced8f7b475b80bf0e9c109c7c7e930866947b" + integrity sha512-FPfOSaI8n2TVXFHTP8/vAVFCXhyALj7w9/Rgefux3oeKZ/nQDNmfNTJ+lIKcoYT1cKkvMllp1Eood7Y5L+TP+A== dependencies: arrify "^2.0.0" base64-js "^1.3.0" ecdsa-sig-formatter "^1.0.11" fast-text-encoding "^1.0.0" - gaxios "^4.0.0" - gcp-metadata "^4.2.0" - gtoken "^5.0.4" + gaxios "^5.0.0" + gcp-metadata "^5.0.0" + gtoken "^6.1.0" jws "^4.0.0" lru-cache "^6.0.0" @@ -786,10 +768,12 @@ google-p12-pem@^3.0.3: dependencies: node-forge "^0.10.0" -graceful-fs@^4.1.2: - version "4.2.8" - resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== +google-p12-pem@^4.0.0: + version "4.0.1" + resolved "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-4.0.1.tgz#82841798253c65b7dc2a4e5fe9df141db670172a" + integrity sha512-WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ== + dependencies: + node-forge "^1.3.1" gtoken@^5.0.4: version "5.3.1" @@ -800,10 +784,14 @@ gtoken@^5.0.4: google-p12-pem "^3.0.3" jws "^4.0.0" -hash-stream-validation@^0.2.2: - version "0.2.4" - resolved "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.4.tgz#ee68b41bf822f7f44db1142ec28ba9ee7ccb7512" - integrity sha512-Gjzu0Xn7IagXVkSu9cSFuK1fqzwtLwFhNhVL8IFJijRNMgUttFbBSIAzKuSIrsFMO1+g1RlsoN49zPIbwPDMGQ== +gtoken@^6.1.0: + version "6.1.2" + resolved "https://registry.npmjs.org/gtoken/-/gtoken-6.1.2.tgz#aeb7bdb019ff4c3ba3ac100bbe7b6e74dce0e8bc" + integrity sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ== + dependencies: + gaxios "^5.0.1" + google-p12-pem "^4.0.0" + jws "^4.0.0" http-errors@1.7.2: version "1.7.2" @@ -856,11 +844,6 @@ iconv-lite@0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= - inherits@2.0.3: version "2.0.3" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -881,11 +864,6 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" - integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== - is-stream-ended@^0.1.4: version "0.1.4" resolved "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz#f50224e95e06bce0e356d440a4827cd35b267eda" @@ -896,11 +874,6 @@ is-stream@^2.0.0: resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== -is-typedarray@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= - jose@^2.0.5: version "2.0.5" resolved "https://registry.npmjs.org/jose/-/jose-2.0.5.tgz#29746a18d9fff7dcf9d5d2a6f62cb0c7cd27abd3" @@ -1059,13 +1032,6 @@ lru-memoizer@^2.1.4: lodash.clonedeep "^4.5.0" lru-cache "~4.0.0" -make-dir@^3.0.0: - version "3.1.0" - resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - media-typer@0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" @@ -1174,7 +1140,7 @@ on-finished@~2.3.0: dependencies: ee-first "1.1.1" -once@^1.3.1, once@^1.4.0: +once@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= @@ -1235,23 +1201,6 @@ pseudomap@^1.0.1: resolved "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -pumpify@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/pumpify/-/pumpify-2.0.1.tgz#abfc7b5a621307c728b551decbbefb51f0e4aa1e" - integrity sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw== - dependencies: - duplexify "^4.1.1" - inherits "^2.0.3" - pump "^3.0.0" - qs@6.7.0: version "6.7.0" resolved "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" @@ -1286,7 +1235,7 @@ require-directory@^2.1.1: resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= -retry-request@^4.0.0, retry-request@^4.2.2: +retry-request@^4.0.0: version "4.2.2" resolved "https://registry.npmjs.org/retry-request/-/retry-request-4.2.2.tgz#b7d82210b6d2651ed249ba3497f07ea602f1a903" integrity sha512-xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg== @@ -1294,6 +1243,14 @@ retry-request@^4.0.0, retry-request@^4.2.2: debug "^4.1.1" extend "^3.0.2" +retry-request@^5.0.0: + version "5.0.2" + resolved "https://registry.npmjs.org/retry-request/-/retry-request-5.0.2.tgz#143d85f90c755af407fcc46b7166a4ba520e44da" + integrity sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ== + dependencies: + debug "^4.1.1" + extend "^3.0.2" + retry@0.13.1: version "0.13.1" resolved "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" @@ -1319,11 +1276,6 @@ semver@^5.6.0: resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^6.0.0: - version "6.3.0" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - send@0.17.1: version "0.17.1" resolved "https://registry.npmjs.org/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -1358,22 +1310,12 @@ setprototypeof@1.1.1: resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== -signal-exit@^3.0.2: - version "3.0.4" - resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.4.tgz#366a4684d175b9cab2081e3681fda3747b6c51d7" - integrity sha512-rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q== - -snakeize@^0.1.0: - version "0.1.0" - resolved "https://registry.npmjs.org/snakeize/-/snakeize-0.1.0.tgz#10c088d8b58eb076b3229bb5a04e232ce126422d" - integrity sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0= - "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= -stream-events@^1.0.4, stream-events@^1.0.5: +stream-events@^1.0.5: version "1.0.5" resolved "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz#bbc898ec4df33a4902d892333d47da9bf1c406d5" integrity sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg== @@ -1385,11 +1327,6 @@ stream-shift@^1.0.0: resolved "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== -streamsearch@0.1.2: - version "0.1.2" - resolved "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" - integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo= - string-width@^4.1.0, string-width@^4.2.0: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" @@ -1418,16 +1355,21 @@ stubs@^3.0.0: resolved "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b" integrity sha1-6NK6H6nJBXAwPAMLaQD31fiavls= -teeny-request@^7.1.3: - version "7.2.0" - resolved "https://registry.npmjs.org/teeny-request/-/teeny-request-7.2.0.tgz#41347ece068f08d741e7b86df38a4498208b2633" - integrity sha512-SyY0pek1zWsi0LRVAALem+avzMLc33MKW/JLLakdP4s9+D7+jHcy5x6P+h94g2QNZsAqQNfX5lsbd3WSeJXrrw== +teeny-request@^8.0.0: + version "8.0.2" + resolved "https://registry.npmjs.org/teeny-request/-/teeny-request-8.0.2.tgz#c06a75101cf782788ba8f9a2ed5f2ac84c1c4e15" + integrity sha512-34pe0a4zASseXZCKdeTiIZqSKA8ETHb1EwItZr01PAR3CLPojeAKgSjzeNS4373gi59hNulyDrPKEbh2zO9sCg== dependencies: http-proxy-agent "^5.0.0" https-proxy-agent "^5.0.0" node-fetch "^2.6.1" stream-events "^1.0.5" - uuid "^8.0.0" + uuid "^9.0.0" + +text-decoding@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/text-decoding/-/text-decoding-1.0.0.tgz#38a5692d23b5c2b12942d6e245599cb58b1bc52f" + integrity sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA== toidentifier@1.0.0: version "1.0.0" @@ -1452,20 +1394,6 @@ type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== - dependencies: - is-typedarray "^1.0.0" - -unique-string@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" - integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== - dependencies: - crypto-random-string "^2.0.0" - unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -1486,6 +1414,11 @@ uuid@^8.0.0, uuid@^8.3.2: resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== +uuid@^9.0.0: + version "9.0.0" + resolved "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" + integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg== + vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" @@ -1532,21 +1465,6 @@ wrappy@1: resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -write-file-atomic@^3.0.0: - version "3.0.3" - resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" - integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== - dependencies: - imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" - -xdg-basedir@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" - integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== - y18n@^5.0.5: version "5.0.8" resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" From 1dbca1b5fd0ef05f91b873af96067289fba16675 Mon Sep 17 00:00:00 2001 From: dwyfrequency Date: Fri, 14 Oct 2022 13:40:53 -0400 Subject: [PATCH 8/8] Rollback rollup-plugin-typescript2 change --- packages/analytics-compat/package.json | 2 +- packages/analytics/package.json | 2 +- packages/app-check-compat/package.json | 2 +- packages/app-check/package.json | 2 +- packages/app-compat/package.json | 2 +- packages/app/package.json | 2 +- packages/auth-compat/demo/package.json | 2 +- packages/auth-compat/package.json | 2 +- packages/auth/demo/package.json | 2 +- packages/auth/package.json | 2 +- packages/component/package.json | 2 +- packages/database/package.json | 2 +- packages/firebase/package.json | 2 +- packages/firestore-compat/package.json | 2 +- packages/firestore/package.json | 2 +- packages/functions-compat/package.json | 2 +- packages/functions/package.json | 2 +- packages/installations-compat/package.json | 2 +- packages/installations/package.json | 2 +- packages/logger/package.json | 2 +- packages/messaging-compat/package.json | 2 +- packages/messaging/package.json | 2 +- packages/performance-compat/package.json | 2 +- packages/performance/package.json | 2 +- packages/remote-config-compat/package.json | 2 +- packages/remote-config/package.json | 2 +- packages/rules-unit-testing/package.json | 2 +- packages/storage-compat/package.json | 2 +- packages/storage/package.json | 2 +- packages/template/package.json | 2 +- packages/util/package.json | 2 +- packages/webchannel-wrapper/package.json | 2 +- repo-scripts/size-analysis/package.json | 2 +- yarn.lock | 63 ++++++++++++++++++---- 34 files changed, 85 insertions(+), 44 deletions(-) diff --git a/packages/analytics-compat/package.json b/packages/analytics-compat/package.json index 93b67d2cc40..c325ff9b860 100644 --- a/packages/analytics-compat/package.json +++ b/packages/analytics-compat/package.json @@ -27,7 +27,7 @@ "@firebase/app-compat": "0.1.37", "rollup": "2.79.1", "@rollup/plugin-json": "4.1.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/analytics/package.json b/packages/analytics/package.json index 1b0aaf5535c..b1e48e8b7e7 100644 --- a/packages/analytics/package.json +++ b/packages/analytics/package.json @@ -53,7 +53,7 @@ "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/app-check-compat/package.json b/packages/app-check-compat/package.json index d3bebcddd7f..a74af951418 100644 --- a/packages/app-check-compat/package.json +++ b/packages/app-check-compat/package.json @@ -49,7 +49,7 @@ "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/app-check/package.json b/packages/app-check/package.json index c8ed6356761..f8601f59103 100644 --- a/packages/app-check/package.json +++ b/packages/app-check/package.json @@ -50,7 +50,7 @@ "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/app-compat/package.json b/packages/app-compat/package.json index 62a0483621e..76f2ce38f37 100644 --- a/packages/app-compat/package.json +++ b/packages/app-compat/package.json @@ -50,7 +50,7 @@ "rollup": "2.79.1", "@rollup/plugin-json": "4.1.0", "rollup-plugin-replace": "2.2.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/app/package.json b/packages/app/package.json index a97bd303b1c..8957ecaf204 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -49,7 +49,7 @@ "@rollup/plugin-json": "4.1.0", "rollup": "2.79.1", "rollup-plugin-replace": "2.2.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/auth-compat/demo/package.json b/packages/auth-compat/demo/package.json index aa7eb50a6b2..c93cff8ec31 100644 --- a/packages/auth-compat/demo/package.json +++ b/packages/auth-compat/demo/package.json @@ -32,7 +32,7 @@ "rollup": "2.79.1", "rollup-plugin-replace": "2.2.0", "rollup-plugin-sourcemaps": "0.6.3", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "rollup-plugin-uglify": "6.0.4", "typescript": "4.2.2" }, diff --git a/packages/auth-compat/package.json b/packages/auth-compat/package.json index 1ca459ddd50..4339341b60d 100644 --- a/packages/auth-compat/package.json +++ b/packages/auth-compat/package.json @@ -60,7 +60,7 @@ "@rollup/plugin-json": "4.1.0", "rollup": "2.79.1", "rollup-plugin-replace": "2.2.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/auth/demo/package.json b/packages/auth/demo/package.json index f9e047528df..907dfd21f64 100644 --- a/packages/auth/demo/package.json +++ b/packages/auth/demo/package.json @@ -30,7 +30,7 @@ "@rollup/plugin-json": "4.1.0", "rollup-plugin-replace": "2.2.0", "rollup-plugin-terser": "7.0.2", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "rollup-plugin-uglify": "6.0.4", "@rollup/plugin-node-resolve": "13.3.0", "lerna": "4.0.0" diff --git a/packages/auth/package.json b/packages/auth/package.json index 2c137e55d37..2ddcb6fe7b7 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -117,7 +117,7 @@ "chromedriver": "98.0.1", "rollup": "2.79.1", "rollup-plugin-sourcemaps": "0.6.3", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/component/package.json b/packages/component/package.json index 36774736576..22e636b1f3b 100644 --- a/packages/component/package.json +++ b/packages/component/package.json @@ -38,7 +38,7 @@ "license": "Apache-2.0", "devDependencies": { "rollup": "2.79.1", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/database/package.json b/packages/database/package.json index 9dcb9fa36b4..e26f7044cd6 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -55,7 +55,7 @@ "devDependencies": { "@firebase/app": "0.8.2", "rollup": "2.79.1", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/firebase/package.json b/packages/firebase/package.json index 926dec27681..7306d8c0778 100644 --- a/packages/firebase/package.json +++ b/packages/firebase/package.json @@ -294,7 +294,7 @@ "@rollup/plugin-node-resolve": "13.3.0", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "rollup-plugin-uglify": "6.0.4", "gulp": "4.0.2", "gulp-sourcemaps": "3.0.0", diff --git a/packages/firestore-compat/package.json b/packages/firestore-compat/package.json index 3b8a5912611..eb6fa76f9db 100644 --- a/packages/firestore-compat/package.json +++ b/packages/firestore-compat/package.json @@ -55,7 +55,7 @@ "rollup": "2.79.1", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "@rollup/plugin-node-resolve": "13.3.0", "ts-node": "10.9.1", "typescript": "4.2.2" diff --git a/packages/firestore/package.json b/packages/firestore/package.json index 2f67b792f76..164a9695045 100644 --- a/packages/firestore/package.json +++ b/packages/firestore/package.json @@ -109,7 +109,7 @@ "rollup-plugin-replace": "2.2.0", "rollup-plugin-sourcemaps": "0.6.3", "rollup-plugin-terser": "7.0.2", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "ts-node": "10.9.1", "typescript": "4.2.2" }, diff --git a/packages/functions-compat/package.json b/packages/functions-compat/package.json index 9dfeb6299a4..635687c09b4 100644 --- a/packages/functions-compat/package.json +++ b/packages/functions-compat/package.json @@ -30,7 +30,7 @@ "@firebase/app-compat": "0.1.37", "rollup": "2.79.1", "@rollup/plugin-json": "4.1.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/functions/package.json b/packages/functions/package.json index 2af992f46de..e93cc90c038 100644 --- a/packages/functions/package.json +++ b/packages/functions/package.json @@ -49,7 +49,7 @@ "@firebase/app": "0.8.2", "rollup": "2.79.1", "@rollup/plugin-json": "4.1.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/installations-compat/package.json b/packages/installations-compat/package.json index e39d1f17036..c44ec329724 100644 --- a/packages/installations-compat/package.json +++ b/packages/installations-compat/package.json @@ -50,7 +50,7 @@ "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "rollup-plugin-uglify": "6.0.4", "typescript": "4.2.2" }, diff --git a/packages/installations/package.json b/packages/installations/package.json index 947efdea67d..bbf14d09a8e 100644 --- a/packages/installations/package.json +++ b/packages/installations/package.json @@ -55,7 +55,7 @@ "@rollup/plugin-commonjs": "21.1.0", "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "rollup-plugin-uglify": "6.0.4", "typescript": "4.2.2" }, diff --git a/packages/logger/package.json b/packages/logger/package.json index d7a2c1b16d6..22437313dd3 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -37,7 +37,7 @@ }, "devDependencies": { "rollup": "2.79.1", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/messaging-compat/package.json b/packages/messaging-compat/package.json index b3773456617..ac9604d8ea6 100644 --- a/packages/messaging-compat/package.json +++ b/packages/messaging-compat/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@firebase/app-compat": "0.1.37", "@rollup/plugin-json": "4.1.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "ts-essentials": "9.3.0", "typescript": "4.2.2" }, diff --git a/packages/messaging/package.json b/packages/messaging/package.json index 51806f488e3..5bda0ad9dab 100644 --- a/packages/messaging/package.json +++ b/packages/messaging/package.json @@ -64,7 +64,7 @@ "devDependencies": { "@firebase/app": "0.8.2", "rollup": "2.79.1", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "@rollup/plugin-json": "4.1.0", "ts-essentials": "9.3.0", "typescript": "4.2.2" diff --git a/packages/performance-compat/package.json b/packages/performance-compat/package.json index c4a508b8a47..97168925372 100644 --- a/packages/performance-compat/package.json +++ b/packages/performance-compat/package.json @@ -50,7 +50,7 @@ "rollup": "2.79.1", "@rollup/plugin-json": "4.1.0", "rollup-plugin-replace": "2.2.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2", "@firebase/app-compat": "0.1.37" }, diff --git a/packages/performance/package.json b/packages/performance/package.json index 7436a7571ea..261a318867c 100644 --- a/packages/performance/package.json +++ b/packages/performance/package.json @@ -50,7 +50,7 @@ "@firebase/app": "0.8.2", "rollup": "2.79.1", "@rollup/plugin-json": "4.1.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/remote-config-compat/package.json b/packages/remote-config-compat/package.json index 91a85ddf12b..9bc6aa26014 100644 --- a/packages/remote-config-compat/package.json +++ b/packages/remote-config-compat/package.json @@ -49,7 +49,7 @@ "rollup": "2.79.1", "@rollup/plugin-json": "4.1.0", "rollup-plugin-replace": "2.2.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2", "@firebase/app-compat": "0.1.37" }, diff --git a/packages/remote-config/package.json b/packages/remote-config/package.json index 2db089824b9..6ed940a87a6 100644 --- a/packages/remote-config/package.json +++ b/packages/remote-config/package.json @@ -51,7 +51,7 @@ "devDependencies": { "@firebase/app": "0.8.2", "rollup": "2.79.1", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/rules-unit-testing/package.json b/packages/rules-unit-testing/package.json index 0a908ef63bc..6c4df1edfe1 100644 --- a/packages/rules-unit-testing/package.json +++ b/packages/rules-unit-testing/package.json @@ -35,7 +35,7 @@ "license": "Apache-2.0", "devDependencies": { "rollup": "2.79.1", - "rollup-plugin-typescript2": "0.34.1" + "rollup-plugin-typescript2": "0.31.2" }, "peerDependencies": { "firebase": "^9.0.0" diff --git a/packages/storage-compat/package.json b/packages/storage-compat/package.json index ceb7a112ff1..0b3bb6069d3 100644 --- a/packages/storage-compat/package.json +++ b/packages/storage-compat/package.json @@ -49,7 +49,7 @@ "@firebase/auth-compat": "0.2.23", "rollup": "2.79.1", "@rollup/plugin-json": "4.1.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "files": [ diff --git a/packages/storage/package.json b/packages/storage/package.json index 4d52a310302..9fd3b214e4a 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -56,7 +56,7 @@ "rollup": "2.79.1", "@rollup/plugin-alias": "3.1.9", "@rollup/plugin-json": "4.1.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/template/package.json b/packages/template/package.json index 15da06066fb..52a0c0ee941 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@firebase/app": "0.8.2", "rollup": "2.79.1", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/util/package.json b/packages/util/package.json index 6d9d60c9907..d092f020da8 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -43,7 +43,7 @@ }, "devDependencies": { "rollup": "2.79.1", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/packages/webchannel-wrapper/package.json b/packages/webchannel-wrapper/package.json index 65e674c3edf..f71852c6ea4 100644 --- a/packages/webchannel-wrapper/package.json +++ b/packages/webchannel-wrapper/package.json @@ -33,7 +33,7 @@ "gulp-sourcemaps": "3.0.0", "rollup": "2.79.1", "rollup-plugin-sourcemaps": "0.6.3", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "typescript": "4.2.2" }, "repository": { diff --git a/repo-scripts/size-analysis/package.json b/repo-scripts/size-analysis/package.json index fb300b74a18..1c10f911106 100644 --- a/repo-scripts/size-analysis/package.json +++ b/repo-scripts/size-analysis/package.json @@ -24,7 +24,7 @@ "@rollup/plugin-json": "4.1.0", "@rollup/plugin-node-resolve": "13.3.0", "rollup-plugin-replace": "2.2.0", - "rollup-plugin-typescript2": "0.34.1", + "rollup-plugin-typescript2": "0.31.2", "@rollup/plugin-virtual": "2.1.0", "webpack": "4.46.0", "@types/webpack": "5.28.0", diff --git a/yarn.lock b/yarn.lock index 7e60fcd705a..b9ed94cf40d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3817,6 +3817,15 @@ resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== +"@yarn-tool/resolve-package@^1.0.40": + version "1.0.47" + resolved "https://registry.npmjs.org/@yarn-tool/resolve-package/-/resolve-package-1.0.47.tgz#8ec25f291a316280a281632331e88926a66fdf19" + integrity sha512-Zaw58gQxjQceJqhqybJi1oUDaORT8i2GTgwICPs8v/X/Pkx35FXQba69ldHVg5pQZ6YLKpROXgyHvBaCJOFXiA== + dependencies: + pkg-dir "< 6 >= 5" + tslib "^2" + upath2 "^3.1.13" + JSONStream@^1.0.4: version "1.3.5" resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" @@ -13501,6 +13510,13 @@ path-is-inside@^1.0.1: resolved "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= +path-is-network-drive@^1.0.20: + version "1.0.20" + resolved "https://registry.npmjs.org/path-is-network-drive/-/path-is-network-drive-1.0.20.tgz#9c264db2e0fce5e9bc2ef9177fcab3f996d1a1b5" + integrity sha512-p5wCWlRB4+ggzxWshqHH9aF3kAuVu295NaENXmVhThbZPJQBeJdxZTP6CIoUR+kWHDUW56S9YcaO1gXnc/BOxw== + dependencies: + tslib "^2" + path-key@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" @@ -13528,6 +13544,13 @@ path-root@^0.1.1: dependencies: path-root-regex "^0.1.0" +path-strip-sep@^1.0.17: + version "1.0.17" + resolved "https://registry.npmjs.org/path-strip-sep/-/path-strip-sep-1.0.17.tgz#3b7dd4f461cf73a9277333f50289ce9b00cffba3" + integrity sha512-+2zIC2fNgdilgV7pTrktY6oOxxZUo9x5zJYfTzxsGze5kSGDDwhA5/0WlBn+sUyv/WuuyYn3OfM+Ue5nhdQUgA== + dependencies: + tslib "^2" + path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -13646,6 +13669,13 @@ pirates@^4.0.5: resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== +"pkg-dir@< 6 >= 5": + version "5.0.0" + resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760" + integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA== + dependencies: + find-up "^5.0.0" + pkg-dir@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" @@ -14745,16 +14775,17 @@ rollup-plugin-terser@7.0.2: serialize-javascript "^4.0.0" terser "^5.0.0" -rollup-plugin-typescript2@0.34.1: - version "0.34.1" - resolved "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.34.1.tgz#c457f155a71d133c142689213fce78694e30d0be" - integrity sha512-P4cHLtGikESmqi1CA+tdMDUv8WbQV48mzPYt77TSTOPJpERyZ9TXdDgjSDix8Fkqce6soYz3+fa4lrC93IEkcw== +rollup-plugin-typescript2@0.31.2: + version "0.31.2" + resolved "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.31.2.tgz#463aa713a7e2bf85b92860094b9f7fb274c5a4d8" + integrity sha512-hRwEYR1C8xDGVVMFJQdEVnNAeWRvpaY97g5mp3IeLnzhNXzSVq78Ye/BJ9PAaUfN4DXa/uDnqerifMOaMFY54Q== dependencies: "@rollup/pluginutils" "^4.1.2" + "@yarn-tool/resolve-package" "^1.0.40" find-cache-dir "^3.3.2" fs-extra "^10.0.0" - semver "^7.3.7" - tslib "^2.4.0" + resolve "^1.20.0" + tslib "^2.3.1" rollup-plugin-uglify@6.0.4: version "6.0.4" @@ -16450,16 +16481,16 @@ tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== +tslib@^2, tslib@^2.3.1: + version "2.4.0" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== + tslib@^2.0.1, tslib@^2.1.0: version "2.3.1" resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== -tslib@^2.3.1, tslib@^2.4.0: - version "2.4.0" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" - integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== - tslib@~2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" @@ -16870,6 +16901,16 @@ unzipper@^0.10.10: readable-stream "~2.3.6" setimmediate "~1.0.4" +upath2@^3.1.13: + version "3.1.19" + resolved "https://registry.npmjs.org/upath2/-/upath2-3.1.19.tgz#d987d34a62b2daad1c54a692fd5a720a30c9a786" + integrity sha512-d23dQLi8nDWSRTIQwXtaYqMrHuca0As53fNiTLLFDmsGBbepsZepISaB2H1x45bDFN/n3Qw9bydvyZEacTrEWQ== + dependencies: + "@types/node" "*" + path-is-network-drive "^1.0.20" + path-strip-sep "^1.0.17" + tslib "^2" + upath@^1.1.1: version "1.2.0" resolved "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"