Merge branch 'main' into main

.github/workflows/release-pr.yml

@@ -31,7 +31,7 @@ jobs:
 
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
-          ref: refs/pull/${{ github.event.issue.number }}/merge
+          ref: ${{ github.event.issue.pull_request.head.sha }}
           fetch-depth: 0
 
       - run: corepack enable

packages/nuxt/.gitignore

@@ -0,0 +1,6 @@
+src/app/components/error-404.vue
+src/app/components/error-500.vue
+src/app/components/error-dev.vue
+src/app/components/welcome.vue
+src/core/runtime/nitro/error-500.ts
+src/core/runtime/nitro/error-dev.ts

packages/nuxt/src/app/components/error-404.vue

@@ -1 +0,0 @@
-../../../../ui-templates/dist/templates/error-404.vue

packages/nuxt/src/app/components/error-500.vue

@@ -1 +0,0 @@
-../../../../ui-templates/dist/templates/error-500.vue

packages/nuxt/src/app/components/error-dev.vue

@@ -1 +0,0 @@
-../../../../ui-templates/dist/templates/error-dev.vue

packages/nuxt/src/app/components/welcome.vue

@@ -1 +0,0 @@
-../../../../ui-templates/dist/templates/welcome.vue

packages/nuxt/src/core/runtime/nitro/error-500.ts

@@ -1 +0,0 @@
-../../../../../ui-templates/dist/templates/error-500.ts

packages/nuxt/src/core/runtime/nitro/error-dev.ts

@@ -1 +0,0 @@
-../../../../../ui-templates/dist/templates/error-dev.ts

packages/ui-templates/lib/render.ts

@@ -1,5 +1,6 @@
 import { fileURLToPath } from 'node:url'
 import { readFileSync, rmdirSync, unlinkSync, writeFileSync } from 'node:fs'
+import { copyFile } from 'node:fs/promises'
 import { basename, dirname, join, resolve } from 'pathe'
 import type { Plugin } from 'vite'
 // @ts-expect-error https://github.com/GoogleChromeLabs/critters/pull/151
@@ -167,6 +168,15 @@ export const RenderPlugin = () => {
         unlinkSync(fileName)
         rmdirSync(dirname(fileName))
       }
+
+      // we manually copy files across rather than using symbolic links for better windows support
+      const nuxtRoot = r('../nuxt')
+      for (const file of ['error-404.vue', 'error-500.vue', 'error-dev.vue', 'welcome.vue']) {
+        await copyFile(r(`dist/templates/${file}`), join(nuxtRoot, 'src/app/components', file))
+      }
+      for (const file of ['error-500.ts', 'error-dev.ts']) {
+        await copyFile(r(`dist/templates/${file}`), join(nuxtRoot, 'src/core/runtime/nitro', file))
+      }
     },
   }
 }