Merge pull request #315 from creative-commoners/pulls/2/merge-up

MNT Fix merge-up
silverstripe · Jun 19, 2024 · f2672d7 · f2672d7
2 parents 52c3e12 + eff1892
commit f2672d7
Show file tree

Hide file tree

Showing 2 changed files with 430 additions and 765 deletions.
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 && stylelint **/client/src/**/*.scss"
+    "lint": "eslint client/src && stylelint client/src"
   },
   "repository": {
     "type": "git",
@@ -49,7 +49,7 @@
     "redux-thunk": "^2.4.2"
   },
   "devDependencies": {
-    "@silverstripe/eslint-config": "^1.2.1",
+    "@silverstripe/eslint-config": "^1.3.0",
     "@silverstripe/webpack-config": "^2.1.0",
     "@testing-library/react": "^14.0.0",
     "babel-core": "^6.26.3",