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

merged 3 commits into from Oct 6, 2021

Commits on Oct 6, 2021

  1. Ensure conditional resolve alias does not affect server

    @ijjk
    ijjk committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    2b6210e View commit details
    Browse the repository at this point in the history

  2. update tests

    @ijjk
    ijjk committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    6aeccbf View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/canary' into fix/trace-conditi… 

    …onal-alias

# Conflicts:
#	packages/next/build/webpack-config.ts
#	test/integration/production/test/index.test.js
    @ijjk
    ijjk committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    a342bed View commit details
    Browse the repository at this point in the history