From d026aadea9646953a8317361adabda48017d6085 Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Tue, 21 May 2024 22:58:40 +0200 Subject: [PATCH 01/23] use only gpl code remove all references to non-free bitwarden_license code --- apps/web/package.json | 3 --- apps/web/tailwind.config.js | 1 - apps/web/tsconfig.json | 1 - clients.code-workspace | 12 ------------ jest.config.js | 3 --- libs/components/tailwind.config.js | 1 - tailwind.config.js | 1 - tsconfig.json | 7 ++----- 8 files changed, 2 insertions(+), 27 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index 73ecd8c3cb7..bf75ca68ff4 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -3,11 +3,8 @@ "version": "2025.1.1", "scripts": { "build:oss": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" webpack", - "build:bit": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" webpack -c ../../bitwarden_license/bit-web/webpack.config.js", "build:oss:watch": "webpack serve", - "build:bit:watch": "webpack serve -c ../../bitwarden_license/bit-web/webpack.config.js", "build:bit:dev": "cross-env ENV=development npm run build:bit", - "build:bit:dev:analyze": "cross-env LOGGING=false webpack -c ../../bitwarden_license/bit-web/webpack.config.js --profile --json > stats.json && npx webpack-bundle-analyzer stats.json build/", "build:bit:dev:watch": "cross-env ENV=development NODE_OPTIONS=\"--max-old-space-size=8192\" npm run build:bit:watch", "build:bit:qa": "cross-env NODE_ENV=production ENV=qa npm run build:bit", "build:bit:euprd": "cross-env NODE_ENV=production ENV=euprd npm run build:bit", diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.js index 2c0108ca3e2..85d3689ea3e 100644 --- a/apps/web/tailwind.config.js +++ b/apps/web/tailwind.config.js @@ -8,7 +8,6 @@ config.content = [ "../../libs/key-management/src/**/*.{html,ts}", "../../libs/vault/src/**/*.{html,ts}", "../../libs/angular/src/**/*.{html,ts}", - "../../bitwarden_license/bit-web/src/**/*.{html,ts}", ]; module.exports = config; diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json index 678db7c4af5..9c89db617a7 100644 --- a/apps/web/tsconfig.json +++ b/apps/web/tsconfig.json @@ -10,7 +10,6 @@ "@bitwarden/auth/common": ["../../libs/auth/src/common"], "@bitwarden/auth/angular": ["../../libs/auth/src/angular"], "@bitwarden/billing": ["../../libs/billing/src"], - "@bitwarden/bit-common/*": ["../../bitwarden_license/bit-common/src/*"], "@bitwarden/common/*": ["../../libs/common/src/*"], "@bitwarden/components": ["../../libs/components/src"], "@bitwarden/generator-components": ["../../libs/tools/generator/components/src"], diff --git a/clients.code-workspace b/clients.code-workspace index f7d86d2a242..75389727d2d 100644 --- a/clients.code-workspace +++ b/clients.code-workspace @@ -8,18 +8,10 @@ "name": "web vault", "path": "apps/web", }, - { - "name": "web vault (bit)", - "path": "bitwarden_license/bit-web", - }, { "name": "cli", "path": "apps/cli", }, - { - "name": "cli (bit)", - "path": "bitwarden_license/bit-cli", - }, { "name": "desktop", "path": "apps/desktop", @@ -32,10 +24,6 @@ "name": "libs", "path": "libs", }, - { - "name": "common (bit)", - "path": "bitwarden_license/bit-common", - }, ], "settings": { "eslint.options": { diff --git a/jest.config.js b/jest.config.js index 3ed082bcbc3..3c385865d8b 100644 --- a/jest.config.js +++ b/jest.config.js @@ -20,9 +20,6 @@ module.exports = { "/apps/cli/jest.config.js", "/apps/desktop/jest.config.js", "/apps/web/jest.config.js", - "/bitwarden_license/bit-web/jest.config.js", - "/bitwarden_license/bit-cli/jest.config.js", - "/bitwarden_license/bit-common/jest.config.js", "/libs/admin-console/jest.config.js", "/libs/angular/jest.config.js", diff --git a/libs/components/tailwind.config.js b/libs/components/tailwind.config.js index 7a53c82ec58..9d0a337bd28 100644 --- a/libs/components/tailwind.config.js +++ b/libs/components/tailwind.config.js @@ -6,7 +6,6 @@ config.content = [ "libs/auth/src/**/*.{html,ts,mdx}", "apps/web/src/**/*.{html,ts,mdx}", "apps/browser/src/**/*.{html,ts,mdx}", - "bitwarden_license/bit-web/src/**/*.{html,ts,mdx}", ".storybook/preview.tsx", ]; config.safelist = [ diff --git a/tailwind.config.js b/tailwind.config.js index 637c28a54ea..7afcea4e655 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -10,7 +10,6 @@ config.content = [ "./libs/tools/send/send-ui/src/*.{html,ts,mdx}", "./libs/vault/src/**/*.{html,ts,mdx}", "./apps/web/src/**/*.{html,ts,mdx}", - "./bitwarden_license/bit-web/src/**/*.{html,ts,mdx}", "./.storybook/preview.js", ]; config.safelist = [ diff --git a/tsconfig.json b/tsconfig.json index 91b4ee7dd6b..691a47c1d32 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -39,8 +39,7 @@ "@bitwarden/tools-card": ["./libs/tools/card/src"], "@bitwarden/node/*": ["./libs/node/src/*"], "@bitwarden/web-vault/*": ["./apps/web/src/*"], - "@bitwarden/vault": ["./libs/vault/src"], - "@bitwarden/bit-common/*": ["./bitwarden_license/bit-common/src/*"] + "@bitwarden/vault": ["./libs/vault/src"] }, "plugins": [ { @@ -57,9 +56,7 @@ "apps/browser/src/**/*", "libs/*/src/**/*", "libs/tools/send/**/src/**/*", - "libs/tools/card/src/**/*", - "bitwarden_license/bit-web/src/**/*", - "bitwarden_license/bit-common/src/**/*" + "libs/tools/card/src/**/*" ], "exclude": [ "apps/web/src/**/*.spec.ts", From 4aa5de7e24c49d54eb0411fe6f3d224c5d54528b Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Tue, 17 Dec 2024 18:29:41 +0100 Subject: [PATCH 02/23] rebrand Bitwarden as Vaultwarden --- apps/web/src/app/app.component.html | 2 +- .../two-factor-setup-authenticator.component.ts | 4 ++-- apps/web/src/app/core/router.service.ts | 2 +- .../web/src/app/layouts/frontend-layout.component.html | 8 +++++++- .../src/app/layouts/header/web-header.component.html | 7 ++++++- apps/web/src/index.html | 4 ++-- apps/web/src/manifest.json | 6 +++--- .../src/angular/anon-layout/anon-layout.component.html | 10 ++++++++-- 8 files changed, 30 insertions(+), 13 deletions(-) diff --git a/apps/web/src/app/app.component.html b/apps/web/src/app/app.component.html index a39c045e0e3..9d72e609b40 100644 --- a/apps/web/src/app/app.component.html +++ b/apps/web/src/app/app.component.html @@ -3,7 +3,7 @@ when the body has the layout_frontend class. Having this match the index allows for a duplicative yet seamless loading state here for process reloading. -->
- Bitwarden + Vaultwarden