Upgrade to redwood v8

This commit is contained in:
Ahmed Al-Taiar
2024-09-05 12:07:22 -04:00
parent 3d031ca73c
commit 97db911c48
21 changed files with 2262 additions and 5986 deletions

View File

@ -1,8 +1,6 @@
// More info at https://redwoodjs.com/docs/project-configuration-dev-test-build // More info at https://redwoodjs.com/docs/project-configuration-dev-test-build
const config = { export default {
rootDir: '../', rootDir: '../',
preset: '@redwoodjs/testing/config/jest/api', preset: '@redwoodjs/testing/config/jest/api',
} }
module.exports = config

View File

@ -5,10 +5,10 @@
"dependencies": { "dependencies": {
"@fastify/cors": "^9.0.1", "@fastify/cors": "^9.0.1",
"@fastify/rate-limit": "^9.1.0", "@fastify/rate-limit": "^9.1.0",
"@redwoodjs/api": "7.7.4", "@redwoodjs/api": "8.0.0",
"@redwoodjs/api-server": "7.7.4", "@redwoodjs/api-server": "8.0.0",
"@redwoodjs/auth-dbauth-api": "7.7.4", "@redwoodjs/auth-dbauth-api": "8.0.0",
"@redwoodjs/graphql-server": "7.7.4", "@redwoodjs/graphql-server": "8.0.0",
"@tus/file-store": "^1.4.0", "@tus/file-store": "^1.4.0",
"@tus/server": "^1.7.0", "@tus/server": "^1.7.0",
"graphql-scalars": "^1.23.0", "graphql-scalars": "^1.23.0",

View File

@ -1,6 +1,6 @@
import type { APIGatewayProxyEvent, Context } from 'aws-lambda' import type { APIGatewayProxyEvent, Context } from 'aws-lambda'
import { isProduction } from '@redwoodjs/api/dist/logger' import { isProduction } from '@redwoodjs/api/logger'
import { import {
DbAuthHandler, DbAuthHandler,
PasswordValidationError, PasswordValidationError,

View File

@ -1,6 +1,6 @@
import type { FastifyReply } from 'fastify' import type { FastifyReply } from 'fastify'
import { isProduction } from '@redwoodjs/api/dist/logger' import { isProduction } from '@redwoodjs/api/logger'
export const setCorsHeaders = (res: FastifyReply) => { export const setCorsHeaders = (res: FastifyReply) => {
res.raw.setHeader( res.raw.setHeader(

View File

@ -10,12 +10,15 @@ import { logger } from 'src/lib/logger'
/* /*
* Instance of the Prisma Client * Instance of the Prisma Client
*/ */
export const db = new PrismaClient({
log: emitLogLevels(['info', 'warn', 'error']), const prismaClient = new PrismaClient({
log: emitLogLevels(['info', 'warn', 'error'])
}) })
handlePrismaLogging({ handlePrismaLogging({
db, db: prismaClient,
logger, logger,
logLevels: ['info', 'warn', 'error'], logLevels: ['info', 'warn', 'error'],
}) })
export const db = prismaClient

View File

@ -2,7 +2,7 @@
import type { Server } from '@tus/server' import type { Server } from '@tus/server'
import type { FastifyReply, FastifyRequest } from 'fastify' import type { FastifyReply, FastifyRequest } from 'fastify'
import { isProduction } from '@redwoodjs/api/dist/logger' import { isProduction } from '@redwoodjs/api/logger'
import { ValidationError } from '@redwoodjs/graphql-server' import { ValidationError } from '@redwoodjs/graphql-server'
import { decryptAndValidateSession, validateSessionCookie } from 'src/lib/auth' import { decryptAndValidateSession, validateSessionCookie } from 'src/lib/auth'

View File

@ -4,7 +4,7 @@ import RateLimit from '@fastify/rate-limit'
import { FileStore } from '@tus/file-store' import { FileStore } from '@tus/file-store'
import { Server } from '@tus/server' import { Server } from '@tus/server'
import { isProduction } from '@redwoodjs/api/dist/logger' import { isProduction } from '@redwoodjs/api/logger'
import { createServer } from '@redwoodjs/api-server' import { createServer } from '@redwoodjs/api-server'
import { logger } from 'src/lib/logger' import { logger } from 'src/lib/logger'

View File

@ -1,6 +1,6 @@
import type { QueryResolvers, MutationResolvers } from 'types/graphql' import type { QueryResolvers, MutationResolvers } from 'types/graphql'
import { isProduction } from '@redwoodjs/api/dist/logger' import { isProduction } from '@redwoodjs/api/logger'
import { ValidationError } from '@redwoodjs/graphql-server' import { ValidationError } from '@redwoodjs/graphql-server'
import { db } from 'src/lib/db' import { db } from 'src/lib/db'

View File

@ -3,9 +3,9 @@
"noEmit": true, "noEmit": true,
"allowJs": true, "allowJs": true,
"esModuleInterop": true, "esModuleInterop": true,
"target": "esnext", "target": "ES2023",
"module": "esnext", "module": "Node16",
"moduleResolution": "node", "moduleResolution": "Node16",
"skipLibCheck": false, "skipLibCheck": false,
"rootDirs": [ "rootDirs": [
"./src", "./src",

View File

@ -8,4 +8,4 @@ const config = {
documents: './web/src/**/!(*.d).{ts,tsx,js,jsx}', documents: './web/src/**/!(*.d).{ts,tsx,js,jsx}',
} }
module.exports = config export default config

View File

@ -2,7 +2,7 @@
// Each side, e.g. ./web/ and ./api/ has specific config that references this root // Each side, e.g. ./web/ and ./api/ has specific config that references this root
// More info at https://redwoodjs.com/docs/project-configuration-dev-test-build // More info at https://redwoodjs.com/docs/project-configuration-dev-test-build
module.exports = { export default {
rootDir: '.', rootDir: '.',
projects: ['<rootDir>/{*,!(node_modules)/**/}/jest.config.js'], projects: ['<rootDir>/{*,!(node_modules)/**/}/jest.config.js'],
} }

View File

@ -7,9 +7,9 @@
] ]
}, },
"devDependencies": { "devDependencies": {
"@redwoodjs/auth-dbauth-setup": "7.7.4", "@redwoodjs/auth-dbauth-setup": "8.0.0",
"@redwoodjs/core": "7.7.4", "@redwoodjs/core": "8.0.0",
"@redwoodjs/project-config": "7.7.4", "@redwoodjs/project-config": "8.0.0",
"prettier-plugin-tailwindcss": "0.4.1" "prettier-plugin-tailwindcss": "0.4.1"
}, },
"eslintConfig": { "eslintConfig": {
@ -22,5 +22,5 @@
"prisma": { "prisma": {
"seed": "yarn rw exec seed" "seed": "yarn rw exec seed"
}, },
"packageManager": "yarn@4.3.0" "packageManager": "yarn@4.4.0"
} }

View File

@ -1,6 +1,6 @@
// https://prettier.io/docs/en/options.html // https://prettier.io/docs/en/options.html
/** @type {import('prettier').RequiredOptions} */ /** @type {import('prettier').RequiredOptions} */
module.exports = { export default {
trailingComma: 'es5', trailingComma: 'es5',
bracketSpacing: true, bracketSpacing: true,
tabWidth: 2, tabWidth: 2,
@ -16,5 +16,5 @@ module.exports = {
}, },
], ],
tailwindConfig: './web/config/tailwind.config.js', tailwindConfig: './web/config/tailwind.config.js',
plugins: [require('prettier-plugin-tailwindcss')], plugins: [await import('prettier-plugin-tailwindcss')],
} }

View File

@ -3,9 +3,9 @@
"noEmit": true, "noEmit": true,
"allowJs": true, "allowJs": true,
"esModuleInterop": true, "esModuleInterop": true,
"target": "esnext", "target": "ES2023",
"module": "esnext", "module": "Node16",
"moduleResolution": "node", "moduleResolution": "Node16",
"paths": { "paths": {
"$api/*": [ "$api/*": [
"../api/*" "../api/*"

View File

@ -1,8 +1,6 @@
// More info at https://redwoodjs.com/docs/project-configuration-dev-test-build // More info at https://redwoodjs.com/docs/project-configuration-dev-test-build
const config = { export default {
rootDir: '../', rootDir: '../',
preset: '@redwoodjs/testing/config/jest/web', preset: '@redwoodjs/testing/config/jest/web',
} }
module.exports = config

View File

@ -14,10 +14,10 @@
"@icons-pack/react-simple-icons": "^10.0.0", "@icons-pack/react-simple-icons": "^10.0.0",
"@mdi/js": "^7.4.47", "@mdi/js": "^7.4.47",
"@mdi/react": "^1.6.1", "@mdi/react": "^1.6.1",
"@redwoodjs/auth-dbauth-web": "7.7.4", "@redwoodjs/auth-dbauth-web": "8.0.0",
"@redwoodjs/forms": "7.7.4", "@redwoodjs/forms": "8.0.0",
"@redwoodjs/router": "7.7.4", "@redwoodjs/router": "8.0.0",
"@redwoodjs/web": "7.7.4", "@redwoodjs/web": "8.0.0",
"@uppy/compressor": "^2.0.1", "@uppy/compressor": "^2.0.1",
"@uppy/core": "^4.1.0", "@uppy/core": "^4.1.0",
"@uppy/dashboard": "^4.0.2", "@uppy/dashboard": "^4.0.2",
@ -27,11 +27,11 @@
"@uppy/react": "^4.0.1", "@uppy/react": "^4.0.1",
"@uppy/tus": "^4.0.0", "@uppy/tus": "^4.0.0",
"humanize-string": "2.1.0", "humanize-string": "2.1.0",
"react": "18.2.0", "react": "18.3.1",
"react-dom": "18.2.0" "react-dom": "18.3.1"
}, },
"devDependencies": { "devDependencies": {
"@redwoodjs/vite": "7.7.4", "@redwoodjs/vite": "8.0.0",
"@types/react": "^18.2.55", "@types/react": "^18.2.55",
"@types/react-dom": "^18.2.19", "@types/react-dom": "^18.2.19",
"autoprefixer": "^10.4.20", "autoprefixer": "^10.4.20",

View File

@ -12,7 +12,7 @@ import type {
} from 'types/graphql' } from 'types/graphql'
import { TypedDocumentNode, useMutation } from '@redwoodjs/web' import { TypedDocumentNode, useMutation } from '@redwoodjs/web'
import { toast } from '@redwoodjs/web/dist/toast' import { toast } from '@redwoodjs/web/toast'
import Uploader from 'src/components/Uploader/Uploader' import Uploader from 'src/components/Uploader/Uploader'

View File

@ -1,4 +1,5 @@
import { Toaster } from '@redwoodjs/web/dist/toast' import { Toaster } from '@redwoodjs/web/toast'
import type { Toast } from '@redwoodjs/web/toast'
import ToastNotification from 'src/components/ToastNotification' import ToastNotification from 'src/components/ToastNotification'
@ -11,7 +12,7 @@ const ToasterWrapper = () => (
}} }}
gutter={8} gutter={8}
> >
{(t) => ( {(t: Toast) => (
<ToastNotification t={t} type={t.type} message={t.message.toString()} /> <ToastNotification t={t} type={t.type} message={t.message.toString()} />
)} )}
</Toaster> </Toaster>

View File

@ -6,7 +6,7 @@ import type { UploadResult, Meta } from '@uppy/core'
import { Dashboard } from '@uppy/react' import { Dashboard } from '@uppy/react'
import Tus from '@uppy/tus' import Tus from '@uppy/tus'
import { isProduction } from '@redwoodjs/api/dist/logger' import { isProduction } from '@redwoodjs/api/logger'
import '@uppy/core/dist/style.min.css' import '@uppy/core/dist/style.min.css'
import '@uppy/dashboard/dist/style.min.css' import '@uppy/dashboard/dist/style.min.css'

View File

@ -3,9 +3,9 @@
"noEmit": true, "noEmit": true,
"allowJs": true, "allowJs": true,
"esModuleInterop": true, "esModuleInterop": true,
"target": "esnext", "target": "ES2022",
"module": "esnext", "module": "ES2022",
"moduleResolution": "node", "moduleResolution": "Bundler",
"skipLibCheck": false, "skipLibCheck": false,
"rootDirs": [ "rootDirs": [
"./src", "./src",

8156
yarn.lock

File diff suppressed because it is too large Load Diff