From b85f36db4703689c2690d6a112b26824a0a468f5 Mon Sep 17 00:00:00 2001
From: Feiyang1 <plane1113@gmail.com>
Date: Tue, 13 Oct 2020 10:48:18 -0700
Subject: [PATCH 1/5] Migrate deprecated plugins to the new ones

---
 packages-exp/app-compat/package.json                      | 2 +-
 packages-exp/app-compat/rollup.config.js                  | 2 +-
 packages-exp/app-compat/rollup.config.release.js          | 2 +-
 packages-exp/app-exp/package.json                         | 2 +-
 packages-exp/app-exp/rollup.config.js                     | 2 +-
 packages-exp/app-exp/rollup.config.release.js             | 2 +-
 packages-exp/auth-compat-exp/demo/package.json            | 6 +++---
 packages-exp/auth-compat-exp/demo/rollup.config.js        | 6 +++---
 packages-exp/auth-compat-exp/package.json                 | 2 +-
 packages-exp/auth-compat-exp/rollup.config.js             | 4 ++--
 packages-exp/auth-exp/demo/package.json                   | 4 ++--
 packages-exp/auth-exp/package.json                        | 2 +-
 packages-exp/auth-exp/rollup.config.shared.js             | 2 +-
 packages-exp/firebase-exp/compat/rollup.config.js         | 6 +++---
 packages-exp/firebase-exp/compat/rollup.config.release.js | 2 +-
 packages-exp/firebase-exp/package.json                    | 4 ++--
 packages-exp/firebase-exp/rollup.config.js                | 6 +++---
 packages-exp/firebase-exp/rollup.config.release.js        | 6 +++---
 packages-exp/functions-exp/rollup.config.js               | 2 +-
 packages-exp/functions-exp/rollup.config.release.js       | 2 +-
 packages-exp/installations-exp/package.json               | 6 +++---
 packages-exp/installations-exp/rollup.config.js           | 2 +-
 packages-exp/installations-exp/rollup.config.release.js   | 2 +-
 packages-exp/installations-exp/test-app/rollup.config.js  | 6 +++---
 packages-exp/performance-exp/package.json                 | 2 +-
 packages-exp/performance-exp/rollup.config.js             | 2 +-
 packages-exp/performance-exp/rollup.config.release.js     | 2 +-
 packages/analytics/package.json                           | 7 +++----
 packages/analytics/rollup.config.js                       | 4 ++--
 packages/app/index.ts                                     | 4 ++--
 packages/app/package.json                                 | 2 +-
 packages/app/rollup.config.js                             | 4 ++--
 packages/database/rollup.config.js                        | 4 ++--
 packages/firebase/package.json                            | 4 ++--
 packages/firebase/rollup.config.js                        | 6 +++---
 packages/firestore/package.json                           | 4 ++--
 packages/firestore/rollup.config.exp.js                   | 2 +-
 packages/firestore/rollup.config.lite.js                  | 2 +-
 packages/firestore/rollup.shared.js                       | 2 +-
 packages/firestore/scripts/build-bundle.js                | 2 +-
 packages/firestore/scripts/build-bundle.ts                | 2 +-
 packages/firestore/tools/console.build.js                 | 2 +-
 packages/functions/rollup.config.js                       | 4 ++--
 packages/installations/package.json                       | 6 +++---
 packages/installations/rollup.config.js                   | 4 ++--
 packages/installations/test-app/rollup.config.js          | 8 ++++----
 packages/messaging/rollup.config.js                       | 4 ++--
 packages/performance/package.json                         | 2 +-
 packages/performance/rollup.config.js                     | 4 ++--
 packages/remote-config/rollup.config.js                   | 4 ++--
 packages/rxfire/package.json                              | 4 ++--
 packages/rxfire/rollup.config.js                          | 6 +++---
 packages/storage/rollup.config.js                         | 4 ++--
 packages/webchannel-wrapper/gulpfile.js                   | 2 +-
 packages/webchannel-wrapper/package.json                  | 2 +-
 repo-scripts/size-analysis/analysis-helper.ts             | 4 ++--
 repo-scripts/size-analysis/package.json                   | 6 +++---
 repo-scripts/size-analysis/rollup.config.js               | 2 +-
 58 files changed, 102 insertions(+), 103 deletions(-)

diff --git a/packages-exp/app-compat/package.json b/packages-exp/app-compat/package.json
index 15cf9e5dbf2..61cbda1a788 100644
--- a/packages-exp/app-compat/package.json
+++ b/packages-exp/app-compat/package.json
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "rollup": "2.29.0",
-    "rollup-plugin-json": "4.0.0",
+    "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-typescript2": "0.27.3",
     "typescript": "4.0.2"
diff --git a/packages-exp/app-compat/rollup.config.js b/packages-exp/app-compat/rollup.config.js
index a6d5bc60993..5e4e3657a39 100644
--- a/packages-exp/app-compat/rollup.config.js
+++ b/packages-exp/app-compat/rollup.config.js
@@ -16,7 +16,7 @@
  */
 
 import typescriptPlugin from 'rollup-plugin-typescript2';
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import typescript from 'typescript';
 import pkg from './package.json';
 
diff --git a/packages-exp/app-compat/rollup.config.release.js b/packages-exp/app-compat/rollup.config.release.js
index 0029acf3566..a38c8a03d41 100644
--- a/packages-exp/app-compat/rollup.config.release.js
+++ b/packages-exp/app-compat/rollup.config.release.js
@@ -16,7 +16,7 @@
  */
 
 import typescriptPlugin from 'rollup-plugin-typescript2';
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import typescript from 'typescript';
 import pkg from './package.json';
 import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
diff --git a/packages-exp/app-exp/package.json b/packages-exp/app-exp/package.json
index 368649e46ab..bb14b11cceb 100644
--- a/packages-exp/app-exp/package.json
+++ b/packages-exp/app-exp/package.json
@@ -39,7 +39,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "rollup": "2.29.0",
-    "rollup-plugin-json": "4.0.0",
+    "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-typescript2": "0.27.3",
     "typescript": "4.0.2"
diff --git a/packages-exp/app-exp/rollup.config.js b/packages-exp/app-exp/rollup.config.js
index f7d04ef1d15..5dc6ca47633 100644
--- a/packages-exp/app-exp/rollup.config.js
+++ b/packages-exp/app-exp/rollup.config.js
@@ -17,7 +17,7 @@
 
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import pkg from './package.json';
 import { es2017BuildsNoPlugin, es5BuildsNoPlugin } from './rollup.shared';
 
diff --git a/packages-exp/app-exp/rollup.config.release.js b/packages-exp/app-exp/rollup.config.release.js
index 046bb1006b8..1b5cca8c1fc 100644
--- a/packages-exp/app-exp/rollup.config.release.js
+++ b/packages-exp/app-exp/rollup.config.release.js
@@ -17,7 +17,7 @@
 
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
 import { es2017BuildsNoPlugin, es5BuildsNoPlugin } from './rollup.shared';
 
diff --git a/packages-exp/auth-compat-exp/demo/package.json b/packages-exp/auth-compat-exp/demo/package.json
index 5f2741d1b90..d381a0e6b89 100644
--- a/packages-exp/auth-compat-exp/demo/package.json
+++ b/packages-exp/auth-compat-exp/demo/package.json
@@ -27,11 +27,11 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "rollup": "1.32.1",
-    "rollup-plugin-json": "4.0.0",
+    "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-replace": "2.2.0",
-    "rollup-plugin-commonjs": "10.1.0",
+    "@rollup/plugin-commonjs": "10.1.0",
     "rollup-plugin-license": "0.14.0",
-    "rollup-plugin-node-resolve": "5.2.0",
+    "@rollup/plugin-node-resolve": "9.0.0",
     "rollup-plugin-sourcemaps": "0.6.3",
     "rollup-plugin-typescript2": "0.27.3",
     "rollup-plugin-uglify": "6.0.4",
diff --git a/packages-exp/auth-compat-exp/demo/rollup.config.js b/packages-exp/auth-compat-exp/demo/rollup.config.js
index 5b0070b3ab5..0316182cc7f 100644
--- a/packages-exp/auth-compat-exp/demo/rollup.config.js
+++ b/packages-exp/auth-compat-exp/demo/rollup.config.js
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import commonjs from 'rollup-plugin-commonjs';
-import json from 'rollup-plugin-json';
-import resolveModule from 'rollup-plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import json from '@rollup/plugin-json';
+import resolveModule from '@rollup/plugin-node-resolve';
 import sourcemaps from 'rollup-plugin-sourcemaps';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
diff --git a/packages-exp/auth-compat-exp/package.json b/packages-exp/auth-compat-exp/package.json
index 0e16b6596ea..7b23c06071e 100644
--- a/packages-exp/auth-compat-exp/package.json
+++ b/packages-exp/auth-compat-exp/package.json
@@ -40,7 +40,7 @@
   "devDependencies": {
     "@firebase/app-compat": "0.x",
     "rollup": "2.29.0",
-    "rollup-plugin-json": "4.0.0",
+    "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-typescript2": "0.27.3",
     "typescript": "4.0.2"
diff --git a/packages-exp/auth-compat-exp/rollup.config.js b/packages-exp/auth-compat-exp/rollup.config.js
index a6223170952..40d11e3b7ee 100644
--- a/packages-exp/auth-compat-exp/rollup.config.js
+++ b/packages-exp/auth-compat-exp/rollup.config.js
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import json from 'rollup-plugin-json';
-import resolve from 'rollup-plugin-node-resolve';
+import json from '@rollup/plugin-json';
+import resolve from '@rollup/plugin-node-resolve';
 import { uglify } from 'rollup-plugin-uglify';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
diff --git a/packages-exp/auth-exp/demo/package.json b/packages-exp/auth-exp/demo/package.json
index 429bc88a79f..7521dccb76c 100644
--- a/packages-exp/auth-exp/demo/package.json
+++ b/packages-exp/auth-exp/demo/package.json
@@ -28,12 +28,12 @@
   "devDependencies": {
     "@rollup/plugin-strip": "2.0.0",
     "rollup": "2.29.0",
-    "rollup-plugin-json": "4.0.0",
+    "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-terser": "6.1.0",
     "rollup-plugin-typescript2": "0.27.3",
     "rollup-plugin-uglify": "6.0.4",
-    "rollup-plugin-node-resolve": "5.2.0",
+    "@rollup/plugin-node-resolve": "9.0.0",
     "lerna": "3.22.1"
   },
   "repository": {
diff --git a/packages-exp/auth-exp/package.json b/packages-exp/auth-exp/package.json
index fc5c25a69a5..93cc7cbf484 100644
--- a/packages-exp/auth-exp/package.json
+++ b/packages-exp/auth-exp/package.json
@@ -51,7 +51,7 @@
   "devDependencies": {
     "@firebase/app-exp": "0.0.800",
     "rollup": "2.29.0",
-    "rollup-plugin-json": "4.0.0",
+    "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-sourcemaps": "0.6.3",
     "rollup-plugin-typescript2": "0.27.3",
     "@rollup/plugin-strip": "2.0.0",
diff --git a/packages-exp/auth-exp/rollup.config.shared.js b/packages-exp/auth-exp/rollup.config.shared.js
index 17611718079..eaeb293dad7 100644
--- a/packages-exp/auth-exp/rollup.config.shared.js
+++ b/packages-exp/auth-exp/rollup.config.shared.js
@@ -17,7 +17,7 @@
 
 import strip from '@rollup/plugin-strip';
 import typescriptPlugin from 'rollup-plugin-typescript2';
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import typescript from 'typescript';
 import pkg from './package.json';
 import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
diff --git a/packages-exp/firebase-exp/compat/rollup.config.js b/packages-exp/firebase-exp/compat/rollup.config.js
index e95220076b2..8c01a151955 100644
--- a/packages-exp/firebase-exp/compat/rollup.config.js
+++ b/packages-exp/firebase-exp/compat/rollup.config.js
@@ -16,14 +16,14 @@
  */
 
 import { resolve } from 'path';
-import resolveModule from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
+import resolveModule from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
 import rollupTypescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import { uglify } from 'rollup-plugin-uglify';
 import { terser } from 'rollup-plugin-terser';
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import pkg from '../package.json';
 import compatPkg from './package.json';
 import appPkg from './app/package.json';
diff --git a/packages-exp/firebase-exp/compat/rollup.config.release.js b/packages-exp/firebase-exp/compat/rollup.config.release.js
index 5bcb99b06c2..c9d5204647a 100644
--- a/packages-exp/firebase-exp/compat/rollup.config.release.js
+++ b/packages-exp/firebase-exp/compat/rollup.config.release.js
@@ -19,7 +19,7 @@ import { resolve } from 'path';
 import sourcemaps from 'rollup-plugin-sourcemaps';
 import rollupTypescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import pkg from '../package.json';
 import compatPkg from './package.json';
 import appPkg from './app/package.json';
diff --git a/packages-exp/firebase-exp/package.json b/packages-exp/firebase-exp/package.json
index 15ecfaff19f..0394b8ab50c 100644
--- a/packages-exp/firebase-exp/package.json
+++ b/packages-exp/firebase-exp/package.json
@@ -45,9 +45,9 @@
   },
   "devDependencies": {
     "rollup": "2.29.0",
-    "rollup-plugin-commonjs": "10.1.0",
+    "@rollup/plugin-commonjs": "10.1.0",
     "rollup-plugin-license": "2.2.0",
-    "rollup-plugin-node-resolve": "5.2.0",
+    "@rollup/plugin-node-resolve": "9.0.0",
     "rollup-plugin-sourcemaps": "0.6.3",
     "rollup-plugin-terser": "7.0.2",
     "rollup-plugin-typescript2": "0.27.3",
diff --git a/packages-exp/firebase-exp/rollup.config.js b/packages-exp/firebase-exp/rollup.config.js
index 281842f7ea7..d6b7aa10ee9 100644
--- a/packages-exp/firebase-exp/rollup.config.js
+++ b/packages-exp/firebase-exp/rollup.config.js
@@ -16,13 +16,13 @@
  */
 
 import { resolve } from 'path';
-import resolveModule from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
+import resolveModule from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
 import rollupTypescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import { uglify } from 'rollup-plugin-uglify';
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import pkg from './package.json';
 import appPkg from './app/package.json';
 
diff --git a/packages-exp/firebase-exp/rollup.config.release.js b/packages-exp/firebase-exp/rollup.config.release.js
index 16530b2d852..2af5a3183de 100644
--- a/packages-exp/firebase-exp/rollup.config.release.js
+++ b/packages-exp/firebase-exp/rollup.config.release.js
@@ -16,14 +16,14 @@
  */
 
 import { resolve } from 'path';
-import resolveModule from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
+import resolveModule from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
 import rollupTypescriptPlugin from 'rollup-plugin-typescript2';
 import alias from '@rollup/plugin-alias';
 import typescript from 'typescript';
 import { uglify } from 'rollup-plugin-uglify';
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
 import pkg from './package.json';
 import appPkg from './app/package.json';
diff --git a/packages-exp/functions-exp/rollup.config.js b/packages-exp/functions-exp/rollup.config.js
index b27cbb90b0f..63db899d25f 100644
--- a/packages-exp/functions-exp/rollup.config.js
+++ b/packages-exp/functions-exp/rollup.config.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import { es2017BuildsNoPlugin, es5BuildsNoPlugin } from './rollup.shared';
diff --git a/packages-exp/functions-exp/rollup.config.release.js b/packages-exp/functions-exp/rollup.config.release.js
index d9b3002326c..1e3b338e4b5 100644
--- a/packages-exp/functions-exp/rollup.config.release.js
+++ b/packages-exp/functions-exp/rollup.config.release.js
@@ -17,7 +17,7 @@
 
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
 import { es2017BuildsNoPlugin, es5BuildsNoPlugin } from './rollup.shared';
 
diff --git a/packages-exp/installations-exp/package.json b/packages-exp/installations-exp/package.json
index 052fdbffbf9..6cce734d566 100644
--- a/packages-exp/installations-exp/package.json
+++ b/packages-exp/installations-exp/package.json
@@ -42,9 +42,9 @@
   "devDependencies": {
     "@firebase/app-exp": "0.0.800",
     "rollup": "2.29.0",
-    "rollup-plugin-commonjs": "10.1.0",
-    "rollup-plugin-json": "4.0.0",
-    "rollup-plugin-node-resolve": "5.2.0",
+    "@rollup/plugin-commonjs": "10.1.0",
+    "@rollup/plugin-json": "4.1.0",
+    "@rollup/plugin-node-resolve": "9.0.0",
     "rollup-plugin-typescript2": "0.27.3",
     "rollup-plugin-uglify": "6.0.4",
     "typescript": "4.0.2"
diff --git a/packages-exp/installations-exp/rollup.config.js b/packages-exp/installations-exp/rollup.config.js
index 799e3c28da4..d66e464f546 100644
--- a/packages-exp/installations-exp/rollup.config.js
+++ b/packages-exp/installations-exp/rollup.config.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import { es2017BuildsNoPlugin, es5BuildsNoPlugin } from './rollup.shared';
diff --git a/packages-exp/installations-exp/rollup.config.release.js b/packages-exp/installations-exp/rollup.config.release.js
index 8e46781577a..5050932f4a4 100644
--- a/packages-exp/installations-exp/rollup.config.release.js
+++ b/packages-exp/installations-exp/rollup.config.release.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
diff --git a/packages-exp/installations-exp/test-app/rollup.config.js b/packages-exp/installations-exp/test-app/rollup.config.js
index c5c39d4e239..6f6d3a3eae7 100644
--- a/packages-exp/installations-exp/test-app/rollup.config.js
+++ b/packages-exp/installations-exp/test-app/rollup.config.js
@@ -16,9 +16,9 @@
  */
 
 import typescriptPlugin from 'rollup-plugin-typescript2';
-import resolve from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
-import json from 'rollup-plugin-json';
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import json from '@rollup/plugin-json';
 import { uglify } from 'rollup-plugin-uglify';
 import typescript from 'typescript';
 
diff --git a/packages-exp/performance-exp/package.json b/packages-exp/performance-exp/package.json
index cac6a15080a..3f991657b19 100644
--- a/packages-exp/performance-exp/package.json
+++ b/packages-exp/performance-exp/package.json
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@firebase/app-exp": "0.0.800",
     "rollup": "2.29.0",
-    "rollup-plugin-json": "4.0.0",
+    "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.27.3",
     "typescript": "4.0.2"
   },
diff --git a/packages-exp/performance-exp/rollup.config.js b/packages-exp/performance-exp/rollup.config.js
index 5bafdffd187..b5221c26179 100644
--- a/packages-exp/performance-exp/rollup.config.js
+++ b/packages-exp/performance-exp/rollup.config.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import pkg from './package.json';
diff --git a/packages-exp/performance-exp/rollup.config.release.js b/packages-exp/performance-exp/rollup.config.release.js
index 86312dc34ab..a217c6990b0 100644
--- a/packages-exp/performance-exp/rollup.config.release.js
+++ b/packages-exp/performance-exp/rollup.config.release.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
diff --git a/packages/analytics/package.json b/packages/analytics/package.json
index ce078b6c932..d32695edc49 100644
--- a/packages/analytics/package.json
+++ b/packages/analytics/package.json
@@ -36,11 +36,10 @@
   "devDependencies": {
     "@firebase/app": "0.6.11",
     "rollup": "2.29.0",
-    "rollup-plugin-commonjs": "10.1.0",
-    "rollup-plugin-json": "4.0.0",
-    "rollup-plugin-node-resolve": "5.2.0",
+    "@rollup/plugin-commonjs": "15.1.0",
+    "@rollup/plugin-json": "4.1.0",
+    "@rollup/plugin-node-resolve": "9.0.0",
     "rollup-plugin-typescript2": "0.27.3",
-    "rollup-plugin-uglify": "6.0.4",
     "typescript": "4.0.2"
   },
   "repository": {
diff --git a/packages/analytics/rollup.config.js b/packages/analytics/rollup.config.js
index add08fb3927..003f5e73e9f 100644
--- a/packages/analytics/rollup.config.js
+++ b/packages/analytics/rollup.config.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import pkg from './package.json';
diff --git a/packages/app/index.ts b/packages/app/index.ts
index 342dd8034d7..0407953c82c 100644
--- a/packages/app/index.ts
+++ b/packages/app/index.ts
@@ -58,9 +58,9 @@ firebaseNamespace.initializeApp = function (...args: any) {
       "resolve.mainFields":
       https://webpack.js.org/configuration/resolve/#resolvemainfields
       
-      If using Rollup, use the rollup-plugin-node-resolve plugin and specify "main"
+      If using Rollup, use the @rollup/plugin-node-resolve plugin and specify "main"
       as the first item in "mainFields", e.g. ['main', 'module'].
-      https://github.com/rollup/rollup-plugin-node-resolve
+      https://github.com/rollup/@rollup/plugin-node-resolve
       `);
   }
   return initializeApp.apply(undefined, args);
diff --git a/packages/app/package.json b/packages/app/package.json
index 4f743475d1d..20614338819 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "rollup": "2.29.0",
-    "rollup-plugin-json": "4.0.0",
+    "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-typescript2": "0.27.3",
     "typescript": "4.0.2"
diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js
index fbf144c893f..31f577f2310 100644
--- a/packages/app/rollup.config.js
+++ b/packages/app/rollup.config.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 import typescriptPlugin from 'rollup-plugin-typescript2';
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import typescript from 'typescript';
 import pkg from './package.json';
 
diff --git a/packages/database/rollup.config.js b/packages/database/rollup.config.js
index 99d4d081f17..668640e67ad 100644
--- a/packages/database/rollup.config.js
+++ b/packages/database/rollup.config.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import pkg from './package.json';
diff --git a/packages/firebase/package.json b/packages/firebase/package.json
index d9aff26ee71..87ae1c4c754 100644
--- a/packages/firebase/package.json
+++ b/packages/firebase/package.json
@@ -62,9 +62,9 @@
   },
   "devDependencies": {
     "rollup": "2.29.0",
-    "rollup-plugin-commonjs": "10.1.0",
+    "@rollup/plugin-commonjs": "10.1.0",
     "rollup-plugin-license": "2.2.0",
-    "rollup-plugin-node-resolve": "5.2.0",
+    "@rollup/plugin-node-resolve": "9.0.0",
     "rollup-plugin-sourcemaps": "0.6.3",
     "rollup-plugin-terser": "7.0.2",
     "rollup-plugin-typescript2": "0.27.3",
diff --git a/packages/firebase/rollup.config.js b/packages/firebase/rollup.config.js
index 5eaea473398..8bcb0195afa 100644
--- a/packages/firebase/rollup.config.js
+++ b/packages/firebase/rollup.config.js
@@ -16,14 +16,14 @@
  */
 
 import { resolve } from 'path';
-import resolveModule from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
+import resolveModule from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
 import sourcemaps from 'rollup-plugin-sourcemaps';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import { uglify } from 'rollup-plugin-uglify';
 import { terser } from 'rollup-plugin-terser';
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import pkg from './package.json';
 
 import appPkg from './app/package.json';
diff --git a/packages/firestore/package.json b/packages/firestore/package.json
index b39f4cbdad5..66a77151472 100644
--- a/packages/firestore/package.json
+++ b/packages/firestore/package.json
@@ -82,8 +82,8 @@
     "protobufjs": "6.10.1",
     "rollup": "2.29.0",
     "rollup-plugin-copy-assets": "1.1.0",
-    "rollup-plugin-json": "4.0.0",
-    "rollup-plugin-node-resolve": "5.2.0",
+    "@rollup/plugin-json": "4.1.0",
+    "@rollup/plugin-node-resolve": "9.0.0",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-sourcemaps": "0.6.3",
     "rollup-plugin-terser": "7.0.2",
diff --git a/packages/firestore/rollup.config.exp.js b/packages/firestore/rollup.config.exp.js
index a3b880e53e9..0765ec38680 100644
--- a/packages/firestore/rollup.config.exp.js
+++ b/packages/firestore/rollup.config.exp.js
@@ -16,7 +16,7 @@
  */
 
 import tmp from 'tmp';
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import alias from '@rollup/plugin-alias';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
diff --git a/packages/firestore/rollup.config.lite.js b/packages/firestore/rollup.config.lite.js
index 1e49ddbb1a2..4ad76e409c8 100644
--- a/packages/firestore/rollup.config.lite.js
+++ b/packages/firestore/rollup.config.lite.js
@@ -17,7 +17,7 @@
 
 import tmp from 'tmp';
 import path from 'path';
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import alias from '@rollup/plugin-alias';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
diff --git a/packages/firestore/rollup.shared.js b/packages/firestore/rollup.shared.js
index e5a89cd311d..d748bfd0d73 100644
--- a/packages/firestore/rollup.shared.js
+++ b/packages/firestore/rollup.shared.js
@@ -16,7 +16,7 @@
  */
 
 const tmp = require('tmp');
-const json = require('rollup-plugin-json');
+const json = require('@rollup/plugin-json');
 const alias = require('@rollup/plugin-alias');
 const typescriptPlugin = require('rollup-plugin-typescript2');
 const typescript = require('typescript');
diff --git a/packages/firestore/scripts/build-bundle.js b/packages/firestore/scripts/build-bundle.js
index 3e4674e7bd5..7ee0453d8a7 100644
--- a/packages/firestore/scripts/build-bundle.js
+++ b/packages/firestore/scripts/build-bundle.js
@@ -14,4 +14,4 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */var __awaiter=this&&this.__awaiter||function(thisArg,_arguments,P,generator){function adopt(value){return value instanceof P?value:new P((function(resolve){resolve(value)}))}return new(P||(P=Promise))((function(resolve,reject){function fulfilled(value){try{step(generator.next(value))}catch(e){reject(e)}}function rejected(value){try{step(generator["throw"](value))}catch(e){reject(e)}}function step(result){result.done?resolve(result.value):adopt(result.value).then(fulfilled,rejected)}step((generator=generator.apply(thisArg,_arguments||[])).next())}))};var __generator=this&&this.__generator||function(thisArg,body){var _={label:0,sent:function(){if(t[0]&1)throw t[1];return t[1]},trys:[],ops:[]},f,y,t,g;return g={next:verb(0),throw:verb(1),return:verb(2)},typeof Symbol==="function"&&(g[Symbol.iterator]=function(){return this}),g;function verb(n){return function(v){return step([n,v])}}function step(op){if(f)throw new TypeError("Generator is already executing.");while(_)try{if(f=1,y&&(t=op[0]&2?y["return"]:op[0]?y["throw"]||((t=y["return"])&&t.call(y),0):y.next)&&!(t=t.call(y,op[1])).done)return t;if(y=0,t)op=[op[0]&2,t.value];switch(op[0]){case 0:case 1:t=op;break;case 4:_.label++;return{value:op[1],done:false};case 5:_.label++;y=op[1];op=[0];continue;case 7:op=_.ops.pop();_.trys.pop();continue;default:if(!(t=_.trys,t=t.length>0&&t[t.length-1])&&(op[0]===6||op[0]===2)){_=0;continue}if(op[0]===3&&(!t||op[1]>t[0]&&op[1]<t[3])){_.label=op[1];break}if(op[0]===6&&_.label<t[1]){_.label=t[1];t=op;break}if(t&&_.label<t[2]){_.label=t[2];_.ops.push(op);break}if(t[2])_.ops.pop();_.trys.pop();continue}op=body.call(thisArg,_)}catch(e){op=[6,e];y=0}finally{f=t=0}if(op[0]&5)throw op[1];return{value:op[0]?op[1]:void 0,done:true}}};exports.__esModule=true;var yargs=require("yargs");var rollup_1=require("rollup");var typescriptPlugin=require("rollup-plugin-typescript2");var alias=require("@rollup/plugin-alias");var json=require("rollup-plugin-json");var util=require("../rollup.shared");var argv=yargs.options({input:{type:"string",demandOption:true,desc:"The location of the index.ts file"},output:{type:"string",demandOption:true,desc:"The location for the transpiled JavaScript bundle"}}).argv;function buildBundle(input,output){return __awaiter(this,void 0,void 0,(function(){var bundle;return __generator(this,(function(_a){switch(_a.label){case 0:return[4,rollup_1.rollup({input:input,plugins:[alias(util.generateAliasConfig("node")),typescriptPlugin({tsconfigOverride:{compilerOptions:{target:"es2017"}},transformers:[util.removeAssertTransformer]}),json({preferConst:true})],external:util.resolveNodeExterns})];case 1:bundle=_a.sent();return[4,bundle.write({file:output,format:"es"})];case 2:_a.sent();return[2]}}))}))}buildBundle(argv.input,argv.output);
\ No newline at end of file
+ */var __awaiter=this&&this.__awaiter||function(thisArg,_arguments,P,generator){function adopt(value){return value instanceof P?value:new P((function(resolve){resolve(value)}))}return new(P||(P=Promise))((function(resolve,reject){function fulfilled(value){try{step(generator.next(value))}catch(e){reject(e)}}function rejected(value){try{step(generator["throw"](value))}catch(e){reject(e)}}function step(result){result.done?resolve(result.value):adopt(result.value).then(fulfilled,rejected)}step((generator=generator.apply(thisArg,_arguments||[])).next())}))};var __generator=this&&this.__generator||function(thisArg,body){var _={label:0,sent:function(){if(t[0]&1)throw t[1];return t[1]},trys:[],ops:[]},f,y,t,g;return g={next:verb(0),throw:verb(1),return:verb(2)},typeof Symbol==="function"&&(g[Symbol.iterator]=function(){return this}),g;function verb(n){return function(v){return step([n,v])}}function step(op){if(f)throw new TypeError("Generator is already executing.");while(_)try{if(f=1,y&&(t=op[0]&2?y["return"]:op[0]?y["throw"]||((t=y["return"])&&t.call(y),0):y.next)&&!(t=t.call(y,op[1])).done)return t;if(y=0,t)op=[op[0]&2,t.value];switch(op[0]){case 0:case 1:t=op;break;case 4:_.label++;return{value:op[1],done:false};case 5:_.label++;y=op[1];op=[0];continue;case 7:op=_.ops.pop();_.trys.pop();continue;default:if(!(t=_.trys,t=t.length>0&&t[t.length-1])&&(op[0]===6||op[0]===2)){_=0;continue}if(op[0]===3&&(!t||op[1]>t[0]&&op[1]<t[3])){_.label=op[1];break}if(op[0]===6&&_.label<t[1]){_.label=t[1];t=op;break}if(t&&_.label<t[2]){_.label=t[2];_.ops.push(op);break}if(t[2])_.ops.pop();_.trys.pop();continue}op=body.call(thisArg,_)}catch(e){op=[6,e];y=0}finally{f=t=0}if(op[0]&5)throw op[1];return{value:op[0]?op[1]:void 0,done:true}}};exports.__esModule=true;var yargs=require("yargs");var rollup_1=require("rollup");var typescriptPlugin=require("rollup-plugin-typescript2");var alias=require("@rollup/plugin-alias");var json=require("@rollup/plugin-json");var util=require("../rollup.shared");var argv=yargs.options({input:{type:"string",demandOption:true,desc:"The location of the index.ts file"},output:{type:"string",demandOption:true,desc:"The location for the transpiled JavaScript bundle"}}).argv;function buildBundle(input,output){return __awaiter(this,void 0,void 0,(function(){var bundle;return __generator(this,(function(_a){switch(_a.label){case 0:return[4,rollup_1.rollup({input:input,plugins:[alias(util.generateAliasConfig("node")),typescriptPlugin({tsconfigOverride:{compilerOptions:{target:"es2017"}},transformers:[util.removeAssertTransformer]}),json({preferConst:true})],external:util.resolveNodeExterns})];case 1:bundle=_a.sent();return[4,bundle.write({file:output,format:"es"})];case 2:_a.sent();return[2]}}))}))}buildBundle(argv.input,argv.output);
\ No newline at end of file
diff --git a/packages/firestore/scripts/build-bundle.ts b/packages/firestore/scripts/build-bundle.ts
index 36f61d5ce34..c3071edcb9e 100644
--- a/packages/firestore/scripts/build-bundle.ts
+++ b/packages/firestore/scripts/build-bundle.ts
@@ -20,7 +20,7 @@ import { rollup } from 'rollup';
 
 const typescriptPlugin = require('rollup-plugin-typescript2');
 const alias = require('@rollup/plugin-alias');
-const json = require('rollup-plugin-json');
+const json = require('@rollup/plugin-json');
 
 const util = require('../rollup.shared');
 
diff --git a/packages/firestore/tools/console.build.js b/packages/firestore/tools/console.build.js
index e7bc7102393..dde82e7acd3 100644
--- a/packages/firestore/tools/console.build.js
+++ b/packages/firestore/tools/console.build.js
@@ -21,7 +21,7 @@
  */
 const rollup = require('rollup');
 const { uglify } = require('rollup-plugin-uglify');
-const resolve = require('rollup-plugin-node-resolve');
+const resolve = require('@rollup/plugin-node-resolve');
 const fs = require('fs');
 const util = require('util');
 const fs_writeFile = util.promisify(fs.writeFile);
diff --git a/packages/functions/rollup.config.js b/packages/functions/rollup.config.js
index 0cb94644633..653177a72a1 100644
--- a/packages/functions/rollup.config.js
+++ b/packages/functions/rollup.config.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import pkg from './package.json';
diff --git a/packages/installations/package.json b/packages/installations/package.json
index 1189f1340d3..90ebdf2281f 100644
--- a/packages/installations/package.json
+++ b/packages/installations/package.json
@@ -32,9 +32,9 @@
   "devDependencies": {
     "@firebase/app": "0.6.11",
     "rollup": "2.29.0",
-    "rollup-plugin-commonjs": "10.1.0",
-    "rollup-plugin-json": "4.0.0",
-    "rollup-plugin-node-resolve": "5.2.0",
+    "@rollup/plugin-commonjs": "10.1.0",
+    "@rollup/plugin-json": "4.1.0",
+    "@rollup/plugin-node-resolve": "9.0.0",
     "rollup-plugin-typescript2": "0.27.3",
     "rollup-plugin-uglify": "6.0.4",
     "typescript": "4.0.2"
diff --git a/packages/installations/rollup.config.js b/packages/installations/rollup.config.js
index c155cf33879..ca233000506 100644
--- a/packages/installations/rollup.config.js
+++ b/packages/installations/rollup.config.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import pkg from './package.json';
 import typescript from 'typescript';
diff --git a/packages/installations/test-app/rollup.config.js b/packages/installations/test-app/rollup.config.js
index f6ef6110872..4a3f71fa295 100644
--- a/packages/installations/test-app/rollup.config.js
+++ b/packages/installations/test-app/rollup.config.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
  */
 
 import typescriptPlugin from 'rollup-plugin-typescript2';
-import resolve from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
-import json from 'rollup-plugin-json';
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import json from '@rollup/plugin-json';
 import { uglify } from 'rollup-plugin-uglify';
 import typescript from 'typescript';
 
diff --git a/packages/messaging/rollup.config.js b/packages/messaging/rollup.config.js
index 693cea56ae1..b1eaf62525a 100644
--- a/packages/messaging/rollup.config.js
+++ b/packages/messaging/rollup.config.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import pkg from './package.json';
diff --git a/packages/performance/package.json b/packages/performance/package.json
index 19bdc5ecf59..78d9db93ca6 100644
--- a/packages/performance/package.json
+++ b/packages/performance/package.json
@@ -37,7 +37,7 @@
   "devDependencies": {
     "@firebase/app": "0.6.11",
     "rollup": "2.29.0",
-    "rollup-plugin-json": "4.0.0",
+    "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.27.3",
     "typescript": "4.0.2"
   },
diff --git a/packages/performance/rollup.config.js b/packages/performance/rollup.config.js
index b0b7ef414bc..bff20f3d6ca 100644
--- a/packages/performance/rollup.config.js
+++ b/packages/performance/rollup.config.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import pkg from './package.json';
diff --git a/packages/remote-config/rollup.config.js b/packages/remote-config/rollup.config.js
index 9da4e9a364d..85934294724 100644
--- a/packages/remote-config/rollup.config.js
+++ b/packages/remote-config/rollup.config.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import json from 'rollup-plugin-json'; // Enables package.json import in TypeScript.
+import json from '@rollup/plugin-json'; // Enables package.json import in TypeScript.
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import pkg from './package.json';
diff --git a/packages/rxfire/package.json b/packages/rxfire/package.json
index 112f2d2cc30..1d96c443570 100644
--- a/packages/rxfire/package.json
+++ b/packages/rxfire/package.json
@@ -45,8 +45,8 @@
   "devDependencies": {
     "firebase": "7.23.0",
     "rollup": "2.29.0",
-    "rollup-plugin-commonjs": "10.1.0",
-    "rollup-plugin-node-resolve": "5.2.0",
+    "@rollup/plugin-commonjs": "10.1.0",
+    "@rollup/plugin-node-resolve": "9.0.0",
     "rollup-plugin-typescript2": "0.27.3",
     "rollup-plugin-uglify": "6.0.4",
     "typescript": "4.0.2"
diff --git a/packages/rxfire/rollup.config.js b/packages/rxfire/rollup.config.js
index 697555eb624..24275a74ec9 100644
--- a/packages/rxfire/rollup.config.js
+++ b/packages/rxfire/rollup.config.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
  */
 
 import { resolve } from 'path';
-import resolveModule from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
+import resolveModule from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import { uglify } from 'rollup-plugin-uglify';
 import typescript from 'typescript';
diff --git a/packages/storage/rollup.config.js b/packages/storage/rollup.config.js
index d2de84132df..87e0baf00fc 100644
--- a/packages/storage/rollup.config.js
+++ b/packages/storage/rollup.config.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import pkg from './package.json';
diff --git a/packages/webchannel-wrapper/gulpfile.js b/packages/webchannel-wrapper/gulpfile.js
index 625262aca08..350a1d8b4d1 100644
--- a/packages/webchannel-wrapper/gulpfile.js
+++ b/packages/webchannel-wrapper/gulpfile.js
@@ -22,7 +22,7 @@ const del = require('del');
 const path = require('path');
 const sourcemaps = require('gulp-sourcemaps');
 const { resolve } = require('path');
-const commonjs = require('rollup-plugin-commonjs');
+const commonjs = require('@rollup/plugin-commonjs');
 const rollupSourcemaps = require('rollup-plugin-sourcemaps');
 const typescriptPlugin = require('rollup-plugin-typescript2');
 const typescript = require('typescript');
diff --git a/packages/webchannel-wrapper/package.json b/packages/webchannel-wrapper/package.json
index 2f2ac8c5c55..1f8d875421f 100644
--- a/packages/webchannel-wrapper/package.json
+++ b/packages/webchannel-wrapper/package.json
@@ -21,7 +21,7 @@
     "gulp": "4.0.2",
     "gulp-sourcemaps": "2.6.5",
     "rollup": "2.29.0",
-    "rollup-plugin-commonjs": "10.1.0",
+    "@rollup/plugin-commonjs": "10.1.0",
     "rollup-plugin-sourcemaps": "0.6.3",
     "rollup-plugin-typescript2": "0.27.3",
     "typescript": "4.0.2"
diff --git a/repo-scripts/size-analysis/analysis-helper.ts b/repo-scripts/size-analysis/analysis-helper.ts
index 38b77249639..cd2d041c4dc 100644
--- a/repo-scripts/size-analysis/analysis-helper.ts
+++ b/repo-scripts/size-analysis/analysis-helper.ts
@@ -21,8 +21,8 @@ import * as fs from 'fs';
 import * as rollup from 'rollup';
 import * as terser from 'terser';
 import * as ts from 'typescript';
-import resolve from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
 import { deepCopy } from '@firebase/util';
 
 export const enum ErrorCode {
diff --git a/repo-scripts/size-analysis/package.json b/repo-scripts/size-analysis/package.json
index 8079249dd50..cde3b67d83d 100644
--- a/repo-scripts/size-analysis/package.json
+++ b/repo-scripts/size-analysis/package.json
@@ -17,9 +17,9 @@
   },
   "dependencies": {
     "rollup": "2.29.0",
-    "rollup-plugin-commonjs": "10.1.0",
-    "rollup-plugin-json": "4.0.0",
-    "rollup-plugin-node-resolve": "5.2.0",
+    "@rollup/plugin-commonjs": "10.1.0",
+    "@rollup/plugin-json": "4.1.0",
+    "@rollup/plugin-node-resolve": "9.0.0",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-typescript2": "0.27.3",
     "tmp": "0.2.1",
diff --git a/repo-scripts/size-analysis/rollup.config.js b/repo-scripts/size-analysis/rollup.config.js
index 36067932fcf..3d39d474843 100644
--- a/repo-scripts/size-analysis/rollup.config.js
+++ b/repo-scripts/size-analysis/rollup.config.js
@@ -18,7 +18,7 @@
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import typescript from 'typescript';
 import pkg from './package.json';
-import json from 'rollup-plugin-json';
+import json from '@rollup/plugin-json';
 
 const deps = Object.keys(
   Object.assign({}, pkg.peerDependencies, pkg.dependencies)

From 19eb300e08902aa19fd8afb381932e874fabbc88 Mon Sep 17 00:00:00 2001
From: Feiyang1 <plane1113@gmail.com>
Date: Tue, 13 Oct 2020 10:54:35 -0700
Subject: [PATCH 2/5] update version

---
 packages-exp/auth-compat-exp/demo/package.json | 2 +-
 packages-exp/firebase-exp/package.json         | 2 +-
 packages-exp/installations-exp/package.json    | 2 +-
 packages/firebase/package.json                 | 2 +-
 packages/installations/package.json            | 2 +-
 packages/rxfire/package.json                   | 2 +-
 packages/webchannel-wrapper/package.json       | 2 +-
 repo-scripts/size-analysis/package.json        | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages-exp/auth-compat-exp/demo/package.json b/packages-exp/auth-compat-exp/demo/package.json
index d381a0e6b89..f217f6b84cc 100644
--- a/packages-exp/auth-compat-exp/demo/package.json
+++ b/packages-exp/auth-compat-exp/demo/package.json
@@ -29,7 +29,7 @@
     "rollup": "1.32.1",
     "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-replace": "2.2.0",
-    "@rollup/plugin-commonjs": "10.1.0",
+    "@rollup/plugin-commonjs": "15.1.0",
     "rollup-plugin-license": "0.14.0",
     "@rollup/plugin-node-resolve": "9.0.0",
     "rollup-plugin-sourcemaps": "0.6.3",
diff --git a/packages-exp/firebase-exp/package.json b/packages-exp/firebase-exp/package.json
index 0394b8ab50c..88678fb7116 100644
--- a/packages-exp/firebase-exp/package.json
+++ b/packages-exp/firebase-exp/package.json
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "rollup": "2.29.0",
-    "@rollup/plugin-commonjs": "10.1.0",
+    "@rollup/plugin-commonjs": "15.1.0",
     "rollup-plugin-license": "2.2.0",
     "@rollup/plugin-node-resolve": "9.0.0",
     "rollup-plugin-sourcemaps": "0.6.3",
diff --git a/packages-exp/installations-exp/package.json b/packages-exp/installations-exp/package.json
index 6cce734d566..fdad30a789a 100644
--- a/packages-exp/installations-exp/package.json
+++ b/packages-exp/installations-exp/package.json
@@ -42,7 +42,7 @@
   "devDependencies": {
     "@firebase/app-exp": "0.0.800",
     "rollup": "2.29.0",
-    "@rollup/plugin-commonjs": "10.1.0",
+    "@rollup/plugin-commonjs": "15.1.0",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "9.0.0",
     "rollup-plugin-typescript2": "0.27.3",
diff --git a/packages/firebase/package.json b/packages/firebase/package.json
index 87ae1c4c754..85191a5ac88 100644
--- a/packages/firebase/package.json
+++ b/packages/firebase/package.json
@@ -62,7 +62,7 @@
   },
   "devDependencies": {
     "rollup": "2.29.0",
-    "@rollup/plugin-commonjs": "10.1.0",
+    "@rollup/plugin-commonjs": "15.1.0",
     "rollup-plugin-license": "2.2.0",
     "@rollup/plugin-node-resolve": "9.0.0",
     "rollup-plugin-sourcemaps": "0.6.3",
diff --git a/packages/installations/package.json b/packages/installations/package.json
index 90ebdf2281f..0e7b91477c0 100644
--- a/packages/installations/package.json
+++ b/packages/installations/package.json
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@firebase/app": "0.6.11",
     "rollup": "2.29.0",
-    "@rollup/plugin-commonjs": "10.1.0",
+    "@rollup/plugin-commonjs": "15.1.0",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "9.0.0",
     "rollup-plugin-typescript2": "0.27.3",
diff --git a/packages/rxfire/package.json b/packages/rxfire/package.json
index 1d96c443570..0a45c205068 100644
--- a/packages/rxfire/package.json
+++ b/packages/rxfire/package.json
@@ -45,7 +45,7 @@
   "devDependencies": {
     "firebase": "7.23.0",
     "rollup": "2.29.0",
-    "@rollup/plugin-commonjs": "10.1.0",
+    "@rollup/plugin-commonjs": "15.1.0",
     "@rollup/plugin-node-resolve": "9.0.0",
     "rollup-plugin-typescript2": "0.27.3",
     "rollup-plugin-uglify": "6.0.4",
diff --git a/packages/webchannel-wrapper/package.json b/packages/webchannel-wrapper/package.json
index 1f8d875421f..83a0df4ea97 100644
--- a/packages/webchannel-wrapper/package.json
+++ b/packages/webchannel-wrapper/package.json
@@ -21,7 +21,7 @@
     "gulp": "4.0.2",
     "gulp-sourcemaps": "2.6.5",
     "rollup": "2.29.0",
-    "@rollup/plugin-commonjs": "10.1.0",
+    "@rollup/plugin-commonjs": "15.1.0",
     "rollup-plugin-sourcemaps": "0.6.3",
     "rollup-plugin-typescript2": "0.27.3",
     "typescript": "4.0.2"
diff --git a/repo-scripts/size-analysis/package.json b/repo-scripts/size-analysis/package.json
index cde3b67d83d..bdbd897d8fe 100644
--- a/repo-scripts/size-analysis/package.json
+++ b/repo-scripts/size-analysis/package.json
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "rollup": "2.29.0",
-    "@rollup/plugin-commonjs": "10.1.0",
+    "@rollup/plugin-commonjs": "15.1.0",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "9.0.0",
     "rollup-plugin-replace": "2.2.0",

From 362fccb2643e1b4c3ae23b528a34ca2e4e561748 Mon Sep 17 00:00:00 2001
From: Feiyang1 <plane1113@gmail.com>
Date: Tue, 13 Oct 2020 11:43:39 -0700
Subject: [PATCH 3/5] update yarn lock

---
 yarn.lock | 91 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 51 insertions(+), 40 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 856f320b5b6..da6d666cdf0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2312,6 +2312,38 @@
   dependencies:
     slash "^3.0.0"
 
+"@rollup/plugin-commonjs@15.1.0":
+  version "15.1.0"
+  resolved "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.1.0.tgz#1e7d076c4f1b2abf7e65248570e555defc37c238"
+  integrity sha512-xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ==
+  dependencies:
+    "@rollup/pluginutils" "^3.1.0"
+    commondir "^1.0.1"
+    estree-walker "^2.0.1"
+    glob "^7.1.6"
+    is-reference "^1.2.1"
+    magic-string "^0.25.7"
+    resolve "^1.17.0"
+
+"@rollup/plugin-json@4.1.0":
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz#54e09867ae6963c593844d8bd7a9c718294496f3"
+  integrity sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==
+  dependencies:
+    "@rollup/pluginutils" "^3.0.8"
+
+"@rollup/plugin-node-resolve@9.0.0":
+  version "9.0.0"
+  resolved "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-9.0.0.tgz#39bd0034ce9126b39c1699695f440b4b7d2b62e6"
+  integrity sha512-gPz+utFHLRrd41WMP13Jq5mqqzHL3OXrfj3/MkSyB6UBIcuNt9j60GCbarzMzdf1VHFpOxfQh/ez7wyadLMqkg==
+  dependencies:
+    "@rollup/pluginutils" "^3.1.0"
+    "@types/resolve" "1.17.1"
+    builtin-modules "^3.1.0"
+    deepmerge "^4.2.2"
+    is-module "^1.0.0"
+    resolve "^1.17.0"
+
 "@rollup/plugin-strip@2.0.0":
   version "2.0.0"
   resolved "https://registry.npmjs.org/@rollup/plugin-strip/-/plugin-strip-2.0.0.tgz#46014ca2bc30bfff4ac289c52d7174671418173d"
@@ -2321,7 +2353,7 @@
     estree-walker "^1.0.1"
     magic-string "^0.25.5"
 
-"@rollup/pluginutils@^3.0.4", "@rollup/pluginutils@^3.0.9", "@rollup/pluginutils@^3.1.0":
+"@rollup/pluginutils@^3.0.4", "@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.0.9", "@rollup/pluginutils@^3.1.0":
   version "3.1.0"
   resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
   integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
@@ -2683,10 +2715,10 @@
     "@types/tough-cookie" "*"
     form-data "^2.5.0"
 
-"@types/resolve@0.0.8":
-  version "0.0.8"
-  resolved "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
-  integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
+"@types/resolve@1.17.1":
+  version "1.17.1"
+  resolved "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
+  integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
   dependencies:
     "@types/node" "*"
 
@@ -5617,6 +5649,11 @@ deep-is@^0.1.3:
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
+deepmerge@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+
 default-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
@@ -6430,6 +6467,11 @@ estree-walker@^1.0.1:
   resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
+estree-walker@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.1.tgz#f8e030fb21cefa183b44b7ad516b747434e7a3e0"
+  integrity sha512-tF0hv+Yi2Ot1cwj9eYHtxC0jB9bmjacjQs6ZBTj82H8JwUywFuc+7E83NWfNMwHXZc11mjfFcVXPe9gEP4B8dg==
+
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -9008,7 +9050,7 @@ is-redirect@^1.0.0:
   resolved "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
   integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
 
-is-reference@^1.1.2:
+is-reference@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
   integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
@@ -10516,7 +10558,7 @@ macos-release@^2.2.0:
   resolved "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz#64033d0ec6a5e6375155a74b1a1eba8e509820ac"
   integrity sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg==
 
-magic-string@0.25.7, magic-string@^0.25.2, magic-string@^0.25.5:
+magic-string@0.25.7, magic-string@^0.25.2, magic-string@^0.25.5, magic-string@^0.25.7:
   version "0.25.7"
   resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
   integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
@@ -13173,7 +13215,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@1.17.0, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@~1.17.0:
+resolve@1.17.0, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@~1.17.0:
   version "1.17.0"
   resolved "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
   integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
@@ -13259,17 +13301,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
-rollup-plugin-commonjs@10.1.0:
-  version "10.1.0"
-  resolved "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz#417af3b54503878e084d127adf4d1caf8beb86fb"
-  integrity sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==
-  dependencies:
-    estree-walker "^0.6.1"
-    is-reference "^1.1.2"
-    magic-string "^0.25.2"
-    resolve "^1.11.0"
-    rollup-pluginutils "^2.8.1"
-
 rollup-plugin-copy-assets@1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/rollup-plugin-copy-assets/-/rollup-plugin-copy-assets-1.1.0.tgz#017e22bef9a9f6ddc632bae60cd660e0270c7706"
@@ -13277,13 +13308,6 @@ rollup-plugin-copy-assets@1.1.0:
   dependencies:
     fs-extra "^5.0.0"
 
-rollup-plugin-json@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/rollup-plugin-json/-/rollup-plugin-json-4.0.0.tgz#a18da0a4b30bf5ca1ee76ddb1422afbb84ae2b9e"
-  integrity sha512-hgb8N7Cgfw5SZAkb3jf0QXii6QX/FOkiIq2M7BAQIEydjHvTyxXHQiIzZaTFgx1GK0cRCHOCBHIyEkkLdWKxow==
-  dependencies:
-    rollup-pluginutils "^2.5.0"
-
 rollup-plugin-license@2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/rollup-plugin-license/-/rollup-plugin-license-2.2.0.tgz#0d19139bbe44dda500fbf15530af07c91949e348"
@@ -13299,17 +13323,6 @@ rollup-plugin-license@2.2.0:
     spdx-expression-validate "2.0.0"
     spdx-satisfies "5.0.0"
 
-rollup-plugin-node-resolve@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz#730f93d10ed202473b1fb54a5997a7db8c6d8523"
-  integrity sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==
-  dependencies:
-    "@types/resolve" "0.0.8"
-    builtin-modules "^3.1.0"
-    is-module "^1.0.0"
-    resolve "^1.11.1"
-    rollup-pluginutils "^2.8.1"
-
 rollup-plugin-replace@2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/rollup-plugin-replace/-/rollup-plugin-replace-2.2.0.tgz#f41ae5372e11e7a217cde349c8b5d5fd115e70e3"
@@ -13357,7 +13370,7 @@ rollup-plugin-uglify@6.0.4:
     serialize-javascript "^2.1.2"
     uglify-js "^3.4.9"
 
-rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.1:
+rollup-pluginutils@^2.6.0:
   version "2.8.2"
   resolved "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
   integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
@@ -14497,7 +14510,6 @@ symbol-observable@^1.1.0:
 
 "sync-promise@git+https://github.com/brettz9/sync-promise.git#full-sync-missing-promise-features":
   version "1.0.1"
-  uid "25845a49a00aa2d2c985a5149b97c86a1fcdc75a"
   resolved "git+https://github.com/brettz9/sync-promise.git#25845a49a00aa2d2c985a5149b97c86a1fcdc75a"
 
 table@^5.2.3:
@@ -15803,7 +15815,6 @@ websocket-extensions@>=0.1.1:
 
 "websql@git+https://github.com/brettz9/node-websql.git#configurable-secure2":
   version "1.0.0"
-  uid "5149bc0763376ca757fc32dc74345ada0467bfbb"
   resolved "git+https://github.com/brettz9/node-websql.git#5149bc0763376ca757fc32dc74345ada0467bfbb"
   dependencies:
     argsarray "^0.0.1"

From 84456e56cf6ee4909bfabc49a7db076148a5096d Mon Sep 17 00:00:00 2001
From: Feiyang1 <plane1113@gmail.com>
Date: Tue, 13 Oct 2020 12:38:42 -0700
Subject: [PATCH 4/5] in order to generate named exports

---
 packages/webchannel-wrapper/src/index.js | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/packages/webchannel-wrapper/src/index.js b/packages/webchannel-wrapper/src/index.js
index ce88162b943..f259ce42165 100644
--- a/packages/webchannel-wrapper/src/index.js
+++ b/packages/webchannel-wrapper/src/index.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,15 +74,9 @@ goog.net.XhrIo.prototype['getResponseText'] =
   goog.net.XhrIo.prototype.getResponseText;
 goog.net.XhrIo.prototype['send'] = goog.net.XhrIo.prototype.send;
 
-/**
- * This ignore statement is required as closure will minify these properties
- * if done in the typical prettier format
- */
-// prettier-ignore
-module['exports'] = {
-  'createWebChannelTransport': goog.net.createWebChannelTransport,
-  'ErrorCode': goog.net.ErrorCode,
-  'EventType': goog.net.EventType,
-  'WebChannel': goog.net.WebChannel,
-  'XhrIo': goog.net.XhrIo
-};
+module['exports']['createWebChannelTransport'] =
+  goog.net.createWebChannelTransport;
+module['exports']['ErrorCode'] = goog.net.ErrorCode;
+module['exports']['EventType'] = goog.net.EventType;
+module['exports']['WebChannel'] = goog.net.WebChannel;
+module['exports']['XhrIo'] = goog.net.XhrIo;

From 8a0782e43315f5f32583486a8a5d52647e1dd836 Mon Sep 17 00:00:00 2001
From: Feiyang1 <plane1113@gmail.com>
Date: Tue, 13 Oct 2020 15:07:31 -0700
Subject: [PATCH 5/5] build cjs correctly

---
 packages/webchannel-wrapper/gulpfile.js | 37 ++++++++++++-------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/packages/webchannel-wrapper/gulpfile.js b/packages/webchannel-wrapper/gulpfile.js
index 350a1d8b4d1..8f6a24a74d5 100644
--- a/packages/webchannel-wrapper/gulpfile.js
+++ b/packages/webchannel-wrapper/gulpfile.js
@@ -61,7 +61,7 @@ const closureDefines = [
  * @param {string} prefix prefix to the compiled code
  * @param {string} suffix suffix to the compiled code
  */
-function createBuildTask(filename, prefix, suffix) {
+function createBuildTask(filename, prefix, suffix, languageout) {
   return function closureBuild() {
     return gulp
       .src(
@@ -83,7 +83,7 @@ function createBuildTask(filename, prefix, suffix) {
             resolve(__dirname, './externs/overrides.js'),
             resolve(__dirname, './externs/module.js')
           ],
-          language_out: 'ECMASCRIPT_2017',
+          language_out: languageout,
           dependency_mode: 'PRUNE',
           define: closureDefines
         })
@@ -134,28 +134,27 @@ async function deleteIntermediateFiles() {
   await del('dist/temp');
 }
 
-// Closure-generated ES2017 intermediate file (CJS format)
-const intermediateCjsFile = 'temp/cjs.js';
-const intermediateCjsPath = resolve(__dirname, 'dist/', intermediateCjsFile);
-const cjsBuild = createBuildTask(
-  intermediateCjsFile,
-  CJS_WRAPPER_PREFIX,
-  CJS_WRAPPER_SUFFIX
-);
-
 // Closure-generated ES2017 intermediate file (no wrapper text)
 const intermediateEsmFile = 'temp/esm.js';
 const intermediateEsmPath = resolve(__dirname, 'dist/', intermediateEsmFile);
-const esmBuild = createBuildTask(intermediateEsmFile, '', '');
+const esmBuild = createBuildTask(
+  intermediateEsmFile,
+  '',
+  '',
+  'ECMASCRIPT_2017'
+);
 
 // cjs output
-const rollupCjsTask = createRollupTask({
-  inputPath: intermediateCjsPath,
-  outputExtension: '',
-  compileToES5: true,
-  format: 'cjs'
-});
-gulp.task('cjs', gulp.series(cjsBuild, rollupCjsTask));
+// Closure-generated ES5 CJS build
+const cjsBuildOutput = 'index.js';
+const cjsBuild = createBuildTask(
+  cjsBuildOutput,
+  CJS_WRAPPER_PREFIX,
+  CJS_WRAPPER_SUFFIX,
+  'ECMASCRIPT5'
+);
+
+gulp.task('cjs', cjsBuild);
 
 // esm intermediateEsmPath
 const rollupEsmTask = createRollupTask({