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

…change the priority of param route
nuxt · May 16, 2023 · bce4af8 · bce4af8
1 parent dcbf3b7
commit bce4af8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/packages/utils/src/route.js b/packages/utils/src/route.js
@@ -126,8 +126,8 @@ export const sortRoutes = function sortRoutes (routes) {
       if (res !== 0) {
         break
       }
-      y = _a[i].includes('*') ? 2 : _a[i].includes(':') ? 1 : 0
-      z = _b[i].includes('*') ? 2 : _b[i].includes(':') ? 1 : 0
+      y = _a[i] === '*' ? 3 : _a[i].includes(':') ? 2 : _a[i].includes('*') ? 1 : 0
+      z = _b[i] === '*' ? 3 : _b[i].includes(':') ? 2 : _b[i].includes('*') ? 1 : 0
       res = y - z
       // If a.length >= b.length
       if (i === _b.length - 1 && res === 0) {

diff --git a/packages/utils/test/__snapshots__/route.test.js.snap b/packages/utils/test/__snapshots__/route.test.js.snap
@@ -298,6 +298,19 @@ exports[`util: route util: route sortRoutes sortRoutes should sort routes 1`] =
     "name": "index",
     "path": "/",
   },
+  {
+    "children": [
+      {
+        "chunkName": "pages/another_route/rout*",
+        "component": "/some/nuxt/app/pages/another_route/rout*.vue",
+        "name": "another_route-rout*",
+        "path": "",
+      },
+    ],
+    "chunkName": "pages/another_route/rout*",
+    "component": "/some/nuxt/app/pages/another_route/rout*.vue",
+    "path": "/another_route/rout*",
+  },
   {
     "chunkName": "pages/another_route/_id",
     "component": "/some/nuxt/app/pages/another_route/_id.vue",
@@ -317,30 +330,17 @@ exports[`util: route util: route sortRoutes sortRoutes should sort routes 1`] =
     "path": "/parent/*",
   },
   {
-    "children": [
-      {
-        "chunkName": "pages/another_route/rout*",
-        "component": "/some/nuxt/app/pages/another_route/rout*.vue",
-        "name": "another_route-rout*",
-        "path": "",
-      },
-    ],
-    "chunkName": "pages/another_route/rout*",
-    "component": "/some/nuxt/app/pages/another_route/rout*.vue",
-    "path": "/another_route/rout*",
+    "chunkName": "pages/de*",
+    "component": "/some/nuxt/app/pages/de*.vue",
+    "name": "de*",
+    "path": "/de*",
   },
   {
     "chunkName": "pages/_param",
     "component": "/some/nuxt/app/pages/_param.vue",
     "name": "param",
     "path": "/:param",
   },
-  {
-    "chunkName": "pages/de*",
-    "component": "/some/nuxt/app/pages/de*.vue",
-    "name": "de*",
-    "path": "/de*",
-  },
   {
     "chunkName": "pages/*",
     "component": "/some/nuxt/app/pages/*.vue",

diff --git a/packages/utils/test/route.test.js b/packages/utils/test/route.test.js
@@ -295,8 +295,8 @@ describe('util: route', () => {
           { path: '/de/tech' },
           { path: '/' },
           { path: '/de/:post' },
-          { path: '/:post' },
           { path: '/de*' },
+          { path: '/:post' },
           { path: '*' }
         ]
       )