#6102 Upgrade web stream tools to v0.20

conf/tsconfig.content_scripts.json

@@ -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"],

conf/tsconfig.test.json

@@ -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": [

package.json

@@ -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",

scripts/build.js

@@ -121,8 +121,10 @@ 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));
-  applyRegexReplace(/'(.\/(streams|util|writer|reader|node-conversions))'/g, "'$1.js'", streamFiles);
+  const streamFiles = fs
+    .readdirSync(streamDir)
+    .map(file => path.join(streamDir, file))
+    .filter(filePath => fs.statSync(filePath).isFile());
 
   // patch isUint8Array until https://github.com/openpgpjs/web-stream-tools/pull/23 is resolved
   // First patch: replaces `return Uint8Array.prototype.isPrototypeOf(input);` with fallback to globalThis

tsconfig.json

@@ -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"],