Merge branch 'main' into fix/use-local-name-for-changes

joshblack · web-flow · commit 88feb23f7131 · 2024-09-23T15:44:37.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # eslint-plugin-primer-react
 
+## 6.1.1
+
+### Patch Changes
+
+- [#237](https://github.com/primer/eslint-plugin-primer-react/pull/237) [`f072227`](https://github.com/primer/eslint-plugin-primer-react/commit/f072227b4e698660fda3c2416ed8a629e8e48a79) Thanks [@lukasoppermann](https://github.com/lukasoppermann)! - no-system-props: Add `bg` prop to `ProgressBar.Item`
+
 ## 6.1.0
 
 ### Minor Changes
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-primer-react",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "description": "ESLint rules for Primer React",
   "main": "src/index.js",
   "scripts": {
diff --git a/src/rules/no-system-props.js b/src/rules/no-system-props.js
@@ -44,6 +44,7 @@ const excludedComponentProps = new Map([
   ['PageLayout.Pane', new Set(['padding', 'position', 'width'])],
   ['PageLayout.Content', new Set(['padding', 'width'])],
   ['ProgressBar', new Set(['bg'])],
+  ['ProgressBar.Item', new Set(['bg'])],
   ['PointerBox', new Set(['bg'])],
   ['Truncate', new Set(['maxWidth'])],
   ['Stack', new Set(['padding', 'gap'])],

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "eslint-plugin-primer-react",`
`3`		`- "version": "6.1.0",`
	`3`	`+ "version": "6.1.1",`
`4`	`4`	`"description": "ESLint rules for Primer React",`
`5`	`5`	`"main": "src/index.js",`
`6`	`6`	`"scripts": {`