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

# Conflicts:
#	package-lock.json
#	package.json
#	test/source/test.ts

Author: sosnovsky

.eslintignore

@@ -14,17 +14,29 @@ updates:
       interval: "weekly"
       day: "sunday"
       time: "22:00"
+    groups:
+      npm-deps:
+        patterns:
+          - "*"
     ignore:
       # ignore all bootstrap major updates
       - dependency-name: "bootstrap"
         update-types: ["version-update:semver-major"]
       # TODO: upgrade iso-8859-2 when ava will have ESM support: https://github.com/orgs/avajs/projects/2
       # https://github.com/FlowCrypt/flowcrypt-browser/pull/3961#issuecomment-921335748
       - dependency-name: "iso-8859-2"
-        update-types: ["version-update:semver-major"]
+        versions: [ ">=1.0.1" ]
       - dependency-name: "openpgp"
         update-types: ["version-update:semver-major"]
-      - dependency-name: "squire-rte"
-        versions: ["2.0.3"]
-      - dependency-name: "puppeteer"
-        versions: ["21.1.1"] # some ui tests with FileChooser fail in this version
+      - dependency-name: "web-ext"
+        update-types: ["version-update:semver-major"]
+      - dependency-name: "@openpgp/web-stream-tools"
+        versions: [">= 0.0.14"]
+      - dependency-name: "ava"
+        update-types: ["version-update:semver-major"]
+      - dependency-name: "chai"
+        update-types: ["version-update:semver-major"]
+      - dependency-name: "chai-as-promised"
+        update-types: ["version-update:semver-major"]
+      - dependency-name: "eslint"
+        update-types: ["version-update:semver-major"]

.github/dependabot.yml

@@ -1,7 +1,7 @@
 # Security
 
-Overview: https://flowcrypt.com/docs/technical/security.html
+Overview: https://flowcrypt.com/docs/technical/security/overview.html
 
-Reporting vulnerabilities: https://flowcrypt.com/docs/technical/bug-bounty.html
+Reporting vulnerabilities: https://flowcrypt.com/docs/technical/security/bug-bounty.html
 
-Fixed vulnerabilities: https://flowcrypt.com/docs/technical/fixed-vulnerabilities.html
+Fixed vulnerabilities: https://flowcrypt.com/docs/technical/security/fixed-vulnerabilities.html

SECURITY.md

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
+    "target": "ES2022",
     "module": "es6",
     "forceConsistentCasingInFileNames": true,
     "noImplicitReturns": true,

conf/tsconfig.content_scripts.json

@@ -1,10 +1,7 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
-    "lib": [
-      "es6",
-      "dom"
-    ],
+    "target": "ES2022",
+    "lib": ["es6", "dom"],
     "allowJs": true,
     "alwaysStrict": true,
     "noImplicitAny": true,
@@ -16,7 +13,5 @@
     "outDir": "../build/streams",
     "skipLibCheck": true
   },
-  "include": [
-    "../node_modules/@openpgp/web-stream-tools/lib/*.js"
-  ]
-}
+  "include": ["../node_modules/@openpgp/web-stream-tools/lib/*.js"]
+}

conf/tsconfig.streams.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
+    "target": "ES2022",
     "lib": ["es6", "dom"],
     "alwaysStrict": true,
     "noImplicitAny": true,

conf/tsconfig.tooling.json

@@ -1,33 +1,32 @@
-module.exports = {
-  parser: '@typescript-eslint/parser',
-  env: {
-    browser: true,
-    node: true,
-    commonjs: true,
-    es6: true,
+// Importing necessary ESLint plugins
+import tseslint from 'typescript-eslint';
+import noOnlyTestsPlugin from 'eslint-plugin-no-only-tests';
+import headerPlugin from 'eslint-plugin-header';
+import jsdocPlugin from 'eslint-plugin-jsdoc';
+import preferArrowPlugin from 'eslint-plugin-prefer-arrow';
+import importPlugin from 'eslint-plugin-import';
+import noNullPlugin from 'eslint-plugin-no-null';
+import localRulesPlugin from 'eslint-plugin-local-rules';
+import eslintConfigPrettier from 'eslint-config-prettier';
+import pluginJs from '@eslint/js';
+
+const commonConfig = {
+  plugins: {
+    '@typescript-eslint': tseslint.plugin,
+    'no-only-tests': noOnlyTestsPlugin,
+    header: headerPlugin,
+    jsdoc: jsdocPlugin,
+    'prefer-arrow': preferArrowPlugin,
+    import: importPlugin,
+    'no-null': noNullPlugin,
+    'local-rules': localRulesPlugin,
   },
-  globals: {
-    $: false,
-    chrome: false,
-    OpenPGP: false,
-  },
-  extends: ['eslint:recommended', 'plugin:@typescript-eslint/strict', 'plugin:@typescript-eslint/stylistic', 'prettier'],
-  ignorePatterns: ['.eslintrc.js'],
-  parserOptions: {
-    project: 'tsconfig.json',
-    sourceType: 'module',
+  languageOptions: {
+    parser: tseslint.parser,
+    parserOptions: {
+      project: true,
+    },
   },
-  plugins: [
-    'no-only-tests',
-    'header',
-    'eslint-plugin-jsdoc',
-    'eslint-plugin-prefer-arrow',
-    'eslint-plugin-import',
-    'eslint-plugin-no-null',
-    'eslint-plugin-local-rules',
-    '@typescript-eslint',
-  ],
-  root: true,
   rules: {
     '@typescript-eslint/consistent-indexed-object-style': 'off',
     '@typescript-eslint/consistent-type-assertions': 'error',
@@ -84,6 +83,14 @@ module.exports = {
     '@typescript-eslint/no-parameter-properties': 'off',
     '@typescript-eslint/no-shadow': 'off',
     '@typescript-eslint/no-unsafe-return': 'error',
+    '@typescript-eslint/prefer-nullish-coalescing': 'off',
+    '@typescript-eslint/no-unnecessary-condition': 'off',
+    '@typescript-eslint/restrict-template-expressions': 'off',
+    '@typescript-eslint/restrict-plus-operands': 'off',
+    '@typescript-eslint/require-await': 'off',
+    '@typescript-eslint/no-confusing-void-expression': 'off',
+    '@typescript-eslint/no-misused-promises': 'off',
+    '@typescript-eslint/no-redundant-type-constituents': 'off',
     '@typescript-eslint/no-unused-vars': ['error'],
     '@typescript-eslint/no-unused-expressions': 'error',
     '@typescript-eslint/no-use-before-define': 'off',
@@ -156,13 +163,60 @@ module.exports = {
     ],
     'local-rules/standard-loops': 'error',
   },
-  overrides: [
-    {
-      files: './test/**/*.ts',
-      rules: {
-        '@typescript-eslint/no-unused-expressions': 'off',
-        '@typescript-eslint/no-non-null-assertion': 'off',
+};
+
+export default [
+  {
+    ignores: ['extension/types/**', 'extension/js/common/core/types/**', 'test/source/core/types/**', 'build/**', 'extension/lib/**', 'eslint.config.js'],
+  },
+  pluginJs.configs.recommended,
+  ...tseslint.configs.strictTypeChecked,
+  ...tseslint.configs.stylisticTypeChecked,
+  eslintConfigPrettier,
+  {
+    ...commonConfig,
+    files: ['extension/**/*.ts'],
+    languageOptions: {
+      ...commonConfig.languageOptions,
+      parserOptions: {
+        project: './tsconfig.json',
       },
     },
-  ],
-};
+  },
+  {
+    ...commonConfig,
+    files: ['tooling/**/*.ts'],
+    languageOptions: {
+      ...commonConfig.languageOptions,
+      parserOptions: {
+        project: './conf/tsconfig.tooling.json',
+      },
+    },
+  },
+  {
+    ...commonConfig,
+    files: ['test/**/*.ts'],
+    languageOptions: {
+      ...commonConfig.languageOptions,
+      parserOptions: {
+        project: './conf/tsconfig.test.eslint.json',
+      },
+    },
+    rules: {
+      ...commonConfig.rules,
+      '@typescript-eslint/no-unused-expressions': 'off',
+      '@typescript-eslint/no-non-null-assertion': 'off',
+      '@typescript-eslint/no-unsafe-assignment': 'off',
+      '@typescript-eslint/no-unsafe-call': 'off',
+      '@typescript-eslint/no-unsafe-member-access': 'off',
+    },
+  },
+  ...tseslint.config({
+    files: ['extension/js/content_scripts/webmail/**/*.ts'],
+    languageOptions: {
+      parserOptions: {
+        project: './conf/tsconfig.content_scripts.json',
+      },
+    },
+  }),
+];

.eslintrc.js eslint.config.mjs.eslintrc.js renamed to eslint.config.mjs

@@ -1,5 +1,7 @@
 <div class="lightboxed">
 
+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>
 
 version 8.5.5 on May 20, 2024: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/478?closed=1" target="_blank">Manifest V3</a>

extension/changelog.txt

@@ -52,6 +52,7 @@ const libs: unknown[] = [
 /* eslint-disable @typescript-eslint/no-explicit-any */
 // add them to global scope so ci can use them
 for (const lib of libs) {
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
   (window as any)[(lib as any).name] = lib;
 }
 /* eslint-enable @typescript-eslint/no-explicit-any */

extension/chrome/dev/ci_unit_test.ts

@@ -50,7 +50,7 @@ Catch.try(async () => {
       const { messages, resultSizeEstimate, nextPageToken } = await gmail.msgList('is:inbox OR is:sent', false, nextCyclePageToken);
       print(`msgList: ${(messages || []).length} msgs, resultSizeEstimate:${resultSizeEstimate}, nextPageToken: ${nextPageToken}`);
       msgMetas.push(...(messages || []));
-      if (!messages || !messages.length || !nextPageToken) {
+      if (!messages?.length || !nextPageToken) {
         break;
       }
       nextCyclePageToken = nextPageToken;