Merge branch '2' into 3

silverstripe · Apr 30, 2024 · e2af26f · e2af26f
2 parents 26d9cec + 83be029
commit e2af26f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 181 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/*
+src/**/*
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
@@ -15,7 +15,7 @@
     "css": "yarn && WEBPACK_CHILD=css webpack -p --bail --progress",
     "test": "jest",
     "coverage": "jest --coverage",
-    "lint": "eslint client/src && sass-lint -v client/src"
+    "lint": "eslint client/src && stylelint **/client/src/**/*.scss"
   },
   "repository": {
     "type": "git",
@@ -49,8 +49,8 @@
     "redux-thunk": "^2.4.2"
   },
   "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-core": "^6.26.3",
     "babel-jest": "^29.3.0",