Skip to content

#6102 Upgrade web stream tools to v0.20 #6103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 15, 2025
Merged

#6102 Upgrade web stream tools to v0.20 #6103

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3399b44
fix: upgrade web stream tools to v0.20
ioanatflowcrypt Oct 14, 2025
98e7c1a
fix: pr reviews
ioanatflowcrypt Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conf/tsconfig.content_scripts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"strictFunctionTypes": false,
"sourceMap": false,
"checkJs": false,
"moduleResolution": "node",
"moduleResolution": "bundler",
"outDir": "../build/_/content_scripts",
"baseUrl": "../extension",
"paths": {
"dompurify": ["../node_modules/dompurify/dist/purify.cjs.d.ts"],
"openpgp": ["../node_modules/openpgp/openpgp.d.ts"],
"@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/lib/index.d.ts"],
"@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/lib/types/index.d.ts"],
"squire-rte": ["../node_modules/squire-rte/dist/types/Squire.d.ts"],
"undici-types": ["../node_modules/undici-types/index.d.ts", "COMMENT"],
"linkifyHtml": ["../node_modules/linkify-html/dist/linkify-html.d.mts", "COMMENT"],
Expand Down
2 changes: 1 addition & 1 deletion conf/tsconfig.test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"outDir": "../build/test",
"skipLibCheck": true,
"paths": {
"@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/lib/index.d.ts", "../build/generic-extension-wip/lib/streams_common.js"]
"@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/lib/types/index.d.ts", "../build/generic-extension-wip/lib/streams_common.js"]
}
},
"files": [
Expand Down
68 changes: 63 additions & 5 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"graceful-fs": "4.1.13"
},
"devDependencies": {
"@openpgp/web-stream-tools": "0.1.3",
"@openpgp/web-stream-tools": "0.2.0",
"@types/chai": "4.3.19",
"@types/chai-as-promised": "7.1.8",
"@types/chrome": "0.1.24",
Expand Down
4 changes: 3 additions & 1 deletion scripts/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ const main = async () => {
// patch imports with .js, e.g. replace './streams' with './streams.js'
// until https://github.com/openpgpjs/web-stream-tools/pull/20 is resolved
const streamDir = path.join(OUTPUT_DIRECTORY, 'lib/streams');
const streamFiles = fs.readdirSync(streamDir).map(file => path.join(streamDir, file));
const streamFiles = fs.readdirSync(streamDir)
.map(file => path.join(streamDir, file))
.filter(filePath => fs.statSync(filePath).isFile());
applyRegexReplace(/'(.\/(streams|util|writer|reader|node-conversions))'/g, "'$1.js'", streamFiles);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like this regex not needed anymore, as linked PR is merged (openpgpjs/web-stream-tools#20) and imports have .js suffix (https://github.com/openpgpjs/web-stream-tools/blob/main/lib/streams.js)


// patch isUint8Array until https://github.com/openpgpjs/web-stream-tools/pull/23 is resolved
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
"useUnknownInCatchVariables": false,
"outDir": "build/generic-extension-wip",
"baseUrl": "./extension",
"moduleResolution": "node",
"moduleResolution": "bundler",
"paths": {
"jquery": ["lib/jquery.min.js", "COMMENT"],
"sweetalert2": ["lib/sweetalert2.js", "COMMENT"],
"openpgp": ["lib/openpgp.min.mjs", "../node_modules/openpgp/openpgp.d.js"],
"pdfjs": ["lib/pdf.min.mjs", "types/pdf.js.d.ts"],
"squire-rte": ["../node_modules/squire-rte/dist/types/Squire.d.ts"],
"@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/lib/index.d.ts", "lib/streams/streams.js"],
"@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/lib/types/index.d.ts", "lib/streams/streams.js"],
"dompurify": ["../node_modules/dompurify/dist/purify.cjs.d.ts", "lib/purify.js", "COMMENT"],
"fine-uploader": ["lib/fine-uploader.js", "COMMENT"],
"filesize": ["lib/filesize.js", "../node_modules/filesize/types/filesize.d.ts"],
Expand Down
Loading