Skip to content

Commit a79cd85

Browse files
committed
build: upgrade compilation target and lib to ES2021
1 parent d96319e commit a79cd85

4 files changed

Lines changed: 7 additions & 9 deletions

File tree

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ var buildProject = ts.createProject('tsconfig.json', { rootDir: 'src', declarati
5656

5757
// Include dom libraries during test compilation since we use some web SDK
5858
// libraries in our tests.
59-
var buildTest = ts.createProject('tsconfig.json', { lib: ['es2018', 'dom'] });
59+
var buildTest = ts.createProject('tsconfig.json', { lib: ['es2021', 'dom'] });
6060

6161
var banner = `/*! firebase-admin v${pkg.version} */\n`;
6262

src/messaging/messaging.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,11 +251,9 @@ export class Messaging {
251251
if (sessionErrors.length > 0) {
252252
// Combine the original stream error and all session errors
253253
const allErrors = [result.reason, ...sessionErrors];
254-
// TODO: AggregateError is supported in Node 18+ but only included in the ES2021+
255-
// We use (global as any).AggregateError as a workaround to access it in ES2020.
256-
const cause = new (global as any).AggregateError(allErrors, 'Stream failure and session failures occurred');
254+
const cause = new AggregateError(allErrors, 'Stream failure and session failures occurred');
257255

258-
const streamMessage = result.reason.message || 'Unknown stream error';
256+
const streamMessage = result.reason?.message || 'Unknown stream error';
259257
const sessionMessage = `. Session failures: ${sessionErrors.map(e => e.message).join(', ')}`;
260258

261259
error = new FirebaseMessagingError({

test/integration/postcheck/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"compilerOptions": {
33
"module": "commonjs",
44
"moduleResolution": "node",
5-
"target": "es2020",
5+
"target": "es2021",
66
"noImplicitAny": false,
7-
"lib": ["es2020"],
7+
"lib": ["es2021"],
88
"outDir": "lib",
99
"typeRoots": [
1010
"node_modules/@types"

tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"compilerOptions": {
33
"module": "commonjs",
4-
"target": "es2020",
4+
"target": "es2021",
55
"declaration": true,
66
"sourceMap": true,
77
"noImplicitAny": true,
@@ -13,7 +13,7 @@
1313
"strictNullChecks": true,
1414
"strictFunctionTypes": true,
1515
//"strictPropertyInitialization": true,
16-
"lib": ["es2020"],
16+
"lib": ["es2021"],
1717
"outDir": "lib",
1818
"stripInternal": true,
1919
"rootDir": "."

0 commit comments

Comments
 (0)