Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/bitwarden/browser into fe…
Browse files Browse the repository at this point in the history
…ature/prettier-apply
  • Loading branch information
Hinton committed Dec 21, 2021
2 parents 4346f95 + cebee8a commit 1d4b009
Show file tree
Hide file tree
Showing 10 changed files with 809 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ insert_final_newline = true
[*.{js,ts,scss,html}]
charset = utf-8
indent_style = space
indent_size = 4
indent_size = 2
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ jobs:
npm run dist
npm run test
- name: Run linter
run: npm run lint
# - name: Run linter
# run: npm run lint

- name: Gulp
run: gulp ci
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@ name: Release

on:
workflow_dispatch:
inputs: {}
inputs:
release_type:
description: 'Release Options'
required: true
default: 'Initial Release'
type: choice
options:
- Initial Release
- Redeploy


jobs:
Expand Down Expand Up @@ -34,7 +42,8 @@ jobs:
curl -sL https://api.github.com/repos/$GITHUB_REPOSITORY/releases/latest | jq -r ".tag_name"
)
if [ "v$version" == "$previous_release_tag_version" ]; then
if [ "v$version" == "$previous_release_tag_version" ] && \
[ "${{ github.event.inputs.release_type }}" == "Initial Release" ]; then
echo "[!] Already released v$version. Please bump version to continue"
exit 1
fi
Expand Down
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
18 changes: 18 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Build directories
build
dist
coverage

jslib

# External libraries / auto synced locales
src/_locales
src/scripts/duo.js
src/content/autofill.js
src/safari

# TODO: Remove this!
src/services/autofill.service.ts

# Github Workflows
.github/workflows
3 changes: 3 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"printWidth": 100
}

0 comments on commit 1d4b009

Please sign in to comment.