Merge branch '3.2' into 3

silverstripe · Apr 30, 2024 · 5b10d73 · 5b10d73
2 parents 7b705ca + 5df6de0
commit 5b10d73
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 182 deletions.
diff --git a/.sass-lint.yml b/.sass-lint.yml
diff --git a/.stylelintignore b/.stylelintignore
@@ -0,0 +1,3 @@
+client/src/styles/legacy/*
+admin/client/src/styles/legacy/*
+vendor/**
diff --git a/.stylelintrc.js b/.stylelintrc.js
@@ -0,0 +1 @@
+module.exports = require('@silverstripe/eslint-config/.stylelintrc');
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "watch": "yarn && NODE_ENV=development webpack --watch --progress",
     "css": "WEBPACK_CHILD=css npm run build",
     "test": "jest",
-    "lint": "eslint client/src; sass-lint -v",
+    "lint": "eslint client/src; stylelint **/client/src/**/*.scss",
     "lint-js-fix": "eslint client/src --fix"
   },
   "repository": {
@@ -36,8 +36,8 @@
     "reactstrap": "^8.9.0"
   },
   "devDependencies": {
-    "@silverstripe/eslint-config": "^1.1.0",
-    "@silverstripe/webpack-config": "^2.0.0",
+    "@silverstripe/eslint-config": "^1.2.1",
+    "@silverstripe/webpack-config": "^2.1.0",
     "@testing-library/react": "^14.0.0",
     "babel-jest": "^29.2.2",
     "core-js": "^3.26.0",