00eff94d8c
This resolves an issue introduced in #52361 where `shouldOmit` is overwritten based on if it is a directory or not without considering include conditions. In an environment where the the application being built is orchestrated and managed by bazel, all files are symbolic links and thus without this the file includes predicate checks aren't considered - and the build fails under certain conditions. <!-- Thanks for opening a PR! Your contribution is much appreciated. To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below. Choose the right checklist for the change(s) that you're making: ## For Contributors ### Improving Documentation - Run `pnpm prettier-fix` to fix formatting issues before opening the PR. - Read the Docs Contribution Guide to ensure your contribution follows the docs guidelines: https://nextjs.org/docs/community/contribution-guide ### Adding or Updating Examples - The "examples guidelines" are followed from our contributing doc https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md - Make sure the linting passes by running `pnpm build && pnpm lint`. See https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md ### Fixing a bug - Related issues linked using `fixes #number` - Tests added. See: https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ### Adding a feature - Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. (A discussion must be opened, see https://github.com/vercel/next.js/discussions/new?category=ideas) - Related issues/discussions are linked using `fixes #number` - e2e tests added (https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) - Documentation added - Telemetry added. In case of a feature if it's used or not. - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ## For Maintainers - Minimal description (aim for explaining to someone not on the team to understand the PR) - When linking to a Slack thread, you might want to share details of the conclusion - Link both the Linear (Fixes NEXT-xxx) and the GitHub issues - Add review comments if necessary to explain to the reviewer the logic behind a change ### What? ### Why? ### How? Closes NEXT- Fixes # --> --------- Co-authored-by: Shu Ding <g@shud.in>
58 lines
1.5 KiB
TypeScript
58 lines
1.5 KiB
TypeScript
/* eslint-env jest */
|
|
|
|
import { getFilesInDir } from 'next/dist/lib/get-files-in-dir'
|
|
import { join } from 'path'
|
|
import fs from 'fs-extra'
|
|
|
|
const testDir = join(__dirname, 'get-files-in-dir-test')
|
|
|
|
const srcDir = join(testDir, 'src')
|
|
|
|
const setupTestDir = async () => {
|
|
const paths = [
|
|
'.hidden',
|
|
'file',
|
|
'folder1/file1',
|
|
'folder1/file2',
|
|
'link',
|
|
'linkfolder',
|
|
]
|
|
|
|
await fs.ensureDir(testDir)
|
|
|
|
// create src directory structure
|
|
await fs.ensureDir(srcDir)
|
|
await fs.outputFile(join(srcDir, '.hidden'), 'hidden')
|
|
await fs.outputFile(join(srcDir, 'file'), 'file')
|
|
await fs.outputFile(join(srcDir, 'folder1', 'file1'), 'file1')
|
|
await fs.outputFile(join(srcDir, 'folder1', 'file2'), 'file2')
|
|
await fs.ensureSymlink(join(srcDir, 'file'), join(srcDir, 'link'))
|
|
await fs.ensureSymlink(join(srcDir, 'link'), join(srcDir, 'link-level-2'))
|
|
await fs.ensureSymlink(
|
|
join(srcDir, 'link-level-2'),
|
|
join(srcDir, 'link-level-3')
|
|
)
|
|
await fs.ensureSymlink(join(srcDir, 'folder1'), join(srcDir, 'linkfolder'))
|
|
return paths
|
|
}
|
|
|
|
describe('getFilesInDir', () => {
|
|
if (process.platform === 'win32') {
|
|
it('should skip on windows to avoid symlink issues', () => {})
|
|
return
|
|
}
|
|
afterAll(() => fs.remove(testDir))
|
|
|
|
it('should work', async () => {
|
|
await fs.remove(testDir)
|
|
await setupTestDir()
|
|
|
|
expect(await getFilesInDir(srcDir)).toIncludeAllMembers([
|
|
'.hidden',
|
|
'file',
|
|
'link',
|
|
'link-level-2',
|
|
'link-level-3',
|
|
])
|
|
})
|
|
})
|