Skip to content

Commit ddd4dad

Browse files
committed
Updgrade to TS5
1 parent 0dbb8e6 commit ddd4dad

File tree

91 files changed

+21191
-237
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+21191
-237
lines changed

.vscode/launch.json

+18
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,24 @@
44
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
55
"version": "0.2.0",
66
"configurations": [
7+
{
8+
"type": "node",
9+
"request": "launch",
10+
"name": "Prune .d.ts",
11+
"program": "${workspaceRoot}/repo-scripts/prune-dts/node_modules/.bin/_mocha",
12+
"cwd": "${workspaceRoot}/repo-scripts/prune-dts",
13+
"args": [
14+
"--require",
15+
"ts-node/register",
16+
"--timeout",
17+
"5000",
18+
"${workspaceFolder}/repo-scripts/prune-dts/*.test.ts"
19+
],
20+
"env": {
21+
"TS_NODE_COMPILER_OPTIONS" : "{\"module\":\"commonjs\"}"
22+
},
23+
"sourceMaps": true,
24+
},
725
{
826
"type": "node",
927
"request": "launch",

e2e/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"karma-typescript": "5.5.4",
3535
"karma-typescript-es6-transform": "5.5.4",
3636
"mocha": "9.2.2",
37-
"typescript": "4.7.4",
37+
"typescript": "5.5.4",
3838
"webpack": "5.76.0",
3939
"webpack-cli": "4.10.0",
4040
"webpack-dev-server": "4.11.1"

integration/compat-interop/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@firebase/remote-config-compat": "0.2.9"
2525
},
2626
"devDependencies": {
27-
"typescript": "4.7.4"
27+
"typescript": "5.5.4"
2828
},
2929
"engines": {
3030
"node": ">=18.0.0"

integration/compat-typings/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"firebase": "*"
1111
},
1212
"devDependencies": {
13-
"typescript": "4.7.4"
13+
"typescript": "5.5.4"
1414
},
1515
"engines": {
1616
"node": ">=18.0.0"

integration/firebase/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"karma-typescript": "5.5.4",
2121
"mocha": "9.2.2",
2222
"npm-run-all": "4.1.5",
23-
"typescript": "4.7.4"
23+
"typescript": "5.5.4"
2424
},
2525
"engines": {
2626
"node": ">=18.0.0"

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"@types/long": "4.0.2",
8181
"@types/mocha": "9.1.1",
8282
"@types/mz": "2.7.8",
83-
"@types/node": "16.18.68",
83+
"@types/node": "22.7.5",
8484
"@types/request": "2.48.12",
8585
"@types/sinon": "9.0.11",
8686
"@types/sinon-chai": "3.2.12",
@@ -156,7 +156,7 @@
156156
"tsec": "0.2.8",
157157
"tslint": "6.1.3",
158158
"typedoc": "0.16.11",
159-
"typescript": "4.7.4",
159+
"typescript": "5.5.4",
160160
"watch": "1.0.2",
161161
"webpack": "5.76.0",
162162
"yargs": "17.7.2"

packages/analytics-compat/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"rollup": "2.79.1",
2727
"@rollup/plugin-json": "4.1.0",
2828
"rollup-plugin-typescript2": "0.31.2",
29-
"typescript": "4.7.4"
29+
"typescript": "5.5.4"
3030
},
3131
"repository": {
3232
"directory": "packages/analytics-compat",

packages/analytics-interop-types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
"url": "https://github.com/firebase/firebase-js-sdk/issues"
2121
},
2222
"devDependencies": {
23-
"typescript": "4.7.4"
23+
"typescript": "5.5.4"
2424
}
2525
}

packages/analytics-types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
"url": "https://github.com/firebase/firebase-js-sdk/issues"
2121
},
2222
"devDependencies": {
23-
"typescript": "4.7.4"
23+
"typescript": "5.5.4"
2424
}
2525
}

packages/analytics/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"@rollup/plugin-json": "4.1.0",
5454
"@rollup/plugin-node-resolve": "13.3.0",
5555
"rollup-plugin-typescript2": "0.31.2",
56-
"typescript": "4.7.4"
56+
"typescript": "5.5.4"
5757
},
5858
"repository": {
5959
"directory": "packages/analytics",

packages/app-check-compat/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@rollup/plugin-json": "4.1.0",
5050
"@rollup/plugin-node-resolve": "13.3.0",
5151
"rollup-plugin-typescript2": "0.31.2",
52-
"typescript": "4.7.4"
52+
"typescript": "5.5.4"
5353
},
5454
"repository": {
5555
"directory": "packages/app-check",

packages/app-check-interop-types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
"url": "https://github.com/firebase/firebase-js-sdk/issues"
2121
},
2222
"devDependencies": {
23-
"typescript": "4.7.4"
23+
"typescript": "5.5.4"
2424
}
2525
}

packages/app-check-types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
"url": "https://github.com/firebase/firebase-js-sdk/issues"
2121
},
2222
"devDependencies": {
23-
"typescript": "4.7.4"
23+
"typescript": "5.5.4"
2424
}
2525
}

packages/app-check/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@rollup/plugin-json": "4.1.0",
5151
"@rollup/plugin-node-resolve": "13.3.0",
5252
"rollup-plugin-typescript2": "0.31.2",
53-
"typescript": "4.7.4"
53+
"typescript": "5.5.4"
5454
},
5555
"repository": {
5656
"directory": "packages/app-check",

packages/app-compat/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@rollup/plugin-json": "4.1.0",
4949
"rollup-plugin-replace": "2.2.0",
5050
"rollup-plugin-typescript2": "0.31.2",
51-
"typescript": "4.7.4"
51+
"typescript": "5.5.4"
5252
},
5353
"repository": {
5454
"directory": "packages/app-compat",

packages/app-types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"@firebase/logger": "0.2.6"
2525
},
2626
"devDependencies": {
27-
"typescript": "4.7.4"
27+
"typescript": "5.5.4"
2828
}
2929
}

packages/app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"rollup-plugin-replace": "2.2.0",
5151
"rollup-plugin-typescript2": "0.31.2",
5252
"rollup-plugin-dts": "5.3.1",
53-
"typescript": "4.7.4"
53+
"typescript": "5.5.4"
5454
},
5555
"repository": {
5656
"directory": "packages/app",

packages/auth-compat/demo/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"rollup-plugin-sourcemaps": "0.6.3",
3535
"rollup-plugin-typescript2": "0.31.2",
3636
"rollup-plugin-uglify": "6.0.4",
37-
"typescript": "4.7.4"
37+
"typescript": "5.5.4"
3838
},
3939
"repository": {
4040
"directory": "packages/auth-compat/demo",

packages/auth-compat/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"rollup-plugin-replace": "2.2.0",
6464
"rollup-plugin-typescript2": "0.31.2",
6565
"selenium-webdriver": "4.8.0",
66-
"typescript": "4.7.4"
66+
"typescript": "5.5.4"
6767
},
6868
"repository": {
6969
"directory": "packages/auth-compat",

packages/auth-interop-types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
"url": "https://github.com/firebase/firebase-js-sdk/issues"
2121
},
2222
"devDependencies": {
23-
"typescript": "4.7.4"
23+
"typescript": "5.5.4"
2424
}
2525
}

packages/auth-types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"url": "https://github.com/firebase/firebase-js-sdk/issues"
2525
},
2626
"devDependencies": {
27-
"typescript": "4.7.4"
27+
"typescript": "5.5.4"
2828
}
2929
}

packages/auth/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
"rollup-plugin-typescript2": "0.31.2",
142142
"selenium-webdriver": "4.8.0",
143143
"totp-generator": "0.0.14",
144-
"typescript": "4.7.4"
144+
"typescript": "5.5.4"
145145
},
146146
"repository": {
147147
"directory": "packages/auth",

packages/auth/src/api/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -237,20 +237,20 @@ export async function _performSignInRequest<T, V extends IdTokenResponse>(
237237
request?: T,
238238
customErrorMap: Partial<ServerErrorMap<ServerError>> = {}
239239
): Promise<V> {
240-
const serverResponse = (await _performApiRequest<T, V | IdTokenMfaResponse>(
240+
const serverResponse = await _performApiRequest<T, V | IdTokenMfaResponse>(
241241
auth,
242242
method,
243243
path,
244244
request,
245245
customErrorMap
246-
)) as V;
246+
);
247247
if ('mfaPendingCredential' in serverResponse) {
248248
_fail(auth, AuthErrorCode.MFA_REQUIRED, {
249249
_serverResponse: serverResponse
250250
});
251251
}
252252

253-
return serverResponse;
253+
return serverResponse as V;
254254
}
255255

256256
export function _getFinalTarget(

packages/auth/src/platform_browser/recaptcha/recaptcha_enterprise_verifier.ts

+9-11
Original file line numberDiff line numberDiff line change
@@ -159,22 +159,20 @@ export async function injectRecaptchaFields<T>(
159159
captchaResp = false
160160
): Promise<T> {
161161
const verifier = new RecaptchaEnterpriseVerifier(auth);
162-
let captchaResponse;
162+
let captchaResponse: string;
163163
try {
164164
captchaResponse = await verifier.verify(action);
165165
} catch (error) {
166166
captchaResponse = await verifier.verify(action, true);
167167
}
168-
const newRequest = { ...request };
169-
if (!captchaResp) {
170-
Object.assign(newRequest, { captchaResponse });
171-
} else {
172-
Object.assign(newRequest, { 'captchaResp': captchaResponse });
173-
}
174-
Object.assign(newRequest, { 'clientType': RecaptchaClientType.WEB });
175-
Object.assign(newRequest, {
176-
'recaptchaVersion': RecaptchaVersion.ENTERPRISE
177-
});
168+
169+
const newRequest: T = {
170+
...request,
171+
...(captchaResp ? { captchaResp: captchaResponse } : { captchaResponse }),
172+
clientType: RecaptchaClientType.WEB,
173+
recaptchaVersion: RecaptchaVersion.ENTERPRISE
174+
};
175+
178176
return newRequest;
179177
}
180178

packages/component/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"devDependencies": {
3939
"rollup": "2.79.1",
4040
"rollup-plugin-typescript2": "0.31.2",
41-
"typescript": "4.7.4"
41+
"typescript": "5.5.4"
4242
},
4343
"repository": {
4444
"directory": "packages/component",

packages/database-compat/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
},
5959
"devDependencies": {
6060
"@firebase/app-compat": "0.2.42",
61-
"typescript": "4.7.4"
61+
"typescript": "5.5.4"
6262
},
6363
"repository": {
6464
"directory": "packages/database-compat",

packages/database-types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"url": "https://github.com/firebase/firebase-js-sdk/issues"
2525
},
2626
"devDependencies": {
27-
"typescript": "4.7.4"
27+
"typescript": "5.5.4"
2828
}
2929
}

packages/database/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"@firebase/app": "0.10.12",
6161
"rollup": "2.79.1",
6262
"rollup-plugin-typescript2": "0.31.2",
63-
"typescript": "4.7.4"
63+
"typescript": "5.5.4"
6464
},
6565
"repository": {
6666
"directory": "packages/database",

packages/firestore-compat/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"rollup-plugin-typescript2": "0.31.2",
6262
"@rollup/plugin-node-resolve": "13.3.0",
6363
"ts-node": "10.9.1",
64-
"typescript": "4.7.4"
64+
"typescript": "5.5.4"
6565
},
6666
"license": "Apache-2.0",
6767
"typings": "dist/src/index.d.ts",

packages/firestore/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
"rollup-plugin-typescript2": "0.31.2",
126126
"rollup-plugin-dts": "5.3.1",
127127
"ts-node": "10.9.1",
128-
"typescript": "4.7.4"
128+
"typescript": "5.5.4"
129129
},
130130
"repository": {
131131
"directory": "packages/firestore",

packages/firestore/scripts/build-bundle.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/firestore/scripts/remove-asserts.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/firestore/scripts/remove-asserts.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,17 @@ class RemoveAsserts {
6464
) {
6565
const method = declaration.name!.text;
6666
if (method === 'debugAssert') {
67-
updatedNode = ts.createOmittedExpression();
67+
updatedNode = ts.factory.createOmittedExpression();
6868
} else if (method === 'hardAssert') {
6969
// Remove the log message but keep the assertion
70-
updatedNode = ts.createCall(
70+
updatedNode = ts.factory.createCallExpression(
7171
declaration.name!,
7272
/*typeArgs*/ undefined,
7373
[node.arguments[0]]
7474
);
7575
} else if (method === 'fail') {
7676
// Remove the log message
77-
updatedNode = ts.createCall(
77+
updatedNode = ts.factory.createCallExpression(
7878
declaration.name!,
7979
/*typeArgs*/ undefined,
8080
[]

0 commit comments

Comments
 (0)