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

Match public files priority in dev #8641

Merged
merged 15 commits into from
Sep 16, 2019
Merged

Match public files priority in dev #8641

merged 15 commits into from
Sep 16, 2019

Commits on Sep 5, 2019

  1. Match public files priority in dev

    @ijjk
    ijjk committed Sep 5, 2019
    Configuration menu
    Copy the full SHA
    9aebcac View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2019

  1. Remove un-needed old public file handling

    @ijjk
    ijjk committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    977d9da View commit details
    Browse the repository at this point in the history

  2. Run public file priority test for non-dev also

    @ijjk
    ijjk committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    d7cbce5 View commit details
    Browse the repository at this point in the history

  3. Make sure to enable publicDirectory

    @ijjk
    ijjk committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    3634613 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/canary' into fix/public-dynami… 

    …c-priority
    @ijjk
    ijjk committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    7b00798 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2019

  1. Add checking for conflicting pages in dev and during build

    @ijjk
    ijjk committed Sep 7, 2019
    Configuration menu
    Copy the full SHA
    7ea4bb9 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2019

  1. Merge branch 'canary' into fix/public-dynamic-priority

    @ijjk
    ijjk authored Sep 10, 2019
    Configuration menu
    Copy the full SHA
    3c8be2e View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2019

  1. Merge remote-tracking branch 'upstream/canary' into fix/public-dynami… 

    …c-priority
    @ijjk
    ijjk committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    b202948 View commit details
    Browse the repository at this point in the history

  2. Add error for public dir middleware conflict

    @ijjk
    ijjk committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    dd051f2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix/public-dynamic-priority' of github.com:ijjk/next.js… 

    … into fix/public-dynamic-priority
    @ijjk
    ijjk committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    2aa25a5 View commit details
    Browse the repository at this point in the history

  4. Add err.sh for _next conflict

    @ijjk
    ijjk committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    efeba53 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/canary' into fix/public-dynami… 

    …c-priority
    @ijjk
    ijjk committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    481d3a8 View commit details
    Browse the repository at this point in the history

  6. Move up public dir conflict checking

    @ijjk
    ijjk committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    3e4d3aa View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'upstream/canary' into fix/public-dynami… 

    …c-priority
    @ijjk
    ijjk committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    fdd4738 View commit details
    Browse the repository at this point in the history

  8. Only run _next conflict check in dev when path contains it

    @ijjk
    ijjk committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    d776b01 View commit details
    Browse the repository at this point in the history