Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .changeset/early-rats-float.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"tinacms-authjs": patch
---

* Bumped react, react-dom, next and next-auth dev dependencies
* Allow Next 15 for peer dependencies for tinacms-authjs
* Allow React 19 for peer dependencies for tinacms-authjs
* Updated the self-hosted example to be ESM-compatible
2 changes: 1 addition & 1 deletion examples/tina-self-hosted-demo/next-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
13 changes: 2 additions & 11 deletions examples/tina-self-hosted-demo/next.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const path = require('path')

module.exports = {
/** @type {import('next').NextConfig} */
export default {
eslint: {
// Warning: This allows production builds to successfully complete even if
// your project has ESLint errors.
Expand All @@ -14,19 +13,11 @@ module.exports = {
ignoreBuildErrors: true,
},
webpack(config) {
// hack to fix hooks error caused by multiple react versions
config.resolve.alias['react'] = path.resolve(
__dirname,
'.',
'node_modules',
'react'
)
config.module.rules.push({
test: /\.svg$/i,
issuer: /\.[jt]sx?$/,
use: ['@svgr/webpack'],
})

return config
},
async rewrites() {
Expand Down
2 changes: 1 addition & 1 deletion examples/tina-self-hosted-demo/postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
plugins: {
'postcss-import': {},
'tailwindcss/nesting': {},
Expand Down
10 changes: 5 additions & 5 deletions examples/tina-self-hosted-demo/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const colors = require('tailwindcss/colors')
const defaultTheme = require('tailwindcss/defaultTheme')
import colors from 'tailwindcss/colors'
import defaultTheme from 'tailwindcss/defaultTheme'
import typography from '@tailwindcss/typography'

module.exports = {
mode: 'jit',
export default {
content: [
'./pages/**/*.{js,ts,jsx,tsx}',
'./components/**/*.{js,ts,jsx,tsx}',
Expand Down Expand Up @@ -228,5 +228,5 @@ module.exports = {
variants: {
extend: { typography: ['tint', 'dark', 'primary'] },
},
plugins: [require('@tailwindcss/typography')],
plugins: [typography],
}
2 changes: 1 addition & 1 deletion examples/tina-self-hosted-demo/tina/tina-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions packages/tinacms-authjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
"devDependencies": {
"@tinacms/datalayer": "workspace:*",
"@tinacms/scripts": "workspace:*",
"next": "14.2.35",
"next-auth": "4.24.7",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"next": "^15.5.9",
"next-auth": "^4.24.13",
"react": "^19.2.3",
"react-dom": "^19.2.3",
"tinacms": "workspace:*",
"typescript": "^5.7.3"
},
"peerDependencies": {
"next": "^12.2.5 || ^13 || ^14",
"next": "^12.2.5 || ^13 || ^14 || ^15",
"next-auth": "^4.22.1",
"react": "^17.0.2 || ^18",
"react-dom": "^17.0.2 || ^18",
"react": "^17.0.2 || ^18 || ^19",
"react-dom": "^17.0.2 || ^18 || ^19",
"tinacms": "workspace:*"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion playwright/tina-playwright/tina/tina-lock.json

Large diffs are not rendered by default.

776 changes: 606 additions & 170 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

Loading