From a6bf05815c5eb567de7d1f18b93bc8743a59be9e Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 16 May 2024 12:15:35 -0300 Subject: [PATCH] chore!: remove unused staticOptions config on uploads (#6378) Removes the unused `staticOptions` on upload config, it was previously typed to express configuration and is unused anywhere in the codebase --- docs/upload/overview.mdx | 3 +- packages/payload/package.json | 2 -- .../payload/src/collections/config/schema.ts | 1 - packages/payload/src/uploads/types.ts | 3 -- pnpm-lock.yaml | 29 +++++++++---------- 5 files changed, 15 insertions(+), 23 deletions(-) diff --git a/docs/upload/overview.mdx b/docs/upload/overview.mdx index aaaadcaa8..90c54cd82 100644 --- a/docs/upload/overview.mdx +++ b/docs/upload/overview.mdx @@ -52,8 +52,7 @@ Every Payload Collection can opt-in to supporting Uploads by specifying the `upl | **`formatOptions`** | An object with `format` and `options` that are used with the Sharp image library to format the upload file. [More](https://sharp.pixelplumbing.com/api-output#toformat) | | **`handlers`** | Array of Express request handlers to execute before the built-in Payload static middleware executes. | | **`imageSizes`** | If specified, image uploads will be automatically resized in accordance to these image sizes. [More](#image-sizes) | -| **`mimeTypes`** | Restrict mimeTypes in the file picker. Array of valid mimetypes or mimetype wildcards [More](#mimetypes) | -| **`staticOptions`** | Set options for `express.static` to use while serving your static files. [More](http://expressjs.com/en/resources/middleware/serve-static.html) | +| **`mimeTypes`** | Restrict mimeTypes in the file picker. Array of valid mimetypes or mimetype wildcards [More](#mimetypes) | | | **`resizeOptions`** | An object passed to the the Sharp image library to resize the uploaded file. [More](https://sharp.pixelplumbing.com/api-resize) | | **`filesRequiredOnCreate`** | Mandate file data on creation, default is true. | diff --git a/packages/payload/package.json b/packages/payload/package.json index 97e3ea5b1..50fa46cab 100644 --- a/packages/payload/package.json +++ b/packages/payload/package.json @@ -119,7 +119,6 @@ "@types/asap": "2.0.0", "@types/body-parser": "1.19.2", "@types/compression": "1.7.2", - "@types/express": "4.17.17", "@types/express-fileupload": "1.4.1", "@types/express-rate-limit": "5.1.3", "@types/express-serve-static-core": "4.17.35", @@ -154,7 +153,6 @@ "object.entries": "1.1.6", "passport-strategy": "1.0.0", "rimraf": "3.0.2", - "serve-static": "1.15.0", "sharp": "0.32.6" }, "peerDependencies": { diff --git a/packages/payload/src/collections/config/schema.ts b/packages/payload/src/collections/config/schema.ts index 0e71b8a50..98e92ca24 100644 --- a/packages/payload/src/collections/config/schema.ts +++ b/packages/payload/src/collections/config/schema.ts @@ -193,7 +193,6 @@ const collectionSchema = joi.object().keys({ }) .allow(null), staticDir: joi.string(), - staticOptions: joi.object(), tempFileDir: joi.string(), trimOptions: joi.alternatives().try( joi.object().keys({ diff --git a/packages/payload/src/uploads/types.ts b/packages/payload/src/uploads/types.ts index a07937f60..ec44b7129 100644 --- a/packages/payload/src/uploads/types.ts +++ b/packages/payload/src/uploads/types.ts @@ -1,5 +1,3 @@ -import type express from 'express' -import type serveStatic from 'serve-static' import type { ResizeOptions, Sharp } from 'sharp' import type { TypeWithID } from '../collections/config/types.js' @@ -101,7 +99,6 @@ export type UploadConfig = { mimeTypes?: string[] resizeOptions?: ResizeOptions staticDir?: string - staticOptions?: serveStatic.ServeStaticOptions>> trimOptions?: ImageUploadTrimOptions } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e67032e99..a0a195d03 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -828,9 +828,6 @@ importers: '@types/compression': specifier: 1.7.2 version: 1.7.2 - '@types/express': - specifier: 4.17.17 - version: 4.17.17 '@types/express-fileupload': specifier: 1.4.1 version: 1.4.1 @@ -933,9 +930,6 @@ importers: rimraf: specifier: 3.0.2 version: 3.0.2 - serve-static: - specifier: 1.15.0 - version: 1.15.0 sharp: specifier: 0.32.6 version: 0.32.6 @@ -5856,15 +5850,6 @@ packages: '@types/send': 0.17.4 dev: true - /@types/express@4.17.17: - resolution: {integrity: sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==} - dependencies: - '@types/body-parser': 1.19.2 - '@types/express-serve-static-core': 4.17.35 - '@types/qs': 6.9.14 - '@types/serve-static': 1.15.7 - dev: true - /@types/express@4.17.21: resolution: {integrity: sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==} dependencies: @@ -8372,6 +8357,7 @@ packages: optional: true dependencies: ms: 2.0.0 + dev: false /debug@4.3.4(supports-color@5.5.0): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} @@ -8555,6 +8541,7 @@ packages: /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==} @@ -8571,6 +8558,7 @@ packages: /destroy@1.2.0: resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==} engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} + dev: false /detect-file@1.0.0: resolution: {integrity: sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==} @@ -8848,6 +8836,7 @@ packages: /ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} + dev: false /effect@3.1.2: resolution: {integrity: sha512-XakSWck6w6ROqKyEys0tKE9K6Gx2p8W/09u2ZTEZZrneO5Z3QEdPhXzWTyC73kD5zUvfJinZLVIas8I1xoHaTg==} @@ -8873,6 +8862,7 @@ packages: /encodeurl@1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} engines: {node: '>= 0.8'} + dev: false /end-of-stream@1.4.4: resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==} @@ -9501,6 +9491,7 @@ packages: /etag@1.8.1: resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==} engines: {node: '>= 0.6'} + dev: false /event-emitter@0.3.5: resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==} @@ -10502,6 +10493,7 @@ packages: setprototypeof: 1.2.0 statuses: 2.0.1 toidentifier: 1.0.1 + dev: false /http-proxy-agent@5.0.0: resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==} @@ -12395,6 +12387,7 @@ packages: /ms@2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} + dev: false /ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} @@ -12762,6 +12755,7 @@ packages: engines: {node: '>= 0.8'} dependencies: ee-first: 1.1.1 + dev: false /once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} @@ -14784,6 +14778,7 @@ packages: statuses: 2.0.1 transitivePeerDependencies: - supports-color + dev: false /serialize-javascript@6.0.2: resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} @@ -14801,6 +14796,7 @@ packages: send: 0.18.0 transitivePeerDependencies: - supports-color + dev: false /set-function-length@1.2.2: resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} @@ -14824,6 +14820,7 @@ packages: /setprototypeof@1.2.0: resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} + dev: false /shallow-clone@3.0.1: resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==} @@ -15123,6 +15120,7 @@ packages: /statuses@2.0.1: resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} engines: {node: '>= 0.8'} + dev: false /std-env@3.7.0: resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==} @@ -15657,6 +15655,7 @@ packages: /toidentifier@1.0.1: resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} engines: {node: '>=0.6'} + dev: false /token-types@4.2.1: resolution: {integrity: sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==}