Merge branch '3.2' into 3

silverstripe · Apr 30, 2024 · 57a3cc1 · 57a3cc1
2 parents 9fe444e + e703335
commit 57a3cc1
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,2 @@
+client/src/styles/legacy/*
+admin/client/src/styles/legacy/*
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
@@ -19,10 +19,10 @@
     "dev": "NODE_ENV=development webpack --progress",
     "watch": "NODE_ENV=development webpack --watch --progress",
     "css": "WEBPACK_CHILD=css npm run build",
-    "lint": "eslint client/src && sass-lint client/src",
+    "lint": "eslint client/src && yarn lint-sass",
     "lint-js": "eslint client/src",
     "lint-js-fix": "eslint client/src --fix",
-    "lint-sass": "sass-lint client/src",
+    "lint-sass": "stylelint **/client/src/**/*.scss",
     "test": "echo 1 > /dev/null"
   },
   "dependencies": {
@@ -33,8 +33,8 @@
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@silverstripe/eslint-config": "^1.0.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,2 @@
		client/src/styles/legacy/*
		admin/client/src/styles/legacy/*
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		module.exports = require('@silverstripe/eslint-config/.stylelintrc');