Merge branch '5.2' into 5

silverstripe · Apr 30, 2024 · 13071d0 · 13071d0
2 parents e5cc486 + edd4808
commit 13071d0
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
@@ -12,10 +12,10 @@
     "test": "jest",
     "coverage": "jest --coverage",
     "lock": "npm-shrinkwrap --dev",
-    "lint": "eslint client/src && sass-lint --verbose client/src/**/*.scss",
+    "lint": "eslint client/src && yarn lint-sass",
     "lint-js": "eslint client/src",
     "lint-js-fix": "eslint client/src --fix",
-    "lint-sass": "sass-lint --verbose client/src/**/*.scss"
+    "lint-sass": "stylelint **/client/src/**/*.scss"
   },
   "repository": {
     "type": "git",
@@ -51,8 +51,8 @@
     "reselect": "^4.1.7"
   },
   "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",
     "jest-cli": "^29.2.2",
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');