diff --git a/.stylelintignore b/.stylelintignore deleted file mode 100644 index 8688292..0000000 --- a/.stylelintignore +++ /dev/null @@ -1 +0,0 @@ -client/src/**/*.js diff --git a/client/src/bundles/bundle.scss b/client/src/bundles/bundle.scss index dea47a2..7c948be 100755 --- a/client/src/bundles/bundle.scss +++ b/client/src/bundles/bundle.scss @@ -2,8 +2,8 @@ @import "variables"; // Import all of your SCSS stylesheets using relative paths from "components" -@import "../components/LoginSession/LoginSession.scss"; -@import "../components/SessionManagerField/SessionManagerField.scss"; +@import "../components/LoginSession/LoginSession"; +@import "../components/SessionManagerField/SessionManagerField"; // Import any legacy SCSS stylesheets // e.g. @import '../styles/MyComponent-ModelAdmin-legacy.scss diff --git a/package.json b/package.json index 70e20ad..5f90fe7 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "css": "WEBPACK_CHILD=css npm run build", "test": "jest", "coverage": "jest --coverage", - "lint": "eslint client/src && yarn lint-sass", + "lint": "yarn lint-js && yarn lint-sass", "lint-js": "eslint client/src", "lint-js-fix": "eslint client/src --fix", "lint-sass": "stylelint client/src" @@ -32,7 +32,7 @@ }, "devDependencies": { "@babel/runtime": "^7.20.1", - "@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-jest": "^29.3.0", diff --git a/yarn.lock b/yarn.lock index f53dad5..9d947e3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1574,10 +1574,10 @@ resolved "https://registry.yarnpkg.com/@sect/modernizr-loader/-/modernizr-loader-1.0.5.tgz#512afc60c715cd658fdffab244123661e1339083" integrity sha512-L8y2BTVeLtdSe1XzBcD2DOlc+7fR7Z/uNdhsKvf3d3x3gmEKz9sfl2wJ3VzFhEd+a/O6qgacuhbziphG2p4s8g== -"@silverstripe/eslint-config@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@silverstripe/eslint-config/-/eslint-config-1.2.1.tgz#17ed5e955308a4a89e87f5090df66ca1e8ea462d" - integrity sha512-T4Lz1aZEDLxRpSNe4EgEmLKPfofxba0p0+YkL/AOD8VM/sng7VM9vKwMoqICbsUGvNoymHfeWtARlCa575O4PA== +"@silverstripe/eslint-config@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@silverstripe/eslint-config/-/eslint-config-1.3.0.tgz#fa88f47cacd6103f6b759d81e1d86f9e93799413" + integrity sha512-Q3+sQKO1ysyMLhJ91kOl2LqJhQICfHFeqMx09EH0xx3dRHgjsQvqHIzVWEzPkM/l7D79m+Ma/WBnon30S7TVlA== dependencies: eslint "^8.26.0" eslint-config-airbnb "^19.0.4"