Pre-process all ES5 builds

packages/firestore/memory/package.json

@@ -2,6 +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",
   "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",
+    "build": "rollup -c rollup.config.es2017.js && rollup -c rollup.config.es.js",
     "build:deps": "lerna run --scope @firebase/'{app,firestore}' --include-dependencies build",
     "build:console": "node tools/console.build.js",
     "predev": "yarn prebuild",
@@ -26,6 +26,7 @@
     "prepare": "yarn build"
   },
   "main": "dist/index.node.cjs.js",
+  "mainES2017": "dist/index.node.esm2017.js",
   "browser": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
   "esm2017": "dist/index.esm2017.js",

packages/firestore/rollup.config.es.js

@@ -0,0 +1,128 @@
+/**
+ * @license
+ * Copyright 2018 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+
+import * as path from 'path';
+
+import typescriptPlugin from 'rollup-plugin-typescript2';
+import sourcemaps from 'rollup-plugin-sourcemaps';
+import typescript from 'typescript';
+import { terser } from 'rollup-plugin-terser';
+import { resolveNodeExterns, resolveBrowserExterns } from './rollup.shared';
+
+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
+// 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
+    },
+    include: ['dist/*.js']
+  }),
+  terser({
+    output: {
+      comments: 'all',
+      beautify: true
+    },
+    mangle: true
+  }),
+  sourcemaps()
+];
+
+const nodePlugins = [
+  typescriptPlugin({
+    typescript,
+    compilerOptions: {
+      allowJs: true,
+      importHelpers: true
+    },
+    include: ['dist/*.js']
+  }),
+  terser({
+    output: {
+      comments: 'all',
+      beautify: true
+    },
+    mangle: false
+  }),
+  sourcemaps()
+];
+
+const browserBuilds = [
+  {
+    input: pkg.esm2017,
+    output: { file: pkg.module, format: 'es', sourcemap: true },
+    plugins: browserPlugins,
+    external: resolveBrowserExterns
+  },
+  {
+    input: path.resolve('./memory', memoryPkg.esm2017),
+    output: {
+      file: path.resolve('./memory', memoryPkg.module),
+      format: 'es',
+      sourcemap: true
+    },
+    plugins: browserPlugins,
+    external: resolveBrowserExterns
+  },
+  {
+    input: pkg.esm2017,
+    output: { file: pkg.browser, format: 'cjs', sourcemap: true },
+    plugins: browserPlugins,
+    external: resolveBrowserExterns
+  },
+  {
+    input: path.resolve('./memory', memoryPkg.esm2017),
+    output: {
+      file: path.resolve('./memory', memoryPkg.browser),
+      format: 'cjs',
+      sourcemap: true
+    },
+    plugins: browserPlugins,
+    external: resolveBrowserExterns
+  }
+];
+
+const nodeBuilds = [
+  {
+    input: pkg.mainES2017,
+    output: [{ file: pkg.main, format: 'cjs', sourcemap: true }],
+    plugins: nodePlugins,
+    external: resolveNodeExterns
+  },
+  {
+    input: path.resolve('./memory', memoryPkg.mainES2017),
+    output: [
+      {
+        file: path.resolve('./memory', memoryPkg.main),
+        format: 'cjs',
+        sourcemap: true
+      }
+    ],
+    plugins: nodePlugins,
+    external: resolveNodeExterns
+  }
+];
+
+export default [...browserBuilds, ...nodeBuilds];

packages/firestore/rollup.config.js → packages/firestore/rollup.config.es2017.js

@@ -21,7 +21,6 @@ import json from 'rollup-plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
 import replace from 'rollup-plugin-replace';
 import copy from 'rollup-plugin-copy-assets';
-import sourcemaps from 'rollup-plugin-sourcemaps';
 import typescript from 'typescript';
 import { terser } from 'rollup-plugin-terser';
 
@@ -30,10 +29,14 @@ import memoryPkg from './memory/package.json';
 
 import {
   appendPrivatePrefixTransformers,
-  manglePrivatePropertiesOptions
-} from './terser.config';
-
-// This Firestore Rollup configuration provides a number of different builds:
+  manglePrivatePropertiesOptions,
+  resolveNodeExterns,
+  resolveBrowserExterns,
+  browserDeps,
+  nodeDeps
+} from './rollup.shared';
+
+// 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
@@ -45,6 +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`.
+//
 // All browser builds rely on Terser's property name mangling to reduce code
 // size.
 //
@@ -53,22 +60,6 @@ import {
 
 // MARK: Browser builds
 
-const browserDeps = Object.keys(
-  Object.assign({}, pkg.peerDependencies, pkg.dependencies)
-);
-
-const nodeDeps = [...browserDeps, 'util', 'path'];
-
-/** Resolves the external dependencies for the browser build. */
-function resolveBrowserExterns(id) {
-  return browserDeps.some(dep => id === dep || id.startsWith(`${dep}/`));
-}
-
-/** Resolves the external dependencies for the Node build. */
-function resolveNodeExterns(id) {
-  return nodeDeps.some(dep => id === dep || id.startsWith(`${dep}/`));
-}
-
 /**
  * Resolves the external dependencies for the Memory-based Firestore
  * implementation. Verifies that no persistence sources are used by Firestore's
@@ -99,95 +90,44 @@ export function resolveMemoryExterns(deps, externsId, referencedBy) {
   return deps.some(dep => externsId === dep || externsId.startsWith(`${dep}/`));
 }
 
-const es5BuildPlugins = [
-  typescriptPlugin({
-    typescript,
-    transformers: appendPrivatePrefixTransformers,
-    cacheRoot: `./.cache/es5.mangled/`
-  }),
-  json(),
-  terser(manglePrivatePropertiesOptions)
-];
-
-const es2017BuildPlugins = [
+const browserBuildPlugins = [
   typescriptPlugin({
     typescript,
     tsconfigOverride: {
       compilerOptions: {
         target: 'es2017'
       }
     },
-    cacheRoot: './.cache/es2017.mangled/',
+    clean: true,
     transformers: appendPrivatePrefixTransformers
   }),
   json({ preferConst: true }),
   terser(manglePrivatePropertiesOptions)
 ];
 
 const browserBuilds = [
-  // ES5 ESM Build (with persistence)
-  {
-    input: 'index.ts',
-    output: { file: pkg.module, format: 'es', sourcemap: true },
-    plugins: es5BuildPlugins,
-    external: resolveBrowserExterns
-  },
-  // ES5 ESM Build (memory-only)
-  {
-    input: 'index.memory.ts',
-    output: {
-      file: path.resolve('./memory', memoryPkg.module),
-      format: 'es',
-      sourcemap: true
-    },
-    plugins: es5BuildPlugins,
-    external: (id, referencedBy) =>
-      resolveMemoryExterns(browserDeps, id, referencedBy)
-  },
-  // ES2017 ESM build (with persistence)
+  // Persistence build
   {
     input: 'index.ts',
     output: {
       file: pkg.esm2017,
       format: 'es',
       sourcemap: true
     },
-    plugins: es2017BuildPlugins,
+    plugins: browserBuildPlugins,
     external: resolveBrowserExterns
   },
-  // ES2017 ESM build (memory-only)
+  // Memory-only build
   {
     input: 'index.memory.ts',
     output: {
       file: path.resolve('./memory', memoryPkg.esm2017),
       format: 'es',
       sourcemap: true
     },
-    plugins: es2017BuildPlugins,
+    plugins: browserBuildPlugins,
     external: (id, referencedBy) =>
       resolveMemoryExterns(browserDeps, id, referencedBy)
-  },
-  // ES5 CJS Build (with persistence)
-  //
-  // This build is based on the mangling in the ESM build above, since
-  // Terser's Property name mangling doesn't work well with CJS's syntax.
-  {
-    input: pkg.module,
-    output: { file: pkg.browser, format: 'cjs', sourcemap: true },
-    plugins: [sourcemaps()]
-  },
-  // ES5 CJS Build (memory-only)
-  //
-  // This build is based on the mangling in the ESM build above, since
-  // Terser's Property name mangling doesn't work well with CJS's syntax.
-  {
-    input: path.resolve('./memory', memoryPkg.module),
-    output: {
-      file: path.resolve('./memory', memoryPkg.browser),
-      format: 'cjs',
-      sourcemap: true
-    },
-    plugins: [sourcemaps()]
   }
 ];
 
@@ -196,7 +136,12 @@ const browserBuilds = [
 const nodeBuildPlugins = [
   typescriptPlugin({
     typescript,
-    cacheRoot: `./.cache/node/`
+    tsconfigOverride: {
+      compilerOptions: {
+        target: 'es2017'
+      }
+    },
+    clean: true
   }),
   json(),
   // Needed as we also use the *.proto files
@@ -209,20 +154,20 @@ const nodeBuildPlugins = [
 ];
 
 const nodeBuilds = [
-  // ES5 CJS build (with persistence)
+  // Persistence build
   {
     input: 'index.node.ts',
-    output: [{ file: pkg.main, format: 'cjs', sourcemap: true }],
+    output: [{ file: pkg.mainES2017, format: 'es', sourcemap: true }],
     plugins: nodeBuildPlugins,
     external: resolveNodeExterns
   },
-  // ES5 CJS build (memory-only)
+  // Memory-only build
   {
     input: 'index.node.memory.ts',
     output: [
       {
-        file: path.resolve('./memory', memoryPkg.main),
-        format: 'cjs',
+        file: path.resolve('./memory', memoryPkg.mainES2017),
+        format: 'es',
         sourcemap: true
       }
     ],

packages/firestore/terser.config.js → packages/firestore/rollup.shared.js

@@ -21,6 +21,24 @@ import { externs } from './externs.json';
 import { renameInternals } from './scripts/rename-internals';
 import { extractPublicIdentifiers } from './scripts/extract-api';
 
+import pkg from './package.json';
+
+export const browserDeps = Object.keys(
+  Object.assign({}, pkg.peerDependencies, pkg.dependencies)
+);
+
+export const nodeDeps = [...browserDeps, 'util', 'path'];
+
+/** Resolves the external dependencies for the browser build. */
+export function resolveBrowserExterns(id) {
+  return browserDeps.some(dep => id === dep || id.startsWith(`${dep}/`));
+}
+
+/** Resolves the external dependencies for the Node build. */
+export function resolveNodeExterns(id) {
+  return nodeDeps.some(dep => id === dep || id.startsWith(`${dep}/`));
+}
+
 const externsPaths = externs.map(p => path.resolve(__dirname, '../../', p));
 const publicIdentifiers = extractPublicIdentifiers(externsPaths);
 

packages/firestore/test/util/helpers.ts

@@ -512,7 +512,7 @@ export function byteStringFromString(value: string): ByteString {
   return ByteString.fromBase64String(base64);
 }
 
-/** 
+/**
  * Decodes a base 64 decoded string.
  *
  * Note that this is typed to accept Uint8Arrays to match the types used