Skip to content

Commit

Permalink
Merge branch 'main' into community/10994/ItemType-Add
Browse files Browse the repository at this point in the history
  • Loading branch information
cd-bitwarden authored Oct 29, 2024
2 parents 16b5af7 + b391c29 commit 71aebdb
Show file tree
Hide file tree
Showing 833 changed files with 43,975 additions and 9,058 deletions.
3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ libs/common/src/tools @bitwarden/team-tools-dev
libs/importer @bitwarden/team-tools-dev
libs/tools @bitwarden/team-tools-dev
bitwarden_license/bit-web/src/app/tools @bitwarden/team-tools-dev
bitwarden_license/bit-common/src/tools @bitwarden/team-tools-dev

## Localization/Crowdin (Tools team)
apps/browser/src/_locales @bitwarden/team-tools-dev
Expand Down Expand Up @@ -105,7 +106,7 @@ apps/desktop/desktop_native @bitwarden/team-platform-dev

## Key management team files ##
apps/desktop/src/key-management @bitwarden/team-key-management-dev
apps/web/src/key-management @bitwarden/team-key-management-dev
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
Expand Down
1 change: 0 additions & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
"cross-env",
"del",
"gulp",
"gulp-filter",
"gulp-if",
"gulp-json-editor",
"gulp-replace",
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/auto-branch-updater.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Auto Update Branch

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/automatic-issue-responses.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Automatic issue responses
on:
issues:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/automatic-pull-request-responses.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Automatic pull request responses
on:
pull_request:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/brew-bump-desktop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Bump Desktop Cask

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-browser.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Build Browser

on:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/build-cli.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Build CLI

on:
Expand Down Expand Up @@ -289,7 +288,7 @@ jobs:
name: bitwarden-cli.${{ env._PACKAGE_VERSION }}.nupkg
path: apps/cli/dist/chocolatey/bitwarden-cli.${{ env._PACKAGE_VERSION }}.nupkg
if-no-files-found: error

- name: Zip NPM Build Artifact
run: Get-ChildItem -Path .\build | Compress-Archive -DestinationPath .\bitwarden-cli-${{ env._PACKAGE_VERSION }}-npm-build.zip

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-desktop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Build Desktop

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-web.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Build Web

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Chromatic

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/crowdin-pull.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Crowdin Sync

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/deploy-web.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Deploy Web Vault
run-name: Deploy Web Vault to ${{ inputs.environment }} from ${{ inputs.branch-or-tag }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/enforce-labels.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Enforce PR labels

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Lint

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/locales-lint.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Locales lint for Crowdin

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish-cli.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Publish CLI
run-name: Publish CLI ${{ inputs.publish_type }}

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/publish-desktop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Publish Desktop
run-name: Publish Desktop ${{ inputs.publish_type }}

Expand Down Expand Up @@ -125,7 +124,7 @@ jobs:
secrets: "aws-electron-access-id,
aws-electron-access-key,
aws-electron-bucket-name"

- name: Create artifacts directory
run: mkdir -p apps/desktop/artifacts

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish-web.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Publish Web
run-name: Publish Web ${{ inputs.publish_type }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release-browser.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Release Browser
run-name: Release Browser ${{ inputs.release_type }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release-cli.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Release CLI
run-name: Release CLI ${{ inputs.release_type }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release-desktop-beta.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Release Desktop Beta

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release-desktop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Release Desktop
run-name: Release Desktop ${{ inputs.release_type }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release-web.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Release Web
run-name: Release Web ${{ inputs.release_type }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/retrieve-current-desktop-rollout.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Retrieve Current Desktop Rollout

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/scan.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Scan

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/staged-rollout-desktop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Staged Rollout Desktop

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/stale-bot.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: 'Close stale issues and PRs'
on:
workflow_dispatch:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Testing

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/version-auto-bump.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Auto Bump Desktop Version

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/version-bump.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Version Bump

on:
Expand Down
21 changes: 0 additions & 21 deletions apps/browser/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,9 @@ const betaBuild = process.env.BETA_BUILD === "1";
const paths = {
build: "./build/",
dist: "./dist/",
node_modules: "./node_modules/",
popupDir: "./src/popup/",
cssDir: "./src/popup/css/",
safari: "./src/safari/",
};

const filters = {
fonts: [
"!build/popup/fonts/*",
"build/popup/fonts/Open_Sans*.woff",
"build/popup/fonts/bwi-font.woff2",
"build/popup/fonts/bwi-font.woff",
"build/popup/fonts/bwi-font.ttf",
],
safari: ["!build/safari/**/*"],
};

/**
* Converts a number to a tuple containing two Uint16's
* @param num {number} This number is expected to be a integer style number with no decimals
Expand Down Expand Up @@ -64,11 +50,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")))
Expand Down Expand Up @@ -192,8 +176,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"))
Expand Down Expand Up @@ -237,13 +219,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(
Expand Down
Loading

0 comments on commit 71aebdb

Please sign in to comment.