Merge branch 'next' into feat/resolve-import-tree

Author: RobinMalfait

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Ensure `flex` is suggested ([#15014](https://github.com/tailwindlabs/tailwindcss/pull/15014))
 - _Upgrade (experimental)_: Resolve imports from passed CSS file(s) ([#15010](https://github.com/tailwindlabs/tailwindcss/pull/15010))
 
 ### Changed

packages/tailwindcss/src/__snapshots__/intellisense.test.ts.snap

@@ -3718,6 +3718,7 @@ exports[`getClassList 1`] = `
   "fill-transparent/95",
   "fill-transparent/100",
   "fixed",
+  "flex",
   "flex-auto",
   "flex-col",
   "flex-col-reverse",

packages/tailwindcss/src/utilities.ts

@@ -812,6 +812,7 @@ export function createUtilities(theme: Theme) {
   staticUtility('table-row-group', [['display', 'table-row-group']])
   staticUtility('table-row', [['display', 'table-row']])
   staticUtility('flow-root', [['display', 'flow-root']])
+  staticUtility('flex', [['display', 'flex']])
   staticUtility('grid', [['display', 'grid']])
   staticUtility('inline-grid', [['display', 'inline-grid']])
   staticUtility('contents', [['display', 'contents']])
@@ -932,10 +933,7 @@ export function createUtilities(theme: Theme) {
   // generate `flex: 1`. Our `functionalUtility` helper can't handle two properties
   // using the same namespace, so we handle this one manually.
   utilities.functional('flex', (candidate) => {
-    if (!candidate.value) {
-      if (candidate.modifier) return
-      return [decl('display', 'flex')]
-    }
+    if (!candidate.value) return
 
     if (candidate.value.kind === 'arbitrary') {
       if (candidate.modifier) return