Merge d46e014 into 7709f10

.changeset/thick-spoons-check.md

@@ -0,0 +1,6 @@
+---
+"@firebase/firestore": patch
+"@firebase/webchannel-wrapper": major
+---
+
+Use closure-net as a dependency of webchannel-wrapper and Firestore.

packages/firestore/externs.json

@@ -24,7 +24,8 @@
     "packages/component/dist/src/provider.d.ts",
     "packages/component/dist/src/component_container.d.ts",
     "packages/logger/dist/src/logger.d.ts",
-    "packages/webchannel-wrapper/src/index.d.ts",
+    "packages/webchannel-wrapper/dist/bloom-blob/bloom_blob_types.d.ts",
+    "packages/webchannel-wrapper/dist/webchannel-blob/webchannel_blob_types.d.ts",
     "packages/util/dist/src/crypt.d.ts",
     "packages/util/dist/src/defaults.d.ts",
     "packages/util/dist/src/emulator.d.ts",

packages/firestore/src/platform/browser/webchannel_connection.ts

@@ -27,9 +27,9 @@ import {
   EventTarget,
   StatEvent,
   Event,
-  Stat,
-  FetchXmlHttpFactory
-} from '@firebase/webchannel-wrapper';
+  FetchXmlHttpFactory,
+  Stat
+} from '@firebase/webchannel-wrapper/webchannel-blob';
 
 import { Token } from '../../api/credentials';
 import { ExperimentalLongPollingOptions } from '../../api/long_polling_options';

packages/firestore/src/remote/bloom_filter.ts

@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Md5, Integer } from '@firebase/webchannel-wrapper';
+
+import { Md5, Integer } from '@firebase/webchannel-wrapper/bloom-blob';
 
 import { newTextEncoder } from '../platform/text_serializer';
 

packages/firestore/test/unit/core/webchannel_wrapper.test.ts

@@ -19,7 +19,7 @@
 // These tests are mostly to ensure that the exported classes correctly map to
 // underlying functionality from google-closure-library.
 
-import { Md5, Integer } from '@firebase/webchannel-wrapper';
+import { Md5, Integer } from '@firebase/webchannel-wrapper/bloom-blob';
 import { expect } from 'chai';
 
 import { newTextEncoder } from '../../../src/platform/text_serializer';

packages/webchannel-wrapper/bloom-blob/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "@firebase/webchannel-wrapper/bloom-blob",
+  "description": "Bloom filter related code from the Closure library.",
+  "main": "../dist/bloom-blob/bloom_blob_es2018.js",
+  "browser": "../dist/bloom-blob/esm/bloom_blob_es2018.js",
+  "module": "../dist/bloom-blob/esm/bloom_blob_es2018.js",
+  "esm5": "../dist/bloom-blob/bloom_blob_es5.js",
+  "typings": "../dist/bloom-blob/bloom_blob_types.d.ts"
+}

packages/webchannel-wrapper/externs/module.js → packages/webchannel-wrapper/empty.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2020 Google LLC
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,5 +15,10 @@
  * limitations under the License.
  */
 
-/** @type {!Object} */
-const module = {};
+/**
+ * This package has no main entry point and only allows imports from its
+ * two subpaths. This file is provided for the top-level package.json
+ * "main" field to point to.
+ */
+
+export default {};