Skip to content

Commit cb6e174

Browse files
committed
update typescript
1 parent c788e66 commit cb6e174

6 files changed

Lines changed: 13 additions & 11 deletions

File tree

Core/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"buffer": "^6.0.3",
1919
"chai": "4.5.0",
2020
"eslint-plugin-local-rules": "^3.0.2",
21-
"typescript": "5.7.3",
21+
"typescript": "6.0.3",
2222
"webpack": "^5.105.0",
2323
"webpack-cli": "7.0.3",
2424
"webpack-node-externals": "3.0.0"

Core/source/core/pgp-msg.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ export class PgpMsg {
205205
if (verifyErr instanceof Error && verifyErr.message === 'Can only verify message with one literal data packet.') {
206206
sig.error = 'FlowCrypt is not equipped to verify this message (err 101)';
207207
} else {
208-
sig.error = verifyErr.message;
208+
sig.error = verifyErr instanceof Error ? verifyErr.message : String(verifyErr);
209209
Catch.reportErr(verifyErr as Error);
210210
}
211211
}

Core/source/platform/require.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ type ReadToEndFn = <T extends Uint8Array | string>(input: MaybeStream<T>, concat
3636
export const requireStreamReadToEnd = async (): Promise<ReadToEndFn> => {
3737
const runtime = globalThis.process?.release?.name || 'not node';
3838
return runtime === 'not node'
39-
? (await import('@openpgp/web-stream-tools')).readToEnd
39+
? ((await import('@openpgp/web-stream-tools')).readToEnd as ReadToEndFn)
4040
: require('../../bundles/raw/web-stream-tools').readToEnd;
4141
};
4242

Core/tsconfig.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
"strictFunctionTypes": false,
1616
"sourceMap": false,
1717
"checkJs": false,
18+
"rootDir": "./source",
1819
"outDir": "./build/ts",
19-
"baseUrl": "./",
2020
"paths": {
21-
"@openpgp/web-stream-tools": ["node_modules/@openpgp/web-stream-tools/lib/types/v4.7-v5.4/index.d.ts"]
21+
"@openpgp/web-stream-tools": ["./node_modules/@openpgp/web-stream-tools/lib/types/index.d.ts"],
22+
"source/*": ["./source/*"]
2223
},
2324
"traceResolution": false,
24-
"typeRoots": ["./source/core/types/", "./node_modules/@types/"]
25+
"typeRoots": ["./source/core/types/", "./node_modules/@types/"],
26+
"types": ["node"]
2527
},
2628
"include": ["./source/**/*.ts"],
2729
"exclude": ["**/build/**", "**/node_modules/**"]

FlowCrypt/Resources/generated/flowcrypt-ios-prod.js.txt

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)