Remove husky

client/.sass-lint.yml

@@ -1,9 +1,9 @@
 files:
-  include: "**/*.s+(a|c)ss"
+  include:
-  ignore: [
+    - "src/app/**/*.scss"
-    "node_modules/**/*.*",
+    - "src/assets/**/*.scss"
-    "client/node_modules/**/*.*"
+    - "src/sass/**/*.scss"
-  ]
+    - "src/standalone/**/*.scss"
 syntax:
     include:
       - scss

client/package.json

@@ -13,14 +13,17 @@
     "url": "git+https://github.com/Chocobozzz/PeerTube.git"
   },
   "scripts": {
-    "lint": "tslint --project ./tsconfig.json -c ./tslint.json 'src/app/**/*.ts' 'src/standalone/**/*.ts'",
+    "lint": "npm run lint-ts && npm run lint-scss",
+    "lint-ts": "tslint --project ./tsconfig.json -c ./tslint.json 'src/app/**/*.ts' 'src/standalone/**/*.ts'",
+    "lint-scss": "sass-lint -c .sass-lint.yml",
     "webpack": "webpack",
     "tslint": "tslint",
     "ng": "ng",
     "postinstall": "npm rebuild node-sass",
     "webpack-bundle-analyzer": "webpack-bundle-analyzer",
     "webdriver-manager": "webdriver-manager",
-    "ngx-extractor": "ngx-extractor"
+    "ngx-extractor": "ngx-extractor",
+    "sass-lint": "sass-lint"
   },
   "typings": "*.d.ts",
   "resolutions": {
@@ -112,6 +115,7 @@
     "raw-loader": "^1",
     "rxjs": "^6.5.2",
     "sanitize-html": "^1.18.4",
+    "sass-lint": "^1.13.1",
     "sass-loader": "7",
     "sass-resources-loader": "^2.0.0",
     "socket.io-client": "^2.2.0",

client/src/sass/bootstrap.scss

@@ -10,8 +10,12 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
 }
 
 @keyframes spin {
-  from { transform: scale(1) rotate(0deg);}
+  from {
-  to { transform: scale(1) rotate(360deg);}
+    transform: scale(1) rotate(0deg);
+  }
+  to {
+    transform: scale(1) rotate(360deg);
+  }
 }
 
 .dropdown-menu {
@@ -172,7 +176,7 @@ ngb-modal-backdrop {
 }
 
 .btn-outline-tertiary {
-	color: var(--secondaryColor);
+  color: var(--secondaryColor);
   border-color: var(--secondaryColor);
 
   &:hover {

client/src/sass/player/bezels.scss

@@ -9,23 +9,23 @@
 }
 
 .vjs-bezel {
-	position: absolute;
+  position: absolute;
-	left: 50%;
+  left: 50%;
-	top: 50%;
+  top: 50%;
-	width: 52px;
+  width: 52px;
-	height: 52px;
+  height: 52px;
-	z-index: 19;
+  z-index: 19;
-	margin-left: -26px;
+  margin-left: -26px;
-	margin-top: -26px;
+  margin-top: -26px;
-	background: rgba(0,0,0,.5);
+  background: rgba(0, 0, 0, .5);
-	border-radius: 26px;
+  border-radius: 26px;
-	animation: bezels-fadeout .5s linear 1 normal forwards;
+  animation: bezels-fadeout .5s linear 1 normal forwards;
   pointer-events: none;
 }
 
 .vjs-bezel-icon {
-	width: 36px;
+  width: 36px;
-	height: 36px;
+  height: 36px;
   margin: 8px;
 
   svg .vjs-svg-fill {

package.json

@@ -74,26 +74,9 @@
     "release": "scripty",
     "release-embed-api": "scripty",
     "nightly": "scripty",
-    "client-report": "scripty"
+    "client-report": "scripty",
-  },
+    "swagger-cli": "swagger-cli",
-  "husky": {
+    "sass-lint": "sass-lint"
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "*.scss": [
-      "sass-lint -c client/.sass-lint.yml",
-      "git add"
-    ],
-    "support/doc/api/*.yaml": [
-      "node ./node_modules/swagger-cli/bin/swagger-cli.js validate support/doc/api/openapi.yaml",
-      "git add"
-    ],
-    "server/tools/README.md": [
-      "npm run generate-cli-doc",
-      "git add"
-    ]
   },
   "resolutions": {
     "@types/bluebird": "3.5.27"
@@ -205,7 +188,6 @@
     "chai-json-schema": "^1.5.0",
     "chai-xml": "^0.3.2",
     "concurrently": "^5.0.0",
-    "husky": "^4.0.0",
     "libxmljs": "0.19.7",
     "lint-staged": "^9.2.0",
     "maildev": "^1.0.0-rc3",
@@ -213,7 +195,6 @@
     "mocha": "^7.0.0",
     "mocha-parallel-tests": "^2.2.1",
     "nodemon": "^2.0.1",
-    "sass-lint": "^1.12.1",
     "source-map-support": "^0.5.0",
     "supertest": "^4.0.2",
     "swagger-cli": "^2.2.0",

scripts/ci.sh

@@ -34,6 +34,7 @@ elif [ "$1" = "api-4" ]; then
     sh ./server/tests/api/ci-4.sh 2
 elif [ "$1" = "lint" ]; then
     npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"
+    npm run swagger-cli -- validate support/doc/api/openapi.yaml
 
     ( cd client
       npm run lint