Merge branch 'main' into km/pm-16227/ssh-import-web-browser

.eslintrc.json

@@ -141,8 +141,7 @@
               }
             ]
           }
-        ],
-        "no-restricted-imports": ["error", { "patterns": ["src/**/*"] }]
+        ]
       }
     },
     {
@@ -164,147 +163,6 @@
         "tailwindcss/no-contradicting-classname": "error"
       }
     },
-    {
-      "files": ["libs/admin-console/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/admin-console/*", "src/**/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/angular/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/angular/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/auth/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/auth/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/billing/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/billing/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/common/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/common/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/components/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/components/*", "src/**/*", "@bitwarden/angular/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/tools/generator/components/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/generator-components/*", "src/**/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/tools/generator/core/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/generator-core/*", "src/**/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/tools/generator/extensions/history/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/generator-history/*", "src/**/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/tools/generator/extensions/legacy/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/generator-legacy/*", "src/**/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/tools/generator/extensions/navigation/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/generator-navigation/*", "src/**/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/tools/export/vault-export/vault-export-core/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/vault-export-core/*", "src/**/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/tools/export/vault-export/vault-export-ui/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          { "patterns": ["@bitwarden/vault-export-ui/*", "src/**/*"] }
-        ]
-      }
-    },
-    {
-      "files": ["libs/importer/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/importer/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/node/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/node/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/platform/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/platform/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/tools/send/send-ui/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/send-ui/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/tools/card/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/tools-card/*", "src/**/*"] }]
-      }
-    },
-    {
-      "files": ["libs/vault/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/vault/*", "src/**/*"] }]
-      }
-    },
     {
       "files": ["apps/browser/src/**/*.ts", "libs/**/*.ts"],
       "excludedFiles": [
@@ -344,10 +202,30 @@
         ]
       }
     },
+    {
+      "files": ["**/src/**/*.ts"],
+      "excludedFiles": ["**/platform/**/*.ts"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "patterns": [
+              "**/platform/**/internal", // General internal pattern
+              // All features that have been converted to barrel files
+              "**/platform/messaging/**",
+              "**/src/**/*" // Prevent relative imports across libs.
+            ]
+          }
+        ]
+      }
+    },
     {
       "files": ["bitwarden_license/bit-common/src/**/*.ts"],
       "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/bit-common/*", "src/**/*"] }]
+        "no-restricted-imports": [
+          "error",
+          { "patterns": ["@bitwarden/bit-common/*", "**/src/**/*"] }
+        ]
       }
     },
     {
@@ -357,7 +235,12 @@
         "no-restricted-imports": [
           "error",
           {
-            "patterns": ["biwarden_license/**", "@bitwarden/bit-common/*", "@bitwarden/bit-web/*"]
+            "patterns": [
+              "biwarden_license/**",
+              "@bitwarden/bit-common/*",
+              "@bitwarden/bit-web/*",
+              "**/src/**/*"
+            ]
           }
         ],
         // Catches dynamic imports, e.g. in routing modules where modules are lazy-loaded

.github/CODEOWNERS

@@ -126,6 +126,7 @@ apps/web/src/app/key-management @bitwarden/team-key-management-dev
 apps/browser/src/key-management @bitwarden/team-key-management-dev
 apps/cli/src/key-management @bitwarden/team-key-management-dev
 libs/key-management @bitwarden/team-key-management-dev
+libs/common/src/key-management @bitwarden/team-key-management-dev
 
 apps/desktop/destkop_native/core/src/biometric/ @bitwarden/team-key-management-dev
 apps/desktop/src/services/native-messaging.service.ts @bitwarden/team-key-management-dev

.github/renovate.json

@@ -75,10 +75,12 @@
     },
     {
       "matchPackageNames": [
+        "@emotion/css",
         "@webcomponents/custom-elements",
         "concurrently",
         "cross-env",
         "del",
+        "lit",
         "nord",
         "patch-package",
         "prettier",
@@ -102,6 +104,8 @@
       "matchPackageNames": [
         "@babel/core",
         "@babel/preset-env",
+        "@bitwarden/sdk-internal",
+        "@electron/fuses",
         "@electron/notarize",
         "@electron/rebuild",
         "@ngtools/webpack",
@@ -113,7 +117,7 @@
         "@types/node",
         "@types/node-forge",
         "@types/node-ipc",
-        "@yao-pkg",
+        "@yao-pkg/pkg",
         "babel-loader",
         "browserslist",
         "copy-webpack-plugin",
@@ -133,6 +137,7 @@
         "tsconfig-paths-webpack-plugin",
         "type-fest",
         "typescript",
+        "typescript-strict-plugin",
         "webpack",
         "webpack-cli",
         "webpack-dev-server",
@@ -149,21 +154,25 @@
         "@angular/cdk",
         "@angular/cli",
         "@angular/common",
-        "@angular/compiler",
         "@angular/compiler-cli",
+        "@angular/compiler",
         "@angular/core",
         "@angular/forms",
+        "@angular/platform-browser-dynamic",
+        "@angular/platform-browser",
         "@angular/platform",
-        "@angular/compiler",
         "@angular/router",
         "@compodoc/compodoc",
         "@ng-select/ng-select",
         "@storybook/addon-a11y",
         "@storybook/addon-actions",
         "@storybook/addon-designs",
         "@storybook/addon-essentials",
+        "@storybook/addon-interactions",
         "@storybook/addon-links",
         "@storybook/angular",
+        "@storybook/manager-api",
+        "@storybook/theming",
         "@types/react",
         "autoprefixer",
         "bootstrap",
@@ -186,7 +195,9 @@
       "matchPackageNames": [
         "@angular-eslint/eslint-plugin",
         "@angular-eslint/eslint-plugin-template",
+        "@angular-eslint/schematics",
         "@angular-eslint/template-parser",
+        "@angular/elements",
         "@types/jest",
         "@typescript-eslint/eslint-plugin",
         "@typescript-eslint/parser",
@@ -199,6 +210,7 @@
         "eslint-plugin-storybook",
         "eslint-plugin-tailwindcss",
         "husky",
+        "jest-extended",
         "jest-junit",
         "jest-mock-extended",
         "jest-preset-angular",

.github/workflows/build-browser.yml

@@ -196,11 +196,7 @@ jobs:
           - name: "edge"
             npm_command: "dist:edge"
             archive_name: "dist-edge.zip"
-            artifact_name: "dist-edge"
-          - name: "edge-mv3"
-            npm_command: "dist:edge:mv3"
-            archive_name: "dist-edge.zip"
-            artifact_name: "DO-NOT-USE-FOR-PROD-dist-edge-MV3"
+            artifact_name: "dist-edge-MV3"
           - name: "firefox"
             npm_command: "dist:firefox"
             archive_name: "dist-firefox.zip"
@@ -212,11 +208,7 @@ jobs:
           - name: "opera"
             npm_command: "dist:opera"
             archive_name: "dist-opera.zip"
-            artifact_name: "dist-opera"
-          - name: "opera-mv3"
-            npm_command: "dist:opera:mv3"
-            archive_name: "dist-opera.zip"
-            artifact_name: "DO-NOT-USE-FOR-PROD-dist-opera-MV3"
+            artifact_name: "dist-opera-MV3"
     steps:
       - name: Check out repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/build-desktop.yml

@@ -1196,6 +1196,8 @@ jobs:
         uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
         with:
           channel-id: C074F5UESQ0
+          method: chat.postMessage
+          token: ${{ steps.retrieve-slack-secret.outputs.slack-bot-token }}
           payload: |
             {
               "blocks": [
@@ -1209,7 +1211,6 @@ jobs:
               ]
             }
         env:
-          SLACK_BOT_TOKEN: ${{ steps.retrieve-slack-secret.outputs.slack-bot-token }}
           BUILD_NUMBER: ${{ needs.setup.outputs.build_number }}