Browse Source

Add Prettier configuration (#1346)

pull/1349/head
Oscar Hinton 4 years ago committed by GitHub
parent
commit
2b0a9d995e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .editorconfig
  2. 4
      .github/workflows/build.yml
  3. 4
      .husky/pre-commit
  4. 10
      .prettierignore
  5. 3
      .prettierrc.json
  6. 823
      package-lock.json
  7. 10
      package.json
  8. 2
      src/404.html
  9. 10
      tslint.json

2
.editorconfig

@ -12,7 +12,7 @@ insert_final_newline = true @@ -12,7 +12,7 @@ insert_final_newline = true
[*.{js,ts,scss,html}]
charset = utf-8
indent_style = space
indent_size = 4
indent_size = 2
[*.{ts}]
quote_type = single

4
.github/workflows/build.yml

@ -388,8 +388,8 @@ jobs: @@ -388,8 +388,8 @@ jobs:
- name: Install dependencies
run: npm ci
- name: Run linter
run: npm run lint
# - name: Run linter
# run: npm run lint
- name: NPM build
run: npm run build:bit:cloud

4
.husky/pre-commit

@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
npx lint-staged

10
.prettierignore

@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
# Build directories
build
dist
jslib
# External libraries / auto synced locales
src/locales
src/404/*.min.css
src/scripts/u2f.js

3
.prettierrc.json

@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
{
"printWidth": 100
}

823
package-lock.json generated

File diff suppressed because it is too large Load Diff

10
package.json

@ -30,7 +30,9 @@ @@ -30,7 +30,9 @@
"deploy": "npm run dist:bit && gh-pages -d build",
"deploy:dev": "npm run dist:bit && gh-pages -d build -r git@github.com:kspearrin/bitwarden-web-dev.git",
"lint": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts'",
"lint:fix": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts' --fix"
"lint:fix": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts' --fix",
"prettier": "prettier --write .",
"prepare": "husky install"
},
"devDependencies": {
"@angular/compiler-cli": "^12.2.13",
@ -48,7 +50,10 @@ @@ -48,7 +50,10 @@
"html-loader": "^3.0.1",
"html-webpack-injector": "1.1.4",
"html-webpack-plugin": "^5.5.0",
"husky": "^7.0.4",
"lint-staged": "^12.1.2",
"mini-css-extract-plugin": "^2.4.5",
"prettier": "2.5.1",
"process": "^0.11.10",
"sass": "^1.32.10",
"sass-loader": "^12.4.0",
@ -94,5 +99,8 @@ @@ -94,5 +99,8 @@
"engines": {
"node": "~16",
"npm": "~8"
},
"lint-staged": {
"*.{js,ts,css,scss,md}": "prettier --write"
}
}

2
src/404.html

@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
<div class="row align-items-center">
<div class="col brand">
<i class="fa fa-shield"></i>&nbsp;
<strong>bit</strong>warden</span>
<strong>bit</strong>warden
</div>
</div>
</div>

10
tslint.json

@ -38,7 +38,6 @@ @@ -38,7 +38,6 @@
"object-literal-sort-keys": false,
"object-literal-shorthand": [ true, "never" ],
"prefer-for-of": false,
"quotemark": [ true, "single" ],
"whitespace": [
true,
"check-branch",
@ -50,10 +49,6 @@ @@ -50,10 +49,6 @@
"check-type"
],
"max-classes-per-file": false,
"semicolon": [
true,
"always"
],
"trailing-comma": [
true,
{
@ -67,9 +62,6 @@ @@ -67,9 +62,6 @@
}
],
"ordered-imports": true,
"arrow-parens": [
true,
"ban-single-arg-parens"
]
"arrow-parens": [true]
}
}

Loading…
Cancel
Save