Merge branch '2.2' into 2

silverstripe · Apr 30, 2024 · ce63a8c · ce63a8c
2 parents a995132 + 4de501b
commit ce63a8c
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
@@ -23,10 +23,10 @@
     "test": "jest",
     "coverage": "jest --coverage",
     "lock": "npm-shrinkwrap --dev",
-    "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"
   },
   "jest": {
     "testEnvironment": "jsdom",
@@ -48,8 +48,8 @@
     }
   },
   "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",
     "@storybook/addon-actions": "^7.0.18",
     "@testing-library/react": "^14.0.0",
     "babel-jest": "^29.3.0",