Unverified Commit ef2decff authored by Zack Tanner's avatar Zack Tanner Committed by GitHub

create-next-app: fix font file corruption when using import alias (#69806)

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: 's avatarJanka Uryga <lolzatu2@gmail.com>
parent 555302b6
...@@ -103,7 +103,16 @@ export const installTemplate = async ({ ...@@ -103,7 +103,16 @@ export const installTemplate = async ({
stats: false, stats: false,
// We don't want to modify compiler options in [ts/js]config.json // We don't want to modify compiler options in [ts/js]config.json
// and none of the files in the .git folder // and none of the files in the .git folder
ignore: ["tsconfig.json", "jsconfig.json", ".git/**/*"], // TODO: Refactor this to be an allowlist, rather than a denylist,
// to avoid corrupting files that weren't intended to be replaced
ignore: [
"tsconfig.json",
"jsconfig.json",
".git/**/*",
"**/fonts/**",
"**/favicon.ico",
],
}); });
const writeSema = new Sema(8, { capacity: files.length }); const writeSema = new Sema(8, { capacity: files.length });
await Promise.all( await Promise.all(
......
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,
})
})
})
}
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment