Merge branch 'main' into fix/param-optionality

nuxt · Jun 9, 2022 · 7c8d2fc · 7c8d2fc
2 parents 74d69db + b31186b
commit 7c8d2fc
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 20 deletions.
diff --git a/docs/content/3.api/1.composables/use-request-event.md b/docs/content/3.api/1.composables/use-request-event.md
@@ -0,0 +1,17 @@
+# `useRequestEvent`
+
+Nuxt provides composables and utilities for first-class server-side-rendering support.
+
+Within your pages, components, and plugins you can use `useRequestEvent` to access the incoming request.
+
+```js
+// Get underlying request event
+const event = useRequestEvent()
+
+// Get the URL
+const url = event.req.url
+```
+
+::alert{icon=👉}
+In the browser, `useRequestEvent` will return `undefined`.
+::
diff --git a/docs/content/migration/6.pages-and-layouts.md b/docs/content/migration/6.pages-and-layouts.md
@@ -163,7 +163,7 @@ definePageMeta({
   transition: {
     name: 'page',
   },
-  keepAlive: {
+  keepalive: {
     exclude: ['modal']
   },
 })

diff --git a/packages/nuxt/src/pages/utils.ts b/packages/nuxt/src/pages/utils.ts
@@ -88,11 +88,15 @@ export function generateRoutesFromFiles (files: string[], pagesDir: string): Nux
     }
 
     parent.push(route)
+    // TODO: https://github.com/vuejs/router/issues/1435
+    parent.sort((a, b) => getSortablePath(a.path).localeCompare(getSortablePath(b.path)))
   }
 
   return prepareRoutes(routes)
 }
 
+const getSortablePath = (path: string) => path.replace(/^\//, '').replace(/:/, 'Z')
+
 function getRoutePath (tokens: SegmentToken[]): string {
   return tokens.reduce((path, token) => {
     return (

diff --git a/packages/nuxt/test/pages.test.ts b/packages/nuxt/test/pages.test.ts
@@ -113,11 +113,23 @@ describe('pages:generateRoutesFromFiles', () => {
           children: []
         },
         {
-          name: 'slug',
-          path: '/:slug',
-          file: `${pagesDir}/[slug].vue`,
+          name: 'nonopt-slug',
+          path: '/nonopt/:slug',
+          file: `${pagesDir}/nonopt/[slug].vue`,
           children: []
         },
+        {
+          name: 'opt-slug',
+          path: '/opt/:slug?',
+          file: `${pagesDir}/opt/[[slug]].vue`,
+          children: []
+        },
+        {
+          children: [],
+          name: 'bar',
+          file: 'pages/[bar]/index.vue',
+          path: '/:bar'
+        },
         {
           children: [
             {
@@ -132,21 +144,9 @@ describe('pages:generateRoutesFromFiles', () => {
           path: '/:foo?'
         },
         {
-          children: [],
-          name: 'bar',
-          file: 'pages/[bar]/index.vue',
-          path: '/:bar'
-        },
-        {
-          name: 'nonopt-slug',
-          path: '/nonopt/:slug',
-          file: `${pagesDir}/nonopt/[slug].vue`,
-          children: []
-        },
-        {
-          name: 'opt-slug',
-          path: '/opt/:slug?',
-          file: `${pagesDir}/opt/[[slug]].vue`,
+          name: 'slug',
+          path: '/:slug',
+          file: `${pagesDir}/[slug].vue`,
           children: []
         },
         {
@@ -159,8 +159,14 @@ describe('pages:generateRoutesFromFiles', () => {
     },
     {
       description: 'should generate correct catch-all route',
-      files: [`${pagesDir}/[...slug].vue`],
+      files: [`${pagesDir}/[...slug].vue`, `${pagesDir}/index.vue`],
       output: [
+        {
+          name: 'index',
+          path: '/',
+          file: `${pagesDir}/index.vue`,
+          children: []
+        },
         {
           name: 'slug',
           path: '/:slug(.*)*',