Skip to content

Commit 9d327c9

Browse files
committed
Merge branch 'v11' into ch-schema
2 parents fed48f8 + a377fb2 commit 9d327c9

File tree

36 files changed

+109
-14
lines changed

36 files changed

+109
-14
lines changed

config/functions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
},
99
"private": true,
1010
"engines": {
11-
"node": "16"
11+
"node": ">=18.0.0"
1212
}
1313
}

e2e/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,8 @@
3838
"webpack": "5.76.0",
3939
"webpack-cli": "4.10.0",
4040
"webpack-dev-server": "4.11.1"
41+
},
42+
"engines": {
43+
"node": ">=18.0.0"
4144
}
4245
}

integration/compat-interop/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,8 @@
2525
},
2626
"devDependencies": {
2727
"typescript": "4.7.4"
28+
},
29+
"engines": {
30+
"node": ">=18.0.0"
2831
}
2932
}

integration/compat-typings/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,8 @@
1111
},
1212
"devDependencies": {
1313
"typescript": "4.7.4"
14+
},
15+
"engines": {
16+
"node": ">=18.0.0"
1417
}
15-
}
18+
}

integration/firebase/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,8 @@
2121
"mocha": "9.2.2",
2222
"npm-run-all": "4.1.5",
2323
"typescript": "4.7.4"
24+
},
25+
"engines": {
26+
"node": ">=18.0.0"
2427
}
2528
}

integration/firestore/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,8 @@
3232
"typescript": "4.2.2",
3333
"webpack": "5.76.0",
3434
"webpack-stream": "7.0.0"
35+
},
36+
"engines": {
37+
"node": ">=18.0.0"
3538
}
3639
}

integration/messaging/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,8 @@
1717
"mocha": "9.2.2",
1818
"undici": "6.19.7",
1919
"selenium-assistant": "6.1.1"
20+
},
21+
"engines": {
22+
"node": ">=18.0.0"
2023
}
2124
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
77
"license": "Apache-2.0",
88
"engines": {
9-
"node": "^8.13.0 || >=10.10.0"
9+
"node": ">=18.0.0"
1010
},
1111
"homepage": "https://github.com/firebase/firebase-js-sdk",
1212
"keywords": [

packages/app-check-compat/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,8 @@
6767
".ts"
6868
],
6969
"reportDir": "./coverage/node"
70+
},
71+
"engines": {
72+
"node": ">=18.0.0"
7073
}
7174
}

packages/app-check/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,8 @@
6868
".ts"
6969
],
7070
"reportDir": "./coverage/node"
71+
},
72+
"engines": {
73+
"node": ">=18.0.0"
7174
}
7275
}

packages/app-compat/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,8 @@
6868
".ts"
6969
],
7070
"reportDir": "./coverage/node"
71+
},
72+
"engines": {
73+
"node": ">=18.0.0"
7174
}
7275
}

packages/app/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,8 @@
6868
".ts"
6969
],
7070
"reportDir": "./coverage/node"
71+
},
72+
"engines": {
73+
"node": ">=18.0.0"
7174
}
7275
}

packages/auth-compat/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,8 @@
8282
".ts"
8383
],
8484
"reportDir": "./coverage/node"
85+
},
86+
"engines": {
87+
"node": ">=18.0.0"
8588
}
8689
}

packages/auth/internal/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,8 @@
66
"browser": "../dist/esm2017/internal.js",
77
"esm5": "../dist/esm5/internal.js",
88
"typings": "../dist/esm5/internal/index.d.ts",
9-
"private": true
9+
"private": true,
10+
"engines": {
11+
"node": ">=18.0.0"
12+
}
1013
}

packages/auth/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,5 +161,8 @@
161161
".ts"
162162
],
163163
"reportDir": "./coverage/node"
164+
},
165+
"engines": {
166+
"node": ">=18.0.0"
164167
}
165168
}

packages/component/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,8 @@
5656
".ts"
5757
],
5858
"reportDir": "./coverage/node"
59+
},
60+
"engines": {
61+
"node": ">=18.0.0"
5962
}
6063
}

packages/database-compat/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,8 @@
6969
},
7070
"bugs": {
7171
"url": "https://github.com/firebase/firebase-js-sdk/issues"
72+
},
73+
"engines": {
74+
"node": ">=18.0.0"
7275
}
7376
}

packages/database/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,8 @@
7878
".ts"
7979
],
8080
"reportDir": "./coverage/node"
81+
},
82+
"engines": {
83+
"node": ">=18.0.0"
8184
}
8285
}

packages/firestore-compat/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,8 @@
7474
},
7575
"bugs": {
7676
"url": "https://github.com/firebase/firebase-js-sdk/issues"
77+
},
78+
"engines": {
79+
"node": ">=18.0.0"
7780
}
7881
}

packages/firestore/lite/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@
88
"react-native": "../dist/lite/index.rn.esm2017.js",
99
"esm5": "../dist/lite/index.browser.esm5.js",
1010
"typings": "../dist/lite/index.d.ts",
11-
"private": true
11+
"private": true,
12+
"engines": {
13+
"node": ">=18.0.0"
14+
}
1215
}

packages/firestore/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@firebase/firestore",
33
"version": "4.7.0",
44
"engines": {
5-
"node": ">=10.10.0"
5+
"node": ">=18.0.0"
66
},
77
"description": "The Cloud Firestore component of the Firebase JS SDK.",
88
"author": "Firebase <[email protected]> (https://firebase.google.com/)",

packages/firestore/src/api/cache_config.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ class MemoryLocalCacheImpl implements MemoryLocalCache {
6262
this._offlineComponentProvider =
6363
settings.garbageCollector._offlineComponentProvider;
6464
} else {
65-
this._offlineComponentProvider = new MemoryOfflineComponentProvider();
65+
this._offlineComponentProvider = new LruGcMemoryOfflineComponentProvider(
66+
undefined
67+
);
6668
}
6769
}
6870

packages/firestore/src/core/firestore_client.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ import { Aggregate } from './aggregate';
6464
import { NamedQuery } from './bundle';
6565
import {
6666
ComponentConfiguration,
67+
LruGcMemoryOfflineComponentProvider,
6768
MemoryOfflineComponentProvider,
6869
OfflineComponentProvider,
6970
OnlineComponentProvider
@@ -339,7 +340,7 @@ async function ensureOfflineComponents(
339340
logDebug(LOG_TAG, 'Using default OfflineComponentProvider');
340341
await setOfflineComponentProvider(
341342
client,
342-
new MemoryOfflineComponentProvider()
343+
new LruGcMemoryOfflineComponentProvider(undefined)
343344
);
344345
}
345346
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2212,4 +2212,17 @@ apiDescribe('Database', persistence => {
22122212
});
22132213
});
22142214
});
2215+
2216+
it('Lru GC is enabled by default.', () => {
2217+
const initialData = { key: 'value' };
2218+
return withTestDb(persistence, async db => {
2219+
const docRef = doc(collection(db, 'test-collection'));
2220+
await setDoc(docRef, initialData);
2221+
return getDocFromCache(docRef).then(doc => {
2222+
expect(doc.exists()).to.be.true;
2223+
expect(doc.metadata.fromCache).to.be.true;
2224+
expect(doc.data()).to.deep.equal(initialData);
2225+
});
2226+
});
2227+
});
22152228
});

packages/firestore/test/integration/util/helpers.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,7 @@ function apiDescribeInternal(
181181
message: string,
182182
testSuite: (persistence: PersistenceMode) => void
183183
): void {
184-
const persistenceModes: PersistenceMode[] = [
185-
new MemoryEagerPersistenceMode()
186-
];
184+
const persistenceModes: PersistenceMode[] = [new MemoryLruPersistenceMode()];
187185
if (isPersistenceAvailable()) {
188186
persistenceModes.push(new IndexedDbPersistenceMode());
189187
}

packages/functions-compat/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,8 @@
7575
".ts"
7676
],
7777
"reportDir": "./coverage/node"
78+
},
79+
"engines": {
80+
"node": ">=18.0.0"
7881
}
7982
}

packages/functions/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,8 @@
8080
".ts"
8181
],
8282
"reportDir": "./coverage/node"
83+
},
84+
"engines": {
85+
"node": ">=18.0.0"
8386
}
8487
}

packages/logger/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,8 @@
5555
".ts"
5656
],
5757
"reportDir": "./coverage/node"
58+
},
59+
"engines": {
60+
"node": ">=18.0.0"
5861
}
5962
}

packages/rules-unit-testing/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"./package.json": "./package.json"
2121
},
2222
"engines": {
23-
"node": ">=10.10.0"
23+
"node": ">=18.0.0"
2424
},
2525
"files": [
2626
"dist"

packages/storage-compat/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,8 @@
6363
},
6464
"bugs": {
6565
"url": "https://github.com/firebase/firebase-js-sdk/issues"
66+
},
67+
"engines": {
68+
"node": ">=18.0.0"
6669
}
6770
}

packages/storage/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,8 @@
7373
"bugs": {
7474
"url": "https://github.com/firebase/firebase-js-sdk/issues"
7575
},
76-
"typings": "dist/src/index.d.ts"
76+
"typings": "dist/src/index.d.ts",
77+
"engines": {
78+
"node": ">=18.0.0"
79+
}
7780
}

packages/util/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,8 @@
6565
".ts"
6666
],
6767
"reportDir": "./coverage/node"
68+
},
69+
"engines": {
70+
"node": ">=18.0.0"
6871
}
6972
}

repo-scripts/api-documenter/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,8 @@
3434
"@types/js-yaml": "4.0.9",
3535
"@types/resolve": "1.20.6",
3636
"mocha-chai-jest-snapshot": "1.1.3"
37+
},
38+
"engines": {
39+
"node": ">=18.0.0"
3740
}
3841
}

repo-scripts/changelog-generator/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,8 @@
3939
".ts"
4040
],
4141
"reportDir": "./coverage/node"
42+
},
43+
"engines": {
44+
"node": ">=18.0.0"
4245
}
4346
}

repo-scripts/prune-dts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.1.0",
44
"private": true,
55
"engines": {
6-
"node": "^8.13.0 || >=10.10.0"
6+
"node": ">=18.0.0"
77
},
88
"description": "A script to prune non-exported types from a d.ts.",
99
"author": "Firebase <[email protected]> (https://firebase.google.com/)",

repo-scripts/size-analysis/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,8 @@
5757
".ts"
5858
],
5959
"reportDir": "./coverage/node"
60+
},
61+
"engines": {
62+
"node": ">=18.0.0"
6063
}
6164
}

0 commit comments

Comments
 (0)