Merge branch 'master' into dependabot/npm_and_yarn/ava-6.1.1

# Conflicts:
#	package-lock.json
#	package.json

Author: sosnovsky

.github/dependabot.yml

@@ -26,8 +26,6 @@ updates:
       # https://github.com/FlowCrypt/flowcrypt-browser/pull/3961#issuecomment-921335748
       - dependency-name: "iso-8859-2"
         versions: [ ">=1.0.1" ]
-      - dependency-name: "openpgp"
-        update-types: ["version-update:semver-major"]
       - dependency-name: "@openpgp/web-stream-tools"
         versions: [">= 0.0.14"]
       - dependency-name: "ava"
@@ -36,7 +34,7 @@ updates:
         update-types: ["version-update:semver-major"]
       - dependency-name: "chai-as-promised"
         update-types: ["version-update:semver-major"]
-      - dependency-name: "eslint"
+      - dependency-name: "openpgp"
         update-types: ["version-update:semver-major"]
       - dependency-name: "filesize"
-        versions: [ "10.1.3", "10.1.4" ]
+        versions: [ ">= 10.1.3" ]

conf/tsconfig.content_scripts.json

@@ -16,11 +16,13 @@
     "outDir": "../build/_/content_scripts",
     "baseUrl": "../extension",
     "paths": {
-      "dompurify": ["types/purify.d.ts"],
+      "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/types/index.v4.9.d.ts"],
+      "@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/lib/index.d.ts"],
       "squire-rte": ["../node_modules/squire-rte/dist/types/Squire.d.ts"],
-      "undici-types": ["../node_modules/undici-types/index.d.ts", "COMMENT"]
+      "undici-types": ["../node_modules/undici-types/index.d.ts", "COMMENT"],
+      "linkifyHtml": ["../node_modules/linkify-html/dist/linkify-html.es.d.ts", "COMMENT"],
+      "linkifyjs": ["../node_modules/linkifyjs/dist/linkify.es.d.ts", "COMMENT"]
     },
     "typeRoots": ["../extension/types", "../extension/js/common/core/types"]
   },

conf/tsconfig.test.json

@@ -12,7 +12,7 @@
     "outDir": "../build/test",
     "skipLibCheck": true,
     "paths": {
-      "@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/types/index.v4.9.d.ts", "../build/streams/streams.js"]
+      "@openpgp/web-stream-tools": ["../node_modules/@openpgp/web-stream-tools/lib/index.d.ts", "../build/generic-extension-wip/lib/streams_common.js"]
     }
   },
   "files": [

conf/webpack.config.js

@@ -2,23 +2,44 @@
 //bundle the web version of @openpgp/web-stream-tools for content script
 const path = require('path');
 
-module.exports = {
-  mode: 'production',
-  entry: {
-    main: '../build/generic-extension-wip/lib/streams/streams.js',
-  },
-  output: {
-    library: {
-      name: 'Stream',
-      type: 'var',
+module.exports = [
+  {
+    mode: 'production',
+    entry: {
+      main: '../build/generic-extension-wip/lib/streams/streams.js',
+    },
+    output: {
+      library: {
+        name: 'Stream',
+        type: 'var',
+      },
+      path: path.resolve('../build/generic-extension-wip/lib'),
+      filename: 'streams_web.js', // <--- Will be compiled to this single file
+    },
+    resolve: {
+      fallback: {
+        stream: false,
+      },
+      extensions: ['.js'],
     },
-    path: path.resolve('../build/generic-extension-wip/lib'),
-    filename: 'streams_web.js', // <--- Will be compiled to this single file
   },
-  resolve: {
-    fallback: {
-      stream: false,
+  {
+    mode: 'production',
+    entry: {
+      main: '../build/generic-extension-wip/lib/streams/streams.js',
+    },
+    output: {
+      library: {
+        type: 'commonjs',
+      },
+      path: path.resolve('../build/generic-extension-wip/lib'),
+      filename: 'streams_common.js', // <--- Will be compiled to this single file
+    },
+    resolve: {
+      fallback: {
+        stream: false,
+      },
+      extensions: ['.js'],
     },
-    extensions: ['.js'],
   },
-};
+];

eslint.config.mjs

@@ -72,6 +72,7 @@ const commonConfig = {
         format: ['camelCase', 'PascalCase'],
       },
     ],
+    '@typescript-eslint/no-deprecated': 'warn',
     '@typescript-eslint/no-empty-interface': 'off',
     '@typescript-eslint/no-explicit-any': ['warn'],
     '@typescript-eslint/no-extraneous-class': 'off',

extension/changelog.txt

@@ -1,5 +1,7 @@
 <div class="lightboxed">
 
+version 8.5.8 on December 20, 2024: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/481?closed=1" target="_blank">Encryption keys generation, encrypted messages parsing improvements</a>
+
 version 8.5.7 on June 13, 2024: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/480?closed=1" target="_blank">Exception reports improvements</a>
 
 version 8.5.6 on June 3, 2024: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/479?closed=1" target="_blank">Manifest V3 fixes</a>

extension/chrome/dev/ci_unit_test.ts

@@ -55,4 +55,6 @@ for (const lib of libs) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
   (window as any)[(lib as any).name] = lib;
 }
+// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+(window as any).MOCK_PORT = '[TEST_REPLACEABLE_MOCK_PORT]';
 /* eslint-enable @typescript-eslint/no-explicit-any */

extension/chrome/elements/add_pubkey.ts

@@ -76,7 +76,10 @@ View.run(
           }
         },
       });
-      $('select.copy_from_email').change(this.setHandler(el => this.copyFromEmailHandler(el)));
+      $('select.copy_from_email').on(
+        'change',
+        this.setHandler(el => this.copyFromEmailHandler(el))
+      );
       $('.action_ok').on(
         'click',
         this.setHandler(() => this.submitHandler())

extension/chrome/elements/attachment.ts

@@ -376,7 +376,7 @@ export class AttachmentDownloadView extends View {
       const result = await this.gmail.msgGet(this.attachment.msgId, 'full');
       if (result?.payload?.parts) {
         for (const attMeta of result.payload.parts) {
-          if (attMeta.filename === name && attMeta.body && attMeta.body.size === this.size && attMeta.body.attachmentId) {
+          if (attMeta.filename === this.name && attMeta.body && attMeta.body.size === this.size && attMeta.body.attachmentId) {
             this.attachment.id = attMeta.body.attachmentId;
             return;
           }

extension/chrome/elements/attachment_preview.ts

@@ -17,6 +17,8 @@ import { AttachmentWarnings } from './shared/attachment_warnings.js';
 import * as pdfjsLib from 'pdfjs';
 import { AttachmentPreviewPdf } from '../../js/common/ui/attachment_preview_pdf.js';
 
+// https://github.com/FlowCrypt/flowcrypt-browser/issues/5822#issuecomment-2362529197
+
 pdfjsLib.GlobalWorkerOptions.workerSrc = chrome.runtime.getURL(`lib/pdf.worker.min.mjs`);
 type AttachmentType = 'img' | 'txt' | 'pdf';
 
@@ -96,10 +98,8 @@ View.run(
       const extension = nameSplit[nameSplit.length - 1].toLowerCase();
       if (['jpg', 'jpeg', 'png', 'gif'].includes(extension)) {
         return 'img';
-      } else if (extension === 'txt') {
-        return 'txt';
-      } else if (extension === 'pdf') {
-        return 'pdf';
+      } else if (['txt', 'pdf'].includes(extension)) {
+        return extension as AttachmentType;
       }
       return undefined;
     };