-
Notifications
You must be signed in to change notification settings - Fork 27k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
create-next-app: fix font file corruption when using import alias (#6…
…9806) There's code that uses `glob` to find all template files and replaces the default import alias with whatever is specified during CNA. This does so without excluding fonts, and so we're unintentionally corrupting these `woff` files. This wasn't a problem in previous versions because we didn't use `localFont` in the default template, just `Inter`. The files were technically still being corrupted it just never manifested unless you went to actually use them. This is a quick fix to introduce minimal changes but ideally in a follow-up we should figure out a better solution for replacing aliases, ie by using an allowlist rather than an exclude list. h/t to @lubieowoce for the thorough test cases Fixes #69748 --------- Co-authored-by: Janka Uryga <[email protected]>
- Loading branch information
1 parent
555302b
commit ef2decf
Showing
2 changed files
with
89 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
import { run, tryNextDev, useTempDir } from '../utils' | ||
|
||
describe.each(['app', 'pages'] as const)( | ||
'CNA options matrix - %s', | ||
(pagesOrApp) => { | ||
let nextTgzFilename: string | ||
|
||
beforeAll(() => { | ||
if (!process.env.NEXT_TEST_PKG_PATHS) { | ||
throw new Error('This test needs to be run with `node run-tests.js`.') | ||
} | ||
|
||
const pkgPaths = new Map<string, string>( | ||
JSON.parse(process.env.NEXT_TEST_PKG_PATHS) | ||
) | ||
|
||
nextTgzFilename = pkgPaths.get('next')! | ||
}) | ||
|
||
const isApp = pagesOrApp === 'app' | ||
|
||
const allFlagValues = { | ||
app: [isApp ? '--app' : '--no-app'], | ||
turbo: [process.env.TURBOPACK ? '--turbo' : '--no-turbo'], | ||
|
||
ts: ['--js', '--ts'], | ||
importAlias: [ | ||
'--import-alias=@acme/*', | ||
'--import-alias=@/*', | ||
'--no-import-alias', | ||
], | ||
// doesn't affect if the app builds or not | ||
// eslint: ['--eslint', '--no-eslint'], | ||
eslint: ['--eslint'], | ||
|
||
srcDir: ['--src-dir', '--no-src-dir'], | ||
tailwind: ['--tailwind', '--no-tailwind'], | ||
|
||
// shouldn't affect if the app builds or not | ||
// packageManager: ['--use-npm', '--use-pnpm', '--use-yarn', '--use-bun'], | ||
} | ||
|
||
const getPermutations = <T>(items: T[][]): T[][] => { | ||
if (!items.length) return [[]] | ||
const [first, ...rest] = items | ||
const children = getPermutations(rest) | ||
return first.flatMap((value) => | ||
children.map((child) => [value, ...child]) | ||
) | ||
} | ||
|
||
const flagPermutations = getPermutations(Object.values(allFlagValues)) | ||
const testCases = flagPermutations.map((flags) => ({ | ||
name: flags.join(' '), | ||
flags, | ||
})) | ||
|
||
let id = 0 | ||
it.each(testCases)('$name', async ({ flags }) => { | ||
await useTempDir(async (cwd) => { | ||
const projectName = `cna-matrix-${pagesOrApp}-${id++}` | ||
const { exitCode } = await run( | ||
[projectName, ...flags], | ||
nextTgzFilename, | ||
{ | ||
cwd, | ||
} | ||
) | ||
expect(exitCode).toBe(0) | ||
|
||
await tryNextDev({ | ||
cwd, | ||
projectName, | ||
isApp, | ||
}) | ||
}) | ||
}) | ||
} | ||
) |