Merge branch 'main' into css_modules_remove_flag_buttongroup

primer · Dec 4, 2024 · ef4743e · ef4743e
2 parents 4d77a42 + 9885564
commit ef4743e
Show file tree

Hide file tree

Showing 36 changed files with 548 additions and 395 deletions.
diff --git a/.changeset/large-grasshoppers-work.md b/.changeset/large-grasshoppers-work.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": minor
+---
+
+Remove the CSS modules feature flag from Checkbox
diff --git a/.changeset/slow-spoons-peel.md b/.changeset/slow-spoons-peel.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": minor
+---
+
+Update `Token`, `IssueLabelToken`, `AvatarToken` components to use CSS Modules
diff --git a/.changeset/soft-bananas-behave.md b/.changeset/soft-bananas-behave.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": minor
+---
+
+Update FormControl sub-components to use new styled components format for migration
diff --git a/.github/workflows/consumer_test.yml b/.github/workflows/consumer_test.yml
diff --git a/examples/app-router/package.json b/examples/app-router/package.json
@@ -15,7 +15,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "styled-components": "5.x",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   },
   "devDependencies": {
     "@next/eslint-plugin-next": "14.1.0",

diff --git a/examples/codesandbox/package.json b/examples/codesandbox/package.json
@@ -25,7 +25,7 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.7",
     "styled-components": "5.x",
-    "typescript": "^5.6.3",
+    "typescript": "^5.7.2",
     "vite": "^5.2.14"
   }
 }
diff --git a/examples/consumer-test/App.tsx b/examples/consumer-test/App.tsx
diff --git a/examples/consumer-test/README.md b/examples/consumer-test/README.md
diff --git a/examples/consumer-test/package.json b/examples/consumer-test/package.json
diff --git a/examples/consumer-test/tsconfig.json b/examples/consumer-test/tsconfig.json
diff --git a/examples/theming/package.json b/examples/theming/package.json
@@ -17,7 +17,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "styled-components": "5.x",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   },
   "devDependencies": {
     "@next/eslint-plugin-next": "14.1.0",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
     "rimraf": "5.0.5",
     "size-limit": "11.1.5",
     "stylelint": "16.9.0",
-    "typescript": "5.6.3"
+    "typescript": "^5.7.2"
   },
   "optionalDependencies": {
     "@rollup/rollup-linux-x64-gnu": "^4.9.6"
@@ -93,5 +93,6 @@
       "webpack": false,
       "running": false
     }
-  ]
+  ],
+  "packageManager": "npm@10.9.1+sha512.c89530d37c4baa38afd43e76a077a84b9aa63840b986426584fd5c5a54ab0a0b21bb1595c851042b733784b0b43706d36a494b4d8ae1a086a762cb8d3f95942a"
 }
diff --git a/packages/postcss-preset-primer/package.json b/packages/postcss-preset-primer/package.json
@@ -29,6 +29,6 @@
     "postcss": "^8.4.41",
     "postcss-custom-properties-fallback": "^1.0.2",
     "postcss-mixins": "^11.0.1",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   }
 }
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -201,7 +201,7 @@
     "terser": "5.36.0",
     "ts-toolbelt": "9.6.0",
     "tsx": "4.7.0",
-    "typescript": "^5.6.3",
+    "typescript": "^5.7.2",
     "typescript-plugin-css-modules": "5.1.0",
     "unist-util-find": "3.0.0",
     "unist-util-find-before": "4.0.0",