Skip to content

Commit f86e0ed

Browse files
authored
feat!: upgrade minimum react, react-dom, @types/react and @types/react-dom versions to match exactly what Next.js is using, various dependency cleanup (#7106)
**BREAKING:** - Upgrades minimum supported @types/react version from npm:types-react@19.0.0-beta.2 to npm:types-react@19.0.0-rc.0 - Upgrades minimum supported @types/react-dom version from npm:types-react-dom@19.0.0-beta.2 to npm:types-react-dom@19.0.0-rc.0 - Upgrades minimum supported react and react-dom version from 19.0.0-rc-f994737d14-20240522 to 19.0.0-rc-6230622a1a-20240610
1 parent e4eb5eb commit f86e0ed

File tree

30 files changed

+8704
-7198
lines changed

30 files changed

+8704
-7198
lines changed

jest.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
/** @type {import('jest').Config} */ const baseJestConfig = {
1+
/** @type {import('jest').Config} */
2+
const baseJestConfig = {
23
extensionsToTreatAsEsm: ['.ts', '.tsx'],
34
setupFiles: ['<rootDir>/test/jest.setup.env.js'],
45
setupFilesAfterEnv: ['<rootDir>/test/jest.setup.js'],

package.json

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
"build:translations": "turbo build --filter translations",
4747
"build:ui": "turbo build --filter ui",
4848
"clean": "turbo clean",
49-
"clean:all": "node ./scripts/delete-recursively.js '@node_modules' 'media' '**/dist' '**/.cache' '**/.next' '**/.turbo' '**/tsconfig.tsbuildinfo' '**/payload*.tgz' '**/meta_*.json'",
50-
"clean:build": "node ./scripts/delete-recursively.js 'media' '**/dist' '**/.cache' '**/.next' '**/.turbo' '**/tsconfig.tsbuildinfo' '**/payload*.tgz' '**/meta_*.json'",
51-
"clean:cache": "node ./scripts/delete-recursively.js node_modules/.cache! packages/payload/node_modules/.cache! .next",
49+
"clean:all": "node ./scripts/delete-recursively.js '@node_modules' 'media/*' '**/dist/' '**/.cache/*' '**/.next/*' '**/.turbo/*' '**/tsconfig.tsbuildinfo' '**/payload*.tgz' '**/meta_*.json'",
50+
"clean:build": "node ./scripts/delete-recursively.js 'media/' '**/dist/' '**/.cache/' '**/.next/' '**/.turbo/' '**/tsconfig.tsbuildinfo' '**/payload*.tgz' '**/meta_*.json'",
51+
"clean:cache": "node ./scripts/delete-recursively.js node_modules/.cache! packages/payload/node_modules/.cache! .next/*",
5252
"dev": "cross-env NODE_OPTIONS=--no-deprecation node ./test/dev.js",
5353
"dev:generate-graphql-schema": "cross-env NODE_OPTIONS=--no-deprecation tsx ./test/generateGraphQLSchema.ts",
5454
"dev:generate-types": "cross-env NODE_OPTIONS=--no-deprecation tsx ./test/generateTypes.ts",
@@ -91,7 +91,7 @@
9191
},
9292
"devDependencies": {
9393
"@jest/globals": "29.7.0",
94-
"@next/bundle-analyzer": "^14.1.0",
94+
"@next/bundle-analyzer": "15.0.0-canary.53",
9595
"@payloadcms/eslint-config": "workspace:*",
9696
"@payloadcms/eslint-plugin": "workspace:*",
9797
"@payloadcms/live-preview-react": "workspace:*",
@@ -103,8 +103,8 @@
103103
"@types/minimist": "1.2.5",
104104
"@types/node": "20.12.5",
105105
"@types/prompts": "^2.4.5",
106-
"@types/react": "npm:types-react@19.0.0-beta.2",
107-
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2",
106+
"@types/react": "npm:types-react@19.0.0-rc.0",
107+
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.0",
108108
"@types/semver": "^7.5.3",
109109
"@types/shelljs": "0.8.15",
110110
"chalk": "^4.1.2",
@@ -120,43 +120,37 @@
120120
"execa": "5.1.1",
121121
"form-data": "3.0.1",
122122
"fs-extra": "10.1.0",
123-
"glob": "8.1.0",
124123
"globby": "11.1.0",
125124
"husky": "9.0.11",
126125
"jest": "29.7.0",
127126
"jest-environment-jsdom": "29.7.0",
128-
"json-schema-to-typescript": "11.0.3",
129127
"lint-staged": "15.2.7",
130128
"minimist": "1.2.8",
131129
"mongodb-memory-server": "^9.0",
132130
"next": "15.0.0-canary.53",
133131
"open": "^10.1.0",
134132
"p-limit": "^5.0.0",
135-
"pino": "8.15.0",
136-
"pino-pretty": "10.2.0",
137133
"playwright": "1.43.0",
138134
"playwright-core": "1.43.0",
139135
"prettier": "3.3.2",
140136
"prompts": "2.4.2",
141-
"react": "^19.0.0-rc-f994737d14-20240522",
142-
"react-dom": "^19.0.0-rc-f994737d14-20240522",
137+
"react": "^19.0.0-rc-6230622a1a-20240610",
138+
"react-dom": "^19.0.0-rc-6230622a1a-20240610",
143139
"rimraf": "3.0.2",
144140
"semver": "^7.5.4",
145141
"sharp": "0.32.6",
146142
"shelljs": "0.8.5",
147143
"slash": "3.0.0",
148144
"sort-package-json": "^2.10.0",
149-
"swc-plugin-transform-remove-imports": "^1.12.1",
150-
"tempy": "^1.0.1",
151-
"ts-node": "10.9.1",
152-
"tsx": "^4.7.1",
145+
"swc-plugin-transform-remove-imports": "1.14.0",
146+
"tempy": "1.0.1",
147+
"tsx": "4.16.2",
153148
"turbo": "^1.13.3",
154-
"typescript": "5.5.3",
155-
"uuid": "10.0.0"
149+
"typescript": "5.5.3"
156150
},
157151
"peerDependencies": {
158-
"react": "^19.0.0 || ^19.0.0-rc-f994737d14-20240522",
159-
"react-dom": "^19.0.0 || ^19.0.0-rc-f994737d14-20240522"
152+
"react": "^19.0.0 || ^19.0.0-rc-6230622a1a-20240610",
153+
"react-dom": "^19.0.0 || ^19.0.0-rc-6230622a1a-20240610"
160154
},
161155
"engines": {
162156
"node": "^18.20.2 || >=20.9.0",
@@ -168,8 +162,8 @@
168162
"domexception": "4"
169163
},
170164
"overrides": {
171-
"@types/react": "npm:types-react@19.0.0-beta.2",
172-
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2",
165+
"@types/react": "npm:types-react@19.0.0-rc.0",
166+
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.0",
173167
"copyfiles": "$copyfiles",
174168
"cross-env": "$cross-env",
175169
"dotenv": "$dotenv",
@@ -185,8 +179,8 @@
185179
}
186180
},
187181
"overrides": {
188-
"@types/react": "npm:types-react@19.0.0-beta.2",
189-
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2"
182+
"@types/react": "npm:types-react@19.0.0-rc.0",
183+
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.0"
190184
},
191185
"workspaces:": [
192186
"packages/*",

packages/db-postgres/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@payloadcms/eslint-config": "workspace:*",
5959
"@types/pg": "8.10.2",
6060
"@types/to-snake-case": "1.0.0",
61-
"esbuild": "^0.21.4",
61+
"esbuild": "0.23.0",
6262
"payload": "workspace:*"
6363
},
6464
"peerDependencies": {

packages/live-preview-react/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
},
3737
"devDependencies": {
3838
"@payloadcms/eslint-config": "workspace:*",
39-
"@types/react": "npm:types-react@19.0.0-beta.2",
40-
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2",
39+
"@types/react": "npm:types-react@19.0.0-rc.0",
40+
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.0",
4141
"payload": "workspace:*"
4242
},
4343
"peerDependencies": {
44-
"react": "^19.0.0 || ^19.0.0-rc-f994737d14-20240522",
45-
"react-dom": "^19.0.0 || ^19.0.0-rc-f994737d14-20240522"
44+
"react": "^19.0.0 || ^19.0.0-rc-6230622a1a-20240610",
45+
"react-dom": "^19.0.0 || ^19.0.0-rc-6230622a1a-20240610"
4646
},
4747
"publishConfig": {
4848
"exports": {
@@ -57,7 +57,7 @@
5757
"types": "./dist/index.d.ts"
5858
},
5959
"overrides": {
60-
"@types/react": "npm:types-react@19.0.0-beta.2",
61-
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2"
60+
"@types/react": "npm:types-react@19.0.0-rc.0",
61+
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.0"
6262
}
6363
}

packages/next/bundleScss.js

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import * as esbuild from 'esbuild'
2+
import fs from 'fs'
3+
import path from 'path'
4+
import { fileURLToPath } from 'url'
5+
const filename = fileURLToPath(import.meta.url)
6+
const dirname = path.dirname(filename)
7+
import { sassPlugin } from 'esbuild-sass-plugin'
8+
9+
// Bundle only the .scss files into a single css file
10+
await esbuild
11+
.build({
12+
entryPoints: ['src/esbuildEntry.ts'],
13+
bundle: true,
14+
minify: true,
15+
outdir: 'dist/prod',
16+
packages: 'external',
17+
plugins: [sassPlugin({ css: 'external' })],
18+
})
19+
.then(() => {
20+
fs.rename('dist/prod/esbuildEntry.css', 'dist/prod/styles.css', (err) => {
21+
if (err) console.error(`Error while renaming index.css: ${err}`)
22+
})
23+
24+
fs.unlink('dist/esbuildEntry.js', (err) => {
25+
if (err) console.error(`Error while deleting dist/esbuildEntry.js: ${err}`)
26+
})
27+
28+
fs.unlink('dist/prod/esbuildEntry.js', (err) => {
29+
if (err) console.error(`Error while deleting dist/prod/esbuildEntry.js: ${err}`)
30+
})
31+
32+
fs.unlink('dist/esbuildEntry.d.ts', (err) => {
33+
if (err) console.error(`Error while deleting dist/esbuildEntry.d.ts: ${err}`)
34+
})
35+
fs.unlink('dist/esbuildEntry.d.ts.map', (err) => {
36+
if (err) console.error(`Error while deleting dist/esbuildEntry.d.ts.map: ${err}`)
37+
})
38+
fs.unlink('dist/esbuildEntry.js.map', (err) => {
39+
if (err) console.error(`Error while deleting dist/esbuildEntry.js.map: ${err}`)
40+
})
41+
console.log('styles.css bundled successfully')
42+
})
43+
.catch((e) => {
44+
throw e
45+
})

packages/next/package.json

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
"dist"
5151
],
5252
"scripts": {
53-
"build": "rm -rf dist && rm -rf tsconfig.tsbuildinfo && pnpm copyfiles && pnpm build:types && pnpm build:swc && pnpm build:cjs && pnpm build:webpack",
53+
"build": "rm -rf dist && rm -rf tsconfig.tsbuildinfo && pnpm copyfiles && pnpm build:types && pnpm build:swc && pnpm build:cjs && pnpm build:esbuild",
5454
"build:cjs": "swc ./src/withPayload.js -o ./dist/cjs/withPayload.cjs --config-file .swcrc-cjs --strip-leading-paths",
55+
"build:esbuild": "node bundleScss.js",
5556
"build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
5657
"build:types": "tsc --emitDeclarationOnly --outDir dist",
57-
"build:webpack": "webpack --config webpack.config.js",
5858
"clean": "rimraf {dist,*.tsbuildinfo}",
5959
"copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png,json}\" \"src/app/api/**\" dist/",
6060
"fix": "eslint \"src/**/*.{ts,tsx}\" --fix",
@@ -76,27 +76,21 @@
7676
"react-diff-viewer-continued": "3.2.6",
7777
"sass": "1.77.4",
7878
"sonner": "^1.5.0",
79+
"uuid": "10.0.0",
7980
"ws": "^8.16.0"
8081
},
8182
"devDependencies": {
8283
"@next/eslint-plugin-next": "^14.1.0",
8384
"@payloadcms/eslint-config": "workspace:*",
8485
"@types/busboy": "^1.5.3",
85-
"@types/react": "npm:types-react@19.0.0-beta.2",
86-
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2",
86+
"@types/react": "npm:types-react@19.0.0-rc.0",
87+
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.0",
88+
"@types/uuid": "10.0.0",
8789
"@types/ws": "^8.5.10",
88-
"css-loader": "^6.10.0",
89-
"css-minimizer-webpack-plugin": "^6.0.0",
90-
"mini-css-extract-plugin": "1.6.2",
90+
"esbuild": "0.23.0",
91+
"esbuild-sass-plugin": "3.3.1",
9192
"payload": "workspace:*",
92-
"postcss-loader": "^8.1.1",
93-
"postcss-preset-env": "^9.5.14",
94-
"sass-loader": "14.2.1",
95-
"swc-loader": "^0.2.6",
96-
"swc-plugin-transform-remove-imports": "^1.12.1",
97-
"terser-webpack-plugin": "^5.3.10",
98-
"webpack": "^5.78.0",
99-
"webpack-cli": "^5.1.4"
93+
"swc-plugin-transform-remove-imports": "1.14.0"
10094
},
10195
"peerDependencies": {
10296
"graphql": "^16.8.1",
@@ -148,7 +142,7 @@
148142
"types": "./dist/index.js"
149143
},
150144
"overrides": {
151-
"@types/react": "npm:types-react@19.0.0-beta.2",
152-
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2"
145+
"@types/react": "npm:types-react@19.0.0-rc.0",
146+
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.0"
153147
}
154148
}
File renamed without changes.

packages/next/webpack.config.js

Lines changed: 0 additions & 115 deletions
This file was deleted.

packages/payload/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,13 @@
128128
"@types/uuid": "10.0.0",
129129
"copyfiles": "2.4.1",
130130
"cross-env": "7.0.3",
131-
"esbuild": "^0.21.4",
131+
"esbuild": "0.23.0",
132132
"graphql-http": "^1.22.0",
133133
"rimraf": "3.0.2",
134134
"sharp": "0.32.6"
135135
},
136136
"peerDependencies": {
137-
"@swc/core": "^1.6.1",
137+
"@swc/core": "^1.6.13",
138138
"graphql": "^16.8.1"
139139
},
140140
"peerDependenciesMeta": {

0 commit comments

Comments
 (0)