Fix conflict

dwyfrequency · dwyfrequency · commit 5aafa979e85a · 2022-10-14T13:01:17.000-04:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/packages/storage-compat/package.json b/packages/storage-compat/package.json
diff --git a/packages/storage/package.json b/packages/storage/package.json
diff --git a/packages/template/package.json b/packages/template/package.json
diff --git a/packages/util/package.json b/packages/util/package.json
diff --git a/packages/webchannel-wrapper/package.json b/packages/webchannel-wrapper/package.json
diff --git a/repo-scripts/size-analysis/package.json b/repo-scripts/size-analysis/package.json
diff --git a/yarn.lock b/yarn.lock
