Merge pull request #339 from cozy/merge-upstream-NOV-2024

Merge upstream 2024.11.2

.eslintrc.json

@@ -294,6 +294,12 @@
         "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": {

.storybook/main.ts

@@ -19,6 +19,8 @@ const config: StorybookConfig = {
     "../apps/browser/src/**/*.stories.@(js|jsx|ts|tsx)",
     "../bitwarden_license/bit-web/src/**/*.mdx",
     "../bitwarden_license/bit-web/src/**/*.stories.@(js|jsx|ts|tsx)",
+    "../libs/tools/card/src/**/*.mdx",
+    "../libs/tools/card/src/**/*.stories.@(js|jsx|ts|tsx)",
   ],
   addons: [
     getAbsolutePath("@storybook/addon-links"),

angular.json

@@ -128,10 +128,10 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "test-storybook:build:production"
+              "buildTarget": "test-storybook:build:production"
             },
             "development": {
-              "browserTarget": "test-storybook:build:development"
+              "buildTarget": "test-storybook:build:development"
             }
           },
           "defaultConfiguration": "development"

apps/browser/config/base.json

@@ -3,6 +3,7 @@
   "flags": {
     "showPasswordless": true,
     "enableCipherKeyEncryption": false,
-    "accountSwitching": false
+    "accountSwitching": false,
+    "sdk": false
   }
 }

apps/browser/gulpfile.js

@@ -14,10 +14,6 @@ const betaBuild = process.env.BETA_BUILD === "1";
 const paths = {
   build: "./build/",
   dist: "./dist/",
-  coverage: "./coverage/",
-  node_modules: "./node_modules/",
-  popupDir: "./src/popup/",
-  cssDir: "./src/popup/css/",
   safari: "./src/safari/",
 };
 
@@ -65,11 +61,9 @@ function distFileName(browserName, ext) {
 
 async function dist(browserName, manifest) {
   const { default: zip } = await import("gulp-zip");
-  const { default: filter } = await import("gulp-filter");
 
   return gulp
     .src(paths.build + "**/*")
-    .pipe(filter(["**"].concat(filters.fonts).concat(filters.safari)))
     .pipe(gulpif("popup/index.html", replace("__BROWSER__", "browser_" + browserName)))
     .pipe(gulpif("manifest.json", jeditor(manifest)))
     .pipe(zip(distFileName(browserName, "zip")))
@@ -194,8 +188,6 @@ function distSafariApp(cb, subBuildPath) {
       return new Promise((resolve) => proc.on("close", resolve));
     })
     .then(async () => {
-      const { default: filter } = await import("gulp-filter");
-
       const libs = fs
         .readdirSync(builtAppexFrameworkPath)
         .filter((p) => p.endsWith(".dylib"))
@@ -239,13 +231,10 @@ function safariCopyAssets(source, dest) {
 }
 
 async function safariCopyBuild(source, dest) {
-  const { default: filter } = await import("gulp-filter");
-
   return new Promise((resolve, reject) => {
     gulp
       .src(source)
       .on("error", reject)
-      .pipe(filter(["**"].concat(filters.fonts)))
       .pipe(gulpif("popup/index.html", replace("__BROWSER__", "browser_safari")))
       .pipe(
         gulpif(
@@ -277,17 +266,6 @@ function stdOutProc(proc) {
   proc.stderr.on("data", (data) => console.error(data.toString()));
 }
 
-async function ciCoverage(cb) {
-  const { default: zip } = await import("gulp-zip");
-  const { default: filter } = await import("gulp-filter");
-
-  return gulp
-    .src(paths.coverage + "**/*")
-    .pipe(filter(["**", "!coverage/coverage*.zip"]))
-    .pipe(zip(`coverage${buildString()}.zip`))
-    .pipe(gulp.dest(paths.coverage));
-}
-
 function applyBetaLabels(manifest) {
   manifest.name = "Bitwarden Password Manager BETA";
   manifest.short_name = "Bitwarden BETA";
@@ -321,5 +299,3 @@ exports["dist:safari:mas"] = distSafariMas;
 exports["dist:safari:masdev"] = distSafariMasDev;
 exports["dist:safari:dmg"] = distSafariDmg;
 exports.dist = gulp.parallel(distFirefox, distChrome, distOpera, distEdge);
-exports["ci:coverage"] = ciCoverage;
-exports.ci = ciCoverage;

apps/browser/package.json

@@ -28,7 +28,6 @@
     "dist:safari:dmg": "npm run build:prod && gulp dist:safari:dmg",
     "dist:sources": "../../scripts/create-archive.sh",
     "test": "jest",
-    "test:coverage": "jest --coverage --coverageDirectory=coverage",
     "test:watch": "jest --watch",
     "test:watch:all": "jest --watchAll"
   }