Merge remote-tracking branch 'origin/master' into LongPollingLogicTweak

Author: dconeybe

packages/firebase/gulpfile.js

@@ -38,3 +38,13 @@ gulp.task('cdn-type-module-path', function () {
       .pipe(gulp.dest('.'))
   );
 });
+
+//google3 does not allow imports from absolute URLs, so we cannot use the gstatic link
+gulp.task('cdn-type-module-path-internal', function () {
+  return gulp
+    .src(files)
+    .pipe(sourcemaps.init({ loadMaps: true }))
+    .pipe(replace(/(['"])@firebase\/app(['"])/g, "'./firebase-app.js'"))
+    .pipe(sourcemaps.write('.'))
+    .pipe(gulp.dest('.'));
+});

packages/firebase/package.json

@@ -367,6 +367,7 @@
   },
   "scripts": {
     "build": "rollup -c && gulp cdn-type-module-path && yarn build:compat",
+    "build:internal": "rollup -c && gulp cdn-type-module-path-internal && yarn build:compat",
     "build:compat": "rollup -c compat/rollup.config.js",
     "dev": "rollup -c -w",
     "test": "echo 'No test suite for firebase wrapper'",

packages/firestore/test/unit/api/database.test.ts

@@ -379,6 +379,16 @@ describe('Settings', () => {
     expect(db._getSettings().experimentalAutoDetectLongPolling).to.be.false;
   });
 
+  it('long polling autoDetect=null should be coerced to false', () => {
+    // Use a new instance of Firestore in order to configure settings.
+    const db = newTestFirestore();
+    db._setSettings({
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      experimentalAutoDetectLongPolling: null as any
+    });
+    expect(db._getSettings().experimentalAutoDetectLongPolling).to.be.false;
+  });
+
   it('long polling force=[something truthy] should be coerced to true', () => {
     // Use a new instance of Firestore in order to configure settings.
     const db = newTestFirestore();
@@ -399,6 +409,16 @@ describe('Settings', () => {
     expect(db._getSettings().experimentalForceLongPolling).to.be.false;
   });
 
+  it('long polling force=null should be coerced to false', () => {
+    // Use a new instance of Firestore in order to configure settings.
+    const db = newTestFirestore();
+    db._setSettings({
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      experimentalForceLongPolling: null as any
+    });
+    expect(db._getSettings().experimentalForceLongPolling).to.be.false;
+  });
+
   it('gets settings from useEmulator', () => {
     // Use a new instance of Firestore in order to configure settings.
     const db = newTestFirestore();