Skip to content

Commit 08ca0f0

Browse files
authored
#5864 Use built in linkify html type (#5876)
* feat: use built in linkify html type * fix: tsbuild * fix: pr reviews
1 parent 5278bd5 commit 08ca0f0

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

extension/chrome/elements/pgp_block_modules/pgp-block-render-module.ts

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { PgpBlockView } from '../pgp_block.js';
88
import { Ui } from '../../../js/common/browser/ui.js';
99
import { Lang } from '../../../js/common/lang.js';
1010
import { Xss } from '../../../js/common/platform/xss.js';
11+
import linkifyHtml from 'linkifyHtml';
1112

1213
export class PgpBlockViewRenderModule {
1314
private heightHist: number[] = [];

extension/types/linkifyHtml.d.ts

-3
This file was deleted.

test/source/tests/decrypt.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1603,7 +1603,8 @@ XZ8r4OC6sguP/yozWlkG+7dDxsgKQVBENeG6Lw==
16031603
})
16041604
);
16051605

1606-
test(
1606+
// TODO: should re-enable test after https://github.com/FlowCrypt/flowcrypt-browser/pull/5873#issuecomment-2513848349 is fixed
1607+
test.skip(
16071608
'decrypt - not an armored public key in a file that looked like a public key',
16081609
testWithBrowser(async (t, browser) => {
16091610
const { authHdr } = await BrowserRecipe.setupCommonAcctWithAttester(t, browser, 'ci.tests.gmail');

tsconfig.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@
3333
"emailjs-mime-parser": ["lib/emailjs/emailjs-mime-parser.js", "COMMENT"],
3434
"emailjs-mime-builder": ["lib/emailjs/emailjs-mime-builder.js", "COMMENT"],
3535
"node-forge": ["./extension/types/node-forge.d.ts", "lib/forge.mjs"],
36-
"undici-types": ["../node_modules/undici-types/index.d.ts", "COMMENT"]
36+
"undici-types": ["../node_modules/undici-types/index.d.ts", "COMMENT"],
37+
"linkifyHtml": ["../node_modules/linkify-html/dist/linkify-html.cjs.d.ts", "COMMENT"],
38+
"linkifyjs": ["../node_modules/linkifyjs/dist/linkify.cjs.d.ts", "COMMENT"]
3739
},
3840
"typeRoots": ["./extension/js/common/core/types", "./extension/types"]
3941
},

0 commit comments

Comments
 (0)