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

Ensure conditional resolve alias does not affect server #29673

Merged
merged 3 commits into from Oct 6, 2021
Merged

Ensure conditional resolve alias does not affect server #29673

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b6210e
Ensure conditional resolve alias does not affect server
ijjk Oct 6, 2021
6aeccbf
update tests
ijjk Oct 6, 2021
a342bed
Merge remote-tracking branch 'upstream/canary' into fix/trace-conditi…
ijjk Oct 6, 2021
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
17 changes: 11 additions & 6 deletions packages/next/build/webpack-config.ts
View file
Open in desktop
Expand Up @@ -504,12 +504,17 @@ export default async function getBaseWebpackConfig(
[DOT_NEXT_ALIAS]: distDir,
...getOptimizedAliases(isServer),
...getReactProfilingInProduction(),
[clientResolveRewrites]: hasRewrites
? clientResolveRewrites
: // With webpack 5 an alias can be pointed to false to noop
isWebpack5
? false
: clientResolveRewritesNoop,

...(!isServer
? {
[clientResolveRewrites]: hasRewrites
? clientResolveRewrites
: // With webpack 5 an alias can be pointed to false to noop
isWebpack5
? false
: clientResolveRewritesNoop,
}
: {}),
},
...(isWebpack5 && !isServer
? {
Expand Down
1 change: 1 addition & 0 deletions test/integration/production/test/index.test.js
View file
Open in desktop
Expand Up @@ -133,6 +133,7 @@ describe('Production Usage', () => {
/node_modules\/react\/cjs\/react\.production\.min\.js/,
/next\/router\.js/,
/next\/dist\/client\/router\.js/,
/next\/dist\/shared\/lib\/router\/utils\/resolve-rewrites\.js/,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be added to a notTests for another page?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it should be included in all of the tested pages since they use next/router or next/link, I updated tests to reflect this in 6aeccbf

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps we need a new page that doesn't use next/router or next/link

],
notTests: [/node_modules\/react\/cjs\/react\.development\.js/],
},
Expand Down