From 4337d24e70e9cfd318e7e82c6430a2751bced9fd Mon Sep 17 00:00:00 2001 From: Sam Olsen Date: Mon, 25 Oct 2021 14:43:12 -0700 Subject: [PATCH 1/3] Fix rollup config for compat --- packages/firebase/compat/rollup.config.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/firebase/compat/rollup.config.js b/packages/firebase/compat/rollup.config.js index 9104650be49..32bea1aa87d 100644 --- a/packages/firebase/compat/rollup.config.js +++ b/packages/firebase/compat/rollup.config.js @@ -29,6 +29,10 @@ import compatPkg from './package.json'; import appPkg from './app/package.json'; const external = Object.keys(pkg.dependencies || {}); +const uglifyOptions = { + mangle: true, + webkit: true, // Necessary to avoid https://bugs.webkit.org/show_bug.cgi?id=223533 +} /** * Global UMD Build @@ -123,7 +127,7 @@ const appBuilds = [ format: 'umd', name: GLOBAL_NAME }, - plugins: [...plugins, typescriptPluginCDN, uglify()] + plugins: [...plugins, typescriptPluginCDN, uglify(uglifyOptions)] } ]; @@ -163,7 +167,7 @@ const componentBuilds = compatPkg.components { input: `${__dirname}/${component}/index.ts`, output: createUmdOutputConfig(`firebase-${component}-compat.js`), - plugins: [...plugins, typescriptPluginCDN, uglify()], + plugins: [...plugins, typescriptPluginCDN, uglify(uglifyOptions)], external: ['@firebase/app-compat', '@firebase/app'] } ]; @@ -197,7 +201,7 @@ const completeBuilds = [ sourcemap: true, name: GLOBAL_NAME }, - plugins: [...plugins, typescriptPluginCDN, uglify()] + plugins: [...plugins, typescriptPluginCDN, uglify(uglifyOptions)] }, /** * App Node.js Builds @@ -244,7 +248,7 @@ const completeBuilds = [ typescriptPluginCDN, json(), commonjs(), - uglify() + uglify(uglifyOptions) ] }, /** From a4ed3342a515ea0379ac5593a70dc522031dab69 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 25 Oct 2021 14:45:28 -0700 Subject: [PATCH 2/3] Add changeset --- .changeset/selfish-tools-obey.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/selfish-tools-obey.md diff --git a/.changeset/selfish-tools-obey.md b/.changeset/selfish-tools-obey.md new file mode 100644 index 00000000000..131ba7f8dd0 --- /dev/null +++ b/.changeset/selfish-tools-obey.md @@ -0,0 +1,5 @@ +--- +"firebase": patch +--- + +Fix compatability layer errors that were being thrown in Safari From 8c857d7f9ed6fb28cbbd9124ee39273e3e33737b Mon Sep 17 00:00:00 2001 From: Sam Olsen Date: Mon, 25 Oct 2021 15:32:44 -0700 Subject: [PATCH 3/3] Formatting --- packages/firebase/compat/rollup.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/firebase/compat/rollup.config.js b/packages/firebase/compat/rollup.config.js index 32bea1aa87d..433d9b557fb 100644 --- a/packages/firebase/compat/rollup.config.js +++ b/packages/firebase/compat/rollup.config.js @@ -31,8 +31,8 @@ import appPkg from './app/package.json'; const external = Object.keys(pkg.dependencies || {}); const uglifyOptions = { mangle: true, - webkit: true, // Necessary to avoid https://bugs.webkit.org/show_bug.cgi?id=223533 -} + webkit: true // Necessary to avoid https://bugs.webkit.org/show_bug.cgi?id=223533 +}; /** * Global UMD Build