Merge branch 'v11' into ch-schema

firebase · Sep 17, 2024 · 9d327c9 · 9d327c9
2 parents fed48f8 + a377fb2
commit 9d327c9
Show file tree

Hide file tree

Showing 36 changed files with 109 additions and 14 deletions.
diff --git a/config/functions/package.json b/config/functions/package.json
@@ -8,6 +8,6 @@
   },
   "private": true,
   "engines": {
-    "node": "16"
+    "node": ">=18.0.0"
   }
 }
diff --git a/e2e/package.json b/e2e/package.json
@@ -38,5 +38,8 @@
     "webpack": "5.76.0",
     "webpack-cli": "4.10.0",
     "webpack-dev-server": "4.11.1"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/integration/compat-interop/package.json b/integration/compat-interop/package.json
@@ -25,5 +25,8 @@
   },
   "devDependencies": {
     "typescript": "4.7.4"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/integration/compat-typings/package.json b/integration/compat-typings/package.json
@@ -11,5 +11,8 @@
   },
   "devDependencies": {
     "typescript": "4.7.4"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
-}
+}
diff --git a/integration/firebase/package.json b/integration/firebase/package.json
@@ -21,5 +21,8 @@
     "mocha": "9.2.2",
     "npm-run-all": "4.1.5",
     "typescript": "4.7.4"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/integration/firestore/package.json b/integration/firestore/package.json
@@ -32,5 +32,8 @@
     "typescript": "4.2.2",
     "webpack": "5.76.0",
     "webpack-stream": "7.0.0"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/integration/messaging/package.json b/integration/messaging/package.json
@@ -17,5 +17,8 @@
     "mocha": "9.2.2",
     "undici": "6.19.7",
     "selenium-assistant": "6.1.1"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "license": "Apache-2.0",
   "engines": {
-    "node": "^8.13.0 || >=10.10.0"
+    "node": ">=18.0.0"
   },
   "homepage": "https://github.com/firebase/firebase-js-sdk",
   "keywords": [

diff --git a/packages/app-check-compat/package.json b/packages/app-check-compat/package.json
@@ -67,5 +67,8 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/packages/app-check/package.json b/packages/app-check/package.json
@@ -68,5 +68,8 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/packages/app-compat/package.json b/packages/app-compat/package.json
@@ -68,5 +68,8 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -68,5 +68,8 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/packages/auth-compat/package.json b/packages/auth-compat/package.json
@@ -82,5 +82,8 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/packages/auth/internal/package.json b/packages/auth/internal/package.json
@@ -6,5 +6,8 @@
   "browser": "../dist/esm2017/internal.js",
   "esm5": "../dist/esm5/internal.js",
   "typings": "../dist/esm5/internal/index.d.ts",
-  "private": true
+  "private": true,
+  "engines": {
+    "node": ">=18.0.0"
+  }
 }
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -161,5 +161,8 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/packages/component/package.json b/packages/component/package.json
@@ -56,5 +56,8 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/packages/database-compat/package.json b/packages/database-compat/package.json
@@ -69,5 +69,8 @@
   },
   "bugs": {
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/packages/database/package.json b/packages/database/package.json
@@ -78,5 +78,8 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/packages/firestore-compat/package.json b/packages/firestore-compat/package.json
@@ -74,5 +74,8 @@
   },
   "bugs": {
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/packages/firestore/lite/package.json b/packages/firestore/lite/package.json
@@ -8,5 +8,8 @@
   "react-native": "../dist/lite/index.rn.esm2017.js",
   "esm5": "../dist/lite/index.browser.esm5.js",
   "typings": "../dist/lite/index.d.ts",
-  "private": true
+  "private": true,
+  "engines": {
+    "node": ">=18.0.0"
+  }
 }
diff --git a/packages/firestore/package.json b/packages/firestore/package.json
@@ -2,7 +2,7 @@
   "name": "@firebase/firestore",
   "version": "4.7.0",
   "engines": {
-    "node": ">=10.10.0"
+    "node": ">=18.0.0"
   },
   "description": "The Cloud Firestore component of the Firebase JS SDK.",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",

diff --git a/packages/firestore/src/api/cache_config.ts b/packages/firestore/src/api/cache_config.ts
@@ -62,7 +62,9 @@ class MemoryLocalCacheImpl implements MemoryLocalCache {
       this._offlineComponentProvider =
         settings.garbageCollector._offlineComponentProvider;
     } else {
-      this._offlineComponentProvider = new MemoryOfflineComponentProvider();
+      this._offlineComponentProvider = new LruGcMemoryOfflineComponentProvider(
+        undefined
+      );
     }
   }
 

diff --git a/packages/firestore/src/core/firestore_client.ts b/packages/firestore/src/core/firestore_client.ts
@@ -64,6 +64,7 @@ import { Aggregate } from './aggregate';
 import { NamedQuery } from './bundle';
 import {
   ComponentConfiguration,
+  LruGcMemoryOfflineComponentProvider,
   MemoryOfflineComponentProvider,
   OfflineComponentProvider,
   OnlineComponentProvider
@@ -339,7 +340,7 @@ async function ensureOfflineComponents(
       logDebug(LOG_TAG, 'Using default OfflineComponentProvider');
       await setOfflineComponentProvider(
         client,
-        new MemoryOfflineComponentProvider()
+        new LruGcMemoryOfflineComponentProvider(undefined)
       );
     }
   }

diff --git a/packages/firestore/test/integration/api/database.test.ts b/packages/firestore/test/integration/api/database.test.ts
@@ -2212,4 +2212,17 @@ apiDescribe('Database', persistence => {
       });
     });
   });
+
+  it('Lru GC is enabled by default.', () => {
+    const initialData = { key: 'value' };
+    return withTestDb(persistence, async db => {
+      const docRef = doc(collection(db, 'test-collection'));
+      await setDoc(docRef, initialData);
+      return getDocFromCache(docRef).then(doc => {
+        expect(doc.exists()).to.be.true;
+        expect(doc.metadata.fromCache).to.be.true;
+        expect(doc.data()).to.deep.equal(initialData);
+      });
+    });
+  });
 });
diff --git a/packages/firestore/test/integration/util/helpers.ts b/packages/firestore/test/integration/util/helpers.ts
@@ -181,9 +181,7 @@ function apiDescribeInternal(
   message: string,
   testSuite: (persistence: PersistenceMode) => void
 ): void {
-  const persistenceModes: PersistenceMode[] = [
-    new MemoryEagerPersistenceMode()
-  ];
+  const persistenceModes: PersistenceMode[] = [new MemoryLruPersistenceMode()];
   if (isPersistenceAvailable()) {
     persistenceModes.push(new IndexedDbPersistenceMode());
   }

diff --git a/packages/functions-compat/package.json b/packages/functions-compat/package.json
@@ -75,5 +75,8 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/packages/functions/package.json b/packages/functions/package.json
@@ -80,5 +80,8 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/packages/logger/package.json b/packages/logger/package.json
@@ -55,5 +55,8 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/packages/rules-unit-testing/package.json b/packages/rules-unit-testing/package.json
@@ -20,7 +20,7 @@
     "./package.json": "./package.json"
   },
   "engines": {
-    "node": ">=10.10.0"
+    "node": ">=18.0.0"
   },
   "files": [
     "dist"

diff --git a/packages/storage-compat/package.json b/packages/storage-compat/package.json
@@ -63,5 +63,8 @@
   },
   "bugs": {
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/packages/storage/package.json b/packages/storage/package.json
@@ -73,5 +73,8 @@
   "bugs": {
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
-  "typings": "dist/src/index.d.ts"
+  "typings": "dist/src/index.d.ts",
+  "engines": {
+    "node": ">=18.0.0"
+  }
 }
diff --git a/packages/util/package.json b/packages/util/package.json
@@ -65,5 +65,8 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/repo-scripts/api-documenter/package.json b/repo-scripts/api-documenter/package.json
@@ -34,5 +34,8 @@
     "@types/js-yaml": "4.0.9",
     "@types/resolve": "1.20.6",
     "mocha-chai-jest-snapshot": "1.1.3"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/repo-scripts/changelog-generator/package.json b/repo-scripts/changelog-generator/package.json
@@ -39,5 +39,8 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }
diff --git a/repo-scripts/prune-dts/package.json b/repo-scripts/prune-dts/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "engines": {
-    "node": "^8.13.0 || >=10.10.0"
+    "node": ">=18.0.0"
   },
   "description": "A script to prune non-exported types from a d.ts.",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",

diff --git a/repo-scripts/size-analysis/package.json b/repo-scripts/size-analysis/package.json
@@ -57,5 +57,8 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }