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

fix(utils): respect patterns within paths when sorting routes #20669

Merged
merged 31 commits into from May 22, 2023
Merged

fix(utils): respect patterns within paths when sorting routes #20669

merged 31 commits into from May 22, 2023

Commits on May 4, 2023

  1. fix: update sortRoutes to sort * with letters

    @marcelobotega
    marcelobotega committed May 4, 2023
    Configuration menu
    Copy the full SHA
    f751fc8 View commit details
    Browse the repository at this point in the history

  2. fix: update sortRoutes regex to sort * with letters

    @marcelobotega
    marcelobotega committed May 4, 2023
    Configuration menu
    Copy the full SHA
    5511cb1 View commit details
    Browse the repository at this point in the history

  3. test: add sort route fixture

    @marcelobotega
    marcelobotega committed May 4, 2023
    Configuration menu
    Copy the full SHA
    f61e85f View commit details
    Browse the repository at this point in the history

  4. fix: add a new level to taken the / into account

    @marcelobotega
    marcelobotega committed May 4, 2023
    Configuration menu
    Copy the full SHA
    603b826 View commit details
    Browse the repository at this point in the history

  5. test: add fixture for route sort with slash

    @marcelobotega
    marcelobotega committed May 4, 2023
    Configuration menu
    Copy the full SHA
    aab77d1 View commit details
    Browse the repository at this point in the history

  6. test: update snapshot

    @marcelobotega
    marcelobotega committed May 4, 2023
    Configuration menu
    Copy the full SHA
    cab1595 View commit details
    Browse the repository at this point in the history

  7. Merge branch '2.x' into bugfix/sorte-route-fix 

    # Conflicts:
#	packages/utils/test/__snapshots__/route.test.js.snap
#	yarn.lock
    @marcelobotega
    marcelobotega committed May 4, 2023
    Configuration menu
    Copy the full SHA
    aebec9f View commit details
    Browse the repository at this point in the history

  8. test: update snapshot

    @marcelobotega
    marcelobotega committed May 4, 2023
    Configuration menu
    Copy the full SHA
    5470111 View commit details
    Browse the repository at this point in the history

  9. chore: update yarn.lock

    @marcelobotega
    marcelobotega committed May 4, 2023
    Configuration menu
    Copy the full SHA
    d896bc7 View commit details
    Browse the repository at this point in the history

  10. chore: rename test file

    @marcelobotega
    marcelobotega committed May 4, 2023
    Configuration menu
    Copy the full SHA
    4a14e41 View commit details
    Browse the repository at this point in the history

  11. test: remove file with * that is not allowed

    @marcelobotega
    marcelobotega committed May 4, 2023
    Configuration menu
    Copy the full SHA
    4869e3e View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. refactor: remove regex change and the new level on the ternary if

    @marcelobotega
    marcelobotega committed May 5, 2023
    Configuration menu
    Copy the full SHA
    d317d40 View commit details
    Browse the repository at this point in the history

  2. test: add posix to sortRoute unit test

    @marcelobotega
    marcelobotega committed May 5, 2023
    Configuration menu
    Copy the full SHA
    67b3b82 View commit details
    Browse the repository at this point in the history

  3. refactor: update dynamic route regex 

    Make the / optional and match : or * anywhere in the string. This ensures that special routes will be below normal routes. Also ensures that route / will be sorted before the special routes.
    @marcelobotega
    marcelobotega committed May 5, 2023
    Configuration menu
    Copy the full SHA
    9c7569d View commit details
    Browse the repository at this point in the history

  4. refactor: remove fixtures and package nuxtjs/i18n in favor of unit tests

    @marcelobotega
    marcelobotega committed May 5, 2023
    Configuration menu
    Copy the full SHA
    052cc53 View commit details
    Browse the repository at this point in the history

  5. test: add sortRoute unit tests

    @marcelobotega
    marcelobotega committed May 5, 2023
    Configuration menu
    Copy the full SHA
    09a4616 View commit details
    Browse the repository at this point in the history

  6. test: update windows snapshot

    @marcelobotega
    marcelobotega committed May 5, 2023
    Configuration menu
    Copy the full SHA
    0872968 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2023

  1. Merge branch '2.x' into bugfix/sorte-route-fix

    @marcelobotega
    marcelobotega committed May 8, 2023
    Configuration menu
    Copy the full SHA
    919287a View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. Merge branch '2.x' into bugfix/sorte-route-fix

    @marcelobotega
    marcelobotega committed May 9, 2023
    Configuration menu
    Copy the full SHA
    2c64cfe View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. Merge branch '2.x' into bugfix/sorte-route-fix

    @marcelobotega
    marcelobotega committed May 11, 2023
    Configuration menu
    Copy the full SHA
    db91d5d View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. Merge branch '2.x' into bugfix/sorte-route-fix

    @marcelobotega
    marcelobotega committed May 15, 2023
    Configuration menu
    Copy the full SHA
    9c339ea View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. Merge branch '2.x' into bugfix/sorte-route-fix

    @marcelobotega
    marcelobotega committed May 16, 2023
    Configuration menu
    Copy the full SHA
    dcbf3b7 View commit details
    Browse the repository at this point in the history

  2. fix(utils): update route order check to take only * into account and … 

    …change the priority of param route
    @marcelobotega
    marcelobotega committed May 16, 2023
    Configuration menu
    Copy the full SHA
    bce4af8 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. fix: update regex to be more efficient 

    Co-authored-by: RafaΕ‚ ChΕ‚odnicki <rchl2k@gmail.com>
    @marcelobotega @rchl
    marcelobotega and rchl committed May 17, 2023
    Configuration menu
    Copy the full SHA
    125094b View commit details
    Browse the repository at this point in the history

  2. Merge branch '2.x' into bugfix/sorte-route-fix

    @marcelobotega
    marcelobotega committed May 17, 2023
    Configuration menu
    Copy the full SHA
    640529c View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

  1. Merge remote-tracking branch 'origin/2.x' into bugfix/sorte-route-fix

    @danielroe
    danielroe committed May 19, 2023
    Configuration menu
    Copy the full SHA
    3c12270 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/2.x' into bugfix/sorte-route-fix

    @danielroe
    danielroe committed May 19, 2023
    Configuration menu
    Copy the full SHA
    696dbc6 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. fix(utils): update getRoutePathExtension to check for _ in the end of… 

    … the key
    @marcelobotega
    marcelobotega committed May 22, 2023
    Configuration menu
    Copy the full SHA
    bde87d3 View commit details
    Browse the repository at this point in the history

  2. Merge branch '2.x' into bugfix/sorte-route-fix

    @marcelobotega
    marcelobotega committed May 22, 2023
    Configuration menu
    Copy the full SHA
    d24275a View commit details
    Browse the repository at this point in the history

  3. revert(utils): update getRoutePathExtension to check for _ in the end… 

    … of the key
    @marcelobotega
    marcelobotega committed May 22, 2023
    Configuration menu
    Copy the full SHA
    431d315 View commit details
    Browse the repository at this point in the history

  4. Merge branch '2.x' into bugfix/sorte-route-fix

    @marcelobotega
    marcelobotega committed May 22, 2023
    Configuration menu
    Copy the full SHA
    bea8f4d View commit details
    Browse the repository at this point in the history