From 398487a0f457d18b27ab3eb9981743f2ae56ae09 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Wed, 21 Jun 2023 23:17:09 -0400 Subject: [PATCH 1/3] Firestore: fix source maps that just redirected back into the minified/obfuscated files --- packages/firestore/rollup.config.js | 16 +++++++++++++--- packages/firestore/rollup.config.lite.js | 17 +++++++++++++---- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/packages/firestore/rollup.config.js b/packages/firestore/rollup.config.js index 21b984ab929..2f8b4a52b5e 100644 --- a/packages/firestore/rollup.config.js +++ b/packages/firestore/rollup.config.js @@ -28,6 +28,7 @@ import { generateBuildTargetReplaceConfig } from '../../scripts/build/rollup_rep import pkg from './package.json'; +const sourcemaps = require('rollup-plugin-sourcemaps'); const util = require('./rollup.shared'); const nodePlugins = function () { @@ -111,7 +112,10 @@ const allBuilds = [ format: 'es', sourcemap: true }, - plugins: [replace(generateBuildTargetReplaceConfig('esm', 2017))], + plugins: [ + sourcemaps(), + replace(generateBuildTargetReplaceConfig('esm', 2017)) + ], external: util.resolveNodeExterns, treeshake: { moduleSideEffects: false @@ -162,7 +166,10 @@ const allBuilds = [ sourcemap: true } ], - plugins: [replace(generateBuildTargetReplaceConfig('cjs', 2017))], + plugins: [ + sourcemaps(), + replace(generateBuildTargetReplaceConfig('cjs', 2017)) + ], external: util.resolveBrowserExterns, treeshake: { moduleSideEffects: false @@ -178,7 +185,10 @@ const allBuilds = [ sourcemap: true } ], - plugins: [replace(generateBuildTargetReplaceConfig('esm', 2017))], + plugins: [ + sourcemaps(), + replace(generateBuildTargetReplaceConfig('esm', 2017)) + ], external: util.resolveBrowserExterns, treeshake: { moduleSideEffects: false diff --git a/packages/firestore/rollup.config.lite.js b/packages/firestore/rollup.config.lite.js index ed11e40f6b8..c7454b9c59b 100644 --- a/packages/firestore/rollup.config.lite.js +++ b/packages/firestore/rollup.config.lite.js @@ -106,8 +106,8 @@ const allBuilds = [ }, include: ['dist/lite/*.js'] }), - json(), sourcemaps(), + json(), replace(generateBuildTargetReplaceConfig('cjs', 5)) ], external: util.resolveNodeExterns, @@ -123,7 +123,10 @@ const allBuilds = [ format: 'es', sourcemap: true }, - plugins: [replace(generateBuildTargetReplaceConfig('esm', 2017))], + plugins: [ + sourcemaps(), + replace(generateBuildTargetReplaceConfig('esm', 2017)) + ], external: util.resolveNodeExterns, treeshake: { moduleSideEffects: false @@ -181,7 +184,10 @@ const allBuilds = [ sourcemap: true } ], - plugins: [replace(generateBuildTargetReplaceConfig('cjs', 2017))], + plugins: [ + sourcemaps(), + replace(generateBuildTargetReplaceConfig('cjs', 2017)) + ], external: util.resolveBrowserExterns, treeshake: { moduleSideEffects: false @@ -197,7 +203,10 @@ const allBuilds = [ sourcemap: true } ], - plugins: [replace(generateBuildTargetReplaceConfig('esm', 2017))], + plugins: [ + sourcemaps(), + replace(generateBuildTargetReplaceConfig('esm', 2017)) + ], external: util.resolveBrowserExterns, treeshake: { moduleSideEffects: false From 162f95785b12d35c4f2745bb8aa4b9f5774d8767 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Wed, 21 Jun 2023 23:18:23 -0400 Subject: [PATCH 2/3] yarn changeset --- .changeset/sour-glasses-count.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/sour-glasses-count.md diff --git a/.changeset/sour-glasses-count.md b/.changeset/sour-glasses-count.md new file mode 100644 index 00000000000..817e82e5624 --- /dev/null +++ b/.changeset/sour-glasses-count.md @@ -0,0 +1,6 @@ +--- +'@firebase/firestore': patch +'firebase': patch +--- + +Fix source maps that incorrectly referenced yet another minified and mangled bundle, rendering them useless. The fixed bundles' source maps are: index.esm2017.js, index.cjs.js, index.node.mjs, and index.browser.esm2017.js (lite sdk only). From 90b3e0c0141cdb710c19a973e552a22e26a1e077 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Thu, 22 Jun 2023 13:25:03 -0400 Subject: [PATCH 3/3] rollup.config.lite.js: undo reordering of sourcemaps(), since it didn't make a difference. --- packages/firestore/rollup.config.lite.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firestore/rollup.config.lite.js b/packages/firestore/rollup.config.lite.js index c7454b9c59b..6a4f55ffa56 100644 --- a/packages/firestore/rollup.config.lite.js +++ b/packages/firestore/rollup.config.lite.js @@ -106,8 +106,8 @@ const allBuilds = [ }, include: ['dist/lite/*.js'] }), - sourcemaps(), json(), + sourcemaps(), replace(generateBuildTargetReplaceConfig('cjs', 5)) ], external: util.resolveNodeExterns,