A few fixes for Firestore bundle sdk builds

packages/firebase/firestore/bundle/index.ts

@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * 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 '@firebase/firestore/bundle';

packages/firebase/firestore/bundle/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "firebase/firestore/bundle",
+  "description": "The bundle loading feature of the Cloud Firestore component.",
+  "main": "dist/index.node.cjs.js",
+  "module": "dist/index.esm.js",
+  "typings": "../empty-import.d.ts"
+}

packages/firebase/firestore/index.cdn.ts

@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * 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 '@firebase/firestore';
+import '@firebase/firestore/bundle';

packages/firebase/firestore/index.ts

@@ -16,4 +16,3 @@
  */
 
 import '@firebase/firestore';
-import '@firebase/firestore/bundle';

packages/firebase/firestore/memory/bundle/index.ts

@@ -0,0 +1,23 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * 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.
+ */
+
+/**
+ * This file serves as the public entrypoint for users that import
+ * `firebase/firestore/memory`.
+ */
+
+import '@firebase/firestore/memory-bundle';

packages/firebase/firestore/memory/bundle/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "firebase/firestore/memory",
+  "description": "The bundle loading feature for the memory-only build of the Cloud Firestore JS SDK.",
+  "main": "dist/index.node.cjs.js",
+  "module": "dist/index.esm.js",
+  "typings": "../../empty-import.d.ts"
+}

packages/firebase/firestore/memory/index.cdn.ts

@@ -0,0 +1,24 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * 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.
+ */
+
+/**
+ * This file serves as the public entrypoint for users that import
+ * `firebase/firestore/memory`.
+ */
+
+import '@firebase/firestore/memory';
+import '@firebase/firestore/memory-bundle';

packages/firebase/firestore/memory/index.ts

@@ -21,4 +21,3 @@
  */
 
 import '@firebase/firestore/memory';
-import '@firebase/firestore/memory-bundle';

packages/firebase/firestore/package.json

@@ -1,7 +1,7 @@
 {
   "name": "firebase/firestore",
   "description": "The Cloud Firestore component of the Firebase JS SDK.",
-  "main": "dist/index.cjs.js",
+  "main": "dist/index.node.cjs.js",
   "module": "dist/index.esm.js",
   "typings": "../empty-import.d.ts"
 }

packages/firebase/rollup.config.js

@@ -28,6 +28,12 @@ import pkg from './package.json';
 
 import appPkg from './app/package.json';
 
+import firestorePkg from './firestore/package.json';
+import firestoreBundlePkg from './firestore/bundle/package.json';
+
+import firestoreMemoryPkg from './firestore/memory/package.json';
+import firestoreMemoryBundlePkg from './firestore/memory/bundle/package.json';
+
 function createUmdOutputConfig(output) {
   return {
     file: output,
@@ -111,7 +117,9 @@ const appBuilds = [
 
 const componentBuilds = pkg.components
   // The "app" component is treated differently because it doesn't depend on itself.
-  .filter(component => component !== 'app')
+  // The "firestore" component is treated differently because it contains multiple
+  // sub components for different builds.
+  .filter(component => component !== 'app' && component !== 'firestore')
   .map(component => {
     const pkg = require(`./${component}/package.json`);
     return [
@@ -149,17 +157,67 @@ const componentBuilds = pkg.components
   })
   .reduce((a, b) => a.concat(b), []);
 
+const firestoreBuilds = [
+  {
+    input: `firestore/index.ts`,
+    output: [
+      {
+        file: resolve('firestore', firestorePkg.main),
+        format: 'cjs',
+        sourcemap: true
+      },
+      {
+        file: resolve('firestore', firestorePkg.module),
+        format: 'es',
+        sourcemap: true
+      }
+    ],
+    plugins,
+    external
+  },
+  {
+    input: `firestore/bundle/index.ts`,
+    output: [
+      {
+        file: resolve('firestore/bundle', firestoreBundlePkg.main),
+        format: 'cjs',
+        sourcemap: true
+      },
+      {
+        file: resolve('firestore/bundle', firestoreBundlePkg.module),
+        format: 'es',
+        sourcemap: true
+      }
+    ],
+    plugins,
+    external
+  },
+  {
+    input: `firestore/index.cdn.ts`,
+    output: createUmdOutputConfig(`firebase-firestore.js`),
+    plugins: [
+      ...plugins,
+      uglify({
+        output: {
+          ascii_only: true // escape unicode chars
+        }
+      })
+    ],
+    external: ['@firebase/app']
+  }
+];
+
 const firestoreMemoryBuilds = [
   {
     input: `firestore/memory/index.ts`,
     output: [
       {
-        file: resolve('firestore/memory', pkg.main),
+        file: resolve('firestore/memory', firestoreMemoryPkg.main),
         format: 'cjs',
         sourcemap: true
       },
       {
-        file: resolve('firestore/memory', pkg.module),
+        file: resolve('firestore/memory', firestoreMemoryPkg.module),
         format: 'es',
         sourcemap: true
       }
@@ -168,7 +226,27 @@ const firestoreMemoryBuilds = [
     external
   },
   {
-    input: `firestore/memory/index.ts`,
+    input: `firestore/memory/bundle/index.ts`,
+    output: [
+      {
+        file: resolve('firestore/memory/bundle', firestoreMemoryBundlePkg.main),
+        format: 'cjs',
+        sourcemap: true
+      },
+      {
+        file: resolve(
+          'firestore/memory/bundle',
+          firestoreMemoryBundlePkg.module
+        ),
+        format: 'es',
+        sourcemap: true
+      }
+    ],
+    plugins,
+    external
+  },
+  {
+    input: `firestore/memory/index.cdn.ts`,
     output: createUmdOutputConfig(`firebase-firestore.memory.js`),
     plugins: [...plugins, uglify()],
     external: ['@firebase/app']
@@ -276,6 +354,7 @@ const completeBuilds = [
 export default [
   ...appBuilds,
   ...componentBuilds,
+  ...firestoreBuilds,
   ...firestoreMemoryBuilds,
   ...completeBuilds
 ];

packages/firebase/src/index.cdn.ts

@@ -33,6 +33,7 @@ import { name, version } from '../package.json';
 import '../auth';
 import '../database';
 import '../firestore';
+import '../firestore/bundle';
 import '../functions';
 import '../messaging';
 import '../storage';

packages/firebase/src/index.node.ts

@@ -21,6 +21,7 @@ import { name, version } from '../package.json';
 import '../auth';
 import '../database';
 import '../firestore';
+import '../firestore/bundle';
 import '../functions';
 
 firebase.registerVersion(name, version, 'node');

packages/firebase/src/index.rn.ts

@@ -24,6 +24,7 @@ import '../database';
 //  `atob`). We should provide a RN build that works out of the box.
 import '../storage';
 import '../firestore';
+import '../firestore/bundle';
 
 firebase.registerVersion(name, version, 'rn');
 

packages/firebase/src/index.ts

@@ -42,6 +42,7 @@ import { name, version } from '../package.json';
 import '../auth';
 import '../database';
 import '../firestore';
+import '../firestore/bundle';
 import '../functions';
 import '../messaging';
 import '../storage';

packages/firestore/rollup.config.node.js

@@ -82,6 +82,9 @@ export default [
       ...util.es2017Plugins('node'),
       replace({
         'process.env.FIRESTORE_PROTO_ROOT': JSON.stringify('../protos')
+      }),
+      copy({
+        targets: [{ src: 'src/protos', dest: 'dist/memory' }]
       })
     ],
     external: util.resolveNodeExterns,