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

Update to have default locale matched on root #17669

Merged
merged 19 commits into from
Oct 8, 2020
Merged

Update to have default locale matched on root #17669

merged 19 commits into from
Oct 8, 2020

Commits on Sep 26, 2020

  1. Add i18n changes

    @ijjk
    ijjk committed Sep 26, 2020
    Configuration menu
    Copy the full SHA
    7559d95 View commit details
    Browse the repository at this point in the history

  2. Handle invalid href case

    @ijjk
    ijjk committed Sep 26, 2020
    Configuration menu
    Copy the full SHA
    fce07ed View commit details
    Browse the repository at this point in the history

  3. Update size-limit test

    @ijjk
    ijjk committed Sep 26, 2020
    Configuration menu
    Copy the full SHA
    7487f19 View commit details
    Browse the repository at this point in the history

  4. Update build output test

    @ijjk
    ijjk committed Sep 26, 2020
    Configuration menu
    Copy the full SHA
    f152d57 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/canary' into add/i18n 

    # Conflicts:
#	packages/next/next-server/server/config.ts
#	packages/next/next-server/server/next-server.ts
#	packages/next/package.json
    @ijjk
    ijjk committed Sep 26, 2020
    Configuration menu
    Copy the full SHA
    4e51828 View commit details
    Browse the repository at this point in the history

  6. Update locale adding

    @ijjk
    ijjk committed Sep 26, 2020
    Configuration menu
    Copy the full SHA
    cb2ff33 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2020

  1. Add i18n tests

    @ijjk
    ijjk committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    69df47e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/canary' into add/i18n

    @ijjk
    ijjk committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    962a9bd View commit details
    Browse the repository at this point in the history

  3. Update build output test

    @ijjk
    ijjk committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    32e5f95 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2020

  1. Merge remote-tracking branch 'upstream/canary' into add/i18n 

    # Conflicts:
#	packages/next/package.json
    @ijjk
    ijjk committed Oct 2, 2020
    Configuration menu
    Copy the full SHA
    9966638 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2020

  1. Add cookie parser for all pages and feature flag more logic

    @ijjk
    ijjk committed Oct 3, 2020
    Configuration menu
    Copy the full SHA
    4b654e7 View commit details
    Browse the repository at this point in the history

  2. Add more feature flagging, lang setting, and serverless handling

    @ijjk
    ijjk committed Oct 3, 2020
    Configuration menu
    Copy the full SHA
    de94016 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2020

  1. Merge remote-tracking branch 'upstream/canary' into add/i18n

    @ijjk
    ijjk committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    e9f6317 View commit details
    Browse the repository at this point in the history

  2. Ensure default locale is redirected to without accept-language

    @ijjk
    ijjk committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    5a7e29a View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2020

  1. Merge remote-tracking branch 'upstream/canary' into add/i18n 

    # Conflicts:
#	packages/next/package.json
    @ijjk
    ijjk committed Oct 6, 2020
    Configuration menu
    Copy the full SHA
    40772e0 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2020

  1. Update to not redirect when default locale matched on root

    @ijjk
    ijjk committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    9027031 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/canary' into i18n/redirect-def… 

    …ault-locale

# Conflicts:
#	packages/next/build/webpack/loaders/next-serverless-loader.ts
#	packages/next/next-server/lib/i18n/normalize-locale-path.ts
#	packages/next/next-server/server/config.ts
#	packages/next/next-server/server/next-server.ts
#	packages/next/package.json
#	test/integration/i18n-support/test/index.test.js
    @ijjk
    ijjk committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    2f4f40e View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2020

  1. Make sure default locale isn't prefixed on the client

    @ijjk
    ijjk committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    552fc6d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'canary' into i18n/redirect-default-locale

    @kodiakhq
    kodiakhq[bot] authored Oct 8, 2020
    Configuration menu
    Copy the full SHA
    cab80be View commit details
    Browse the repository at this point in the history