diff --git a/Dockerfile b/Dockerfile index e9c4eb9..e74920d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,8 +23,8 @@ RUN node --version && npm --version # Can be a tag, release, but prefer a commit hash because it's not changeable # https://github.com/bitwarden/clients/commit/${VAULT_VERSION} # -# Using https://github.com/bitwarden/clients/releases/tag/web-v2024.11.1 -ARG VAULT_VERSION=2dd6ac276c197fcaf36934931cf431de95345832 +# Using https://github.com/bitwarden/clients/releases/tag/web-v2024.11.2 +ARG VAULT_VERSION=3b71950c55f9524fbf6e6801b2a1daf9ac71a792 ENV VAULT_VERSION=$VAULT_VERSION ENV VAULT_FOLDER=bw_clients ENV CHECKOUT_TAGS=false diff --git a/patches/v2024.11.1.patch b/patches/v2024.11.2.patch similarity index 94% rename from patches/v2024.11.1.patch rename to patches/v2024.11.2.patch index f2d098a..9f764be 100644 --- a/patches/v2024.11.1.patch +++ b/patches/v2024.11.2.patch @@ -1,34 +1,19 @@ -diff --git a/apps/web/package.json b/apps/web/package.json -index 02ee6babe9..c232adfa25 100644 ---- a/apps/web/package.json -+++ b/apps/web/package.json -@@ -3,26 +3,11 @@ - "version": "2024.11.1", - "scripts": { - "build:oss": "webpack", -- "build:bit": "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", -- "build:bit:euqa": "cross-env NODE_ENV=production ENV=euqa npm run build:bit", -- "build:bit:usdev": "cross-env NODE_ENV=production ENV=usdev npm run build:bit", -- "build:bit:cloud": "cross-env NODE_ENV=production ENV=cloud npm run build:bit", - "build:oss:selfhost:watch": "cross-env ENV=selfhosted npm run build:oss:watch", -- "build:bit:selfhost:watch": "cross-env ENV=selfhosted npm run build:bit:watch", - "build:oss:selfhost:prod": "cross-env ENV=selfhosted NODE_ENV=production npm run build:oss", -- "build:bit:selfhost:prod": "cross-env ENV=selfhosted NODE_ENV=production npm run build:bit", -- "build:bit:ee": "cross-env NODE_ENV=production ENV=ee npm run build:bit", - "clean:l10n": "git push origin --delete l10n_master", -- "dist:bit:cloud": "npm run build:bit:cloud", - "dist:oss:selfhost": "npm run build:oss:selfhost:prod", -- "dist:bit:selfhost": "npm run build:bit:selfhost:prod", - "test": "jest", - "test:watch": "jest --watch", - "test:watch:all": "jest --watchAll" +diff --git a/apps/web/config/base.json b/apps/web/config/base.json +index cfaf604fb0..804252469a 100644 +--- a/apps/web/config/base.json ++++ b/apps/web/config/base.json +@@ -1,11 +1,5 @@ + { + "urls": {}, +- "stripeKey": "pk_test_KPoCfZXu7mznb9uSCPZ2JpTD", +- "braintreeKey": "sandbox_r72q8jq6_9pnxkwm75f87sdc2", +- "paypal": { +- "businessId": "AD3LAUZSNVPJY", +- "buttonAction": "https://www.sandbox.paypal.com/cgi-bin/webscr" +- }, + "dev": { + "port": 8080, + "allowedHosts": "auto" diff --git a/apps/web/src/app/admin-console/organizations/create/organization-information.component.html b/apps/web/src/app/admin-console/organizations/create/organization-information.component.html index e0a8006081..789efd9264 100644 --- a/apps/web/src/app/admin-console/organizations/create/organization-information.component.html diff --git a/scripts/apply_patches.sh b/scripts/apply_patches.sh index 3a19e67..ae1f8b4 100755 --- a/scripts/apply_patches.sh +++ b/scripts/apply_patches.sh @@ -57,7 +57,9 @@ replace_embedded_svg_icon \ echo "Remove non-free bitwarden_license/ code" rm -rf ./bitwarden_license/ -rm -rf ./apps/web/src/app/tools/access-intelligence/ +if [ -d "./apps/web/src/app/tools/access-intelligence/" ]; then + rm -rf ./apps/web/src/app/tools/access-intelligence/ +fi echo "Using patch: ${PATCH_NAME}" git apply "../patches/${PATCH_NAME}" --reject diff --git a/scripts/generate_patch_file.sh b/scripts/generate_patch_file.sh index ee82ed5..1653a66 100755 --- a/scripts/generate_patch_file.sh +++ b/scripts/generate_patch_file.sh @@ -32,6 +32,7 @@ if [ "$(git status --porcelain | wc -l)" -ge 1 ]; then ':!apps/web/src/images/logo-dark@2x.png' \ ':!apps/web/src/images/logo-white@2x.png' \ ':!apps/web/src/images/icon-white.png' \ + ':!apps/web/src/images/icon-white.svg' \ ':!apps/web/src/images/icon-dark.png' \ ':!apps/web/src/images/icons/android-chrome-192x192.png' \ ':!apps/web/src/images/icons/android-chrome-512x512.png' \