Merge branch '3' into 4

bringyourownideas · Jun 20, 2024 · ffc5d2b · ffc5d2b
2 parents c4790a7 + 1aa5ca2
commit ffc5d2b
Show file tree

Hide file tree

Showing 3 changed files with 302 additions and 92 deletions.
diff --git a/.stylelintignore b/.stylelintignore
diff --git a/package.json b/package.json
@@ -20,10 +20,10 @@
     "watch": "NODE_ENV=development webpack --watch --progress",
     "css": "WEBPACK_CHILD=css npm run build",
     "lock": "npm-shrinkwrap --dev",
-    "lint": "eslint client/src && yarn lint-sass",
+    "lint": "yarn lint-js && yarn lint-sass",
     "lint-js": "eslint client/src",
     "lint-js-fix": "eslint client/src --fix",
-    "lint-sass": "stylelint **/client/src/**/*.scss"
+    "lint-sass": "stylelint client/src"
   },
   "dependencies": {
     "classnames": "^2.3.2",
@@ -34,7 +34,7 @@
     "reactstrap": "^8.9.0"
   },
   "devDependencies": {
-    "@silverstripe/eslint-config": "^1.2.1",
+    "@silverstripe/eslint-config": "^1.3.0",
     "@silverstripe/webpack-config": "^2.1.0",
     "webpack": "^5.74.0",
     "webpack-cli": "^5.0.0"