From 8a10fd1547c19503731002eded02e86f4418a69f Mon Sep 17 00:00:00 2001 From: James Date: Mon, 4 Mar 2024 20:29:28 -0500 Subject: [PATCH] chore: rolls back payload sharp version --- package.json | 2 +- packages/db-mongodb/src/models/buildSchema.ts | 3 +- packages/payload/package.json | 9 +- pnpm-lock.yaml | 139 +++++++++++++++++- 4 files changed, 142 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 35e0621db9..91e660cf87 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "lint-staged": "^14.0.1", "minimist": "1.2.8", "mongodb-memory-server": "^9", - "next": "14.1.1-canary.26", + "next": "14.1.2", "node-mocks-http": "^1.14.1", "nodemon": "3.0.3", "pino": "8.15.0", diff --git a/packages/db-mongodb/src/models/buildSchema.ts b/packages/db-mongodb/src/models/buildSchema.ts index a7829846bc..e285bedde4 100644 --- a/packages/db-mongodb/src/models/buildSchema.ts +++ b/packages/db-mongodb/src/models/buildSchema.ts @@ -1,8 +1,7 @@ /* eslint-disable @typescript-eslint/ban-ts-comment */ /* eslint-disable class-methods-use-this */ /* eslint-disable @typescript-eslint/no-use-before-define */ -import type { IndexOptions, SchemaOptions, SchemaTypeOptions } from 'mongoose' -import type { Schema } from 'mongoose' +import type { IndexOptions, Schema, SchemaOptions, SchemaTypeOptions } from 'mongoose' import type { SanitizedConfig, SanitizedLocalizationConfig } from 'payload/config' import type { ArrayField, diff --git a/packages/payload/package.json b/packages/payload/package.json index a480517143..d9d9eacdc7 100644 --- a/packages/payload/package.json +++ b/packages/payload/package.json @@ -65,7 +65,8 @@ "probe-image-size": "6.0.0", "sanitize-filename": "1.6.3", "scheduler": "0.23.0", - "scmp": "2.1.0" + "scmp": "2.1.0", + "sharp": "0.32.6" }, "devDependencies": { "@monaco-editor/react": "4.5.1", @@ -112,11 +113,7 @@ "release-it": "17.1.1", "rimraf": "3.0.2", "serve-static": "1.15.0", - "ts-essentials": "7.0.3", - "sharp": "0.33.2" - }, - "peerDependencies": { - "sharp": "0.33.2" + "ts-essentials": "7.0.3" }, "engines": { "node": ">=18.17.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 038f0cd8eb..4752d86b72 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -192,8 +192,8 @@ importers: specifier: ^9 version: 9.1.6 next: - specifier: 14.1.1-canary.26 - version: 14.1.1-canary.26(@babel/core@7.24.0)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1) + specifier: 14.1.2 + version: 14.1.2(@babel/core@7.24.0)(react-dom@18.2.0)(react@18.2.0) node-mocks-http: specifier: ^1.14.1 version: 1.14.1 @@ -4975,6 +4975,11 @@ packages: /@next/env@14.1.1-canary.26: resolution: {integrity: sha512-NpwQaDqrJSREns70aTeh6vC44GPr2qHgoZdk2SPEJmuq1rD+n21FJVn5LtueUbHSZ0RcyPfATYfvdLGnsnZybw==} + dev: false + + /@next/env@14.1.2: + resolution: {integrity: sha512-U0iEG+JF86j6qyu330sfPgsMmDVH8vWVmzZadl+an5EU3o5HqdNytOpM+HsFpl58PmhGBTKx3UmM9c+eoLK0mA==} + dev: true /@next/eslint-plugin-next@14.1.0: resolution: {integrity: sha512-x4FavbNEeXx/baD/zC/SdrvkjSby8nBn8KcCREqk6UuwvwoAPZmaV8TFCAuo/cpovBRTIY67mHhe86MQQm/68Q==} @@ -4988,6 +4993,16 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true + dev: false + optional: true + + /@next/swc-darwin-arm64@14.1.2: + resolution: {integrity: sha512-E4/clgk0ZrYMo9eMRwP/4IO/cvXF1yEYSnGcdGfH+NYTR8bNFy76TSlc1Vb2rK3oaQY4BVHRpx8f/sMN/D5gNw==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true optional: true /@next/swc-darwin-x64@14.1.1-canary.26: @@ -4996,6 +5011,16 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true + dev: false + optional: true + + /@next/swc-darwin-x64@14.1.2: + resolution: {integrity: sha512-j8mEOI+ZM0tU9B/L/OGa6F7d9FXYMkog5OWWuhTWzz3iZ91UKIGGpD/ojTNKuejainDMgbqOBTNnLg0jZywM/g==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true optional: true /@next/swc-linux-arm64-gnu@14.1.1-canary.26: @@ -5004,6 +5029,16 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true + dev: false + optional: true + + /@next/swc-linux-arm64-gnu@14.1.2: + resolution: {integrity: sha512-qpRrd5hl6BFTWiFLgHtJmqqQGRMs+ol0MN9pEp0SYoLs3j8OTErPiDMhbKWjMWHGdc2E3kg4RRBV3cSTZiePiQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true optional: true /@next/swc-linux-arm64-musl@14.1.1-canary.26: @@ -5012,6 +5047,16 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true + dev: false + optional: true + + /@next/swc-linux-arm64-musl@14.1.2: + resolution: {integrity: sha512-HAhvVXAv+wnbj0wztT0YnpgJVoHtw1Mv4Y1R/JJcg5yXSU8FsP2uEGUwjQaqPoD76YSZjuKl32YbJlmPgQbLFw==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true optional: true /@next/swc-linux-x64-gnu@14.1.1-canary.26: @@ -5020,6 +5065,16 @@ packages: cpu: [x64] os: [linux] requiresBuild: true + dev: false + optional: true + + /@next/swc-linux-x64-gnu@14.1.2: + resolution: {integrity: sha512-PCWC312woXLWOXiedi1E+fEw6B/ECP1fMiK1nSoGS2E43o56Z8kq4WeJLbJoufFQGVj5ZOKU3jIVyV//3CI4wQ==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true optional: true /@next/swc-linux-x64-musl@14.1.1-canary.26: @@ -5028,6 +5083,16 @@ packages: cpu: [x64] os: [linux] requiresBuild: true + dev: false + optional: true + + /@next/swc-linux-x64-musl@14.1.2: + resolution: {integrity: sha512-KQSKzdWPNrYZjeTPCsepEpagOzU8Nf3Zzu53X1cLsSY6QlOIkYcSgEihRjsMKyeQW4aSvc+nN5pIpC2pLWNSMA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true optional: true /@next/swc-win32-arm64-msvc@14.1.1-canary.26: @@ -5036,6 +5101,16 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true + dev: false + optional: true + + /@next/swc-win32-arm64-msvc@14.1.2: + resolution: {integrity: sha512-3b0PouKd09Ulm2T1tjaRnwQj9+UwSsMO680d/sD4XAlm29KkNmVLAEIwWTfb3L+E11Qyw+jdcN3HtbDCg5+vYA==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true optional: true /@next/swc-win32-ia32-msvc@14.1.1-canary.26: @@ -5044,6 +5119,16 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true + dev: false + optional: true + + /@next/swc-win32-ia32-msvc@14.1.2: + resolution: {integrity: sha512-CC1gaJY4h+wg6d5r2biggGM6nCFXh/6WEim2VOQI0WrA6easCQi2P2hzWyrU6moQ0g1GOiWzesGc6nn0a92Kgg==} + engines: {node: '>= 10'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true optional: true /@next/swc-win32-x64-msvc@14.1.1-canary.26: @@ -5052,6 +5137,16 @@ packages: cpu: [x64] os: [win32] requiresBuild: true + dev: false + optional: true + + /@next/swc-win32-x64-msvc@14.1.2: + resolution: {integrity: sha512-pfASwanOd+yP3D80O63DuQffrBySZPuB7wRN0IGSRq/0rDm9p/MvvnLzzgP2kSiLOUklOrFYVax7P6AEzjGykQ==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true optional: true /@nodelib/fs.scandir@2.1.5: @@ -13578,6 +13673,46 @@ packages: transitivePeerDependencies: - '@babel/core' - babel-plugin-macros + dev: false + + /next@14.1.2(@babel/core@7.24.0)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-p4RfNmopqkzRP1uUyBJnHii+qMg71f2udWhTTZopBB8b3T5QXNzn7yO+LCYHPWZG2kAvEn4l4neyJHqkXvo2wg==} + engines: {node: '>=18.17.0'} + hasBin: true + peerDependencies: + '@opentelemetry/api': ^1.1.0 + react: ^18.2.0 + react-dom: ^18.2.0 + sass: ^1.3.0 + peerDependenciesMeta: + '@opentelemetry/api': + optional: true + sass: + optional: true + dependencies: + '@next/env': 14.1.2 + '@swc/helpers': 0.5.2 + busboy: 1.6.0 + caniuse-lite: 1.0.30001591 + graceful-fs: 4.2.11 + postcss: 8.4.31 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + styled-jsx: 5.1.1(@babel/core@7.24.0)(react@18.2.0) + optionalDependencies: + '@next/swc-darwin-arm64': 14.1.2 + '@next/swc-darwin-x64': 14.1.2 + '@next/swc-linux-arm64-gnu': 14.1.2 + '@next/swc-linux-arm64-musl': 14.1.2 + '@next/swc-linux-x64-gnu': 14.1.2 + '@next/swc-linux-x64-musl': 14.1.2 + '@next/swc-win32-arm64-msvc': 14.1.2 + '@next/swc-win32-ia32-msvc': 14.1.2 + '@next/swc-win32-x64-msvc': 14.1.2 + transitivePeerDependencies: + - '@babel/core' + - babel-plugin-macros + dev: true /node-domexception@1.0.0: resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}