Merge pull request #149 from wwnorton/stylelint-5

stylelint-config-norton v5
wwnorton · Jun 28, 2023 · bd89795 · bd89795
2 parents 69d6435 + ea5f94a
commit bd89795
Show file tree

Hide file tree

Showing 7 changed files with 1,259 additions and 949 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,13 +14,16 @@
     ]
   },
   "devDependencies": {
-    "conventional-changelog-conventionalcommits": "^5.0.0",
+    "conventional-changelog-conventionalcommits": "^6.1.0",
     "eslint": "^8.43.0",
-    "husky": "^7.0.4",
+    "husky": "^8.0.3",
     "lerna": "^7.1.1",
-    "lint-staged": "^12.5.0",
+    "lint-staged": "^13.2.3",
     "react": "^18.2.0",
-    "typescript": "^4.9.5",
+    "typescript": "^5.1.5",
     "vitest": "^0.32.2"
+  },
+  "engines": {
+    "node": ">= 16.13.0"
   }
 }
diff --git a/packages/stylelint-config-norton/package.json b/packages/stylelint-config-norton/package.json
@@ -27,11 +27,11 @@
     "test"
   ],
   "dependencies": {
-    "stylelint-config-standard": "^25.0.0",
-    "stylelint-config-standard-scss": "^3.0.0",
-    "stylelint-order": "^5.0.0"
+    "stylelint-config-standard": "^33.0.0",
+    "stylelint-config-standard-scss": "^9.0.0",
+    "stylelint-order": "^6.0.3"
   },
   "devDependencies": {
-    "stylelint": "^14.16.1"
+    "stylelint": "^15.5.0"
   }
 }
diff --git a/packages/stylelint-config-norton/src/css.js b/packages/stylelint-config-norton/src/css.js
@@ -2,7 +2,7 @@
 module.exports = {
 	extends: [
 		// https://github.com/stylelint/stylelint-config-standard
-		'stylelint-config-standard',
+		require.resolve('stylelint-config-standard'),
 
 		// Norton-specific overrides
 		require.resolve('./rules/accessibility'),

diff --git a/packages/stylelint-config-norton/src/scss.js b/packages/stylelint-config-norton/src/scss.js
@@ -2,7 +2,7 @@
 module.exports = {
 	extends: [
 		// https://github.com/stylelint-scss/stylelint-config-standard-scss
-		'stylelint-config-standard-scss',
+		require.resolve('stylelint-config-standard-scss'),
 
 		// Norton-specific overrides
 		require.resolve('./rules/accessibility'),

diff --git a/packages/stylelint-config-norton/test/fixtures/valid.css b/packages/stylelint-config-norton/test/fixtures/valid.css
@@ -42,8 +42,8 @@
 
 /* Flush single line comment */
 @media
-	screen and (min-resolution: 192dpi),
-	screen and (min-resolution: 2dppx) {
+	screen and (resolution >= 192dpi),
+	screen and (resolution >= 2dppx) {
 	.selector {
 		height: 10rem;
 		margin: 10px;

diff --git a/packages/stylelint-config-norton/test/fixtures/valid.scss b/packages/stylelint-config-norton/test/fixtures/valid.scss
@@ -1,5 +1,5 @@
-@import url('x.css');
-@import url('y.css');
+@import 'x.css';
+@import 'y.css';
 @forward './foo.scss';
 @use 'bootstrap' as bs;
 @use 'sass:color';
@@ -65,8 +65,8 @@
 
 /* Flush single line comment */
 @media
-	screen and (min-resolution: 192dpi),
-	screen and (min-resolution: 2dppx) {
+	screen and (resolution >= 192dpi),
+	screen and (resolution >= 2dppx) {
 	.selector {
 		height: 10rem;
 		margin: 10px;