Skip to content

Upgrade TinaCMS to 3.6.x#575

Closed
jamiefolsom wants to merge 5 commits intodevelopfrom
feature/tinacms-upgrade-3.6
Closed

Upgrade TinaCMS to 3.6.x#575
jamiefolsom wants to merge 5 commits intodevelopfrom
feature/tinacms-upgrade-3.6

Conversation

@jamiefolsom
Copy link
Copy Markdown
Member

@jamiefolsom jamiefolsom commented Mar 16, 2026

Summary

  • Upgrade tinacms 2.7.x → 3.6.x, @tinacms/cli 1.9.x → 2.1.x, @tinacms/datalayer 1.3.x → 2.0.x, tinacms-authjs 10.x → 20.x, next-tinacms-s3 10.x → 20.x
  • Add react-dnd and react-dnd-html5-backend as explicit deps (dropped as transitive deps in tinacms 3.x, still needed by @udecode/plate-dnd)
  • Add next-auth as explicit dep (moved from direct to peer dep in tinacms-authjs 20.x)
  • Externalize next in netlify.toml so esbuild doesn't bundle Next.js framework modules in the Netlify function
  • Merge dev-workflow branch for local testing

Test plan

  • npm run vitest and npm run test-config pass
  • Dev server starts with juel site (dev.sh juel --no-match)
  • TinaCMS dev server initializes and generates types
  • Netlify function loads and handles TinaCMS API requests (200s)
  • Astro renders pages (home, posts, individual posts)
  • Verify TinaCMS admin UI loads and content editing works on a deployed preview
  • Test with additional sites (atlas, uss, padp)

Includes #574

Fix build.content.mjs:
- Support GITHUB_BRANCH env var for cloning content repos
- Remove content/ before copying to prevent merge artifacts

Add scripts/dev.sh - single-command local dev workflow:
- Checks out the exact commit deployed on the Netlify site
- Unlinks/relinks Netlify site to ensure correct env vars
- Clears process env vars that override site settings
- Backs up .env to let Netlify site vars take priority
- Cleans generated content, .tina/, and i18n files
- Sets USE_CONTENT_CACHE=true to avoid loader timeouts
- Kills stale processes on ports 4321/9000
- Starts netlify dev

Usage: npm run dev -- <site> (sites defined in scripts/sites.json)
Queries Netlify API for all CDP sites the user has access to and
writes scripts/sites.json. Developers can then edit the file to
use shorter names.
tinacms ^2.7.2 → ^3.6.1
@tinacms/cli ^1.9.2 → ^2.1.9
@tinacms/datalayer ^1.3.14 → ^2.0.12
tinacms-authjs ^10.0.2 → ^20.0.1
next-tinacms-s3 ^10.0.2 → ^20.0.1
tinacms 3.x dropped react-dnd and react-dnd-html5-backend as transitive
deps but @udecode/plate-dnd still needs them. tinacms-authjs 20.x moved
next-auth from direct to peer dep. Externalize next in netlify.toml so
esbuild doesn't try to bundle Next.js framework modules.
@netlify
Copy link
Copy Markdown

netlify bot commented Mar 16, 2026

Deploy Preview for universities-studying-slavery failed. Why did it fail? →

Name Link
🔨 Latest commit 0bf6995
🔍 Latest deploy log https://app.netlify.com/projects/universities-studying-slavery/deploys/69b869984aae5700081d7aa5

@netlify
Copy link
Copy Markdown

netlify bot commented Mar 16, 2026

Deploy Preview for juel-staging failed. Why did it fail? →

Name Link
🔨 Latest commit 0bf6995
🔍 Latest deploy log https://app.netlify.com/projects/juel-staging/deploys/69b86998d25e8b0008e7830f

@netlify
Copy link
Copy Markdown

netlify bot commented Mar 16, 2026

Deploy Preview for padp-staging failed. Why did it fail? →

Name Link
🔨 Latest commit 0bf6995
🔍 Latest deploy log https://app.netlify.com/projects/padp-staging/deploys/69b86998448524000823b328

@netlify
Copy link
Copy Markdown

netlify bot commented Mar 16, 2026

Deploy Preview for juel-ancestry failed. Why did it fail? →

Name Link
🔨 Latest commit 0bf6995
🔍 Latest deploy log https://app.netlify.com/projects/juel-ancestry/deploys/69b869987a76380008891d8d

@netlify
Copy link
Copy Markdown

netlify bot commented Mar 16, 2026

Deploy Preview for gbof-c19nyc-staging failed. Why did it fail? →

Name Link
🔨 Latest commit 0bf6995
🔍 Latest deploy log https://app.netlify.com/projects/gbof-c19nyc-staging/deploys/69b86998448524000823b324

@netlify
Copy link
Copy Markdown

netlify bot commented Mar 16, 2026

Deploy Preview for registro-project failed. Why did it fail? →

Name Link
🔨 Latest commit 0bf6995
🔍 Latest deploy log https://app.netlify.com/projects/registro-project/deploys/69b869983087a2000893d2da

@netlify
Copy link
Copy Markdown

netlify bot commented Mar 16, 2026

Deploy Preview for juel-life failed. Why did it fail? →

Name Link
🔨 Latest commit 0bf6995
🔍 Latest deploy log https://app.netlify.com/projects/juel-life/deploys/69b86998a3678a0008ac1eaf

@netlify
Copy link
Copy Markdown

netlify bot commented Mar 16, 2026

Deploy Preview for libertos failed. Why did it fail? →

Name Link
🔨 Latest commit 0bf6995
🔍 Latest deploy log https://app.netlify.com/projects/libertos/deploys/69b869980540ce000841a8c0

@netlify
Copy link
Copy Markdown

netlify bot commented Mar 16, 2026

Deploy Preview for gamepossible failed. Why did it fail? →

Name Link
🔨 Latest commit 0bf6995
🔍 Latest deploy log https://app.netlify.com/projects/gamepossible/deploys/69b86998ba40850007846850

@netlify
Copy link
Copy Markdown

netlify bot commented Mar 16, 2026

Deploy Preview for pss-scavenger-hunt failed. Why did it fail? →

Name Link
🔨 Latest commit 0bf6995
🔍 Latest deploy log https://app.netlify.com/projects/pss-scavenger-hunt/deploys/69b8699836120100084e208b

@jamiefolsom jamiefolsom requested a review from ajolipa March 16, 2026 20:36
@jamiefolsom jamiefolsom mentioned this pull request Mar 16, 2026
5 tasks
@jamiefolsom
Copy link
Copy Markdown
Member Author

Superseded by #577 which includes the TinaCMS 3.6.x upgrade along with Clerk RBAC.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant