Upgrade Firestore Node CJS builds to es2017

Author: dlarocque

packages/firestore/rollup.config.js

@@ -32,43 +32,29 @@ import pkg from './package.json';
 const sourcemaps = require('rollup-plugin-sourcemaps');
 const util = require('./rollup.shared');
 
-const nodePlugins = function () {
-  return [
-    typescriptPlugin({
-      typescript,
-      tsconfigOverride: {
-        compilerOptions: {
-          target: 'es2017'
-        }
-      },
-      cacheDir: tmp.dirSync(),
-      abortOnError: true,
-      transformers: [util.removeAssertTransformer]
-    }),
-    json({ preferConst: true }),
-    replace({
-      '__GRPC_VERSION__': grpcVersion
-    })
-  ];
-};
+const nodePlugins = [
+  typescriptPlugin({
+    typescript,
+    cacheDir: tmp.dirSync(),
+    abortOnError: true,
+    transformers: [util.removeAssertTransformer]
+  }),
+  json({ preferConst: true }),
+  replace({
+    '__GRPC_VERSION__': grpcVersion
+  })
+];
 
-const browserPlugins = function () {
-  return [
-    typescriptPlugin({
-      typescript,
-      tsconfigOverride: {
-        compilerOptions: {
-          target: 'es2017'
-        }
-      },
-      cacheDir: tmp.dirSync(),
-      abortOnError: true,
-      transformers: [util.removeAssertAndPrefixInternalTransformer]
-    }),
-    json({ preferConst: true }),
-    terser(util.manglePrivatePropertiesOptions)
-  ];
-};
+const browserPlugins = [
+  typescriptPlugin({
+    typescript,
+    cacheDir: tmp.dirSync(),
+    abortOnError: true,
+    transformers: [util.removeAssertAndPrefixInternalTransformer]
+  }),
+  json({ preferConst: true }),
+  terser(util.manglePrivatePropertiesOptions)
+];
 
 const allBuilds = [
   // Intermediate Node ESM build without build target reporting
@@ -97,7 +83,17 @@ const allBuilds = [
       sourcemap: true
     },
     plugins: [
-      ...util.es2017ToEs5Plugins(/* mangled= */ false),
+      typescriptPlugin({
+        typescript,
+        tsconfigOverride: {
+          compilerOptions: {
+            allowJs: true
+          }
+        },
+        include: ['dist/**/*.js'],
+        cacheDir: tmp.dirSync()
+      }),
+      sourcemaps(),
       replace(generateBuildTargetReplaceConfig('cjs', 2017))
     ],
     external: util.resolveNodeExterns,

packages/firestore/rollup.shared.js

@@ -34,17 +34,17 @@ const pkg = require('./package.json');
 // This file contains shared utilities for Firestore's rollup builds.
 
 // Firestore is released in a number of different build configurations:
-// - Browser builds that support persistence in ES5 CJS and ES5 ESM formats and
-//   ES2017 in ESM format.
-// - In-memory Browser builds that support persistence in ES5 CJS and ES5 ESM
-//   formats and ES2017 in ESM format.
+// - Browser builds that support persistence in ES2017 CJS and ESM formats.
+// - In-memory Browser builds that support persistence in ES2017 CJS and ESM
+//   formats.
 // - A NodeJS build that supports persistence (to be used with an IndexedDb
 //   shim)
 // - A in-memory only NodeJS build
 //
 // The in-memory builds are roughly 130 KB smaller, but throw an exception
 // for calls to `enablePersistence()` or `clearPersistence()`.
 //
+// TODO(dlarocque): Update this pipeline, since we no longer need to target ES5.
 // We use two different rollup pipelines to take advantage of tree shaking,
 // as Rollup does not support tree shaking for TypeScript classes transpiled
 // down to ES5 (see https://bit.ly/340P23U). The build pipeline in this file
@@ -248,11 +248,6 @@ exports.es2017Plugins = function (platform, mangled = false) {
       alias(generateAliasConfig(platform)),
       typescriptPlugin({
         typescript,
-        tsconfigOverride: {
-          compilerOptions: {
-            target: 'es2017'
-          }
-        },
         cacheDir: tmp.dirSync(),
         transformers: [removeAssertAndPrefixInternalTransformer]
       }),
@@ -264,11 +259,6 @@ exports.es2017Plugins = function (platform, mangled = false) {
       alias(generateAliasConfig(platform)),
       typescriptPlugin({
         typescript,
-        tsconfigOverride: {
-          compilerOptions: {
-            target: 'es2017'
-          }
-        },
         cacheDir: tmp.dirSync(),
         transformers: [removeAssertTransformer]
       }),
@@ -277,50 +267,6 @@ exports.es2017Plugins = function (platform, mangled = false) {
   }
 };
 
-exports.es2017ToEs5Plugins = function (mangled = false) {
-  if (mangled) {
-    return [
-      typescriptPlugin({
-        typescript,
-        tsconfigOverride: {
-          compilerOptions: {
-            allowJs: true
-          }
-        },
-        include: ['dist/**/*.js'],
-        cacheDir: tmp.dirSync()
-      }),
-      terser({
-        output: {
-          comments: 'all',
-          beautify: true
-        },
-        // See comment above `manglePrivatePropertiesOptions`. This build did
-        // not have the identical variable name issue but we should be
-        // consistent.
-        mangle: {
-          reserved: ['_getProvider']
-        }
-      }),
-      sourcemaps()
-    ];
-  } else {
-    return [
-      typescriptPlugin({
-        typescript,
-        tsconfigOverride: {
-          compilerOptions: {
-            allowJs: true
-          }
-        },
-        include: ['dist/**/*.js'],
-        cacheDir: tmp.dirSync()
-      }),
-      sourcemaps()
-    ];
-  }
-};
-
 exports.es2017PluginsCompat = function (
   platform,
   pathTransformer,
@@ -331,11 +277,6 @@ exports.es2017PluginsCompat = function (
       alias(generateAliasConfig(platform)),
       typescriptPlugin({
         typescript,
-        tsconfigOverride: {
-          compilerOptions: {
-            target: 'es2017'
-          }
-        },
         cacheDir: tmp.dirSync(),
         abortOnError: true,
         transformers: [
@@ -351,11 +292,6 @@ exports.es2017PluginsCompat = function (
       alias(generateAliasConfig(platform)),
       typescriptPlugin({
         typescript,
-        tsconfigOverride: {
-          compilerOptions: {
-            target: 'es2017'
-          }
-        },
         cacheDir: tmp.dirSync(),
         abortOnError: true,
         transformers: [removeAssertTransformer, pathTransformer]