Chore/upstream 202604#17
Merged
Merged
Conversation
Sync with upstream Tailwind Plus Syntax template (commit 0e86a10). Stack: - next 14 -> 16.2.4 (webpack mode via --webpack flag) - react / react-dom 18 -> 19.2.4 - tailwindcss 3 -> 4.2.4 (CSS-first @theme config) - @markdoc/next.js 0.3 -> 0.5 (nextjsExports: ['revalidate']) - eslint 8 -> 9 (flat config) - @headlessui/react, next-themes, flexsearch, prettier-plugin-tailwindcss bumps Tailwind v4 migration: - tailwind.css now @import 'tailwindcss' + @plugin + @theme blocks (font-proxyma and container-8xl preserved) - prism.css uses var(--color-*) instead of theme() - delete tailwind.config.ts (replaced by CSS @theme) - delete autoprefixer (bundled in v4) - class sweep: bg-gradient-to-* -> bg-linear-to-*, backdrop-blur -> backdrop-blur-sm, flex-grow -> grow, break-words -> wrap-break-word, outline-none -> outline-hidden, theme(colors.*) -> var(--color-*) Drop @svgr/webpack, convert SVG icons to TSX: - 30 used SVGs converted to React components in src/components/icons/*Icon.tsx - SvgIcon.jsx -> SvgIcon.tsx (typed registry) - search.svg -> SearchGlyphIcon.tsx (avoid name clash with Search.tsx) - next.config.mjs no longer needs custom webpack block - prismjs and fathom-client kept (Fence.tsx requires + Fathom analytics)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Status
chore/upstream-202604, checked out by user)@svgr/webpack,autoprefixer; bumped next 16.2.2 → 16.2.4 to clear security advisory)tailwind.csswith@theme/@plugin,prism.csstheme()→var(), deletedtailwind.config.ts, preservedfont-proxymaand--container-8xl)/tmp/svg-convert/convert.mjs) that lifts inline<defs><style>.a{...}</style>rules onto elements, strips XML declarations, titles, descs, xlink/svgjs namespaces, then emits typed React components matching theInstallationIcon.tsxconvention ((props: React.ComponentPropsWithoutRef<'svg'>) => <svg ...{...props}>).*Icon.tsxfiles insrc/components/icons/.search.svg→SearchGlyphIcon.tsxto avoid clashing with the existingSearchIconinSearch.tsx.SvgIcon.jsx→SvgIcon.tsxwith a typedIconNameunion; registry key'search'still maps for docs{% icon name="search" /%}..svgfiles (kept the unused ones for follow-up cleanup).next.config.mjs(no webpack block, addednextjsExports: ['revalidate'])tsc --noEmitclean, ESLint clean, added onereact-hooks/immutabilitydisable inSearch.tsxfor theautocompleteself-reference insidenavigate)npm run build→ all 72 routes generated successfullynpm run dev→ home (200, 110KB) and/start-guide/how-to-write-markdown-notes(200, 114KB) renderfont-proxymaclass present in HTMLM10.546…rendered twice on a docs page (matches the two{% icon name="cog" /%}markdown calls)chore/upstream-202604Outcome
Completed. Notes:
nextto16.2.4(upstream pinned16.2.2) to clear a high-severity advisory.next's nestedpostcss. The only suggested "fix" is downgrading next to 9.3.3 (absurd). Accepted as-is until a future Next patch ships..svgfiles remain insrc/components/icons/. Out of scope for this PR; safe to delete in a follow-up cleanup PR.Fence.tsx'srequire('prismjs/components/prism-bash')may be redundant since v2 ofprism-react-rendererincludes a base bundle. Did not verify; left untouched per "leave working code alone" principle.chore/upstream-202604is local. Open a PR when ready.Files changed