Review

Author: schmidt-sebastian

packages/firestore/memory/package.json

@@ -2,7 +2,7 @@
   "name": "@firebase/firestore/memory",
   "description": "A memory-only build of the Cloud Firestore JS SDK.",
   "main": "../dist/index.memory.node.cjs.js",
-  "mainES2017": "../dist/index.memory.node.esm2017.js",
+  "main-esm2017": "../dist/index.memory.node.esm2017.js",
   "browser": "../dist/index.memory.cjs.js",
   "module": "../dist/index.memory.esm.js",
   "esm2017": "../dist/index.memory.esm2017.js",

packages/firestore/package.json

@@ -5,7 +5,7 @@
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "scripts": {
     "prebuild": "tsc -d --downlevelIteration --declarationDir dist/lib --emitDeclarationOnly && tsc -m es2015 --moduleResolution node scripts/*.ts ",
-    "build": "rollup -c rollup.config.es2017.js && rollup -c rollup.config.es.js",
+    "build": "rollup -c rollup.config.es2017.js && rollup -c rollup.config.es5.js",
     "build:deps": "lerna run --scope @firebase/'{app,firestore}' --include-dependencies build",
     "build:console": "node tools/console.build.js",
     "predev": "yarn prebuild",
@@ -26,7 +26,7 @@
     "prepare": "yarn build"
   },
   "main": "dist/index.node.cjs.js",
-  "mainES2017": "dist/index.node.esm2017.js",
+  "main-esm2017": "dist/index.node.esm2017.js",
   "browser": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
   "esm2017": "dist/index.esm2017.js",

packages/firestore/rollup.config.es2017.js

@@ -48,9 +48,10 @@ import {
 // The in-memory builds are roughly 130 KB smaller, but throw an exception
 // for calls to `enablePersistence()` or `clearPersistence()`.
 //
-// We use two different rollup pipelines to take advantage of tree shaking in
-// the ES2017 builds. The build pipeline in this file produces ES2017 builds
-// that are consumed by `rollup.config.es.js`.
+// We use two different rollup pipelines to take advantage of tree shaking,
+// which Rollup only supports in pure ES2017 builds. The build pipeline in this
+// file produces pre-tree shaken ES2017 builds that are consumed by the ES5
+// builds in `rollup.config.es.js`.
 //
 // All browser builds rely on Terser's property name mangling to reduce code
 // size.
@@ -157,7 +158,7 @@ const nodeBuilds = [
   // Persistence build
   {
     input: 'index.node.ts',
-    output: [{ file: pkg.mainES2017, format: 'es', sourcemap: true }],
+    output: [{ file: pkg['main-esm2017'], format: 'es', sourcemap: true }],
     plugins: nodeBuildPlugins,
     external: resolveNodeExterns
   },
@@ -166,7 +167,7 @@ const nodeBuilds = [
     input: 'index.node.memory.ts',
     output: [
       {
-        file: path.resolve('./memory', memoryPkg.mainES2017),
+        file: path.resolve('./memory', memoryPkg['main-esm2017']),
         format: 'es',
         sourcemap: true
       }

packages/firestore/rollup.config.es.js renamed to packages/firestore/rollup.config.es5.js

@@ -27,16 +27,15 @@ import pkg from './package.json';
 import memoryPkg from './memory/package.json';
 
 // This file defines the second rollup pipeline and transpiles the ES2017 SDK
-// into ES3 code. By splitting the build process into two independent build
+// into ES5 code. By splitting the build process into two independent build
 // pipelines, we take advantage of tree shaking in ES2017 builds even for
 // language levels that don't support tree shaking.
 
 const browserPlugins = [
   typescriptPlugin({
     typescript,
     compilerOptions: {
-      allowJs: true,
-      importHelpers: true
+      allowJs: true
     },
     include: ['dist/*.js']
   }),
@@ -54,18 +53,10 @@ const nodePlugins = [
   typescriptPlugin({
     typescript,
     compilerOptions: {
-      allowJs: true,
-      importHelpers: true
+      allowJs: true
     },
     include: ['dist/*.js']
   }),
-  terser({
-    output: {
-      comments: 'all',
-      beautify: true
-    },
-    mangle: false
-  }),
   sourcemaps()
 ];
 
@@ -106,13 +97,13 @@ const browserBuilds = [
 
 const nodeBuilds = [
   {
-    input: pkg.mainES2017,
+    input: pkg['main-esm2017'],
     output: [{ file: pkg.main, format: 'cjs', sourcemap: true }],
     plugins: nodePlugins,
     external: resolveNodeExterns
   },
   {
-    input: path.resolve('./memory', memoryPkg.mainES2017),
+    input: path.resolve('./memory', memoryPkg['main-esm2017']),
     output: [
       {
         file: path.resolve('./memory', memoryPkg.main),