From 184fbb23668c44a4cef832bc454cf1e654f19315 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 11:39:38 -0400 Subject: [PATCH 01/29] fix: ensure .env.local files are automatically loaded in bin scripts and within importConfig --- packages/payload/src/bin/loadEnv.ts | 24 ++++++++++--------- .../src/utilities/importWithoutClientFiles.ts | 3 +++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/packages/payload/src/bin/loadEnv.ts b/packages/payload/src/bin/loadEnv.ts index bc7364406e2..50a6c3d7354 100644 --- a/packages/payload/src/bin/loadEnv.ts +++ b/packages/payload/src/bin/loadEnv.ts @@ -4,19 +4,21 @@ import fs from 'fs' import path from 'path' /** - * Try to find user's .env and load it + * Try to find user's env file and load it. Supports both .env and .env.local */ -export function loadEnv() { - const envPath = findUp.sync('.env') +const envFiles = ['.env', '.env.local'] - if (envPath) { - dotenv.config({ path: envPath }) - } else { - const cwdPath = path.resolve(process.cwd(), '.env') - if (fs.existsSync(cwdPath)) { - dotenv.config({ - path: cwdPath, - }) +export function loadEnv() { + for (const file of envFiles) { + const filePath = findUp.sync(file) + if (filePath) { + dotenv.config({ path: filePath }) + } else { + // If the file is not found via findUp, check the current working directory + const cwdPath = path.resolve(process.cwd(), file) + if (fs.existsSync(cwdPath)) { + dotenv.config({ path: cwdPath }) + } } } } diff --git a/packages/payload/src/utilities/importWithoutClientFiles.ts b/packages/payload/src/utilities/importWithoutClientFiles.ts index d24be128526..6859d009d5e 100644 --- a/packages/payload/src/utilities/importWithoutClientFiles.ts +++ b/packages/payload/src/utilities/importWithoutClientFiles.ts @@ -4,6 +4,8 @@ import path from 'path' import type { SanitizedConfig } from '../config/types.js' +import { loadEnv } from '../bin/loadEnv.js' + const filename = fileURLToPath(import.meta.url) const dirname = path.dirname(filename) @@ -20,6 +22,7 @@ export const importWithoutClientFiles = async (filePath: string) => * Resolve and load Payload config from either a relative or absolute path */ export const importConfig = async (configPath: string) => { + loadEnv() // loadConfig would usually be run outside of next. This means they will not get next's automatic env loading here. In order to not force them to install dotenv and set it up manually, we can load the env for them here const isAbsolutePath = path.isAbsolute(configPath) if (isAbsolutePath) { const config = await importWithoutClientFiles<{ default: Promise }>(configPath) From 36ed70560a88b9e0c0677e59589174a7326f32cf Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 13:14:08 -0400 Subject: [PATCH 02/29] use next's algorithm for loading .env files --- package.json | 2 +- packages/payload/package.json | 2 +- packages/payload/src/bin/loadEnv.ts | 32 ++++++++++++++--------------- packages/plugin-sentry/package.json | 1 - packages/translations/package.json | 2 +- pnpm-lock.yaml | 32 ++++++++++++++--------------- test/package.json | 2 +- 7 files changed, 35 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index d4860839110..599af78241b 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "concat-stream": "^2.0.0", "copyfiles": "2.4.1", "cross-env": "7.0.3", - "dotenv": "8.6.0", + "dotenv": "16.4.5", "drizzle-kit": "0.20.14-1f2c838", "drizzle-orm": "0.29.4", "escape-html": "^1.0.3", diff --git a/packages/payload/package.json b/packages/payload/package.json index d5f8a2e63fa..bb24968a6d6 100644 --- a/packages/payload/package.json +++ b/packages/payload/package.json @@ -81,6 +81,7 @@ "pretest": "pnpm build" }, "dependencies": { + "@next/env": "^15.0.0-rc.0", "@payloadcms/translations": "workspace:*", "@swc-node/core": "^1.13.0", "@swc-node/sourcemap-support": "^0.5.0", @@ -92,7 +93,6 @@ "console-table-printer": "2.11.2", "dataloader": "2.2.2", "deepmerge": "4.3.1", - "dotenv": "8.6.0", "file-type": "16.5.4", "find-up": "4.1.0", "get-tsconfig": "^4.7.2", diff --git a/packages/payload/src/bin/loadEnv.ts b/packages/payload/src/bin/loadEnv.ts index 50a6c3d7354..2c04ff4e74b 100644 --- a/packages/payload/src/bin/loadEnv.ts +++ b/packages/payload/src/bin/loadEnv.ts @@ -1,24 +1,24 @@ -import dotenv from 'dotenv' +import { loadEnvConfig } from '@next/env' import findUp from 'find-up' -import fs from 'fs' -import path from 'path' /** - * Try to find user's env file and load it. Supports both .env and .env.local + * Try to find user's env files and load it. Uses the same algorithm next.js uses to parse env files, meaning this also supports .env.local, .env.development, .env.production, etc. */ -const envFiles = ['.env', '.env.local'] +export function loadEnv(path?: string) { + if (path?.length) { + loadEnvConfig(path, true) + return + } + + const { loadedEnvFiles } = loadEnvConfig(process.cwd(), true) // assuming this won't run in production -export function loadEnv() { - for (const file of envFiles) { - const filePath = findUp.sync(file) - if (filePath) { - dotenv.config({ path: filePath }) - } else { - // If the file is not found via findUp, check the current working directory - const cwdPath = path.resolve(process.cwd(), file) - if (fs.existsSync(cwdPath)) { - dotenv.config({ path: cwdPath }) + if (!loadedEnvFiles?.length) { + // use findUp to find the env file. So, run loadEnvConfig for every directory upwards + findUp.sync((dir) => { + const { loadedEnvFiles } = loadEnvConfig(dir, true) + if (loadedEnvFiles?.length) { + return findUp.stop } - } + }) } } diff --git a/packages/plugin-sentry/package.json b/packages/plugin-sentry/package.json index 7f7687c5cb6..bdce30fda99 100644 --- a/packages/plugin-sentry/package.json +++ b/packages/plugin-sentry/package.json @@ -51,7 +51,6 @@ "@types/react-dom": "npm:types-react-dom@19.0.0-beta.2", "copyfiles": "^2.4.1", "cross-env": "^7.0.3", - "dotenv": "^8.2.0", "jest": "^29.5.0", "nodemon": "3.0.3", "payload": "workspace:*", diff --git a/packages/translations/package.json b/packages/translations/package.json index 52f927529bf..0a7d4012022 100644 --- a/packages/translations/package.json +++ b/packages/translations/package.json @@ -40,7 +40,7 @@ "@types/react": "npm:types-react@19.0.0-beta.2", "@types/react-dom": "npm:types-react-dom@19.0.0-beta.2", "date-fns": "3.3.1", - "dotenv": "8.6.0", + "dotenv": "16.4.5", "prettier": "^3.0.3", "typescript": "5.4.5" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a7e9b8eb3d8..304d001dcd4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,7 +9,7 @@ overrides: '@types/react-dom': npm:types-react-dom@19.0.0-beta.2 copyfiles: 2.4.1 cross-env: 7.0.3 - dotenv: 8.6.0 + dotenv: 16.4.5 drizzle-orm: 0.29.4 graphql: ^16.8.1 mongodb-memory-server: ^9.0 @@ -114,8 +114,8 @@ importers: specifier: 7.0.3 version: 7.0.3 dotenv: - specifier: 8.6.0 - version: 8.6.0 + specifier: 16.4.5 + version: 16.4.5 drizzle-kit: specifier: 0.20.14-1f2c838 version: 0.20.14-1f2c838 @@ -712,6 +712,9 @@ importers: packages/payload: dependencies: + '@next/env': + specifier: ^15.0.0-rc.0 + version: 15.0.0-rc.0 '@payloadcms/translations': specifier: workspace:* version: link:../translations @@ -748,9 +751,6 @@ importers: deepmerge: specifier: 4.3.1 version: 4.3.1 - dotenv: - specifier: 8.6.0 - version: 8.6.0 file-type: specifier: 16.5.4 version: 16.5.4 @@ -1163,9 +1163,6 @@ importers: cross-env: specifier: 7.0.3 version: 7.0.3 - dotenv: - specifier: 8.6.0 - version: 8.6.0 jest: specifier: ^29.5.0 version: 29.7.0(@types/node@20.12.5)(ts-node@10.9.1) @@ -1500,8 +1497,8 @@ importers: specifier: 3.3.1 version: 3.3.1 dotenv: - specifier: 8.6.0 - version: 8.6.0 + specifier: 16.4.5 + version: 16.4.5 prettier: specifier: ^3.0.3 version: 3.2.5 @@ -1777,8 +1774,8 @@ importers: specifier: workspace:* version: link:../packages/create-payload-app dotenv: - specifier: 8.6.0 - version: 8.6.0 + specifier: 16.4.5 + version: 16.4.5 eslint-plugin-payload: specifier: workspace:* version: link:../packages/eslint-plugin-payload @@ -8816,7 +8813,7 @@ packages: chokidar: 3.6.0 confbox: 0.1.7 defu: 6.1.4 - dotenv: 8.6.0 + dotenv: 16.4.5 giget: 1.2.3 jiti: 1.21.0 mlly: 1.6.1 @@ -10016,9 +10013,10 @@ packages: is-obj: 2.0.0 dev: false - /dotenv@8.6.0: - resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==} - engines: {node: '>=10'} + /dotenv@16.4.5: + resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==} + engines: {node: '>=12'} + dev: true /dreamopt@0.8.0: resolution: {integrity: sha512-vyJTp8+mC+G+5dfgsY+r3ckxlz+QMX40VjPQsZc5gxVAxLmi64TBoVkP54A/pRAXMXsbu2GMMBrZPxNv23waMg==} diff --git a/test/package.json b/test/package.json index 03d073d40ab..247cd6a789f 100644 --- a/test/package.json +++ b/test/package.json @@ -47,7 +47,7 @@ "babel-plugin-react-compiler": "0.0.0-experimental-592953e-20240517", "comment-json": "^4.2.3", "create-payload-app": "workspace:*", - "dotenv": "8.6.0", + "dotenv": "16.4.5", "eslint-plugin-payload": "workspace:*", "eslint-plugin-playwright": "1.5.3", "execa": "5.1.1", From d5ca63a2a39674d3abfb4528843a798ec6c530c2 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 13:18:23 -0400 Subject: [PATCH 03/29] fix commonjs bs --- packages/payload/src/bin/loadEnv.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/payload/src/bin/loadEnv.ts b/packages/payload/src/bin/loadEnv.ts index 2c04ff4e74b..a410b64bf5a 100644 --- a/packages/payload/src/bin/loadEnv.ts +++ b/packages/payload/src/bin/loadEnv.ts @@ -1,4 +1,5 @@ -import { loadEnvConfig } from '@next/env' +import nextEnvImport from '@next/env' +const { loadEnvConfig } = nextEnvImport import findUp from 'find-up' /** From ac80b8cad4a46a5693d83b5785d81a177ffd9326 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 13:28:14 -0400 Subject: [PATCH 04/29] chore: upgrade findUp package --- packages/payload/package.json | 2 +- packages/payload/src/bin/loadEnv.ts | 6 ++-- packages/payload/src/config/find.ts | 14 ++++----- pnpm-lock.yaml | 45 +++++++++++++++++++++++++++-- 4 files changed, 53 insertions(+), 14 deletions(-) diff --git a/packages/payload/package.json b/packages/payload/package.json index bb24968a6d6..7f7e80043e7 100644 --- a/packages/payload/package.json +++ b/packages/payload/package.json @@ -94,7 +94,7 @@ "dataloader": "2.2.2", "deepmerge": "4.3.1", "file-type": "16.5.4", - "find-up": "4.1.0", + "find-up": "7.0.0", "get-tsconfig": "^4.7.2", "http-status": "1.6.2", "image-size": "^1.1.1", diff --git a/packages/payload/src/bin/loadEnv.ts b/packages/payload/src/bin/loadEnv.ts index a410b64bf5a..1e1801d3a8c 100644 --- a/packages/payload/src/bin/loadEnv.ts +++ b/packages/payload/src/bin/loadEnv.ts @@ -1,6 +1,6 @@ import nextEnvImport from '@next/env' const { loadEnvConfig } = nextEnvImport -import findUp from 'find-up' +import { findUpStop, findUpSync } from 'find-up' /** * Try to find user's env files and load it. Uses the same algorithm next.js uses to parse env files, meaning this also supports .env.local, .env.development, .env.production, etc. @@ -15,10 +15,10 @@ export function loadEnv(path?: string) { if (!loadedEnvFiles?.length) { // use findUp to find the env file. So, run loadEnvConfig for every directory upwards - findUp.sync((dir) => { + findUpSync((dir) => { const { loadedEnvFiles } = loadEnvConfig(dir, true) if (loadedEnvFiles?.length) { - return findUp.stop + return findUpStop } }) } diff --git a/packages/payload/src/config/find.ts b/packages/payload/src/config/find.ts index 2ff9a16f90f..d0f5b13b1ad 100644 --- a/packages/payload/src/config/find.ts +++ b/packages/payload/src/config/find.ts @@ -1,4 +1,4 @@ -import findUp from 'find-up' +import { findUpSync, pathExistsSync } from 'find-up' import fs from 'fs' import path from 'path' @@ -13,7 +13,7 @@ const getTSConfigPaths = (): { rootPath?: string srcPath?: string } => { - const tsConfigPath = findUp.sync('tsconfig.json') + const tsConfigPath = findUpSync('tsconfig.json') if (!tsConfigPath) { return { @@ -79,17 +79,17 @@ export const findConfig = (): string => { for (const searchPath of searchPaths) { if (!searchPath) continue - const configPath = findUp.sync( + const configPath = findUpSync( (dir) => { const tsPath = path.join(dir, 'payload.config.ts') - const hasTS = findUp.sync.exists(tsPath) + const hasTS = pathExistsSync(tsPath) if (hasTS) { return tsPath } const jsPath = path.join(dir, 'payload.config.js') - const hasJS = findUp.sync.exists(jsPath) + const hasJS = pathExistsSync(jsPath) if (hasJS) { return jsPath @@ -108,13 +108,13 @@ export const findConfig = (): string => { // If no config file is found in the directories defined by tsconfig.json, // try searching in the 'src' and 'dist' directory as a last resort, as they are most commonly used if (process.env.NODE_ENV === 'production') { - const distConfigPath = findUp.sync(['payload.config.js', 'payload.config.ts'], { + const distConfigPath = findUpSync(['payload.config.js', 'payload.config.ts'], { cwd: path.resolve(process.cwd(), 'dist'), }) if (distConfigPath) return distConfigPath } else { - const srcConfigPath = findUp.sync(['payload.config.js', 'payload.config.ts'], { + const srcConfigPath = findUpSync(['payload.config.js', 'payload.config.ts'], { cwd: path.resolve(process.cwd(), 'src'), }) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 304d001dcd4..e0248bad080 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -755,8 +755,8 @@ importers: specifier: 16.5.4 version: 16.5.4 find-up: - specifier: 4.1.0 - version: 4.1.0 + specifier: 7.0.0 + version: 7.0.0 get-tsconfig: specifier: ^4.7.2 version: 4.7.3 @@ -11199,6 +11199,15 @@ packages: locate-path: 6.0.0 path-exists: 4.0.0 + /find-up@7.0.0: + resolution: {integrity: sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==} + engines: {node: '>=18'} + dependencies: + locate-path: 7.2.0 + path-exists: 5.0.0 + unicorn-magic: 0.1.0 + dev: false + /find-versions@5.1.0: resolution: {integrity: sha512-+iwzCJ7C5v5KgcBuueqVoNiHVoQpwiUK5XFLjf0affFTep+Wcw93tPvmb8tqujDNmzhBDPddnWV/qgWSXgq+Hg==} engines: {node: '>=12'} @@ -13264,6 +13273,13 @@ packages: dependencies: p-locate: 5.0.0 + /locate-path@7.2.0: + resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dependencies: + p-locate: 6.0.0 + dev: false + /lodash.debounce@4.0.8: resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==} dev: true @@ -14236,6 +14252,13 @@ packages: dependencies: yocto-queue: 0.1.0 + /p-limit@4.0.0: + resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dependencies: + yocto-queue: 1.0.0 + dev: false + /p-limit@5.0.0: resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==} engines: {node: '>=18'} @@ -14262,6 +14285,13 @@ packages: dependencies: p-limit: 3.1.0 + /p-locate@6.0.0: + resolution: {integrity: sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dependencies: + p-limit: 4.0.0 + dev: false + /p-map@4.0.0: resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==} engines: {node: '>=10'} @@ -14327,6 +14357,11 @@ packages: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} + /path-exists@5.0.0: + resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dev: false + /path-is-absolute@1.0.1: resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} engines: {node: '>=0.10.0'} @@ -17530,6 +17565,11 @@ packages: engines: {node: '>=4'} dev: true + /unicorn-magic@0.1.0: + resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==} + engines: {node: '>=18'} + dev: false + /unique-string@2.0.0: resolution: {integrity: sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==} engines: {node: '>=8'} @@ -18119,7 +18159,6 @@ packages: /yocto-queue@1.0.0: resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} engines: {node: '>=12.20'} - dev: true /zod-validation-error@2.1.0(zod@3.22.4): resolution: {integrity: sha512-VJh93e2wb4c3tWtGgTa0OF/dTt/zoPCPzXq4V11ZjxmEAFaPi/Zss1xIZdEB5RD8GD00U0/iVXgqkF77RV7pdQ==} From 14bd4c90fae4af1c98fb8e0e9409b8e11f5a8f60 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 13:29:59 -0400 Subject: [PATCH 05/29] fix --- packages/payload/src/utilities/telemetry/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/payload/src/utilities/telemetry/index.ts b/packages/payload/src/utilities/telemetry/index.ts index f3412a7948d..6b95b6a01b8 100644 --- a/packages/payload/src/utilities/telemetry/index.ts +++ b/packages/payload/src/utilities/telemetry/index.ts @@ -2,7 +2,7 @@ import { execSync } from 'child_process' import ciInfo from 'ci-info' import ConfImport from 'conf' import { randomBytes } from 'crypto' -import findUp from 'find-up' +import { findUp } from 'find-up' import fs from 'fs' import path from 'path' import { fileURLToPath } from 'url' From e45688454f48f5cafd1b85dd8114a3d8f5ddf84a Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 13:38:44 -0400 Subject: [PATCH 06/29] remove useless webpack devDependencies from payload --- packages/payload/package.json | 2 -- pnpm-lock.yaml | 17 ----------------- 2 files changed, 19 deletions(-) diff --git a/packages/payload/package.json b/packages/payload/package.json index 7f7e80043e7..058e32cac01 100644 --- a/packages/payload/package.json +++ b/packages/payload/package.json @@ -141,11 +141,9 @@ "confusing-browser-globals": "1.0.11", "copyfiles": "2.4.1", "cross-env": "7.0.3", - "file-loader": "6.2.0", "form-data": "3.0.1", "get-port": "5.1.1", "graphql-http": "^1.22.0", - "mini-css-extract-plugin": "1.6.2", "nodemon": "3.0.3", "object.assign": "4.1.4", "object.entries": "1.1.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e0248bad080..0cfee97fe25 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -893,9 +893,6 @@ importers: cross-env: specifier: 7.0.3 version: 7.0.3 - file-loader: - specifier: 6.2.0 - version: 6.2.0(webpack@5.91.0) form-data: specifier: 3.0.1 version: 3.0.1 @@ -905,9 +902,6 @@ importers: graphql-http: specifier: ^1.22.0 version: 1.22.0(graphql@16.8.1) - mini-css-extract-plugin: - specifier: 1.6.2 - version: 1.6.2(webpack@5.91.0) nodemon: specifier: 3.0.3 version: 3.0.3 @@ -11085,17 +11079,6 @@ packages: dependencies: flat-cache: 3.2.0 - /file-loader@6.2.0(webpack@5.91.0): - resolution: {integrity: sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==} - engines: {node: '>= 10.13.0'} - peerDependencies: - webpack: ^4.0.0 || ^5.0.0 - dependencies: - loader-utils: 2.0.4 - schema-utils: 3.3.0 - webpack: 5.91.0(@swc/core@1.4.13)(esbuild@0.19.12)(webpack-cli@5.1.4) - dev: true - /file-type@16.5.4: resolution: {integrity: sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==} engines: {node: '>=10'} From 7d6a0daa613417de540edab9f1f9b3fd48256a99 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 13:49:29 -0400 Subject: [PATCH 07/29] get rid of nodemon --- packages/payload/package.json | 4 ---- pnpm-lock.yaml | 3 --- 2 files changed, 7 deletions(-) diff --git a/packages/payload/package.json b/packages/payload/package.json index 058e32cac01..feda639b996 100644 --- a/packages/payload/package.json +++ b/packages/payload/package.json @@ -69,12 +69,9 @@ "build": "pnpm copyfiles && pnpm build:swc && pnpm build:types", "build:swc": "swc ./src -d ./dist --config-file .swcrc", "build:types": "tsc --emitDeclarationOnly --outDir dist", - "build:watch": "nodemon --watch 'src/**' --ext 'ts,tsx' --exec \"pnpm build:tsc\"", "clean": "rimraf {dist,*.tsbuildinfo}", "clean:cache": "rimraf node_modules/.cache", "copyfiles": "copyfiles -u 1 \"src/**/*.{html,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/", - "dev": "nodemon", - "dev:postgres": "cross-env PAYLOAD_DATABASE=postgres nodemon", "fix": "eslint \"src/**/*.ts\" --fix", "lint": "eslint \"src/**/*.ts\"", "prepublishOnly": "pnpm clean && pnpm turbo build", @@ -144,7 +141,6 @@ "form-data": "3.0.1", "get-port": "5.1.1", "graphql-http": "^1.22.0", - "nodemon": "3.0.3", "object.assign": "4.1.4", "object.entries": "1.1.6", "passport-strategy": "1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0cfee97fe25..52a929be034 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -902,9 +902,6 @@ importers: graphql-http: specifier: ^1.22.0 version: 1.22.0(graphql@16.8.1) - nodemon: - specifier: 3.0.3 - version: 3.0.3 object.assign: specifier: 4.1.4 version: 4.1.4 From 428feecea7b63dfb29894c5adcc4e9671527e1ed Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 13:55:51 -0400 Subject: [PATCH 08/29] remove useless devdeps --- packages/payload/package.json | 2 -- pnpm-lock.yaml | 12 ------------ 2 files changed, 14 deletions(-) diff --git a/packages/payload/package.json b/packages/payload/package.json index feda639b996..244b857bbcb 100644 --- a/packages/payload/package.json +++ b/packages/payload/package.json @@ -116,8 +116,6 @@ "@types/body-parser": "1.19.2", "@types/compression": "1.7.2", "@types/express-fileupload": "1.4.1", - "@types/express-rate-limit": "5.1.3", - "@types/express-serve-static-core": "4.17.35", "@types/hapi__joi": "17.1.9", "@types/ignore-styles": "5.0.0", "@types/joi": "14.3.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 52a929be034..c093d782e24 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -827,12 +827,6 @@ importers: '@types/express-fileupload': specifier: 1.4.1 version: 1.4.1 - '@types/express-rate-limit': - specifier: 5.1.3 - version: 5.1.3 - '@types/express-serve-static-core': - specifier: 4.17.35 - version: 4.17.35 '@types/hapi__joi': specifier: 17.1.9 version: 17.1.9 @@ -7089,12 +7083,6 @@ packages: '@types/express': 4.17.21 dev: true - /@types/express-rate-limit@5.1.3: - resolution: {integrity: sha512-H+TYy3K53uPU2TqPGFYaiWc2xJV6+bIFkDd/Ma2/h67Pa6ARk9kWE0p/K9OH1Okm0et9Sfm66fmXoAxsH2PHXg==} - dependencies: - '@types/express': 4.17.21 - dev: true - /@types/express-serve-static-core@4.17.35: resolution: {integrity: sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==} dependencies: From fdecf1c45de684f106e1bca39bf704e7d0548c7c Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 13:57:54 -0400 Subject: [PATCH 09/29] remove incorrect @types/probe-image-size dependency (not devDependency) --- packages/payload/package.json | 1 - pnpm-lock.yaml | 16 ---------------- 2 files changed, 17 deletions(-) diff --git a/packages/payload/package.json b/packages/payload/package.json index 244b857bbcb..c1de3ab63fc 100644 --- a/packages/payload/package.json +++ b/packages/payload/package.json @@ -82,7 +82,6 @@ "@payloadcms/translations": "workspace:*", "@swc-node/core": "^1.13.0", "@swc-node/sourcemap-support": "^0.5.0", - "@types/probe-image-size": "^7.2.4", "ajv": "^8.12.0", "bson-objectid": "2.0.4", "ci-info": "^4.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c093d782e24..49e9b1eb996 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -727,9 +727,6 @@ importers: '@swc/core': specifier: ^1.4.13 version: 1.4.13 - '@types/probe-image-size': - specifier: ^7.2.4 - version: 7.2.4 ajv: specifier: ^8.12.0 version: 8.12.0 @@ -7269,12 +7266,6 @@ packages: - supports-color dev: true - /@types/needle@3.3.0: - resolution: {integrity: sha512-UFIuc1gdyzAqeVUYpSL+cliw2MmU/ZUhVZKE7Zo4wPbgc8hbljeKSnn6ls6iG8r5jpegPXLUIhJ+Wb2kLVs8cg==} - dependencies: - '@types/node': 20.12.5 - dev: false - /@types/node-fetch@2.6.11: resolution: {integrity: sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==} dependencies: @@ -7352,13 +7343,6 @@ packages: resolution: {integrity: sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==} dev: false - /@types/probe-image-size@7.2.4: - resolution: {integrity: sha512-HVqYj3L+D+S/6qpQRv5qMxrD/5pglzZuhP7ZIqgVSZ+Ck4z1TCFkNIRG8WesFueQTqWFTSgkkAl6f8lwxFPQSw==} - dependencies: - '@types/needle': 3.3.0 - '@types/node': 20.12.5 - dev: false - /@types/prompts@2.4.9: resolution: {integrity: sha512-qTxFi6Buiu8+50/+3DGIWLHM6QuWsEKugJnnP6iv2Mc4ncxE4A/OJkjuVOA+5X0X1S/nq5VJRa8Lu+nwcvbrKA==} dependencies: From b22ec5cfa32de1df311003301f2c59b22dab78a1 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 14:01:41 -0400 Subject: [PATCH 10/29] add missing @types/uuid package --- packages/payload/package.json | 1 + pnpm-lock.yaml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/packages/payload/package.json b/packages/payload/package.json index c1de3ab63fc..76dbb411ce7 100644 --- a/packages/payload/package.json +++ b/packages/payload/package.json @@ -132,6 +132,7 @@ "@types/passport-local": "1.0.35", "@types/pluralize": "0.0.33", "@types/react-datepicker": "4.11.2", + "@types/uuid": "^9.0.8", "confusing-browser-globals": "1.0.11", "copyfiles": "2.4.1", "cross-env": "7.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 49e9b1eb996..7ce5ab29452 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -875,6 +875,9 @@ importers: '@types/react-datepicker': specifier: 4.11.2 version: 4.11.2(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) + '@types/uuid': + specifier: ^9.0.8 + version: 9.0.8 confusing-browser-globals: specifier: 1.0.11 version: 1.0.11 From 480b26a85b17682078d2e8597f95a944672a5b74 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 14:05:25 -0400 Subject: [PATCH 11/29] matching @types/react-datepicker version --- packages/payload/package.json | 2 +- pnpm-lock.yaml | 51 ++--------------------------------- 2 files changed, 3 insertions(+), 50 deletions(-) diff --git a/packages/payload/package.json b/packages/payload/package.json index 76dbb411ce7..c255f4e6438 100644 --- a/packages/payload/package.json +++ b/packages/payload/package.json @@ -131,7 +131,7 @@ "@types/passport-jwt": "3.0.9", "@types/passport-local": "1.0.35", "@types/pluralize": "0.0.33", - "@types/react-datepicker": "4.11.2", + "@types/react-datepicker": "6.2.0", "@types/uuid": "^9.0.8", "confusing-browser-globals": "1.0.11", "copyfiles": "2.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7ce5ab29452..755d3a8e76f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -873,8 +873,8 @@ importers: specifier: 0.0.33 version: 0.0.33 '@types/react-datepicker': - specifier: 4.11.2 - version: 4.11.2(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) + specifier: 6.2.0 + version: 6.2.0(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) '@types/uuid': specifier: ^9.0.8 version: 9.0.8 @@ -6098,10 +6098,6 @@ packages: resolution: {integrity: sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==} dev: true - /@popperjs/core@2.11.8: - resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} - dev: true - /@react-email/render@0.0.7: resolution: {integrity: sha512-hMMhxk6TpOcDC5qnKzXPVJoVGEwfm+U5bGOPH+MyTTlx0F02RLQygcATBKsbP7aI/mvkmBAZoFbgPIHop7ovug==} engines: {node: '>=16.0.0'} @@ -7365,18 +7361,6 @@ packages: resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==} dev: true - /@types/react-datepicker@4.11.2(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522): - resolution: {integrity: sha512-ELYyX3lb3K1WltqdlF1hbnaDGgzlF6PIR5T4W38cSEcfrQDIrPE+Ioq5pwRe/KEJ+ihHMjvTVZQkwJx0pWMNHQ==} - dependencies: - '@popperjs/core': 2.11.8 - '@types/react': /types-react@19.0.0-beta.2 - date-fns: 2.30.0 - react-popper: 2.3.0(@popperjs/core@2.11.8)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) - transitivePeerDependencies: - - react - - react-dom - dev: true - /@types/react-datepicker@6.2.0(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522): resolution: {integrity: sha512-+JtO4Fm97WLkJTH8j8/v3Ldh7JCNRwjMYjRaKh4KHH0M3jJoXtwiD3JBCsdlg3tsFIw9eQSqyAPeVDN2H2oM9Q==} dependencies: @@ -9616,13 +9600,6 @@ packages: resolution: {integrity: sha512-8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g==} dev: false - /date-fns@2.30.0: - resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} - engines: {node: '>=0.11'} - dependencies: - '@babel/runtime': 7.24.4 - dev: true - /date-fns@3.3.1: resolution: {integrity: sha512-y8e109LYGgoQDveiEBD3DYXKba1jWf5BA8YU1FL5Tvm0BTdEfy54WLCwnuYWZNnzzvALy/QQ4Hov+Q9RVRv+Zw==} @@ -15617,10 +15594,6 @@ packages: react: 19.0.0-rc-f994737d14-20240522 dev: false - /react-fast-compare@3.2.2: - resolution: {integrity: sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==} - dev: true - /react-image-crop@10.1.8(react@19.0.0-rc-f994737d14-20240522): resolution: {integrity: sha512-4rb8XtXNx7ZaOZarKKnckgz4xLMvds/YrU6mpJfGhGAsy2Mg4mIw1x+DCCGngVGq2soTBVVOxx2s/C6mTX9+pA==} peerDependencies: @@ -15649,20 +15622,6 @@ packages: react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522) dev: false - /react-popper@2.3.0(@popperjs/core@2.11.8)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522): - resolution: {integrity: sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==} - peerDependencies: - '@popperjs/core': ^2.0.0 - react: ^19.0.0-rc-f994737d14-20240522 - react-dom: ^19.0.0-rc-f994737d14-20240522 - dependencies: - '@popperjs/core': 2.11.8 - react: 19.0.0-rc-f994737d14-20240522 - react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522) - react-fast-compare: 3.2.2 - warning: 4.0.3 - dev: true - /react-select@5.8.0(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(types-react@19.0.0-beta.2): resolution: {integrity: sha512-TfjLDo58XrhP6VG5M/Mi56Us0Yt8X7xD6cDybC7yoRMUNm7BGO7qk8J0TLQOua/prb8vUOtsfnXZwfm30HGsAA==} peerDependencies: @@ -17713,12 +17672,6 @@ packages: dependencies: makeerror: 1.0.12 - /warning@4.0.3: - resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==} - dependencies: - loose-envify: 1.4.0 - dev: true - /watchpack@2.4.1: resolution: {integrity: sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==} engines: {node: '>=10.13.0'} From 7c431d9ef7b8dd8677ee30642efe0429f3e254d8 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 14:11:28 -0400 Subject: [PATCH 12/29] huge devDependency cleanup --- packages/payload/package.json | 19 ---- pnpm-lock.yaml | 166 ++++++---------------------------- 2 files changed, 26 insertions(+), 159 deletions(-) diff --git a/packages/payload/package.json b/packages/payload/package.json index c255f4e6438..93a11dab095 100644 --- a/packages/payload/package.json +++ b/packages/payload/package.json @@ -111,37 +111,18 @@ "devDependencies": { "@monaco-editor/react": "4.5.1", "@payloadcms/eslint-config": "workspace:*", - "@types/asap": "2.0.0", - "@types/body-parser": "1.19.2", - "@types/compression": "1.7.2", "@types/express-fileupload": "1.4.1", - "@types/hapi__joi": "17.1.9", - "@types/ignore-styles": "5.0.0", "@types/joi": "14.3.4", "@types/json-schema": "7.0.12", "@types/jsonwebtoken": "8.5.9", - "@types/method-override": "0.0.32", - "@types/mime": "2.0.3", "@types/minimist": "1.2.2", "@types/mkdirp": "1.0.2", - "@types/node-fetch": "2.6.4", - "@types/nodemailer": "6.4.14", - "@types/passport": "1.0.12", - "@types/passport-anonymous": "1.0.3", - "@types/passport-jwt": "3.0.9", - "@types/passport-local": "1.0.35", "@types/pluralize": "0.0.33", "@types/react-datepicker": "6.2.0", "@types/uuid": "^9.0.8", - "confusing-browser-globals": "1.0.11", "copyfiles": "2.4.1", "cross-env": "7.0.3", - "form-data": "3.0.1", - "get-port": "5.1.1", "graphql-http": "^1.22.0", - "object.assign": "4.1.4", - "object.entries": "1.1.6", - "passport-strategy": "1.0.0", "rimraf": "3.0.2", "sharp": "0.32.6" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 755d3a8e76f..2d5942f9247 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -812,24 +812,9 @@ importers: '@payloadcms/eslint-config': specifier: workspace:* version: link:../eslint-config-payload - '@types/asap': - specifier: 2.0.0 - version: 2.0.0 - '@types/body-parser': - specifier: 1.19.2 - version: 1.19.2 - '@types/compression': - specifier: 1.7.2 - version: 1.7.2 '@types/express-fileupload': specifier: 1.4.1 version: 1.4.1 - '@types/hapi__joi': - specifier: 17.1.9 - version: 17.1.9 - '@types/ignore-styles': - specifier: 5.0.0 - version: 5.0.0 '@types/joi': specifier: 14.3.4 version: 14.3.4 @@ -839,36 +824,12 @@ importers: '@types/jsonwebtoken': specifier: 8.5.9 version: 8.5.9 - '@types/method-override': - specifier: 0.0.32 - version: 0.0.32 - '@types/mime': - specifier: 2.0.3 - version: 2.0.3 '@types/minimist': specifier: 1.2.2 version: 1.2.2 '@types/mkdirp': specifier: 1.0.2 version: 1.0.2 - '@types/node-fetch': - specifier: 2.6.4 - version: 2.6.4 - '@types/nodemailer': - specifier: 6.4.14 - version: 6.4.14 - '@types/passport': - specifier: 1.0.12 - version: 1.0.12 - '@types/passport-anonymous': - specifier: 1.0.3 - version: 1.0.3 - '@types/passport-jwt': - specifier: 3.0.9 - version: 3.0.9 - '@types/passport-local': - specifier: 1.0.35 - version: 1.0.35 '@types/pluralize': specifier: 0.0.33 version: 0.0.33 @@ -878,33 +839,15 @@ importers: '@types/uuid': specifier: ^9.0.8 version: 9.0.8 - confusing-browser-globals: - specifier: 1.0.11 - version: 1.0.11 copyfiles: specifier: 2.4.1 version: 2.4.1 cross-env: specifier: 7.0.3 version: 7.0.3 - form-data: - specifier: 3.0.1 - version: 3.0.1 - get-port: - specifier: 5.1.1 - version: 5.1.1 graphql-http: specifier: ^1.22.0 version: 1.22.0(graphql@16.8.1) - object.assign: - specifier: 4.1.4 - version: 4.1.4 - object.entries: - specifier: 1.1.6 - version: 1.1.6 - passport-strategy: - specifier: 1.0.0 - version: 1.0.0 rimraf: specifier: 3.0.2 version: 3.0.2 @@ -6967,10 +6910,6 @@ packages: resolution: {integrity: sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==} dev: true - /@types/asap@2.0.0: - resolution: {integrity: sha512-upIS0Gt9Mc8eEpCbYMZ1K8rhNosfKUtimNcINce+zLwJF5UpM3Vv7yz3S5l/1IX+DxTa8lTkUjqynvjRXyJzsg==} - dev: true - /@types/babel__core@7.20.5: resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==} dependencies: @@ -7024,12 +6963,6 @@ packages: /@types/caseless@0.12.5: resolution: {integrity: sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==} - /@types/compression@1.7.2: - resolution: {integrity: sha512-lwEL4M/uAGWngWFLSG87ZDr2kLrbuR8p7X+QZB1OQlT+qkHsCPDVFnHPyXf4Vyl4yDDorNY+mAhosxkCvppatg==} - dependencies: - '@types/express': 4.17.21 - dev: true - /@types/concat-stream@2.0.3: resolution: {integrity: sha512-3qe4oQAPNwVNwK4C9c8u+VJqv9kez+2MR4qJpoPFfXtgxxif1QbFusvXzK0/Wra2VX07smostI2VMmJNSpZjuQ==} dependencies: @@ -7125,10 +7058,6 @@ packages: dependencies: '@types/node': 20.12.5 - /@types/hapi__joi@17.1.9: - resolution: {integrity: sha512-oOMFT8vmCTFncsF1engrs04jatz8/Anwx3De9uxnOK4chgSEgWBvFtpSoJo8u3784JNO+ql5tzRR6phHoRnscQ==} - dev: true - /@types/http-cache-semantics@4.0.4: resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==} dev: true @@ -7137,12 +7066,6 @@ packages: resolution: {integrity: sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==} dev: true - /@types/ignore-styles@5.0.0: - resolution: {integrity: sha512-NHDTLx8xF/T/jIxvH+0wFHHDsPtz6ulSMdUQ8p66qk9vJZ25S4cUUSQcal3+JxcQikCEdpaG5gUW2bVQvmh7KA==} - dependencies: - '@types/node': 20.12.5 - dev: true - /@types/is-hotkey@0.1.10: resolution: {integrity: sha512-RvC8KMw5BCac1NvRRyaHgMMEtBaZ6wh0pyPTBu7izn4Sj/AX9Y4aXU5c7rX8PnM/knsuUpC1IeoBkANtxBypsQ==} @@ -7225,20 +7148,10 @@ packages: /@types/lodash@4.17.0: resolution: {integrity: sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==} - /@types/method-override@0.0.32: - resolution: {integrity: sha512-Vf9AohOlANmhNswCbkdRG3p+tYcq1+63O+ex1UoNIVYWW3tO8Mx6Z+5G1R8DENeC6/t1SiDJS+ph6ACKpryokg==} - dependencies: - '@types/express': 4.17.21 - dev: true - /@types/mime@1.3.5: resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==} dev: true - /@types/mime@2.0.3: - resolution: {integrity: sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==} - dev: true - /@types/minimatch@5.1.2: resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==} @@ -7292,41 +7205,6 @@ packages: resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==} dev: false - /@types/passport-anonymous@1.0.3: - resolution: {integrity: sha512-unE2IivuYx6LUHlHokKMebx2TVi/YhqnnwM/Z3teGa/HTsRKgpD0PWrjpbw15ES8K8QNSCnRmXb/NpOyTem0tA==} - dependencies: - '@types/passport': 1.0.12 - dev: true - - /@types/passport-jwt@3.0.9: - resolution: {integrity: sha512-5XJt+79emfgpuBvBQusUPylFIVtW1QVAAkTRwCbRJAmxUjmLtIqUU6V1ovpnHPu6Qut3mR5Juc+s7kd06roNTg==} - dependencies: - '@types/express': 4.17.21 - '@types/jsonwebtoken': 8.5.9 - '@types/passport-strategy': 0.2.38 - dev: true - - /@types/passport-local@1.0.35: - resolution: {integrity: sha512-K4eLTJ8R0yYW8TvCqkjB0pTKoqfUSdl5PfZdidTjV2ETV3604fQxtY6BHKjQWAx50WUS0lqzBvKv3LoI1ZBPeA==} - dependencies: - '@types/express': 4.17.21 - '@types/passport': 1.0.12 - '@types/passport-strategy': 0.2.38 - dev: true - - /@types/passport-strategy@0.2.38: - resolution: {integrity: sha512-GC6eMqqojOooq993Tmnmp7AUTbbQSgilyvpCYQjT+H6JfG/g6RGc7nXEniZlp0zyKJ0WUdOiZWLBZft9Yug1uA==} - dependencies: - '@types/express': 4.17.21 - '@types/passport': 1.0.12 - dev: true - - /@types/passport@1.0.12: - resolution: {integrity: sha512-QFdJ2TiAEoXfEQSNDISJR1Tm51I78CymqcBa8imbjo6dNNu+l2huDxxbDEIoFIwOSKMkOfHEikyDuZ38WwWsmw==} - dependencies: - '@types/express': 4.17.21 - dev: true - /@types/pg@8.10.2: resolution: {integrity: sha512-MKFs9P6nJ+LAeHLU3V0cODEOgyThJ3OAnmOlsZsxux6sfQs3HRXR5bBn7xG5DjckEFhTAxsXi7k7cd0pCMxpJw==} dependencies: @@ -8293,6 +8171,7 @@ packages: get-intrinsic: 1.2.4 is-array-buffer: 3.0.4 is-shared-array-buffer: 1.0.3 + dev: false /arrify@2.0.1: resolution: {integrity: sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==} @@ -9163,10 +9042,6 @@ packages: proto-list: 1.2.4 dev: false - /confusing-browser-globals@1.0.11: - resolution: {integrity: sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==} - dev: true - /consola@3.2.3: resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==} engines: {node: ^14.18.0 || >=16.10.0} @@ -9579,6 +9454,7 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 is-data-view: 1.0.1 + dev: false /data-view-byte-length@1.0.1: resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==} @@ -9587,6 +9463,7 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 is-data-view: 1.0.1 + dev: false /data-view-byte-offset@1.0.0: resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==} @@ -9595,6 +9472,7 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 is-data-view: 1.0.1 + dev: false /dataloader@2.2.2: resolution: {integrity: sha512-8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g==} @@ -10215,6 +10093,7 @@ packages: typed-array-length: 1.0.6 unbox-primitive: 1.0.2 which-typed-array: 1.1.15 + dev: false /es-define-property@1.0.0: resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==} @@ -10268,6 +10147,7 @@ packages: engines: {node: '>= 0.4'} dependencies: es-errors: 1.3.0 + dev: false /es-set-tostringtag@2.0.3: resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==} @@ -10276,6 +10156,7 @@ packages: get-intrinsic: 1.2.4 has-tostringtag: 1.0.2 hasown: 2.0.2 + dev: false /es-shim-unscopables@1.0.2: resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==} @@ -10290,6 +10171,7 @@ packages: is-callable: 1.2.7 is-date-object: 1.0.5 is-symbol: 1.0.4 + dev: false /es5-ext@0.10.64: resolution: {integrity: sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==} @@ -11313,6 +11195,7 @@ packages: define-properties: 1.2.1 es-abstract: 1.23.3 functions-have-names: 1.2.3 + dev: false /functions-have-names@1.2.3: resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} @@ -11404,6 +11287,7 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 get-intrinsic: 1.2.4 + dev: false /get-tsconfig@4.7.3: resolution: {integrity: sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==} @@ -11537,6 +11421,7 @@ packages: engines: {node: '>= 0.4'} dependencies: define-properties: 1.2.1 + dev: false /globby@11.1.0: resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} @@ -12009,6 +11894,7 @@ packages: engines: {node: '>= 0.4'} dependencies: is-typed-array: 1.1.13 + dev: false /is-date-object@1.0.5: resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} @@ -12092,6 +11978,7 @@ packages: /is-negative-zero@2.0.3: resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==} engines: {node: '>= 0.4'} + dev: false /is-number-object@1.0.7: resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==} @@ -12193,6 +12080,7 @@ packages: engines: {node: '>= 0.4'} dependencies: which-typed-array: 1.1.15 + dev: false /is-unicode-supported@2.0.0: resolution: {integrity: sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==} @@ -12207,6 +12095,7 @@ packages: resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==} dependencies: call-bind: 1.0.7 + dev: false /is-weakset@2.0.3: resolution: {integrity: sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==} @@ -14028,15 +13917,7 @@ packages: define-properties: 1.2.1 has-symbols: 1.0.3 object-keys: 1.1.1 - - /object.entries@1.1.6: - resolution: {integrity: sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - dev: true + dev: false /object.entries@1.1.8: resolution: {integrity: sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==} @@ -14275,11 +14156,6 @@ packages: resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==} engines: {node: '>= 0.8'} - /passport-strategy@1.0.0: - resolution: {integrity: sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==} - engines: {node: '>= 0.4.0'} - dev: true - /path-exists@3.0.0: resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==} engines: {node: '>=4'} @@ -15986,6 +15862,7 @@ packages: get-intrinsic: 1.2.4 has-symbols: 1.0.3 isarray: 2.0.5 + dev: false /safe-buffer@5.1.2: resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} @@ -16001,6 +15878,7 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 is-regex: 1.1.4 + dev: false /safe-stable-stringify@2.4.3: resolution: {integrity: sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==} @@ -16638,6 +16516,7 @@ packages: define-properties: 1.2.1 es-abstract: 1.23.3 es-object-atoms: 1.0.0 + dev: false /string.prototype.trimend@1.0.8: resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==} @@ -16645,6 +16524,7 @@ packages: call-bind: 1.0.7 define-properties: 1.2.1 es-object-atoms: 1.0.0 + dev: false /string.prototype.trimstart@1.0.8: resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==} @@ -16653,6 +16533,7 @@ packages: call-bind: 1.0.7 define-properties: 1.2.1 es-object-atoms: 1.0.0 + dev: false /string_decoder@0.10.31: resolution: {integrity: sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==} @@ -17374,6 +17255,7 @@ packages: call-bind: 1.0.7 es-errors: 1.3.0 is-typed-array: 1.1.13 + dev: false /typed-array-byte-length@1.0.1: resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==} @@ -17384,6 +17266,7 @@ packages: gopd: 1.0.1 has-proto: 1.0.3 is-typed-array: 1.1.13 + dev: false /typed-array-byte-offset@1.0.2: resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==} @@ -17395,6 +17278,7 @@ packages: gopd: 1.0.1 has-proto: 1.0.3 is-typed-array: 1.1.13 + dev: false /typed-array-length@1.0.6: resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==} @@ -17406,6 +17290,7 @@ packages: has-proto: 1.0.3 is-typed-array: 1.1.13 possible-typed-array-names: 1.0.0 + dev: false /typedarray@0.0.6: resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==} @@ -17438,6 +17323,7 @@ packages: has-bigints: 1.0.2 has-symbols: 1.0.3 which-boxed-primitive: 1.0.2 + dev: false /undefsafe@2.0.5: resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==} From c7124cd57de49cc06506721b40a04032888966b6 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 14:29:16 -0400 Subject: [PATCH 13/29] cleanup next package --- packages/next/package.json | 4 +- pnpm-lock.yaml | 86 ++++++-------------------------------- 2 files changed, 13 insertions(+), 77 deletions(-) diff --git a/packages/next/package.json b/packages/next/package.json index 53606b1baab..3e76d0dd9f9 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -46,9 +46,7 @@ "@payloadcms/graphql": "workspace:*", "@payloadcms/translations": "workspace:*", "@payloadcms/ui": "workspace:*", - "@types/busboy": "^1.5.3", "busboy": "^1.6.0", - "deep-equal": "2.2.2", "file-type": "19.0.0 || 19.0.0-rc-f994737d14-20240522", "graphql-http": "^1.22.0", "graphql-playground-html": "1.6.30", @@ -57,12 +55,12 @@ "qs": "6.11.2", "react-diff-viewer-continued": "3.2.6", "react-toastify": "10.0.5", - "sass": "^1.71.1", "ws": "^8.16.0" }, "devDependencies": { "@next/eslint-plugin-next": "^14.1.0", "@payloadcms/eslint-config": "workspace:*", + "@types/busboy": "^1.5.3", "@types/react": "npm:types-react@19.0.0-beta.2", "@types/react-dom": "npm:types-react-dom@19.0.0-beta.2", "@types/ws": "^8.5.10", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2d5942f9247..95ac336f0e0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -612,15 +612,9 @@ importers: '@payloadcms/ui': specifier: workspace:* version: link:../ui - '@types/busboy': - specifier: ^1.5.3 - version: 1.5.3 busboy: specifier: ^1.6.0 version: 1.6.0 - deep-equal: - specifier: 2.2.2 - version: 2.2.2 file-type: specifier: 19.0.0 || 19.0.0-rc-f994737d14-20240522 version: 19.0.0 @@ -638,7 +632,7 @@ importers: version: 1.6.2 next: specifier: ^15.0.0-rc.0 - version: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(sass@1.74.1) + version: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) path-to-regexp: specifier: ^6.2.1 version: 6.2.2 @@ -651,9 +645,6 @@ importers: react-toastify: specifier: 10.0.5 version: 10.0.5(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) - sass: - specifier: ^1.71.1 - version: 1.74.1 ws: specifier: ^8.16.0 version: 8.16.0 @@ -664,6 +655,9 @@ importers: '@payloadcms/eslint-config': specifier: workspace:* version: link:../eslint-config-payload + '@types/busboy': + specifier: ^1.5.3 + version: 1.5.3 '@types/react': specifier: npm:types-react@19.0.0-beta.2 version: /types-react@19.0.0-beta.2 @@ -693,7 +687,7 @@ importers: version: 9.5.4(postcss@8.4.38) sass-loader: specifier: ^14.1.1 - version: 14.1.1(sass@1.74.1)(webpack@5.91.0) + version: 14.1.1(webpack@5.91.0) swc-loader: specifier: ^0.2.6 version: 0.2.6(@swc/core@1.4.13)(webpack@5.91.0) @@ -1577,7 +1571,7 @@ importers: version: 9.5.4(postcss@8.4.38) sass-loader: specifier: ^14.1.1 - version: 14.1.1(sass@1.74.1)(webpack@5.91.0) + version: 14.1.1(webpack@5.91.0) swc-loader: specifier: ^0.2.6 version: 0.2.6(@swc/core@1.4.13)(webpack@5.91.0) @@ -6950,6 +6944,7 @@ packages: resolution: {integrity: sha512-YMBLFN/xBD8bnqywIlGyYqsNFXu6bsiY7h3Ae0kO17qEuTjsqeyYMRPSUDacIKIquws2Y6KjmxAyNx8xB3xQbw==} dependencies: '@types/node': 20.12.5 + dev: true /@types/cacheable-request@6.0.3: resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==} @@ -8467,6 +8462,7 @@ packages: /binary-extensions@2.3.0: resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} engines: {node: '>=8'} + dev: true /bl@4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} @@ -8782,6 +8778,7 @@ packages: readdirp: 3.6.0 optionalDependencies: fsevents: 2.3.3 + dev: true /chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} @@ -11753,9 +11750,6 @@ packages: /immer@9.0.21: resolution: {integrity: sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==} - /immutable@4.3.5: - resolution: {integrity: sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==} - /import-fresh@3.3.0: resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} engines: {node: '>=6'} @@ -11864,6 +11858,7 @@ packages: engines: {node: '>=8'} dependencies: binary-extensions: 2.3.0 + dev: true /is-boolean-object@1.1.2: resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} @@ -13667,54 +13662,6 @@ packages: - '@babel/core' - babel-plugin-macros - /next@15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(sass@1.74.1): - resolution: {integrity: sha512-IWcCvxUSCAuOK5gig4+9yiyt/dLKpIa+WT01Qcx4CBE4TtwJljyTDnCVVn64jDZ4qmSzsaEYXpb4DTI8qbk03A==} - engines: {node: '>=18.17.0'} - hasBin: true - peerDependencies: - '@opentelemetry/api': ^1.1.0 - '@playwright/test': ^1.41.2 - babel-plugin-react-compiler: '*' - react: ^19.0.0-rc-f994737d14-20240522 - react-dom: ^19.0.0-rc-f994737d14-20240522 - sass: ^1.3.0 - peerDependenciesMeta: - '@opentelemetry/api': - optional: true - '@playwright/test': - optional: true - babel-plugin-react-compiler: - optional: true - sass: - optional: true - dependencies: - '@next/env': 15.0.0-rc.0 - '@playwright/test': 1.43.0 - '@swc/helpers': 0.5.11 - busboy: 1.6.0 - caniuse-lite: 1.0.30001607 - graceful-fs: 4.2.11 - postcss: 8.4.31 - react: 19.0.0-rc-f994737d14-20240522 - react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522) - sass: 1.74.1 - styled-jsx: 5.1.3(@babel/core@7.24.5)(react@19.0.0-rc-f994737d14-20240522) - optionalDependencies: - '@next/swc-darwin-arm64': 15.0.0-rc.0 - '@next/swc-darwin-x64': 15.0.0-rc.0 - '@next/swc-linux-arm64-gnu': 15.0.0-rc.0 - '@next/swc-linux-arm64-musl': 15.0.0-rc.0 - '@next/swc-linux-x64-gnu': 15.0.0-rc.0 - '@next/swc-linux-x64-musl': 15.0.0-rc.0 - '@next/swc-win32-arm64-msvc': 15.0.0-rc.0 - '@next/swc-win32-ia32-msvc': 15.0.0-rc.0 - '@next/swc-win32-x64-msvc': 15.0.0-rc.0 - sharp: 0.33.4 - transitivePeerDependencies: - - '@babel/core' - - babel-plugin-macros - dev: false - /node-abi@3.57.0: resolution: {integrity: sha512-Dp+A9JWxRaKuHP35H77I4kCKesDy5HUDEmScia2FyncMTOXASMyg251F5PhFoDA5uqBrDDffiLpbqnrZmNXW+g==} engines: {node: '>=10'} @@ -15605,6 +15552,7 @@ packages: engines: {node: '>=8.10.0'} dependencies: picomatch: 2.3.1 + dev: true /real-require@0.2.0: resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==} @@ -15893,7 +15841,7 @@ packages: truncate-utf8-bytes: 1.0.2 dev: false - /sass-loader@14.1.1(sass@1.74.1)(webpack@5.91.0): + /sass-loader@14.1.1(webpack@5.91.0): resolution: {integrity: sha512-QX8AasDg75monlybel38BZ49JP5Z+uSKfKwF2rO7S74BywaRmGQMUBw9dtkS+ekyM/QnP+NOrRYq8ABMZ9G8jw==} engines: {node: '>= 18.12.0'} peerDependencies: @@ -15915,19 +15863,9 @@ packages: optional: true dependencies: neo-async: 2.6.2 - sass: 1.74.1 webpack: 5.91.0(@swc/core@1.4.13)(esbuild@0.19.12)(webpack-cli@5.1.4) dev: true - /sass@1.74.1: - resolution: {integrity: sha512-w0Z9p/rWZWelb88ISOLyvqTWGmtmu2QJICqDBGyNnfG4OUnPX9BBjjYIXUpXCMOOg5MQWNpqzt876la1fsTvUA==} - engines: {node: '>=14.0.0'} - hasBin: true - dependencies: - chokidar: 3.6.0 - immutable: 4.3.5 - source-map-js: 1.2.0 - /sax@1.3.0: resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==} From fcd9eeb13f6c504b2bc778edc948019d49df21fd Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 14:30:22 -0400 Subject: [PATCH 14/29] matching @types/uuid versions --- packages/plugin-stripe/package.json | 2 +- packages/ui/package.json | 2 +- pnpm-lock.yaml | 10 +++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/plugin-stripe/package.json b/packages/plugin-stripe/package.json index 140266fd0cc..b5028dfa4d9 100644 --- a/packages/plugin-stripe/package.json +++ b/packages/plugin-stripe/package.json @@ -63,7 +63,7 @@ "@types/lodash.get": "^4.4.7", "@types/react": "npm:types-react@19.0.0-beta.2", "@types/react-dom": "npm:types-react-dom@19.0.0-beta.2", - "@types/uuid": "^9.0.0", + "@types/uuid": "^9.0.8", "payload": "workspace:*" }, "peerDependencies": { diff --git a/packages/ui/package.json b/packages/ui/package.json index f8b7279b2b4..f59ee35318f 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -130,7 +130,7 @@ "@types/react": "npm:types-react@19.0.0-beta.2", "@types/react-datepicker": "6.2.0", "@types/react-dom": "npm:types-react-dom@19.0.0-beta.2", - "@types/uuid": "8.3.4", + "@types/uuid": "^9.0.8", "babel-plugin-react-compiler": "0.0.0-experimental-592953e-20240517", "babel-plugin-transform-remove-imports": "^1.7.1", "css-loader": "^6.10.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 95ac336f0e0..66668db15df 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1169,7 +1169,7 @@ importers: specifier: npm:types-react-dom@19.0.0-beta.2 version: /types-react-dom@19.0.0-beta.2 '@types/uuid': - specifier: ^9.0.0 + specifier: ^9.0.8 version: 9.0.8 payload: specifier: workspace:* @@ -1543,8 +1543,8 @@ importers: specifier: npm:types-react-dom@19.0.0-beta.2 version: /types-react-dom@19.0.0-beta.2 '@types/uuid': - specifier: 8.3.4 - version: 8.3.4 + specifier: ^9.0.8 + version: 9.0.8 babel-plugin-react-compiler: specifier: 0.0.0-experimental-592953e-20240517 version: 0.0.0-experimental-592953e-20240517 @@ -7305,10 +7305,6 @@ packages: dependencies: '@types/node': 20.12.5 - /@types/uuid@8.3.4: - resolution: {integrity: sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==} - dev: true - /@types/uuid@9.0.8: resolution: {integrity: sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==} From 516db1c88a00ea7d34e6ec448bf8f67265294d68 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 14:31:13 -0400 Subject: [PATCH 15/29] matching uuid versions --- packages/db-mongodb/package.json | 2 +- packages/db-postgres/package.json | 2 +- packages/ui/package.json | 2 +- pnpm-lock.yaml | 15 +++++---------- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/packages/db-mongodb/package.json b/packages/db-mongodb/package.json index 43b6110ede3..541f0067041 100644 --- a/packages/db-mongodb/package.json +++ b/packages/db-mongodb/package.json @@ -40,7 +40,7 @@ "mongoose": "6.12.3", "mongoose-paginate-v2": "1.7.22", "prompts": "2.4.2", - "uuid": "9.0.0" + "uuid": "^9.0.1" }, "devDependencies": { "@payloadcms/eslint-config": "workspace:*", diff --git a/packages/db-postgres/package.json b/packages/db-postgres/package.json index 7a99f098c64..f2796710f50 100644 --- a/packages/db-postgres/package.json +++ b/packages/db-postgres/package.json @@ -50,7 +50,7 @@ "pg": "8.11.3", "prompts": "2.4.2", "to-snake-case": "1.0.0", - "uuid": "9.0.0" + "uuid": "^9.0.1" }, "devDependencies": { "@payloadcms/eslint-config": "workspace:*", diff --git a/packages/ui/package.json b/packages/ui/package.json index f59ee35318f..fe573ac6496 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -116,7 +116,7 @@ "react-toastify": "10.0.5", "scheduler": "0.23.0", "use-context-selector": "1.4.1", - "uuid": "9.0.1" + "uuid": "^9.0.1" }, "devDependencies": { "@babel/cli": "^7.24.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 66668db15df..f428a51d124 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -349,8 +349,8 @@ importers: specifier: 2.4.2 version: 2.4.2 uuid: - specifier: 9.0.0 - version: 9.0.0 + specifier: ^9.0.1 + version: 9.0.1 devDependencies: '@payloadcms/eslint-config': specifier: workspace:* @@ -392,8 +392,8 @@ importers: specifier: 1.0.0 version: 1.0.0 uuid: - specifier: 9.0.0 - version: 9.0.0 + specifier: ^9.0.1 + version: 9.0.1 devDependencies: '@payloadcms/eslint-config': specifier: workspace:* @@ -1506,7 +1506,7 @@ importers: specifier: 1.4.1 version: 1.4.1(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(scheduler@0.23.0) uuid: - specifier: 9.0.1 + specifier: ^9.0.1 version: 9.0.1 devDependencies: '@babel/cli': @@ -17439,11 +17439,6 @@ packages: resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} hasBin: true - /uuid@9.0.0: - resolution: {integrity: sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==} - hasBin: true - dev: false - /uuid@9.0.1: resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==} hasBin: true From 5bdc76563279fc043a5e8d61a02cc0f66b75985f Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 14:37:15 -0400 Subject: [PATCH 16/29] add back @types/nodemailer --- packages/payload/package.json | 1 + pnpm-lock.yaml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/packages/payload/package.json b/packages/payload/package.json index 93a11dab095..27262621913 100644 --- a/packages/payload/package.json +++ b/packages/payload/package.json @@ -117,6 +117,7 @@ "@types/jsonwebtoken": "8.5.9", "@types/minimist": "1.2.2", "@types/mkdirp": "1.0.2", + "@types/nodemailer": "6.4.14", "@types/pluralize": "0.0.33", "@types/react-datepicker": "6.2.0", "@types/uuid": "^9.0.8", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f428a51d124..4b3c4b9f989 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -824,6 +824,9 @@ importers: '@types/mkdirp': specifier: 1.0.2 version: 1.0.2 + '@types/nodemailer': + specifier: 6.4.14 + version: 6.4.14 '@types/pluralize': specifier: 0.0.33 version: 0.0.33 From fc3c75e553417416dd8275ef1053c83d1c62005d Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 14:56:01 -0400 Subject: [PATCH 17/29] upgrade scheduler and use-context-selector --- packages/ui/package.json | 4 ++-- pnpm-lock.yaml | 28 +++++++--------------------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/packages/ui/package.json b/packages/ui/package.json index fe573ac6496..4934a628acd 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -114,8 +114,8 @@ "react-image-crop": "10.1.8", "react-select": "5.8.0", "react-toastify": "10.0.5", - "scheduler": "0.23.0", - "use-context-selector": "1.4.1", + "scheduler": "0.25.0-rc-f994737d14-20240522", + "use-context-selector": "2.0.0", "uuid": "^9.0.1" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4b3c4b9f989..9bda0e3170e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1503,11 +1503,11 @@ importers: specifier: 10.0.5 version: 10.0.5(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) scheduler: - specifier: 0.23.0 - version: 0.23.0 + specifier: 0.25.0-rc-f994737d14-20240522 + version: 0.25.0-rc-f994737d14-20240522 use-context-selector: - specifier: 1.4.1 - version: 1.4.1(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(scheduler@0.23.0) + specifier: 2.0.0 + version: 2.0.0(react@19.0.0-rc-f994737d14-20240522)(scheduler@0.25.0-rc-f994737d14-20240522) uuid: specifier: ^9.0.1 version: 9.0.1 @@ -15875,12 +15875,6 @@ packages: xmlchars: 2.2.0 dev: true - /scheduler@0.23.0: - resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==} - dependencies: - loose-envify: 1.4.0 - dev: false - /scheduler@0.25.0-rc-f994737d14-20240522: resolution: {integrity: sha512-qS+xGFF7AljP2APO2iJe8zESNsK20k25MACz+WGOXPybUsRdi1ssvaoF93im2nSX2q/XT3wKkjdz6RQfbmaxdw==} @@ -17389,22 +17383,14 @@ packages: requires-port: 1.0.0 dev: true - /use-context-selector@1.4.1(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(scheduler@0.23.0): - resolution: {integrity: sha512-Io2ArvcRO+6MWIhkdfMFt+WKQX+Vb++W8DS2l03z/Vw/rz3BclKpM0ynr4LYGyU85Eke+Yx5oIhTY++QR0ZDoA==} + /use-context-selector@2.0.0(react@19.0.0-rc-f994737d14-20240522)(scheduler@0.25.0-rc-f994737d14-20240522): + resolution: {integrity: sha512-owfuSmUNd3eNp3J9CdDl0kMgfidV+MkDvHPpvthN5ThqM+ibMccNE0k+Iq7TWC6JPFvGZqanqiGCuQx6DyV24g==} peerDependencies: react: ^19.0.0-rc-f994737d14-20240522 - react-dom: ^19.0.0-rc-f994737d14-20240522 - react-native: '*' scheduler: '>=0.19.0' - peerDependenciesMeta: - react-dom: - optional: true - react-native: - optional: true dependencies: react: 19.0.0-rc-f994737d14-20240522 - react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522) - scheduler: 0.23.0 + scheduler: 0.25.0-rc-f994737d14-20240522 dev: false /use-isomorphic-layout-effect@1.1.2(react@19.0.0-rc-f994737d14-20240522)(types-react@19.0.0-beta.2): From 8240f9684caf68b4eb748150106e43800b7d6535 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 15:11:35 -0400 Subject: [PATCH 18/29] fix incorrect date-fns imports, previously hidden by an ancient peerdep's declare modules --- .../translations/src/importDateFNSLocale.ts | 58 +++++++++---------- .../ui/src/elements/DatePicker/DatePicker.tsx | 1 - .../ui/src/providers/Translation/index.tsx | 2 +- packages/ui/src/utilities/dateLocales.ts | 52 ++++++++--------- 4 files changed, 56 insertions(+), 57 deletions(-) diff --git a/packages/translations/src/importDateFNSLocale.ts b/packages/translations/src/importDateFNSLocale.ts index cc9602e8e4c..f9b84aa4739 100644 --- a/packages/translations/src/importDateFNSLocale.ts +++ b/packages/translations/src/importDateFNSLocale.ts @@ -5,119 +5,119 @@ export const importDateFNSLocale = async (locale: string): Promise => { switch (locale) { case 'ar': - result = await import('date-fns/locale/ar') + result = (await import('date-fns/locale/ar')).ar break case 'az': - result = await import('date-fns/locale/az') + result = (await import('date-fns/locale/az')).az break case 'bg': - result = await import('date-fns/locale/bg') + result = (await import('date-fns/locale/bg')).bg break case 'cs': - result = await import('date-fns/locale/cs') + result = (await import('date-fns/locale/cs')).cs break case 'de': - result = await import('date-fns/locale/de') + result = (await import('date-fns/locale/de')).de break case 'en-US': - result = await import('date-fns/locale/en-US') + result = (await import('date-fns/locale/en-US')).enUS break case 'es': - result = await import('date-fns/locale/es') + result = (await import('date-fns/locale/es')).es break case 'fa-IR': - result = await import('date-fns/locale/fa-IR') + result = (await import('date-fns/locale/fa-IR')).faIR break case 'fr': - result = await import('date-fns/locale/fr') + result = (await import('date-fns/locale/fr')).fr break case 'he': - result = await import('date-fns/locale/he') + result = (await import('date-fns/locale/he')).he break case 'hr': - result = await import('date-fns/locale/hr') + result = (await import('date-fns/locale/hr')).hr break case 'hu': - result = await import('date-fns/locale/hu') + result = (await import('date-fns/locale/hu')).hu break case 'it': - result = await import('date-fns/locale/it') + result = (await import('date-fns/locale/it')).it break case 'ja': - result = await import('date-fns/locale/ja') + result = (await import('date-fns/locale/ja')).ja break case 'ko': - result = await import('date-fns/locale/ko') + result = (await import('date-fns/locale/ko')).ko break case 'nb': - result = await import('date-fns/locale/nb') + result = (await import('date-fns/locale/nb')).nb break case 'nl': - result = await import('date-fns/locale/nl') + result = (await import('date-fns/locale/nl')).nl break case 'pl': - result = await import('date-fns/locale/pl') + result = (await import('date-fns/locale/pl')).pl break case 'pt': - result = await import('date-fns/locale/pt') + result = (await import('date-fns/locale/pt')).pt break case 'ro': - result = await import('date-fns/locale/ro') + result = (await import('date-fns/locale/ro')).ro break case 'ru': - result = await import('date-fns/locale/ru') + result = (await import('date-fns/locale/ru')).ru break case 'sk': - result = await import('date-fns/locale/sk') + result = (await import('date-fns/locale/sk')).sk break case 'sv': - result = await import('date-fns/locale/sv') + result = (await import('date-fns/locale/sv')).sv break case 'th': - result = await import('date-fns/locale/th') + result = (await import('date-fns/locale/th')).th break case 'tr': - result = await import('date-fns/locale/tr') + result = (await import('date-fns/locale/tr')).tr break case 'uk': - result = await import('date-fns/locale/uk') + result = (await import('date-fns/locale/uk')).uk break case 'vi': - result = await import('date-fns/locale/vi') + result = (await import('date-fns/locale/vi')).vi break case 'zh-CN': - result = await import('date-fns/locale/zh-CN') + result = (await import('date-fns/locale/zh-CN')).zhCN break case 'zh-TW': - result = await import('date-fns/locale/zh-TW') + result = (await import('date-fns/locale/zh-TW')).zhTW break } diff --git a/packages/ui/src/elements/DatePicker/DatePicker.tsx b/packages/ui/src/elements/DatePicker/DatePicker.tsx index db3c652c404..2b30795def5 100644 --- a/packages/ui/src/elements/DatePicker/DatePicker.tsx +++ b/packages/ui/src/elements/DatePicker/DatePicker.tsx @@ -77,7 +77,6 @@ const DateTime: React.FC = (props) => { monthsShown: Math.min(2, monthsToShow), onChange, placeholderText, - // @ts-expect-error // TODO Fix this - Broke with React 19 types popperPlacement: 'bottom-start', selected: value && new Date(value), showMonthYearPicker: pickerAppearance === 'monthOnly', diff --git a/packages/ui/src/providers/Translation/index.tsx b/packages/ui/src/providers/Translation/index.tsx index fb1a6d11bca..8ef2b7eecfa 100644 --- a/packages/ui/src/providers/Translation/index.tsx +++ b/packages/ui/src/providers/Translation/index.tsx @@ -11,7 +11,7 @@ import type { ClientConfig, LanguageOptions } from 'payload/types' import { t } from '@payloadcms/translations' import { importDateFNSLocale } from '@payloadcms/translations' -import enUS from 'date-fns/locale/en-US' +import { enUS } from 'date-fns/locale/en-US' import React, { createContext, useContext, useEffect, useState } from 'react' import { useRouteCache } from '../RouteCache/index.js' diff --git a/packages/ui/src/utilities/dateLocales.ts b/packages/ui/src/utilities/dateLocales.ts index c03483c1287..3f00378bc0a 100644 --- a/packages/ui/src/utilities/dateLocales.ts +++ b/packages/ui/src/utilities/dateLocales.ts @@ -1,29 +1,29 @@ -import ar from 'date-fns/locale/ar' -import az from 'date-fns/locale/az' -import bg from 'date-fns/locale/bg' -import cs from 'date-fns/locale/cs' -import de from 'date-fns/locale/de' -import enUS from 'date-fns/locale/en-US' -import es from 'date-fns/locale/es' -import faIR from 'date-fns/locale/fa-IR' -import fr from 'date-fns/locale/fr' -import hr from 'date-fns/locale/hr' -import hu from 'date-fns/locale/hu' -import it from 'date-fns/locale/it' -import ja from 'date-fns/locale/ja' -import ko from 'date-fns/locale/ko' -import nb from 'date-fns/locale/nb' -import nl from 'date-fns/locale/nl' -import pl from 'date-fns/locale/pl' -import pt from 'date-fns/locale/pt' -import ro from 'date-fns/locale/ro' -import ru from 'date-fns/locale/ru' -import sv from 'date-fns/locale/sv' -import th from 'date-fns/locale/th' -import tr from 'date-fns/locale/tr' -import vi from 'date-fns/locale/vi' -import zhCN from 'date-fns/locale/zh-CN' -import zhTW from 'date-fns/locale/zh-TW' +import { ar } from 'date-fns/locale/ar' +import { az } from 'date-fns/locale/az' +import { bg } from 'date-fns/locale/bg' +import { cs } from 'date-fns/locale/cs' +import { de } from 'date-fns/locale/de' +import { enUS } from 'date-fns/locale/en-US' +import { es } from 'date-fns/locale/es' +import { faIR } from 'date-fns/locale/fa-IR' +import { fr } from 'date-fns/locale/fr' +import { hr } from 'date-fns/locale/hr' +import { hu } from 'date-fns/locale/hu' +import { it } from 'date-fns/locale/it' +import { ja } from 'date-fns/locale/ja' +import { ko } from 'date-fns/locale/ko' +import { nb } from 'date-fns/locale/nb' +import { nl } from 'date-fns/locale/nl' +import { pl } from 'date-fns/locale/pl' +import { pt } from 'date-fns/locale/pt' +import { ro } from 'date-fns/locale/ro' +import { ru } from 'date-fns/locale/ru' +import { sv } from 'date-fns/locale/sv' +import { th } from 'date-fns/locale/th' +import { tr } from 'date-fns/locale/tr' +import { vi } from 'date-fns/locale/vi' +import { zhCN } from 'date-fns/locale/zh-CN' +import { zhTW } from 'date-fns/locale/zh-TW' export const dateLocales = { ar, From 7422864a86b8023fa22e9fe0c3b6804b737965ba Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 15:11:57 -0400 Subject: [PATCH 19/29] add missing sass package and upgrade other sass loader packages --- packages/next/package.json | 5 +++-- packages/next/src/views/Document/getDocumentData.tsx | 1 + packages/ui/package.json | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/next/package.json b/packages/next/package.json index 3e76d0dd9f9..864f21bc8b9 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -69,8 +69,9 @@ "mini-css-extract-plugin": "1.6.2", "payload": "workspace:*", "postcss-loader": "^8.1.1", - "postcss-preset-env": "^9.5.0", - "sass-loader": "^14.1.1", + "postcss-preset-env": "^9.5.14", + "sass": "1.77.4", + "sass-loader": "14.2.1", "swc-loader": "^0.2.6", "swc-plugin-transform-remove-imports": "^1.12.1", "terser-webpack-plugin": "^5.3.10", diff --git a/packages/next/src/views/Document/getDocumentData.tsx b/packages/next/src/views/Document/getDocumentData.tsx index 4a2ad0b449a..5adb86c52db 100644 --- a/packages/next/src/views/Document/getDocumentData.tsx +++ b/packages/next/src/views/Document/getDocumentData.tsx @@ -1,3 +1,4 @@ +import type { Locale } from 'payload/config' import type { Data, PayloadRequestWithData, diff --git a/packages/ui/package.json b/packages/ui/package.json index 4934a628acd..7d802537967 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -138,8 +138,9 @@ "mini-css-extract-plugin": "1.6.2", "payload": "workspace:*", "postcss-loader": "^8.1.1", - "postcss-preset-env": "^9.5.0", - "sass-loader": "^14.1.1", + "postcss-preset-env": "^9.5.14", + "sass": "1.77.4", + "sass-loader": "14.2.1", "swc-loader": "^0.2.6", "swc-plugin-transform-remove-imports": "^1.12.1", "terser-webpack-plugin": "^5.3.10", From 91e64348953440f77c5543fe04942764fbf6c4d5 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 15:12:08 -0400 Subject: [PATCH 20/29] pnpm-lock --- pnpm-lock.yaml | 433 ++++++++++++++++++++++++++----------------------- 1 file changed, 233 insertions(+), 200 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9bda0e3170e..29057f42c70 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -172,7 +172,7 @@ importers: version: 9.1.8 next: specifier: 15.0.0-rc.0 - version: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) + version: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(sass@1.77.4) node-mocks-http: specifier: ^1.14.1 version: 1.14.1 @@ -632,7 +632,7 @@ importers: version: 1.6.2 next: specifier: ^15.0.0-rc.0 - version: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) + version: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(sass@1.77.4) path-to-regexp: specifier: ^6.2.1 version: 6.2.2 @@ -683,11 +683,14 @@ importers: specifier: ^8.1.1 version: 8.1.1(postcss@8.4.38)(typescript@5.4.5)(webpack@5.91.0) postcss-preset-env: - specifier: ^9.5.0 - version: 9.5.4(postcss@8.4.38) + specifier: ^9.5.14 + version: 9.5.14(postcss@8.4.38) + sass: + specifier: 1.77.4 + version: 1.77.4 sass-loader: - specifier: ^14.1.1 - version: 14.1.1(webpack@5.91.0) + specifier: 14.2.1 + version: 14.2.1(sass@1.77.4)(webpack@5.91.0) swc-loader: specifier: ^0.2.6 version: 0.2.6(@swc/core@1.4.13)(webpack@5.91.0) @@ -1474,7 +1477,7 @@ importers: version: 2.3.0 next: specifier: ^15.0.0-rc.0 - version: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) + version: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(sass@1.77.4) object-to-formdata: specifier: 4.5.1 version: 4.5.1 @@ -1570,11 +1573,14 @@ importers: specifier: ^8.1.1 version: 8.1.1(postcss@8.4.38)(typescript@5.4.5)(webpack@5.91.0) postcss-preset-env: - specifier: ^9.5.0 - version: 9.5.4(postcss@8.4.38) + specifier: ^9.5.14 + version: 9.5.14(postcss@8.4.38) + sass: + specifier: 1.77.4 + version: 1.77.4 sass-loader: - specifier: ^14.1.1 - version: 14.1.1(webpack@5.91.0) + specifier: 14.2.1 + version: 14.2.1(sass@1.77.4)(webpack@5.91.0) swc-loader: specifier: ^0.2.6 version: 0.2.6(@swc/core@1.4.13)(webpack@5.91.0) @@ -3893,119 +3899,119 @@ packages: dependencies: '@jridgewell/trace-mapping': 0.3.9 - /@csstools/cascade-layer-name-parser@1.0.9(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4): - resolution: {integrity: sha512-RRqNjxTZDUhx7pxYOBG/AkCVmPS3zYzfE47GEhIGkFuWFTQGJBgWOUUkKNo5MfxIfjDz5/1L3F3rF1oIsYaIpw==} + /@csstools/cascade-layer-name-parser@1.0.11(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1): + resolution: {integrity: sha512-yhsonEAhaWRQvHFYhSzOUobH2Ev++fMci+ppFRagw0qVSPlcPV4FnNmlwpM/b2BM10ZeMRkVV4So6YRswD0O0w==} engines: {node: ^14 || ^16 || >=18} peerDependencies: - '@csstools/css-parser-algorithms': ^2.6.1 - '@csstools/css-tokenizer': ^2.2.4 + '@csstools/css-parser-algorithms': ^2.6.3 + '@csstools/css-tokenizer': ^2.3.1 dependencies: - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 dev: true - /@csstools/color-helpers@4.1.0: - resolution: {integrity: sha512-pWRKF6cDwget8HowIIf2MqEmqIca/cf8/jO4b3PRtUF5EfQXYMtBIKycXB4yXTCUmwLKOoRZAzh/hjnc7ywOIg==} + /@csstools/color-helpers@4.2.0: + resolution: {integrity: sha512-hJJrSBzbfGxUsaR6X4Bzd/FLx0F1ulKnR5ljY9AiXCtsR+H+zSWQDFWlKES1BRaVZTDHLpIIHS9K2o0h+JLlrg==} engines: {node: ^14 || ^16 || >=18} dev: true - /@csstools/css-calc@1.2.0(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4): - resolution: {integrity: sha512-iQqIW5vDPqQdLx07/atCuNKDprhIWjB0b8XRhUyXZWBZYUG+9mNyFwyu30rypX84WLevVo25NYW2ipxR8WyseQ==} + /@csstools/css-calc@1.2.2(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1): + resolution: {integrity: sha512-0owrl7AruDRKAxoSIW8XzJdz7GnuW3AOj4rYLfmXsoKIX2ZZzttzGXoiC8n8V08X7wIBlEWWVB4C8fAN18+I6Q==} engines: {node: ^14 || ^16 || >=18} peerDependencies: - '@csstools/css-parser-algorithms': ^2.6.1 - '@csstools/css-tokenizer': ^2.2.4 + '@csstools/css-parser-algorithms': ^2.6.3 + '@csstools/css-tokenizer': ^2.3.1 dependencies: - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 dev: true - /@csstools/css-color-parser@1.6.3(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4): - resolution: {integrity: sha512-pQPUPo32HW3/NuZxrwr3VJHE+vGqSTVI5gK4jGbuJ7eOFUrsTmZikXcVdInCVWOvuxK5xbCzwDWoTlZUCAKN+A==} + /@csstools/css-color-parser@2.0.2(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1): + resolution: {integrity: sha512-Agx2YmxTcZ7TfB7KNZQ+iekaxbWSdblvtA35aTwE3KfuYyjOlCg3P4KGGdQF/cjm1pHWVSBo5duF/BRfZ8s07A==} engines: {node: ^14 || ^16 || >=18} peerDependencies: - '@csstools/css-parser-algorithms': ^2.6.1 - '@csstools/css-tokenizer': ^2.2.4 + '@csstools/css-parser-algorithms': ^2.6.3 + '@csstools/css-tokenizer': ^2.3.1 dependencies: - '@csstools/color-helpers': 4.1.0 - '@csstools/css-calc': 1.2.0(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/color-helpers': 4.2.0 + '@csstools/css-calc': 1.2.2(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 dev: true - /@csstools/css-parser-algorithms@2.6.1(@csstools/css-tokenizer@2.2.4): - resolution: {integrity: sha512-ubEkAaTfVZa+WwGhs5jbo5Xfqpeaybr/RvWzvFxRs4jfq16wH8l8Ty/QEEpINxll4xhuGfdMbipRyz5QZh9+FA==} + /@csstools/css-parser-algorithms@2.6.3(@csstools/css-tokenizer@2.3.1): + resolution: {integrity: sha512-xI/tL2zxzEbESvnSxwFgwvy5HS00oCXxL4MLs6HUiDcYfwowsoQaABKxUElp1ARITrINzBnsECOc1q0eg2GOrA==} engines: {node: ^14 || ^16 || >=18} peerDependencies: - '@csstools/css-tokenizer': ^2.2.4 + '@csstools/css-tokenizer': ^2.3.1 dependencies: - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-tokenizer': 2.3.1 dev: true - /@csstools/css-tokenizer@2.2.4: - resolution: {integrity: sha512-PuWRAewQLbDhGeTvFuq2oClaSCKPIBmHyIobCV39JHRYN0byDcUWJl5baPeNUcqrjtdMNqFooE0FGl31I3JOqw==} + /@csstools/css-tokenizer@2.3.1: + resolution: {integrity: sha512-iMNHTyxLbBlWIfGtabT157LH9DUx9X8+Y3oymFEuMj8HNc+rpE3dPFGFgHjpKfjeFDjLjYIAIhXPGvS2lKxL9g==} engines: {node: ^14 || ^16 || >=18} dev: true - /@csstools/media-query-list-parser@2.1.9(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4): - resolution: {integrity: sha512-qqGuFfbn4rUmyOB0u8CVISIp5FfJ5GAR3mBrZ9/TKndHakdnm6pY0L/fbLcpPnrzwCyyTEZl1nUcXAYHEWneTA==} + /@csstools/media-query-list-parser@2.1.11(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1): + resolution: {integrity: sha512-uox5MVhvNHqitPP+SynrB1o8oPxPMt2JLgp5ghJOWf54WGQ5OKu47efne49r1SWqs3wRP8xSWjnO9MBKxhB1dA==} engines: {node: ^14 || ^16 || >=18} peerDependencies: - '@csstools/css-parser-algorithms': ^2.6.1 - '@csstools/css-tokenizer': ^2.2.4 + '@csstools/css-parser-algorithms': ^2.6.3 + '@csstools/css-tokenizer': ^2.3.1 dependencies: - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 dev: true - /@csstools/postcss-cascade-layers@4.0.4(postcss@8.4.38): - resolution: {integrity: sha512-MKErv8lpEwVmAcAwidY1Kfd3oWrh2Q14kxHs9xn26XzjP/PrcdngWq63lJsZeMlBY7o+WlEOeE+FP6zPzeY2uw==} + /@csstools/postcss-cascade-layers@4.0.6(postcss@8.4.38): + resolution: {integrity: sha512-Xt00qGAQyqAODFiFEJNkTpSUz5VfYqnDLECdlA/Vv17nl/OIV5QfTRHGAXrBGG5YcJyHpJ+GF9gF/RZvOQz4oA==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/selector-specificity': 3.0.3(postcss-selector-parser@6.0.16) + '@csstools/selector-specificity': 3.1.1(postcss-selector-parser@6.0.16) postcss: 8.4.38 postcss-selector-parser: 6.0.16 dev: true - /@csstools/postcss-color-function@3.0.13(postcss@8.4.38): - resolution: {integrity: sha512-gM24cIPU45HSPJ2zllz7VKjS1OKQS1sKOMI7Wsw8gFyXSGAGrxhYo++McylOqOXd8ecMaKxKQMUJqJVibvJYig==} + /@csstools/postcss-color-function@3.0.16(postcss@8.4.38): + resolution: {integrity: sha512-KtmXfckANSKsLBoTQCzggvKft1cmmmDKYjFO4yVlB23nWUgGInVBTE9T5JLmH29NNdTWSEPLWPUxoQ6XiIEn2Q==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/css-color-parser': 1.6.3(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-color-parser': 2.0.2(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 '@csstools/postcss-progressive-custom-properties': 3.2.0(postcss@8.4.38) '@csstools/utilities': 1.0.0(postcss@8.4.38) postcss: 8.4.38 dev: true - /@csstools/postcss-color-mix-function@2.0.13(postcss@8.4.38): - resolution: {integrity: sha512-mD8IIfGVeWkN1H1wfCqYePOg4cDnVrOXm4P0OlYcvKriq6sImGCGShv/2D88q6s3iUlLXfUBES+DUjLVjDMhnw==} + /@csstools/postcss-color-mix-function@2.0.16(postcss@8.4.38): + resolution: {integrity: sha512-BJnD1M5Pdypl1cJuwGuzVC52PqgzaObsDLu34jgf+QU7daVFqz432PvpqvXTmfTSNt4OckOT1QIzWexEFlDNXw==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/css-color-parser': 1.6.3(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-color-parser': 2.0.2(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 '@csstools/postcss-progressive-custom-properties': 3.2.0(postcss@8.4.38) '@csstools/utilities': 1.0.0(postcss@8.4.38) postcss: 8.4.38 dev: true - /@csstools/postcss-exponential-functions@1.0.5(postcss@8.4.38): - resolution: {integrity: sha512-7S7I7KgwHWQYzJJAoIjRtUf7DQs1dxipeg1A6ikZr0PYapNJX7UHz0evlpE67SQqYj1xBs70gpG7xUv3uLp4PA==} + /@csstools/postcss-exponential-functions@1.0.7(postcss@8.4.38): + resolution: {integrity: sha512-9usBPQX74OhiF/VuaVrp44UAPzqbKNyoaxEa6tbEXiFp+OAm3yB/TLRKyPUWg5tvvHGCduGJVdJJB3w8c8NBtA==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/css-calc': 1.2.0(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-calc': 1.2.2(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 postcss: 8.4.38 dev: true @@ -4020,41 +4026,41 @@ packages: postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-gamut-mapping@1.0.6(postcss@8.4.38): - resolution: {integrity: sha512-qGFpHU9cRf9qqkbHh9cWMTlBtGi/ujPgP/znQdwkbB4TgDR1ddI5wRRrksBsx64sfoUSlIEd70bxXzD9FtfdLg==} + /@csstools/postcss-gamut-mapping@1.0.9(postcss@8.4.38): + resolution: {integrity: sha512-JmOeiBJj1RJriAkr+aLBaiYUpEqdNOIo3ERQ5a4uNzy18upzrQ6tz7m2Vt1GQpJ62zQj7rC5PjAhCoZCoyE31g==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/css-color-parser': 1.6.3(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-color-parser': 2.0.2(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 postcss: 8.4.38 dev: true - /@csstools/postcss-gradients-interpolation-method@4.0.14(postcss@8.4.38): - resolution: {integrity: sha512-VMWC3xtpchHJoRBb/fs1gJR/5nHopX+0GwwmgdCI1DjROtfWUKIW0nv8occ922Gv0/Lk93XBtYBv8JttVBMZUQ==} + /@csstools/postcss-gradients-interpolation-method@4.0.17(postcss@8.4.38): + resolution: {integrity: sha512-qSNIqzLPKd2SadfWwHZv42lDRyYlLaM+Vx5rRIsnYCZbQxzFfe1XAwssrcCsHgba5bA6bi5oDoFCx0W+PRCpfw==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/css-color-parser': 1.6.3(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-color-parser': 2.0.2(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 '@csstools/postcss-progressive-custom-properties': 3.2.0(postcss@8.4.38) '@csstools/utilities': 1.0.0(postcss@8.4.38) postcss: 8.4.38 dev: true - /@csstools/postcss-hwb-function@3.0.12(postcss@8.4.38): - resolution: {integrity: sha512-90kIs+FsM6isAXLVoFHTTl4h0J6g1J1M6ahpIjAs6/k7a2A9FB/q+l0MHpLre0ZiPlBf2y3e1j4L+79vml7kJw==} + /@csstools/postcss-hwb-function@3.0.15(postcss@8.4.38): + resolution: {integrity: sha512-l34fRiZ7o5+pULv7OplXniBTU4TuKYNNOv0abuvUanddWGSy3+YHlMKUSgcVFo0d1DorxPAhJSTCrugl+4OmMQ==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/css-color-parser': 1.6.3(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-color-parser': 2.0.2(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 '@csstools/postcss-progressive-custom-properties': 3.2.0(postcss@8.4.38) '@csstools/utilities': 1.0.0(postcss@8.4.38) postcss: 8.4.38 @@ -4081,25 +4087,25 @@ packages: postcss: 8.4.38 dev: true - /@csstools/postcss-is-pseudo-class@4.0.6(postcss@8.4.38): - resolution: {integrity: sha512-HilOhAsMpFheMYkuaREZx+CGa4hsG6kQdzwXSsuqKDFzYz2eIMP213+3dH/vUbPXaWrzqLKr8m3i0dgYPoh7vg==} + /@csstools/postcss-is-pseudo-class@4.0.8(postcss@8.4.38): + resolution: {integrity: sha512-0aj591yGlq5Qac+plaWCbn5cpjs5Sh0daovYUKJUOMjIp70prGH/XPLp7QjxtbFXz3CTvb0H9a35dpEuIuUi3Q==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/selector-specificity': 3.0.3(postcss-selector-parser@6.0.16) + '@csstools/selector-specificity': 3.1.1(postcss-selector-parser@6.0.16) postcss: 8.4.38 postcss-selector-parser: 6.0.16 dev: true - /@csstools/postcss-light-dark-function@1.0.3(postcss@8.4.38): - resolution: {integrity: sha512-izW8hvhOqJlarLcGXO5PSylW9pQS3fytmhRdx2/e1oZFi15vs7ZShOHcREHJ3FfGdYqDA10cP9uhH0A3hmm1Rw==} + /@csstools/postcss-light-dark-function@1.0.5(postcss@8.4.38): + resolution: {integrity: sha512-kKM9dtEaVmSTb3scL2pgef62KyWv6SK19JiAnCCuiDhlRE6PADKzaPPBXmP3qj4IEgIH+cQhdEosB0eroU6Fnw==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 '@csstools/postcss-progressive-custom-properties': 3.2.0(postcss@8.4.38) '@csstools/utilities': 1.0.0(postcss@8.4.38) postcss: 8.4.38 @@ -4142,39 +4148,39 @@ packages: postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-logical-viewport-units@2.0.7(postcss@8.4.38): - resolution: {integrity: sha512-L4G3zsp/bnU0+WXUyysihCUH14LkfMgUJsS9vKz3vCYbVobOTqQRoNXnEPpyNp8WYyolLqAWbGGJhVu8J6u2OQ==} + /@csstools/postcss-logical-viewport-units@2.0.9(postcss@8.4.38): + resolution: {integrity: sha512-iBBJuExgHwedFH9AqNOHWzZFgYnt17zhu1qWjmSihu1P5pw0lIG9q5t3uIgJJFDNmYoOGfBKan66z9u1QH8yBQ==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-tokenizer': 2.3.1 '@csstools/utilities': 1.0.0(postcss@8.4.38) postcss: 8.4.38 dev: true - /@csstools/postcss-media-minmax@1.1.4(postcss@8.4.38): - resolution: {integrity: sha512-xl/PIO3TUbXO1ZA4SA6HCw+Q9UGe2cgeRKx3lHCzoNig2D4bT5vfVCOrwhxjUb09oHihc9eI3I0iIfVPiXaN1A==} + /@csstools/postcss-media-minmax@1.1.6(postcss@8.4.38): + resolution: {integrity: sha512-bc0frf2Lod53j6wEHVsaVElfvCf6uhc96v99M/wUfer4MmNYfO3YLx1kFuB8xXvb0AXiWx4fohCJqemHV3bfRg==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/css-calc': 1.2.0(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 - '@csstools/media-query-list-parser': 2.1.9(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) + '@csstools/css-calc': 1.2.2(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 + '@csstools/media-query-list-parser': 2.1.11(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) postcss: 8.4.38 dev: true - /@csstools/postcss-media-queries-aspect-ratio-number-values@2.0.7(postcss@8.4.38): - resolution: {integrity: sha512-HBDAQw1K0NilcHGMUHv8jzf2mpOtcWTVKtuY3AeZ5TS1uyWWNVi5/yuA/tREPLU9WifNdqHQ+rfbsV/8zTIkTg==} + /@csstools/postcss-media-queries-aspect-ratio-number-values@2.0.9(postcss@8.4.38): + resolution: {integrity: sha512-PR0s3tFSxPoKoPLoKuiZuYhwQC5bQxq/gFfywX2u/kh8rMzesARPZYKxE71I3jHWi6KDHGZl9Xb5xcFPwtvLiQ==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 - '@csstools/media-query-list-parser': 2.1.9(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 + '@csstools/media-query-list-parser': 2.1.11(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) postcss: 8.4.38 dev: true @@ -4199,15 +4205,15 @@ packages: postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-oklab-function@3.0.13(postcss@8.4.38): - resolution: {integrity: sha512-xbzMmukDFAwCt2+279io7ZiamZj87s6cnU3UgKB3G+NMpRX9A6uvN8xlnTLCe384hqg6hix5vlOmwkxqACb5pg==} + /@csstools/postcss-oklab-function@3.0.16(postcss@8.4.38): + resolution: {integrity: sha512-zm8nND+EraZrmbO4mgcT8FrJrAQUfWNfMmbV5uTCpWtAcO5ycX3E3bO8T1TjczKYRxC5QMM/91n9YExYCF4Mvw==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/css-color-parser': 1.6.3(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-color-parser': 2.0.2(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 '@csstools/postcss-progressive-custom-properties': 3.2.0(postcss@8.4.38) '@csstools/utilities': 1.0.0(postcss@8.4.38) postcss: 8.4.38 @@ -4223,15 +4229,15 @@ packages: postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-relative-color-syntax@2.0.13(postcss@8.4.38): - resolution: {integrity: sha512-mENWPNcHdiEYtjHFfZP9U1jNukQgFpSQ7wvTvwiadK3qgNBiSl0vMSinM9kKsGsJLTHQ0LEAqWLHurU52I4Jeg==} + /@csstools/postcss-relative-color-syntax@2.0.16(postcss@8.4.38): + resolution: {integrity: sha512-TSM8fVqJkT8JZDranZPnkpxjU/Q1sNR192lXMND+EcKOUjYa6uYpGSfHgjnWjCRiBSciettS+sL7y9wmnas7qQ==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/css-color-parser': 1.6.3(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-color-parser': 2.0.2(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 '@csstools/postcss-progressive-custom-properties': 3.2.0(postcss@8.4.38) '@csstools/utilities': 1.0.0(postcss@8.4.38) postcss: 8.4.38 @@ -4247,38 +4253,38 @@ packages: postcss-selector-parser: 6.0.16 dev: true - /@csstools/postcss-stepped-value-functions@3.0.6(postcss@8.4.38): - resolution: {integrity: sha512-rnyp8tWRuBXERTHVdB5hjUlif5dQgPcyN+BX55wUnYpZ3LN9QPfK2Z3/HUZymwyou8Gg6vhd6X2W+g1pLq1jYg==} + /@csstools/postcss-stepped-value-functions@3.0.8(postcss@8.4.38): + resolution: {integrity: sha512-X76+thsvsmH/SkqVbN+vjeFKe1ABGLRx8/Wl68QTb/zvJWdzgx5S/nbszZP5O3nTRc5eI8NxIOrQUiy30fR+0g==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/css-calc': 1.2.0(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-calc': 1.2.2(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 postcss: 8.4.38 dev: true - /@csstools/postcss-text-decoration-shorthand@3.0.5(postcss@8.4.38): - resolution: {integrity: sha512-qKxXpD0TYINkUtWDN1RHdeWKtZCzEv5j3UMT/ZGqyY27icwCFw7iKO0bUeLSHjYFBqhurCWvoOsa9REqLdrNDw==} + /@csstools/postcss-text-decoration-shorthand@3.0.6(postcss@8.4.38): + resolution: {integrity: sha512-Q8HEu4AEiwNVZBD6+DpQ8M9SajpMow4+WtmndWIAv8qxDtDYL4JK1xXWkhOGk28PrcJawOvkrEZ8Ri59UN1TJw==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/color-helpers': 4.1.0 + '@csstools/color-helpers': 4.2.0 postcss: 8.4.38 postcss-value-parser: 4.2.0 dev: true - /@csstools/postcss-trigonometric-functions@3.0.6(postcss@8.4.38): - resolution: {integrity: sha512-i5Zd0bMJooZAn+ZcDmPij2WCkcOJJJ6opzK+QeDjxbMrYmoGQl0CY8FDHdeQyBF1Nly+Q0Fq3S7QfdNLKBBaCg==} + /@csstools/postcss-trigonometric-functions@3.0.8(postcss@8.4.38): + resolution: {integrity: sha512-zEzyGriPqoIYFgHJqWNy8bmoxjM4+ONyTap1ZzQK/Lll/VsCYvx0IckB33W/u89uLSVeeB8xC7uTrkoQ7ogKyQ==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/css-calc': 1.2.0(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-calc': 1.2.2(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 postcss: 8.4.38 dev: true @@ -4291,17 +4297,17 @@ packages: postcss: 8.4.38 dev: true - /@csstools/selector-resolve-nested@1.1.0(postcss-selector-parser@6.0.16): + /@csstools/selector-resolve-nested@1.1.0(postcss-selector-parser@6.1.0): resolution: {integrity: sha512-uWvSaeRcHyeNenKg8tp17EVDRkpflmdyvbE0DHo6D/GdBb6PDnCYYU6gRpXhtICMGMcahQmj2zGxwFM/WC8hCg==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss-selector-parser: ^6.0.13 dependencies: - postcss-selector-parser: 6.0.16 + postcss-selector-parser: 6.1.0 dev: true - /@csstools/selector-specificity@3.0.3(postcss-selector-parser@6.0.16): - resolution: {integrity: sha512-KEPNw4+WW5AVEIyzC80rTbWEUatTW2lXpN8+8ILC8PiPeWPjwUzrPZDIOZ2wwqDmeqOYTdSGyL3+vE5GC3FB3Q==} + /@csstools/selector-specificity@3.1.1(postcss-selector-parser@6.0.16): + resolution: {integrity: sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss-selector-parser: ^6.0.13 @@ -4309,6 +4315,15 @@ packages: postcss-selector-parser: 6.0.16 dev: true + /@csstools/selector-specificity@3.1.1(postcss-selector-parser@6.1.0): + resolution: {integrity: sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==} + engines: {node: ^14 || ^16 || >=18} + peerDependencies: + postcss-selector-parser: ^6.0.13 + dependencies: + postcss-selector-parser: 6.1.0 + dev: true + /@csstools/utilities@1.0.0(postcss@8.4.38): resolution: {integrity: sha512-tAgvZQe/t2mlvpNosA4+CkMiZ2azISW5WPAcdSalZlEjQvUfghHxfQcrCiK/7/CrfAWVxyM88kGFYO82heIGDg==} engines: {node: ^14 || ^16 || >=18} @@ -8461,7 +8476,6 @@ packages: /binary-extensions@2.3.0: resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} engines: {node: '>=8'} - dev: true /bl@4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} @@ -8777,7 +8791,6 @@ packages: readdirp: 3.6.0 optionalDependencies: fsevents: 2.3.3 - dev: true /chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} @@ -9188,8 +9201,8 @@ packages: engines: {node: '>=8'} dev: true - /css-blank-pseudo@6.0.1(postcss@8.4.38): - resolution: {integrity: sha512-goSnEITByxTzU4Oh5oJZrEWudxTqk7L6IXj1UW69pO6Hv0UdX+Vsrt02FFu5DweRh2bLu6WpX/+zsQCu5O1gKw==} + /css-blank-pseudo@6.0.2(postcss@8.4.38): + resolution: {integrity: sha512-J/6m+lsqpKPqWHOifAFtKFeGLOzw3jR92rxQcwRUfA/eTuZzKfKlxOmYDx2+tqOPQAueNvBiY8WhAeHu5qNmTg==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 @@ -9207,13 +9220,13 @@ packages: postcss: 8.4.38 dev: true - /css-has-pseudo@6.0.3(postcss@8.4.38): - resolution: {integrity: sha512-qIsDxK/z0byH/mpNsv5hzQ5NOl8m1FRmOLgZpx4bG5uYHnOlO2XafeMI4mFIgNSViHwoUWcxSJZyyijaAmbs+A==} + /css-has-pseudo@6.0.5(postcss@8.4.38): + resolution: {integrity: sha512-ZTv6RlvJJZKp32jPYnAJVhowDCrRrHUTAxsYSuUPBEDJjzws6neMnzkRblxtgmv1RgcV5dhH2gn7E3wA9Wt6lw==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/selector-specificity': 3.0.3(postcss-selector-parser@6.0.16) + '@csstools/selector-specificity': 3.1.1(postcss-selector-parser@6.0.16) postcss: 8.4.38 postcss-selector-parser: 6.0.16 postcss-value-parser: 4.2.0 @@ -11749,6 +11762,9 @@ packages: /immer@9.0.21: resolution: {integrity: sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==} + /immutable@4.3.6: + resolution: {integrity: sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==} + /import-fresh@3.3.0: resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} engines: {node: '>=6'} @@ -11857,7 +11873,6 @@ packages: engines: {node: '>=8'} dependencies: binary-extensions: 2.3.0 - dev: true /is-boolean-object@1.1.2: resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} @@ -13614,7 +13629,7 @@ packages: /next-tick@1.1.0: resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==} - /next@15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522): + /next@15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(sass@1.77.4): resolution: {integrity: sha512-IWcCvxUSCAuOK5gig4+9yiyt/dLKpIa+WT01Qcx4CBE4TtwJljyTDnCVVn64jDZ4qmSzsaEYXpb4DTI8qbk03A==} engines: {node: '>=18.17.0'} hasBin: true @@ -13645,6 +13660,7 @@ packages: postcss: 8.4.31 react: 19.0.0-rc-f994737d14-20240522 react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522) + sass: 1.77.4 styled-jsx: 5.1.3(@babel/core@7.24.5)(react@19.0.0-rc-f994737d14-20240522) optionalDependencies: '@next/swc-darwin-arm64': 15.0.0-rc.0 @@ -14406,15 +14422,15 @@ packages: postcss-value-parser: 4.2.0 dev: true - /postcss-color-functional-notation@6.0.8(postcss@8.4.38): - resolution: {integrity: sha512-BilFPTHcfWEnuQeqL83nbSPVK3tcU57S60aOrqgditarNDzOojyF0Gdc2Ur5L+zox366QjrCe0rOBLDO2pNvRQ==} + /postcss-color-functional-notation@6.0.11(postcss@8.4.38): + resolution: {integrity: sha512-gJ+hAtAsgBF4w7eh28Pg7EA60lx7vE5xO/B/yZawaI6FYHky+5avA9YSe73nJHnAMEVFpCMeJc6Wts5g+niksg==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/css-color-parser': 1.6.3(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-color-parser': 2.0.2(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 '@csstools/postcss-progressive-custom-properties': 3.2.0(postcss@8.4.38) '@csstools/utilities': 1.0.0(postcss@8.4.38) postcss: 8.4.38 @@ -14466,42 +14482,42 @@ packages: postcss-value-parser: 4.2.0 dev: true - /postcss-custom-media@10.0.4(postcss@8.4.38): - resolution: {integrity: sha512-Ubs7O3wj2prghaKRa68VHBvuy3KnTQ0zbGwqDYY1mntxJD0QL2AeiAy+AMfl3HBedTCVr2IcFNktwty9YpSskA==} + /postcss-custom-media@10.0.6(postcss@8.4.38): + resolution: {integrity: sha512-BjihQoIO4Wjqv9fQNExSJIim8UAmkhLxuJnhJsLTRFSba1y1MhxkJK5awsM//6JJ+/Tu5QUxf624RQAvKHv6SA==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/cascade-layer-name-parser': 1.0.9(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 - '@csstools/media-query-list-parser': 2.1.9(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) + '@csstools/cascade-layer-name-parser': 1.0.11(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 + '@csstools/media-query-list-parser': 2.1.11(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) postcss: 8.4.38 dev: true - /postcss-custom-properties@13.3.6(postcss@8.4.38): - resolution: {integrity: sha512-vVVIwQbJiIz+PBLMIWA6XMi53Zg66/f474KolA7x0Das6EwkATc/9ZvM6zZx2gs7ZhcgVHjmWBbHkK9FlCgLeA==} + /postcss-custom-properties@13.3.10(postcss@8.4.38): + resolution: {integrity: sha512-ejaalIpl7p0k0L5ngIZ86AZGmp3m1KdeOCbSQTK4gQcB1ncaoPTHorw206+tsZRIhIDYvh5ZButEje6740YDXw==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/cascade-layer-name-parser': 1.0.9(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/cascade-layer-name-parser': 1.0.11(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 '@csstools/utilities': 1.0.0(postcss@8.4.38) postcss: 8.4.38 postcss-value-parser: 4.2.0 dev: true - /postcss-custom-selectors@7.1.8(postcss@8.4.38): - resolution: {integrity: sha512-fqDkGSEsO7+oQaqdRdR8nwwqH+N2uk6LE/2g4myVJJYz/Ly418lHKEleKTdV/GzjBjFcG4n0dbfuH/Pd2BE8YA==} + /postcss-custom-selectors@7.1.10(postcss@8.4.38): + resolution: {integrity: sha512-bV/6+IExyT2J4kMzX6c+ZMlN1xDfjcC4ePr1ywKezcTgwgUn11qQN3jdzFBpo8Dk1K7vO/OYOwMb5AtJP4JZcg==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/cascade-layer-name-parser': 1.0.9(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/cascade-layer-name-parser': 1.0.11(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 postcss: 8.4.38 postcss-selector-parser: 6.0.16 dev: true @@ -14612,15 +14628,15 @@ packages: postcss-value-parser: 4.2.0 dev: true - /postcss-lab-function@6.0.13(postcss@8.4.38): - resolution: {integrity: sha512-tzEThi3prSyomnVqaAU+k/YJib4rxeeTKVfMt+mPcEugFgp0t6xRjoc7fzaWCoEwYLC6GxGLD8/Ugx8COCqabw==} + /postcss-lab-function@6.0.16(postcss@8.4.38): + resolution: {integrity: sha512-QWv0VxfjgIl8jBR/wuQcm/o31jn4P/LwzYuVKzNQoO5t7HPcU0d3RfWUiDrHN3frmSv+YYZppr3P81tKFTDyqg==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/css-color-parser': 1.6.3(@csstools/css-parser-algorithms@2.6.1)(@csstools/css-tokenizer@2.2.4) - '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4) - '@csstools/css-tokenizer': 2.2.4 + '@csstools/css-color-parser': 2.0.2(@csstools/css-parser-algorithms@2.6.3)(@csstools/css-tokenizer@2.3.1) + '@csstools/css-parser-algorithms': 2.6.3(@csstools/css-tokenizer@2.3.1) + '@csstools/css-tokenizer': 2.3.1 '@csstools/postcss-progressive-custom-properties': 3.2.0(postcss@8.4.38) '@csstools/utilities': 1.0.0(postcss@8.4.38) postcss: 8.4.38 @@ -14767,16 +14783,16 @@ packages: postcss: 8.4.38 dev: true - /postcss-nesting@12.1.1(postcss@8.4.38): - resolution: {integrity: sha512-qc74KvIAQNa5ujZKG1UV286dhaDW6basbUy2i9AzNU/T8C9hpvGu9NZzm1SfePe2yP7sPYgpA8d4sPVopn2Hhw==} + /postcss-nesting@12.1.5(postcss@8.4.38): + resolution: {integrity: sha512-N1NgI1PDCiAGWPTYrwqm8wpjv0bgDmkYHH72pNsqTCv9CObxjxftdYu6AKtGN+pnJa7FQjMm3v4sp8QJbFsYdQ==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/selector-resolve-nested': 1.1.0(postcss-selector-parser@6.0.16) - '@csstools/selector-specificity': 3.0.3(postcss-selector-parser@6.0.16) + '@csstools/selector-resolve-nested': 1.1.0(postcss-selector-parser@6.1.0) + '@csstools/selector-specificity': 3.1.1(postcss-selector-parser@6.1.0) postcss: 8.4.38 - postcss-selector-parser: 6.0.16 + postcss-selector-parser: 6.1.0 dev: true /postcss-normalize-charset@6.0.2(postcss@8.4.38): @@ -14917,56 +14933,56 @@ packages: postcss-value-parser: 4.2.0 dev: true - /postcss-preset-env@9.5.4(postcss@8.4.38): - resolution: {integrity: sha512-o/jOlJjhm4f6rI5q1f+4Og3tz1cjaO50er9ndk7ZdcXHjWOH49kMAhqDC/nQifypQkOAiAmF46dPt3pZM+Cwbg==} + /postcss-preset-env@9.5.14(postcss@8.4.38): + resolution: {integrity: sha512-gTMi+3kENN/mN+K59aR+vEOjlkujTmmXJcM9rnAqGh9Y/euQ/ypdp9rd8mO1eoIjAD8vNS15+xbkBxoi+65BqQ==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/postcss-cascade-layers': 4.0.4(postcss@8.4.38) - '@csstools/postcss-color-function': 3.0.13(postcss@8.4.38) - '@csstools/postcss-color-mix-function': 2.0.13(postcss@8.4.38) - '@csstools/postcss-exponential-functions': 1.0.5(postcss@8.4.38) + '@csstools/postcss-cascade-layers': 4.0.6(postcss@8.4.38) + '@csstools/postcss-color-function': 3.0.16(postcss@8.4.38) + '@csstools/postcss-color-mix-function': 2.0.16(postcss@8.4.38) + '@csstools/postcss-exponential-functions': 1.0.7(postcss@8.4.38) '@csstools/postcss-font-format-keywords': 3.0.2(postcss@8.4.38) - '@csstools/postcss-gamut-mapping': 1.0.6(postcss@8.4.38) - '@csstools/postcss-gradients-interpolation-method': 4.0.14(postcss@8.4.38) - '@csstools/postcss-hwb-function': 3.0.12(postcss@8.4.38) + '@csstools/postcss-gamut-mapping': 1.0.9(postcss@8.4.38) + '@csstools/postcss-gradients-interpolation-method': 4.0.17(postcss@8.4.38) + '@csstools/postcss-hwb-function': 3.0.15(postcss@8.4.38) '@csstools/postcss-ic-unit': 3.0.6(postcss@8.4.38) '@csstools/postcss-initial': 1.0.1(postcss@8.4.38) - '@csstools/postcss-is-pseudo-class': 4.0.6(postcss@8.4.38) - '@csstools/postcss-light-dark-function': 1.0.3(postcss@8.4.38) + '@csstools/postcss-is-pseudo-class': 4.0.8(postcss@8.4.38) + '@csstools/postcss-light-dark-function': 1.0.5(postcss@8.4.38) '@csstools/postcss-logical-float-and-clear': 2.0.1(postcss@8.4.38) '@csstools/postcss-logical-overflow': 1.0.1(postcss@8.4.38) '@csstools/postcss-logical-overscroll-behavior': 1.0.1(postcss@8.4.38) '@csstools/postcss-logical-resize': 2.0.1(postcss@8.4.38) - '@csstools/postcss-logical-viewport-units': 2.0.7(postcss@8.4.38) - '@csstools/postcss-media-minmax': 1.1.4(postcss@8.4.38) - '@csstools/postcss-media-queries-aspect-ratio-number-values': 2.0.7(postcss@8.4.38) + '@csstools/postcss-logical-viewport-units': 2.0.9(postcss@8.4.38) + '@csstools/postcss-media-minmax': 1.1.6(postcss@8.4.38) + '@csstools/postcss-media-queries-aspect-ratio-number-values': 2.0.9(postcss@8.4.38) '@csstools/postcss-nested-calc': 3.0.2(postcss@8.4.38) '@csstools/postcss-normalize-display-values': 3.0.2(postcss@8.4.38) - '@csstools/postcss-oklab-function': 3.0.13(postcss@8.4.38) + '@csstools/postcss-oklab-function': 3.0.16(postcss@8.4.38) '@csstools/postcss-progressive-custom-properties': 3.2.0(postcss@8.4.38) - '@csstools/postcss-relative-color-syntax': 2.0.13(postcss@8.4.38) + '@csstools/postcss-relative-color-syntax': 2.0.16(postcss@8.4.38) '@csstools/postcss-scope-pseudo-class': 3.0.1(postcss@8.4.38) - '@csstools/postcss-stepped-value-functions': 3.0.6(postcss@8.4.38) - '@csstools/postcss-text-decoration-shorthand': 3.0.5(postcss@8.4.38) - '@csstools/postcss-trigonometric-functions': 3.0.6(postcss@8.4.38) + '@csstools/postcss-stepped-value-functions': 3.0.8(postcss@8.4.38) + '@csstools/postcss-text-decoration-shorthand': 3.0.6(postcss@8.4.38) + '@csstools/postcss-trigonometric-functions': 3.0.8(postcss@8.4.38) '@csstools/postcss-unset-value': 3.0.1(postcss@8.4.38) autoprefixer: 10.4.19(postcss@8.4.38) browserslist: 4.23.0 - css-blank-pseudo: 6.0.1(postcss@8.4.38) - css-has-pseudo: 6.0.3(postcss@8.4.38) + css-blank-pseudo: 6.0.2(postcss@8.4.38) + css-has-pseudo: 6.0.5(postcss@8.4.38) css-prefers-color-scheme: 9.0.1(postcss@8.4.38) cssdb: 8.0.0 postcss: 8.4.38 postcss-attribute-case-insensitive: 6.0.3(postcss@8.4.38) postcss-clamp: 4.1.0(postcss@8.4.38) - postcss-color-functional-notation: 6.0.8(postcss@8.4.38) + postcss-color-functional-notation: 6.0.11(postcss@8.4.38) postcss-color-hex-alpha: 9.0.4(postcss@8.4.38) postcss-color-rebeccapurple: 9.0.3(postcss@8.4.38) - postcss-custom-media: 10.0.4(postcss@8.4.38) - postcss-custom-properties: 13.3.6(postcss@8.4.38) - postcss-custom-selectors: 7.1.8(postcss@8.4.38) + postcss-custom-media: 10.0.6(postcss@8.4.38) + postcss-custom-properties: 13.3.10(postcss@8.4.38) + postcss-custom-selectors: 7.1.10(postcss@8.4.38) postcss-dir-pseudo-class: 8.0.1(postcss@8.4.38) postcss-double-position-gradients: 5.0.6(postcss@8.4.38) postcss-focus-visible: 9.0.1(postcss@8.4.38) @@ -14974,20 +14990,20 @@ packages: postcss-font-variant: 5.0.0(postcss@8.4.38) postcss-gap-properties: 5.0.1(postcss@8.4.38) postcss-image-set-function: 6.0.3(postcss@8.4.38) - postcss-lab-function: 6.0.13(postcss@8.4.38) + postcss-lab-function: 6.0.16(postcss@8.4.38) postcss-logical: 7.0.1(postcss@8.4.38) - postcss-nesting: 12.1.1(postcss@8.4.38) + postcss-nesting: 12.1.5(postcss@8.4.38) postcss-opacity-percentage: 2.0.0(postcss@8.4.38) postcss-overflow-shorthand: 5.0.1(postcss@8.4.38) postcss-page-break: 3.0.4(postcss@8.4.38) postcss-place: 9.0.1(postcss@8.4.38) - postcss-pseudo-class-any-link: 9.0.1(postcss@8.4.38) + postcss-pseudo-class-any-link: 9.0.2(postcss@8.4.38) postcss-replace-overflow-wrap: 4.0.0(postcss@8.4.38) postcss-selector-not: 7.0.2(postcss@8.4.38) dev: true - /postcss-pseudo-class-any-link@9.0.1(postcss@8.4.38): - resolution: {integrity: sha512-cKYGGZ9yzUZi+dZd7XT2M8iSDfo+T2Ctbpiizf89uBTBfIpZpjvTavzIJXpCReMVXSKROqzpxClNu6fz4DHM0Q==} + /postcss-pseudo-class-any-link@9.0.2(postcss@8.4.38): + resolution: {integrity: sha512-HFSsxIqQ9nA27ahyfH37cRWGk3SYyQLpk0LiWw/UGMV4VKT5YG2ONee4Pz/oFesnK0dn2AjcyequDbIjKJgB0g==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 @@ -15043,6 +15059,14 @@ packages: util-deprecate: 1.0.2 dev: true + /postcss-selector-parser@6.1.0: + resolution: {integrity: sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==} + engines: {node: '>=4'} + dependencies: + cssesc: 3.0.0 + util-deprecate: 1.0.2 + dev: true + /postcss-svgo@6.0.3(postcss@8.4.38): resolution: {integrity: sha512-dlrahRmxP22bX6iKEjOM+c8/1p+81asjKT+V5lrgOH944ryx/OHpclnIbGsKVd3uWOXFLYJwCVf0eEkJGvO96g==} engines: {node: ^14 || ^16 || >= 18} @@ -15551,7 +15575,6 @@ packages: engines: {node: '>=8.10.0'} dependencies: picomatch: 2.3.1 - dev: true /real-require@0.2.0: resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==} @@ -15840,8 +15863,8 @@ packages: truncate-utf8-bytes: 1.0.2 dev: false - /sass-loader@14.1.1(webpack@5.91.0): - resolution: {integrity: sha512-QX8AasDg75monlybel38BZ49JP5Z+uSKfKwF2rO7S74BywaRmGQMUBw9dtkS+ekyM/QnP+NOrRYq8ABMZ9G8jw==} + /sass-loader@14.2.1(sass@1.77.4)(webpack@5.91.0): + resolution: {integrity: sha512-G0VcnMYU18a4N7VoNDegg2OuMjYtxnqzQWARVWCIVSZwJeiL9kg8QMsuIZOplsJgTzZLF6jGxI3AClj8I9nRdQ==} engines: {node: '>= 18.12.0'} peerDependencies: '@rspack/core': 0.x || 1.x @@ -15862,9 +15885,19 @@ packages: optional: true dependencies: neo-async: 2.6.2 + sass: 1.77.4 webpack: 5.91.0(@swc/core@1.4.13)(esbuild@0.19.12)(webpack-cli@5.1.4) dev: true + /sass@1.77.4: + resolution: {integrity: sha512-vcF3Ckow6g939GMA4PeU7b2K/9FALXk2KF9J87txdHzXbUF9XRQRwSxcAs/fGaTnJeBFd7UoV22j3lzMLdM0Pw==} + engines: {node: '>=14.0.0'} + hasBin: true + dependencies: + chokidar: 3.6.0 + immutable: 4.3.6 + source-map-js: 1.2.0 + /sax@1.3.0: resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==} @@ -17368,7 +17401,7 @@ packages: consola: 3.2.3 effect: 3.1.5 fast-check: 3.18.0 - next: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) + next: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(sass@1.77.4) std-env: 3.7.0 /uri-js@4.4.1: From 4469607b5d57b667ec5aaaa397cee3fa29475831 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 15:30:09 -0400 Subject: [PATCH 21/29] further cleanup. move devdeps out of root package.json --- nodemon.json | 15 -- package.json | 17 +-- packages/db-mongodb/package.json | 1 - pnpm-lock.yaml | 237 +++---------------------------- test/package.json | 3 + 5 files changed, 22 insertions(+), 251 deletions(-) delete mode 100644 nodemon.json diff --git a/nodemon.json b/nodemon.json deleted file mode 100644 index 1e4392e86b0..00000000000 --- a/nodemon.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/nodemon.json", - "exec": "ts-node ./test/dev.ts -- -I", - "ext": "ts,js,json", - "ignore": [ - ".git", - "node_modules", - "node_modules/**/node_modules", - "packages/payload/src/admin", - "packages/payload/src/**/*.spec.ts", - "test/**/payload-types.ts" - ], - "watch": ["./test/", "./packages/**/*.ts"], - "stdin": false -} diff --git a/package.json b/package.json index 599af78241b..896a2bbbe6c 100644 --- a/package.json +++ b/package.json @@ -84,18 +84,14 @@ "tsconfig.json": "node scripts/reset-tsconfig.js" }, "devDependencies": { - "@aws-sdk/client-s3": "^3.525.0", "@next/bundle-analyzer": "^14.1.0", - "@octokit/core": "^5.1.0", "@payloadcms/eslint-config": "workspace:*", "@payloadcms/live-preview-react": "workspace:*", "@playwright/test": "1.43.0", - "@sentry/react": "^7.77.0", "@swc/cli": "^0.1.62", "@swc/jest": "0.2.36", "@testing-library/jest-dom": "6.4.2", "@testing-library/react": "14.2.1", - "@types/concat-stream": "^2.0.1", "@types/fs-extra": "^11.0.2", "@types/jest": "29.5.12", "@types/minimist": "1.2.5", @@ -106,11 +102,9 @@ "@types/react-dom": "npm:types-react-dom@19.0.0-beta.2", "@types/semver": "^7.5.3", "@types/shelljs": "0.8.15", - "add-stream": "^1.0.0", "chalk": "^4.1.2", "changelogen": "^0.5.5", "comment-json": "^4.2.3", - "concat-stream": "^2.0.0", "copyfiles": "2.4.1", "cross-env": "7.0.3", "dotenv": "16.4.5", @@ -121,20 +115,15 @@ "execa": "5.1.1", "form-data": "3.0.1", "fs-extra": "10.1.0", - "get-port": "5.1.1", - "get-stream": "6.0.1", "glob": "8.1.0", "globby": "11.1.0", "husky": "^8.0.3", "jest": "29.7.0", "jest-environment-jsdom": "29.7.0", - "jwt-decode": "4.0.0", "lint-staged": "^14.0.1", "minimist": "1.2.8", "mongodb-memory-server": "^9.0", "next": "15.0.0-rc.0", - "node-mocks-http": "^1.14.1", - "nodemon": "3.0.3", "open": "^10.1.0", "p-limit": "^5.0.0", "pino": "8.15.0", @@ -146,14 +135,11 @@ "qs": "6.11.2", "react": "^19.0.0-rc-f994737d14-20240522", "react-dom": "^19.0.0-rc-f994737d14-20240522", - "read-stream": "^2.1.1", "rimraf": "3.0.2", "semver": "^7.5.4", "sharp": "0.32.6", "shelljs": "0.8.5", - "simple-git": "^3.24.0", "slash": "3.0.0", - "slate": "0.91.4", "sort-package-json": "^2.10.0", "swc-plugin-transform-remove-imports": "^1.12.1", "tempfile": "^3.0.0", @@ -162,8 +148,7 @@ "tsx": "^4.7.1", "turbo": "^1.13.3", "typescript": "5.4.5", - "uuid": "^9.0.1", - "yocto-queue": "^1.0.0" + "uuid": "^9.0.1" }, "peerDependencies": { "react": "^19.0.0 || ^19.0.0-rc-f994737d14-20240522", diff --git a/packages/db-mongodb/package.json b/packages/db-mongodb/package.json index 541f0067041..f88bdfd3ee8 100644 --- a/packages/db-mongodb/package.json +++ b/packages/db-mongodb/package.json @@ -35,7 +35,6 @@ "dependencies": { "bson-objectid": "2.0.4", "deepmerge": "4.3.1", - "get-port": "5.1.1", "http-status": "1.6.2", "mongoose": "6.12.3", "mongoose-paginate-v2": "1.7.22", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 29057f42c70..ac755457b7a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,15 +26,9 @@ importers: .: devDependencies: - '@aws-sdk/client-s3': - specifier: ^3.525.0 - version: 3.550.0 '@next/bundle-analyzer': specifier: ^14.1.0 version: 14.1.4 - '@octokit/core': - specifier: ^5.1.0 - version: 5.2.0 '@payloadcms/eslint-config': specifier: workspace:* version: link:packages/eslint-config-payload @@ -44,9 +38,6 @@ importers: '@playwright/test': specifier: 1.43.0 version: 1.43.0 - '@sentry/react': - specifier: ^7.77.0 - version: 7.112.2(react@19.0.0-rc-f994737d14-20240522) '@swc/cli': specifier: ^0.1.62 version: 0.1.65(@swc/core@1.4.13) @@ -59,9 +50,6 @@ importers: '@testing-library/react': specifier: 14.2.1 version: 14.2.1(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) - '@types/concat-stream': - specifier: ^2.0.1 - version: 2.0.3 '@types/fs-extra': specifier: ^11.0.2 version: 11.0.4 @@ -92,9 +80,6 @@ importers: '@types/shelljs': specifier: 0.8.15 version: 0.8.15 - add-stream: - specifier: ^1.0.0 - version: 1.0.0 chalk: specifier: ^4.1.2 version: 4.1.2 @@ -104,9 +89,6 @@ importers: comment-json: specifier: ^4.2.3 version: 4.2.3 - concat-stream: - specifier: ^2.0.0 - version: 2.0.0 copyfiles: specifier: 2.4.1 version: 2.4.1 @@ -137,12 +119,6 @@ importers: fs-extra: specifier: 10.1.0 version: 10.1.0 - get-port: - specifier: 5.1.1 - version: 5.1.1 - get-stream: - specifier: 6.0.1 - version: 6.0.1 glob: specifier: 8.1.0 version: 8.1.0 @@ -158,9 +134,6 @@ importers: jest-environment-jsdom: specifier: 29.7.0 version: 29.7.0 - jwt-decode: - specifier: 4.0.0 - version: 4.0.0 lint-staged: specifier: ^14.0.1 version: 14.0.1 @@ -173,12 +146,6 @@ importers: next: specifier: 15.0.0-rc.0 version: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(sass@1.77.4) - node-mocks-http: - specifier: ^1.14.1 - version: 1.14.1 - nodemon: - specifier: 3.0.3 - version: 3.0.3 open: specifier: ^10.1.0 version: 10.1.0 @@ -212,9 +179,6 @@ importers: react-dom: specifier: ^19.0.0-rc-f994737d14-20240522 version: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522) - read-stream: - specifier: ^2.1.1 - version: 2.1.1 rimraf: specifier: 3.0.2 version: 3.0.2 @@ -227,15 +191,9 @@ importers: shelljs: specifier: 0.8.5 version: 0.8.5 - simple-git: - specifier: ^3.24.0 - version: 3.24.0 slash: specifier: 3.0.0 version: 3.0.0 - slate: - specifier: 0.91.4 - version: 0.91.4 sort-package-json: specifier: ^2.10.0 version: 2.10.0 @@ -263,9 +221,6 @@ importers: uuid: specifier: ^9.0.1 version: 9.0.1 - yocto-queue: - specifier: ^1.0.0 - version: 1.0.0 packages/create-payload-app: dependencies: @@ -333,9 +288,6 @@ importers: deepmerge: specifier: 4.3.1 version: 4.3.1 - get-port: - specifier: 5.1.1 - version: 5.1.1 http-status: specifier: 1.6.2 version: 1.6.2 @@ -1689,6 +1641,9 @@ importers: '@payloadcms/ui': specifier: workspace:* version: link:../packages/ui + '@sentry/react': + specifier: ^7.77.0 + version: 7.112.2(react@19.0.0-rc-f994737d14-20240522) '@types/react': specifier: npm:types-react@19.0.0-beta.2 version: /types-react@19.0.0-beta.2 @@ -1719,6 +1674,9 @@ importers: http-status: specifier: 1.6.2 version: 1.6.2 + jwt-decode: + specifier: 4.0.0 + version: 4.0.0 lexical: specifier: 0.15.0 version: 0.15.0 @@ -1728,6 +1686,9 @@ importers: server-only: specifier: ^0.0.1 version: 0.0.1 + slate: + specifier: 0.91.4 + version: 0.91.4 tempy: specifier: ^1.0.1 version: 1.0.1 @@ -5502,18 +5463,6 @@ packages: resolution: {integrity: sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==} dev: false - /@kwsites/file-exists@1.1.1: - resolution: {integrity: sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==} - dependencies: - debug: 4.3.4(supports-color@5.5.0) - transitivePeerDependencies: - - supports-color - dev: true - - /@kwsites/promise-deferred@1.1.1: - resolution: {integrity: sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==} - dev: true - /@lexical/clipboard@0.15.0: resolution: {integrity: sha512-binCltK7KiURQJFogvueYfmDNEKynN/lmZrCLFp2xBjEIajqw4WtOVLJZ33engdqNlvj0JqrxrWxbKG+yvUwrg==} dependencies: @@ -5964,70 +5913,6 @@ packages: '@nodelib/fs.scandir': 2.1.5 fastq: 1.17.1 - /@octokit/auth-token@4.0.0: - resolution: {integrity: sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==} - engines: {node: '>= 18'} - dev: true - - /@octokit/core@5.2.0: - resolution: {integrity: sha512-1LFfa/qnMQvEOAdzlQymH0ulepxbxnCYAKJZfMci/5XJyIHWgEYnDmgnKakbTh7CH2tFQ5O60oYDvns4i9RAIg==} - engines: {node: '>= 18'} - dependencies: - '@octokit/auth-token': 4.0.0 - '@octokit/graphql': 7.1.0 - '@octokit/request': 8.3.1 - '@octokit/request-error': 5.1.0 - '@octokit/types': 13.2.0 - before-after-hook: 2.2.3 - universal-user-agent: 6.0.1 - dev: true - - /@octokit/endpoint@9.0.5: - resolution: {integrity: sha512-ekqR4/+PCLkEBF6qgj8WqJfvDq65RH85OAgrtnVp1mSxaXF03u2xW/hUdweGS5654IlC0wkNYC18Z50tSYTAFw==} - engines: {node: '>= 18'} - dependencies: - '@octokit/types': 13.2.0 - universal-user-agent: 6.0.1 - dev: true - - /@octokit/graphql@7.1.0: - resolution: {integrity: sha512-r+oZUH7aMFui1ypZnAvZmn0KSqAUgE1/tUXIWaqUCa1758ts/Jio84GZuzsvUkme98kv0WFY8//n0J1Z+vsIsQ==} - engines: {node: '>= 18'} - dependencies: - '@octokit/request': 8.3.1 - '@octokit/types': 13.2.0 - universal-user-agent: 6.0.1 - dev: true - - /@octokit/openapi-types@22.0.0: - resolution: {integrity: sha512-kWzSxSIBjCtwrT8/O/A/nrSjmHvR5I9GGTHPyBU19VuEae+QZfaPnnfLwXgV56n51xHN3U2dYy8zh/kO9/39ig==} - dev: true - - /@octokit/request-error@5.1.0: - resolution: {integrity: sha512-GETXfE05J0+7H2STzekpKObFe765O5dlAKUTLNGeH+x47z7JjXHfsHKo5z21D/o/IOZTUEI6nyWyR+bZVP/n5Q==} - engines: {node: '>= 18'} - dependencies: - '@octokit/types': 13.2.0 - deprecation: 2.3.1 - once: 1.4.0 - dev: true - - /@octokit/request@8.3.1: - resolution: {integrity: sha512-fin4cl5eHN5Ybmb/gtn7YZ+ycyUlcyqqkg5lfxeSChqj7sUt6TNaJPehREi+0PABKLREYL8pfaUhH3TicEWNoA==} - engines: {node: '>= 18'} - dependencies: - '@octokit/endpoint': 9.0.5 - '@octokit/request-error': 5.1.0 - '@octokit/types': 13.2.0 - universal-user-agent: 6.0.1 - dev: true - - /@octokit/types@13.2.0: - resolution: {integrity: sha512-K4rpfbIQLe4UimS/PWZAcImhZUC80lhe2f1NpAaaTulPJXv54QIAFFCQEEbdQdqTV/745QDmdvp8NI49LaI00A==} - dependencies: - '@octokit/openapi-types': 22.0.0 - dev: true - /@one-ini/wasm@0.1.1: resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==} dev: false @@ -6976,12 +6861,6 @@ packages: /@types/caseless@0.12.5: resolution: {integrity: sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==} - /@types/concat-stream@2.0.3: - resolution: {integrity: sha512-3qe4oQAPNwVNwK4C9c8u+VJqv9kez+2MR4qJpoPFfXtgxxif1QbFusvXzK0/Wra2VX07smostI2VMmJNSpZjuQ==} - dependencies: - '@types/node': 20.12.5 - dev: true - /@types/connect@3.4.38: resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==} dependencies: @@ -7886,6 +7765,7 @@ packages: dependencies: mime-types: 2.1.35 negotiator: 0.6.3 + dev: false /acorn-globals@7.0.1: resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==} @@ -7918,10 +7798,6 @@ packages: engines: {node: '>=0.4.0'} hasBin: true - /add-stream@1.0.0: - resolution: {integrity: sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==} - dev: true - /agent-base@6.0.2: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} @@ -8432,10 +8308,6 @@ packages: /base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} - /before-after-hook@2.2.3: - resolution: {integrity: sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==} - dev: true - /big-integer@1.6.52: resolution: {integrity: sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==} engines: {node: '>=0.6'} @@ -9005,16 +8877,6 @@ packages: /concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} - /concat-stream@2.0.0: - resolution: {integrity: sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==} - engines: {'0': node >= 6.0} - dependencies: - buffer-from: 1.1.2 - inherits: 2.0.4 - readable-stream: 3.6.2 - typedarray: 0.0.6 - dev: true - /condense-newlines@0.2.1: resolution: {integrity: sha512-P7X+QL9Hb9B/c8HI5BFFKmjgBu2XpQuF98WZ9XkO+dBGgk5XgwiQz7o1SmpglNWId3581UcS0SFAWfoIhMHPfg==} engines: {node: '>=0.10.0'} @@ -9689,20 +9551,11 @@ packages: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} - /depd@1.1.2: - resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==} - engines: {node: '>= 0.6'} - dev: true - /depd@2.0.0: resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==} engines: {node: '>= 0.8'} dev: false - /deprecation@2.3.1: - resolution: {integrity: sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==} - dev: true - /dequal@2.0.3: resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} engines: {node: '>=6'} @@ -11141,6 +10994,7 @@ packages: /fresh@0.5.2: resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==} engines: {node: '>= 0.6'} + dev: false /fs-constants@1.0.0: resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} @@ -11254,10 +11108,6 @@ packages: resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==} engines: {node: '>=8.0.0'} - /get-port@5.1.1: - resolution: {integrity: sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==} - engines: {node: '>=8'} - /get-stdin@8.0.0: resolution: {integrity: sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==} engines: {node: '>=10'} @@ -13247,6 +13097,7 @@ packages: /media-typer@0.3.0: resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==} engines: {node: '>= 0.6'} + dev: false /memoize-one@6.0.0: resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==} @@ -13273,10 +13124,6 @@ packages: resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==} dev: false - /merge-descriptors@1.0.3: - resolution: {integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==} - dev: true - /merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} @@ -13291,6 +13138,7 @@ packages: /methods@1.1.2: resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==} engines: {node: '>= 0.6'} + dev: false /micromatch@4.0.5: resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} @@ -13313,6 +13161,7 @@ packages: resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==} engines: {node: '>=4'} hasBin: true + dev: false /mime@3.0.0: resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==} @@ -13612,6 +13461,7 @@ packages: /negotiator@0.6.3: resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==} engines: {node: '>= 0.6'} + dev: false /neo-async@2.6.2: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} @@ -13718,24 +13568,6 @@ packages: /node-int64@0.4.0: resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==} - /node-mocks-http@1.14.1: - resolution: {integrity: sha512-mfXuCGonz0A7uG1FEjnypjm34xegeN5+HI6xeGhYKecfgaZhjsmYoLE9LEFmT+53G1n8IuagPZmVnEL/xNsFaA==} - engines: {node: '>=14'} - dependencies: - '@types/express': 4.17.21 - '@types/node': 20.12.5 - accepts: 1.3.8 - content-disposition: 0.5.4 - depd: 1.1.2 - fresh: 0.5.2 - merge-descriptors: 1.0.3 - methods: 1.1.2 - mime: 1.6.0 - parseurl: 1.3.3 - range-parser: 1.2.1 - type-is: 1.6.18 - dev: true - /node-releases@2.0.14: resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==} @@ -14117,6 +13949,7 @@ packages: /parseurl@1.3.3: resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==} engines: {node: '>= 0.8'} + dev: false /path-exists@3.0.0: resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==} @@ -15233,11 +15066,6 @@ packages: resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==} engines: {node: '>= 0.6.0'} - /process@0.5.2: - resolution: {integrity: sha512-oNpcutj+nYX2FjdEW7PGltWhXulAnFlM0My/k48L90hARCOJtvBbQXc/6itV2jDvU5xAAtonP+r6wmQgCcbAUA==} - engines: {node: '>= 0.6.0'} - dev: true - /prompts@2.4.2: resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==} engines: {node: '>= 6'} @@ -15341,6 +15169,7 @@ packages: /range-parser@1.2.1: resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==} engines: {node: '>= 0.6'} + dev: false /raw-body@2.5.2: resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==} @@ -15518,13 +15347,6 @@ packages: resolution: {integrity: sha512-SeU2v5Xy6FotVhKz0pMS2gvYP7HlkF0qgTskj3JzA1vlxcb3dQjxlm9t0ZlJqcgoyI3VFAw7bomuDMdgy1nBuw==} engines: {node: '>=0.10.0'} - /read-stream@2.1.1: - resolution: {integrity: sha512-UcZnoo+AEM+ipqwOQ4JLxkIDYyWvOT3hvcal/fSL3VFFUKeHoHgC89gltJtekAejj+ji7dTe0TVb5mpj8/kt0g==} - dependencies: - process: 0.5.2 - readable-stream: github.com/Raynos/readable-stream/b1a911ce6e4f4c5a7e2948cd23c2f9ee1ea0696f - dev: true - /readable-stream@1.0.34: resolution: {integrity: sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==} dependencies: @@ -16172,16 +15994,6 @@ packages: simple-concat: 1.0.1 dev: true - /simple-git@3.24.0: - resolution: {integrity: sha512-QqAKee9Twv+3k8IFOFfPB2hnk6as6Y6ACUpwCtQvRYBAes23Wv3SZlHVobAzqcE8gfsisCvPw3HGW3HYM+VYYw==} - dependencies: - '@kwsites/file-exists': 1.1.1 - '@kwsites/promise-deferred': 1.1.1 - debug: 4.3.4(supports-color@5.5.0) - transitivePeerDependencies: - - supports-color - dev: true - /simple-swizzle@0.2.2: resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==} dependencies: @@ -17208,6 +17020,7 @@ packages: dependencies: media-typer: 0.3.0 mime-types: 2.1.35 + dev: false /type@2.7.2: resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==} @@ -17256,10 +17069,6 @@ packages: possible-typed-array-names: 1.0.0 dev: false - /typedarray@0.0.6: - resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==} - dev: true - /types-react-dom@19.0.0-beta.2: resolution: {integrity: sha512-U1qAZtPiPsv7R6BJlxeXFZsPre2jBG/DtzWJ0tAqqZfwuySo+0pT0df39wn+42OaHvXNDterwC4O0uw8el5BXQ==} dependencies: @@ -17341,10 +17150,6 @@ packages: crypto-random-string: 2.0.0 dev: true - /universal-user-agent@6.0.1: - resolution: {integrity: sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==} - dev: true - /universalify@0.2.0: resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==} engines: {node: '>= 4.0.0'} @@ -17915,9 +17720,3 @@ packages: /zod@3.22.4: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} - - github.com/Raynos/readable-stream/b1a911ce6e4f4c5a7e2948cd23c2f9ee1ea0696f: - resolution: {tarball: https://codeload.github.com/Raynos/readable-stream/tar.gz/b1a911ce6e4f4c5a7e2948cd23c2f9ee1ea0696f} - name: readable-stream - version: 0.3.1 - dev: true diff --git a/test/package.json b/test/package.json index 247cd6a789f..81cb9479303 100644 --- a/test/package.json +++ b/test/package.json @@ -42,6 +42,7 @@ "@payloadcms/storage-vercel-blob": "workspace:*", "@payloadcms/translations": "workspace:*", "@payloadcms/ui": "workspace:*", + "@sentry/react": "^7.77.0", "@types/react": "npm:types-react@19.0.0-beta.2", "@types/react-dom": "npm:types-react-dom@19.0.0-beta.2", "babel-plugin-react-compiler": "0.0.0-experimental-592953e-20240517", @@ -52,9 +53,11 @@ "eslint-plugin-playwright": "1.5.3", "execa": "5.1.1", "http-status": "1.6.2", + "jwt-decode": "4.0.0", "lexical": "0.15.0", "payload": "workspace:*", "server-only": "^0.0.1", + "slate": "0.91.4", "tempy": "^1.0.1", "ts-essentials": "7.0.3", "typescript": "5.4.5", From db9f0ec56f2064309f09f917bb9e2d46a7a5532a Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 15:35:38 -0400 Subject: [PATCH 22/29] fix jest esm support --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 896a2bbbe6c..07ac653b7bf 100644 --- a/package.json +++ b/package.json @@ -65,13 +65,13 @@ "script:pack": "tsx scripts/pack-all-to-dest.ts", "pretest": "pnpm build", "test": "pnpm test:int && pnpm test:components && pnpm test:e2e", - "test:components": "cross-env NODE_OPTIONS=--no-deprecation jest --config=jest.components.config.js", + "test:components": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-deprecation\" jest --config=jest.components.config.js", "test:e2e": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 tsx ./test/runE2E.ts", "test:e2e:debug": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 PWDEBUG=1 DISABLE_LOGGING=true playwright test", "test:e2e:headed": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 DISABLE_LOGGING=true playwright test --headed", - "test:int": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand", - "test:int:postgres": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=postgres DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand", - "test:unit": "cross-env NODE_OPTIONS=--no-deprecation NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=jest.config.js --runInBand", + "test:int": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-deprecation\" NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand", + "test:int:postgres": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-deprecation\" NODE_NO_WARNINGS=1 PAYLOAD_DATABASE=postgres DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=test/jest.config.js --runInBand", + "test:unit": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-deprecation\" NODE_NO_WARNINGS=1 DISABLE_LOGGING=true jest --forceExit --detectOpenHandles --config=jest.config.js --runInBand", "translateNewKeys": "pnpm --filter payload run translateNewKeys" }, "lint-staged": { From cee5702a0e0a2ba97fd280f9a82c3db9b6a40260 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 15:37:43 -0400 Subject: [PATCH 23/29] fix incorrect __dirname usage --- test/collections-graphql/int.spec.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/collections-graphql/int.spec.ts b/test/collections-graphql/int.spec.ts index b9d395716ac..cbba179d906 100644 --- a/test/collections-graphql/int.spec.ts +++ b/test/collections-graphql/int.spec.ts @@ -1,5 +1,6 @@ import type { Payload } from 'payload' +import { fileURLToPath } from 'node:url' import path from 'path' import { getFileByPath } from 'payload/uploads' import { mapAsync } from 'payload/utilities' @@ -16,6 +17,9 @@ const title = 'title' let restClient: NextRESTClient let payload: Payload +const filename = fileURLToPath(import.meta.url) +const dirname = path.dirname(filename) + describe('collections-graphql', () => { beforeAll(async () => { ;({ payload, restClient } = await initPayloadInt(config)) @@ -1077,7 +1081,7 @@ describe('collections-graphql', () => { }) it('should query upload enabled docs', async () => { - const file = await getFileByPath(path.resolve(__dirname, '../uploads/test-image.jpg')) + const file = await getFileByPath(path.resolve(dirname, '../uploads/test-image.jpg')) const mediaDoc = await payload.create({ collection: 'media', From 3e3c32f5006b4a42009b4771e08fbcac2049a5e9 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 15:45:53 -0400 Subject: [PATCH 24/29] remove another __dirname --- test/plugin-relationship-object-ids/config.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/plugin-relationship-object-ids/config.ts b/test/plugin-relationship-object-ids/config.ts index 249ff4107cc..bd2ef112ccb 100644 --- a/test/plugin-relationship-object-ids/config.ts +++ b/test/plugin-relationship-object-ids/config.ts @@ -1,5 +1,8 @@ import { relationshipsAsObjectID } from '@payloadcms/plugin-relationship-object-ids' import path from 'path' +const filename = fileURLToPath(import.meta.url) +const dirname = path.dirname(filename) +import { fileURLToPath } from 'node:url' import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js' @@ -99,7 +102,7 @@ export default buildConfigWithDefaults({ const upload = await payload.create({ collection: 'uploads', data: {}, - filePath: path.resolve(__dirname, './payload-logo.png'), + filePath: path.resolve(dirname, './payload-logo.png'), }) await payload.create({ From d12c216531de6c59a497167545792b0599f7886d Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 15:57:00 -0400 Subject: [PATCH 25/29] fix types --- package.json | 1 + packages/create-payload-app/package.json | 2 +- packages/plugin-cloud/package.json | 2 +- packages/plugin-sentry/package.json | 4 +- pnpm-lock.yaml | 50 ++++-------------------- test/create-payload-app/int.spec.ts | 4 +- 6 files changed, 15 insertions(+), 48 deletions(-) diff --git a/package.json b/package.json index 07ac653b7bf..b9593863599 100644 --- a/package.json +++ b/package.json @@ -84,6 +84,7 @@ "tsconfig.json": "node scripts/reset-tsconfig.js" }, "devDependencies": { + "@aws-sdk/client-s3": "^3.525.0", "@next/bundle-analyzer": "^14.1.0", "@payloadcms/eslint-config": "workspace:*", "@payloadcms/live-preview-react": "workspace:*", diff --git a/packages/create-payload-app/package.json b/packages/create-payload-app/package.json index b8cc893223c..89434690d7d 100644 --- a/packages/create-payload-app/package.json +++ b/packages/create-payload-app/package.json @@ -51,7 +51,7 @@ "@types/degit": "^2.8.3", "@types/esprima": "^4.0.6", "@types/fs-extra": "^9.0.12", - "@types/jest": "^27.0.3", + "@types/jest": "29.5.12", "@types/node": "20.12.5", "temp-dir": "2.0.0" } diff --git a/packages/plugin-cloud/package.json b/packages/plugin-cloud/package.json index 39b3c910079..c5293a8cb74 100644 --- a/packages/plugin-cloud/package.json +++ b/packages/plugin-cloud/package.json @@ -41,7 +41,7 @@ "resend": "^0.17.2" }, "devDependencies": { - "@types/jest": "^29.5.1", + "@types/jest": "29.5.12", "@types/nodemailer": "6.4.14", "payload": "workspace:*", "ts-jest": "^29.1.0" diff --git a/packages/plugin-sentry/package.json b/packages/plugin-sentry/package.json index bdce30fda99..5f8b24b1dc3 100644 --- a/packages/plugin-sentry/package.json +++ b/packages/plugin-sentry/package.json @@ -45,13 +45,13 @@ "devDependencies": { "@payloadcms/eslint-config": "workspace:*", "@types/express": "^4.17.9", - "@types/jest": "^29.5.2", + "@types/jest": "29.5.12", "@types/node": "20.12.5", "@types/react": "npm:types-react@19.0.0-beta.2", "@types/react-dom": "npm:types-react-dom@19.0.0-beta.2", "copyfiles": "^2.4.1", "cross-env": "^7.0.3", - "jest": "^29.5.0", + "jest": "^29.7.0", "nodemon": "3.0.3", "payload": "workspace:*", "ts-jest": "^29.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ac755457b7a..67be12269d2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,6 +26,9 @@ importers: .: devDependencies: + '@aws-sdk/client-s3': + specifier: ^3.525.0 + version: 3.550.0 '@next/bundle-analyzer': specifier: ^14.1.0 version: 14.1.4 @@ -271,8 +274,8 @@ importers: specifier: ^9.0.12 version: 9.0.13 '@types/jest': - specifier: ^27.0.3 - version: 27.5.2 + specifier: 29.5.12 + version: 29.5.12 '@types/node': specifier: 20.12.5 version: 20.12.5 @@ -835,7 +838,7 @@ importers: version: 0.17.2 devDependencies: '@types/jest': - specifier: ^29.5.1 + specifier: 29.5.12 version: 29.5.12 '@types/nodemailer': specifier: 6.4.14 @@ -1026,7 +1029,7 @@ importers: specifier: ^4.17.9 version: 4.17.21 '@types/jest': - specifier: ^29.5.2 + specifier: 29.5.12 version: 29.5.12 '@types/node': specifier: 20.12.5 @@ -1044,7 +1047,7 @@ importers: specifier: 7.0.3 version: 7.0.3 jest: - specifier: ^29.5.0 + specifier: ^29.7.0 version: 29.7.0(@types/node@20.12.5)(ts-node@10.9.1) nodemon: specifier: 3.0.3 @@ -6980,13 +6983,6 @@ packages: dependencies: '@types/istanbul-lib-report': 3.0.3 - /@types/jest@27.5.2: - resolution: {integrity: sha512-mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA==} - dependencies: - jest-matcher-utils: 27.5.1 - pretty-format: 27.5.1 - dev: true - /@types/jest@29.5.12: resolution: {integrity: sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==} dependencies: @@ -9596,11 +9592,6 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dev: true - /diff-sequences@27.5.1: - resolution: {integrity: sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dev: true - /diff-sequences@29.6.3: resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -12196,16 +12187,6 @@ packages: - babel-plugin-macros - supports-color - /jest-diff@27.5.1: - resolution: {integrity: sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - chalk: 4.1.2 - diff-sequences: 27.5.1 - jest-get-type: 27.5.1 - pretty-format: 27.5.1 - dev: true - /jest-diff@29.7.0: resolution: {integrity: sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -12265,11 +12246,6 @@ packages: jest-mock: 29.7.0 jest-util: 29.7.0 - /jest-get-type@27.5.1: - resolution: {integrity: sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dev: true - /jest-get-type@29.6.3: resolution: {integrity: sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -12299,16 +12275,6 @@ packages: jest-get-type: 29.6.3 pretty-format: 29.7.0 - /jest-matcher-utils@27.5.1: - resolution: {integrity: sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - chalk: 4.1.2 - jest-diff: 27.5.1 - jest-get-type: 27.5.1 - pretty-format: 27.5.1 - dev: true - /jest-matcher-utils@29.7.0: resolution: {integrity: sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} diff --git a/test/create-payload-app/int.spec.ts b/test/create-payload-app/int.spec.ts index 25e3be9a814..431b7fcd830 100644 --- a/test/create-payload-app/int.spec.ts +++ b/test/create-payload-app/int.spec.ts @@ -30,7 +30,7 @@ describe('create-payload-app', () => { const projectDir = tempy.directory() beforeEach(async () => { if (fs.existsSync(projectDir)) { - fs.rmdirSync(projectDir, { recursive: true }) + fs.rmSync(projectDir, { recursive: true }) } // Create dir for Next.js project @@ -57,7 +57,7 @@ describe('create-payload-app', () => { afterEach(() => { if (fs.existsSync(projectDir)) { - fs.rmdirSync(projectDir, { recursive: true }) + fs.rmSync(projectDir, { recursive: true }) } }) From 7eb8fc5f5fda0ee1d4d737cc7b405dd688f69366 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 16:03:48 -0400 Subject: [PATCH 26/29] fix unit tests jest --- package.json | 1 + .../create-payload-app/src/lib/create-project.spec.ts | 1 + .../create-payload-app/src/lib/wrap-next-config.spec.ts | 1 + packages/email-resend/src/email-resend.spec.ts | 1 + packages/payload/src/fields/validations.spec.ts | 3 ++- packages/plugin-cloud/src/email.spec.ts | 3 ++- packages/plugin-cloud/src/plugin.spec.ts | 3 ++- pnpm-lock.yaml | 8 ++++++-- 8 files changed, 16 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b9593863599..e6a8ba3e2c0 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,7 @@ }, "devDependencies": { "@aws-sdk/client-s3": "^3.525.0", + "@jest/globals": "29.7.0", "@next/bundle-analyzer": "^14.1.0", "@payloadcms/eslint-config": "workspace:*", "@payloadcms/live-preview-react": "workspace:*", diff --git a/packages/create-payload-app/src/lib/create-project.spec.ts b/packages/create-payload-app/src/lib/create-project.spec.ts index e01a08889cb..2d6f8f50ba1 100644 --- a/packages/create-payload-app/src/lib/create-project.spec.ts +++ b/packages/create-payload-app/src/lib/create-project.spec.ts @@ -5,6 +5,7 @@ import { createProject } from './create-project.js' import { dbReplacements } from './packages.js' import { getValidTemplates } from './templates.js' import globby from 'globby' +import { jest } from '@jest/globals' import tempDirectory from 'temp-dir' diff --git a/packages/create-payload-app/src/lib/wrap-next-config.spec.ts b/packages/create-payload-app/src/lib/wrap-next-config.spec.ts index 1099336232a..14871cccf0c 100644 --- a/packages/create-payload-app/src/lib/wrap-next-config.spec.ts +++ b/packages/create-payload-app/src/lib/wrap-next-config.spec.ts @@ -1,5 +1,6 @@ import { parseAndModifyConfigContent, withPayloadStatement } from './wrap-next-config.js' import * as p from '@clack/prompts' +import { jest } from '@jest/globals' const esmConfigs = { defaultNextConfig: `/** @type {import('next').NextConfig} */ diff --git a/packages/email-resend/src/email-resend.spec.ts b/packages/email-resend/src/email-resend.spec.ts index 7536d054a8b..4fe2e9cd229 100644 --- a/packages/email-resend/src/email-resend.spec.ts +++ b/packages/email-resend/src/email-resend.spec.ts @@ -1,5 +1,6 @@ import { resendAdapter } from './index.js' import { Payload } from 'payload/types' +import { jest } from '@jest/globals' describe('email-resend', () => { const defaultFromAddress = 'dev@payloadcms.com' diff --git a/packages/payload/src/fields/validations.spec.ts b/packages/payload/src/fields/validations.spec.ts index b555e010104..f3331e7c4cd 100644 --- a/packages/payload/src/fields/validations.spec.ts +++ b/packages/payload/src/fields/validations.spec.ts @@ -1,10 +1,11 @@ import type { ValidateOptions } from './config/types.js' +import { jest } from '@jest/globals' import { number, password, point, relationship, select, text, textarea } from './validations.js' const t = jest.fn((string) => string) -let options: ValidateOptions = { +let options: ValidateOptions = { data: undefined, operation: 'create', siblingData: undefined, diff --git a/packages/plugin-cloud/src/email.spec.ts b/packages/plugin-cloud/src/email.spec.ts index 36cfa659ff4..596c91a548c 100644 --- a/packages/plugin-cloud/src/email.spec.ts +++ b/packages/plugin-cloud/src/email.spec.ts @@ -1,6 +1,7 @@ import type { Config } from 'payload/config' import type { Payload } from 'payload' import nodemailer from 'nodemailer' +import { jest } from '@jest/globals' import { defaults } from 'payload/config' @@ -11,7 +12,7 @@ describe('email', () => { const skipVerify = true const defaultDomain = 'test.com' const apiKey = 'test' - let createTransportSpy: jest.SpyInstance + let createTransportSpy: jest.Spied const mockedPayload: Payload = jest.fn() as unknown as Payload diff --git a/packages/plugin-cloud/src/plugin.spec.ts b/packages/plugin-cloud/src/plugin.spec.ts index f611c16f50f..109976a8a74 100644 --- a/packages/plugin-cloud/src/plugin.spec.ts +++ b/packages/plugin-cloud/src/plugin.spec.ts @@ -1,5 +1,6 @@ import type { Config } from 'payload/config' import type { Payload } from 'payload' +import { jest } from '@jest/globals' import nodemailer from 'nodemailer' import { defaults } from 'payload/config' @@ -10,7 +11,7 @@ import { nodemailerAdapter } from '@payloadcms/email-nodemailer' const mockedPayload: Payload = jest.fn() as unknown as Payload describe('plugin', () => { - let createTransportSpy: jest.SpyInstance + let createTransportSpy: jest.Spied const skipVerify = true diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 67be12269d2..dbea5f993f8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,6 +29,9 @@ importers: '@aws-sdk/client-s3': specifier: ^3.525.0 version: 3.550.0 + '@jest/globals': + specifier: 29.7.0 + version: 29.7.0 '@next/bundle-analyzer': specifier: ^14.1.0 version: 14.1.4 @@ -49,7 +52,7 @@ importers: version: 0.2.36(@swc/core@1.4.13) '@testing-library/jest-dom': specifier: 6.4.2 - version: 6.4.2(@types/jest@29.5.12)(jest@29.7.0) + version: 6.4.2(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0) '@testing-library/react': specifier: 14.2.1 version: 14.2.1(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) @@ -6735,7 +6738,7 @@ packages: pretty-format: 27.5.1 dev: true - /@testing-library/jest-dom@6.4.2(@types/jest@29.5.12)(jest@29.7.0): + /@testing-library/jest-dom@6.4.2(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0): resolution: {integrity: sha512-CzqH0AFymEMG48CpzXFriYYkOjk6ZGPCLMhW9e9jg3KMCn5OfJecF8GtGW7yGfR/IgCe3SX8BSwjdzI6BBbZLw==} engines: {node: '>=14', npm: '>=6', yarn: '>=1'} peerDependencies: @@ -6758,6 +6761,7 @@ packages: dependencies: '@adobe/css-tools': 4.3.3 '@babel/runtime': 7.24.4 + '@jest/globals': 29.7.0 '@types/jest': 29.5.12 aria-query: 5.3.0 chalk: 3.0.0 From 220bb7cf4409f434b0b00a9fc1bc4f031423c5eb Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 16:17:02 -0400 Subject: [PATCH 27/29] remove useless package again --- package.json | 1 - pnpm-lock.yaml | 3 --- 2 files changed, 4 deletions(-) diff --git a/package.json b/package.json index e6a8ba3e2c0..4f5c547c9ea 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,6 @@ "tsconfig.json": "node scripts/reset-tsconfig.js" }, "devDependencies": { - "@aws-sdk/client-s3": "^3.525.0", "@jest/globals": "29.7.0", "@next/bundle-analyzer": "^14.1.0", "@payloadcms/eslint-config": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dbea5f993f8..1bfff317669 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,9 +26,6 @@ importers: .: devDependencies: - '@aws-sdk/client-s3': - specifier: ^3.525.0 - version: 3.550.0 '@jest/globals': specifier: 29.7.0 version: 29.7.0 From c27a3344e1ec9e21091d1e7ea5cfc8bc04630773 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 16:33:14 -0400 Subject: [PATCH 28/29] fix sass dependency issue --- packages/next/package.json | 2 +- packages/ui/package.json | 1 - pnpm-lock.yaml | 66 +++++++++++++++++++++++++++++++------- 3 files changed, 56 insertions(+), 13 deletions(-) diff --git a/packages/next/package.json b/packages/next/package.json index 864f21bc8b9..4e3de16aec7 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -55,6 +55,7 @@ "qs": "6.11.2", "react-diff-viewer-continued": "3.2.6", "react-toastify": "10.0.5", + "sass": "1.77.4", "ws": "^8.16.0" }, "devDependencies": { @@ -70,7 +71,6 @@ "payload": "workspace:*", "postcss-loader": "^8.1.1", "postcss-preset-env": "^9.5.14", - "sass": "1.77.4", "sass-loader": "14.2.1", "swc-loader": "^0.2.6", "swc-plugin-transform-remove-imports": "^1.12.1", diff --git a/packages/ui/package.json b/packages/ui/package.json index 7d802537967..c25fe1387fd 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -139,7 +139,6 @@ "payload": "workspace:*", "postcss-loader": "^8.1.1", "postcss-preset-env": "^9.5.14", - "sass": "1.77.4", "sass-loader": "14.2.1", "swc-loader": "^0.2.6", "swc-plugin-transform-remove-imports": "^1.12.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1bfff317669..4ef41aad238 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -148,7 +148,7 @@ importers: version: 9.1.8 next: specifier: 15.0.0-rc.0 - version: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(sass@1.77.4) + version: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) open: specifier: ^10.1.0 version: 10.1.0 @@ -587,7 +587,7 @@ importers: version: 1.6.2 next: specifier: ^15.0.0-rc.0 - version: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(sass@1.77.4) + version: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(sass@1.77.4) path-to-regexp: specifier: ^6.2.1 version: 6.2.2 @@ -600,6 +600,9 @@ importers: react-toastify: specifier: 10.0.5 version: 10.0.5(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) + sass: + specifier: 1.77.4 + version: 1.77.4 ws: specifier: ^8.16.0 version: 8.16.0 @@ -640,9 +643,6 @@ importers: postcss-preset-env: specifier: ^9.5.14 version: 9.5.14(postcss@8.4.38) - sass: - specifier: 1.77.4 - version: 1.77.4 sass-loader: specifier: 14.2.1 version: 14.2.1(sass@1.77.4)(webpack@5.91.0) @@ -1432,7 +1432,7 @@ importers: version: 2.3.0 next: specifier: ^15.0.0-rc.0 - version: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(sass@1.77.4) + version: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) object-to-formdata: specifier: 4.5.1 version: 4.5.1 @@ -1530,9 +1530,6 @@ importers: postcss-preset-env: specifier: ^9.5.14 version: 9.5.14(postcss@8.4.38) - sass: - specifier: 1.77.4 - version: 1.77.4 sass-loader: specifier: 14.2.1 version: 14.2.1(sass@1.77.4)(webpack@5.91.0) @@ -13446,7 +13443,7 @@ packages: /next-tick@1.1.0: resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==} - /next@15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(sass@1.77.4): + /next@15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522): resolution: {integrity: sha512-IWcCvxUSCAuOK5gig4+9yiyt/dLKpIa+WT01Qcx4CBE4TtwJljyTDnCVVn64jDZ4qmSzsaEYXpb4DTI8qbk03A==} engines: {node: '>=18.17.0'} hasBin: true @@ -13477,6 +13474,52 @@ packages: postcss: 8.4.31 react: 19.0.0-rc-f994737d14-20240522 react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522) + styled-jsx: 5.1.3(@babel/core@7.24.5)(react@19.0.0-rc-f994737d14-20240522) + optionalDependencies: + '@next/swc-darwin-arm64': 15.0.0-rc.0 + '@next/swc-darwin-x64': 15.0.0-rc.0 + '@next/swc-linux-arm64-gnu': 15.0.0-rc.0 + '@next/swc-linux-arm64-musl': 15.0.0-rc.0 + '@next/swc-linux-x64-gnu': 15.0.0-rc.0 + '@next/swc-linux-x64-musl': 15.0.0-rc.0 + '@next/swc-win32-arm64-msvc': 15.0.0-rc.0 + '@next/swc-win32-ia32-msvc': 15.0.0-rc.0 + '@next/swc-win32-x64-msvc': 15.0.0-rc.0 + sharp: 0.33.4 + transitivePeerDependencies: + - '@babel/core' + - babel-plugin-macros + + /next@15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(sass@1.77.4): + resolution: {integrity: sha512-IWcCvxUSCAuOK5gig4+9yiyt/dLKpIa+WT01Qcx4CBE4TtwJljyTDnCVVn64jDZ4qmSzsaEYXpb4DTI8qbk03A==} + engines: {node: '>=18.17.0'} + hasBin: true + peerDependencies: + '@opentelemetry/api': ^1.1.0 + '@playwright/test': ^1.41.2 + babel-plugin-react-compiler: '*' + react: ^19.0.0-rc-f994737d14-20240522 + react-dom: ^19.0.0-rc-f994737d14-20240522 + sass: ^1.3.0 + peerDependenciesMeta: + '@opentelemetry/api': + optional: true + '@playwright/test': + optional: true + babel-plugin-react-compiler: + optional: true + sass: + optional: true + dependencies: + '@next/env': 15.0.0-rc.0 + '@playwright/test': 1.43.0 + '@swc/helpers': 0.5.11 + busboy: 1.6.0 + caniuse-lite: 1.0.30001607 + graceful-fs: 4.2.11 + postcss: 8.4.31 + react: 19.0.0-rc-f994737d14-20240522 + react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522) sass: 1.77.4 styled-jsx: 5.1.3(@babel/core@7.24.5)(react@19.0.0-rc-f994737d14-20240522) optionalDependencies: @@ -13493,6 +13536,7 @@ packages: transitivePeerDependencies: - '@babel/core' - babel-plugin-macros + dev: false /node-abi@3.57.0: resolution: {integrity: sha512-Dp+A9JWxRaKuHP35H77I4kCKesDy5HUDEmScia2FyncMTOXASMyg251F5PhFoDA5uqBrDDffiLpbqnrZmNXW+g==} @@ -17173,7 +17217,7 @@ packages: consola: 3.2.3 effect: 3.1.5 fast-check: 3.18.0 - next: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)(sass@1.77.4) + next: 15.0.0-rc.0(@babel/core@7.24.5)(@playwright/test@1.43.0)(babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517)(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522) std-env: 3.7.0 /uri-js@4.4.1: From e162fe6392288ff11aaf7044d4f30f596209d418 Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Mon, 3 Jun 2024 17:09:03 -0400 Subject: [PATCH 29/29] attempt to unflake lexical e2e test again --- test/fields/collections/Lexical/e2e/blocks/e2e.spec.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/fields/collections/Lexical/e2e/blocks/e2e.spec.ts b/test/fields/collections/Lexical/e2e/blocks/e2e.spec.ts index 598b3c47d29..763a4e8a7d1 100644 --- a/test/fields/collections/Lexical/e2e/blocks/e2e.spec.ts +++ b/test/fields/collections/Lexical/e2e/blocks/e2e.spec.ts @@ -575,6 +575,14 @@ describe('lexicalBlocks', () => { // reload page and assert again await page.reload() await wait(300) + await newSubLexicalAndUploadBlock.scrollIntoViewIfNeeded() + await expect(newSubLexicalAndUploadBlock).toBeVisible() + await newSubLexicalAndUploadBlock + .locator('.field-type.upload .file-meta__url a') + .scrollIntoViewIfNeeded() + await expect( + newSubLexicalAndUploadBlock.locator('.field-type.upload .file-meta__url a'), + ).toBeVisible() await expect( newSubLexicalAndUploadBlock.locator('.field-type.upload .file-meta__url a'),