Skip to content

Commit 1c490ae

Browse files
authored
fix(deps): move file-type to deps (#6171)
1 parent c6132df commit 1c490ae

File tree

4 files changed

+86
-13
lines changed

4 files changed

+86
-13
lines changed

jest.config.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/**
2+
* Ignores all ESM packages that make Jest mad.
3+
*
4+
* "Jest encountered an unexpected token"
5+
*
6+
* Direct packages:
7+
* - file-type
8+
*/
9+
const esModules = [
10+
// file-type and all dependencies: https://github.com/sindresorhus/file-type
11+
'file-type',
12+
'strtok3',
13+
'readable-web-to-node-stream',
14+
'token-types',
15+
'peek-readable',
16+
].join('|')
17+
118
/** @type {import('jest').Config} */
219
const baseJestConfig = {
320
extensionsToTreatAsEsm: ['.ts', '.tsx'],
@@ -14,6 +31,10 @@ const baseJestConfig = {
1431
transform: {
1532
'^.+\\.(t|j)sx?$': ['@swc/jest'],
1633
},
34+
transformIgnorePatterns: [
35+
`/node_modules/(?!.pnpm)(?!(${esModules})/)`,
36+
`/node_modules/.pnpm/(?!(${esModules.replace(/\//g, '\\+')})@)`,
37+
],
1738
verbose: true,
1839
}
1940

packages/next/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@
4949
"@types/busboy": "^1.5.3",
5050
"busboy": "^1.6.0",
5151
"deep-equal": "2.2.2",
52+
"file-type": "19.0.0",
5253
"graphql-http": "^1.22.0",
5354
"graphql-playground-html": "1.6.30",
55+
"http-status": "1.6.2",
5456
"path-to-regexp": "^6.2.1",
5557
"qs": "6.11.2",
5658
"react-diff-viewer-continued": "3.2.6",
@@ -66,7 +68,6 @@
6668
"@types/ws": "^8.5.10",
6769
"css-loader": "^6.10.0",
6870
"css-minimizer-webpack-plugin": "^6.0.0",
69-
"file-type": "16.5.4",
7071
"mini-css-extract-plugin": "1.6.2",
7172
"payload": "workspace:*",
7273
"postcss-loader": "^8.1.1",
@@ -79,9 +80,7 @@
7980
"webpack-cli": "^5.1.4"
8081
},
8182
"peerDependencies": {
82-
"file-type": "16.5.4",
8383
"graphql": "^16.8.1",
84-
"http-status": "1.6.2",
8584
"next": "^14.3.0-canary.7",
8685
"payload": "workspace:*"
8786
},

packages/next/src/routes/rest/files/getFile.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Collection, PayloadRequestWithData } from 'payload/types'
22

3-
import getFileType from 'file-type'
3+
import { fileTypeFromFile } from 'file-type'
44
import fsPromises from 'fs/promises'
55
import httpStatus from 'http-status'
66
import path from 'path'
@@ -58,7 +58,7 @@ export const getFile = async ({ collection, filename, req }: Args): Promise<Resp
5858
'Content-Length': stats.size + '',
5959
})
6060

61-
const fileTypeResult = (await getFileType.fromFile(filePath)) || getFileTypeFallback(filePath)
61+
const fileTypeResult = (await fileTypeFromFile(filePath)) || getFileTypeFallback(filePath)
6262
headers.set('Content-Type', fileTypeResult.mime)
6363

6464
return new Response(data, {

pnpm-lock.yaml

Lines changed: 61 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)