Merge branch 'main' into al-trailingaction-css

primer · Dec 16, 2024 · 1b003c0 · 1b003c0
2 parents cb95ff9 + eedbdbd
commit 1b003c0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/.changeset/kind-phones-drop.md b/.changeset/kind-phones-drop.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+Move Select component css module feature flag to ga
diff --git a/.changeset/plenty-tools-count.md b/.changeset/plenty-tools-count.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+Move Stack component css module feature flag to ga
diff --git a/packages/react/src/Select/Select.tsx b/packages/react/src/Select/Select.tsx
@@ -16,7 +16,7 @@ export type SelectProps = Omit<
   placeholder?: string
 }
 
-const CSS_MODULES_FEATURE_FLAG = 'primer_react_css_modules_staff'
+const CSS_MODULES_FEATURE_FLAG = 'primer_react_css_modules_ga'
 
 const arrowRightOffset = '4px'
 

diff --git a/packages/react/src/Stack/Stack.tsx b/packages/react/src/Stack/Stack.tsx
@@ -7,7 +7,7 @@ import {toggleStyledComponent} from '../internal/utils/toggleStyledComponent'
 import {useFeatureFlag} from '../FeatureFlags'
 import {clsx} from 'clsx'
 
-const CSS_MODULE_FEATURE_FLAG = 'primer_react_css_modules_staff'
+const CSS_MODULE_FEATURE_FLAG = 'primer_react_css_modules_ga'
 
 const StyledStack = toggleStyledComponent(
   CSS_MODULE_FEATURE_FLAG,