Merge branch '3' into 4

silverstripe · May 1, 2024 · b1063fe · b1063fe
2 parents eb8317d + 9b15c80
commit b1063fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
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
@@ -9,12 +9,12 @@
     "build": "yarn && yarn lint && rm -rf client/dist/* && NODE_ENV=production webpack --mode production --bail --progress",
     "dev": "NODE_ENV=development webpack --progress",
     "watch": "NODE_ENV=development webpack --watch --progress",
-    "lint": "eslint client/src/js && sass-lint client/src/styles"
+    "lint": "eslint client/src/js && stylelint client/src/styles"
   },
   "dependencies": {},
   "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');