Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve to real path before checking for path inequality #17279

Merged
merged 7 commits into from Oct 14, 2020
Merged

Resolve to real path before checking for path inequality #17279

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3caacd5
fix check of symlinked files
remorses Sep 22, 2020
be7cc80
handle null baseRes case
remorses Sep 22, 2020
eac50c5
Merge branch 'canary' into fix-pnpm
lfades Sep 22, 2020
7e948d8
added test for pnpm
remorses Sep 28, 2020
15a991d
use local pnpm instad of global install
remorses Sep 28, 2020
05b04a6
Merge branch 'canary' into fix-pnpm
remorses Oct 7, 2020
5696cba
Merge branch 'canary' into fix-pnpm
timneutkens Oct 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions packages/next/build/webpack-config.ts
View file
Open in desktop
@@ -1,7 +1,7 @@
import { codeFrameColumns } from '@babel/code-frame'
import ReactRefreshWebpackPlugin from '@next/react-refresh-utils/ReactRefreshWebpackPlugin'
import crypto from 'crypto'
import { readFileSync } from 'fs'
import { readFileSync, realpathSync } from 'fs'
import chalk from 'next/dist/compiled/chalk'
import semver from 'next/dist/compiled/semver'
import TerserPlugin from 'next/dist/compiled/terser-webpack-plugin'
Expand Down Expand Up @@ -665,7 +665,12 @@ export default async function getBaseWebpackConfig(
// Same as above: if the package, when required from the root,
// would be different from what the real resolution would use, we
// cannot externalize it.
if (baseRes !== res) {
if (
!baseRes ||
(baseRes !== res &&
// if res and baseRes are symlinks they could point to the the same file
realpathSync(baseRes) !== realpathSync(res))
) {
return callback()
}
}
Expand Down