Merge branch '5.2' into 5

silverstripe · Apr 30, 2024 · 300f628 · 300f628
2 parents efa4dda + 942c599
commit 300f628
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 100 deletions.
diff --git a/.sass-lint.yml b/.sass-lint.yml
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
@@ -6,7 +6,7 @@
     "dev": "NODE_ENV=development webpack --progress",
     "watch": "yarn && NODE_ENV=development webpack --watch --progress",
     "css": "WEBPACK_CHILD=css npm run build",
-    "lint": "eslint client/src; sass-lint -v"
+    "lint": "eslint client/src; stylelint client/src/**/*.scss"
   },
   "repository": {
     "type": "git",
@@ -33,8 +33,8 @@
     "redux": "^4.2.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",
     "webpack": "^5.74.0",
     "webpack-cli": "^5.0.0"
   },
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		module.exports = require('@silverstripe/eslint-config/.stylelintrc');