Merge commit '56477eb39cfd8a73c9920577d24d75fed36e2cf5' into feature/cme-connector

.gitattributes

@@ -1,3 +1 @@
-*.sh eol=lf
-.dockerignore eol=lf
-dockerfile eol=lf
+* text=auto eol=lf

.github/workflows/build.yml

@@ -382,8 +382,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

package.json

@@ -29,7 +29,7 @@
     "dist:bit:selfhost": "npm run build:bit:selfhost:prod",
     "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": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts' && prettier --check .",
     "lint:fix": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts' --fix",
     "prettier": "prettier --write .",
     "prepare": "husky install"