nuxt-nightly 4.1.1-29284589.27dc1f24 → 4.1.1-29285142.e858eea6

package/dist/core/runtime/nitro/handlers/renderer.js

@@ -6,7 +6,7 @@ import {
   renderResourceHeaders
 } from "vue-bundle-renderer/runtime";
 import { appendResponseHeader, createError, getQuery, getResponseStatus, getResponseStatusText, writeEarlyHints } from "h3";
-import { getQuery as getURLQuery, joinURL, withoutTrailingSlash } from "ufo";
+import { getQuery as getURLQuery, hasProtocol, joinURL, withoutTrailingSlash } from "ufo";
 import { propsToString, renderSSRHead } from "@unhead/vue/server";
 import destr from "destr";
 import { defineRenderHandler, getRouteRules, useNitroApp } from "nitropack/runtime";
@@ -20,6 +20,7 @@ import { renderSSRHeadOptions } from "#internal/unhead.config.mjs";
 import { appHead, appTeleportAttrs, appTeleportTag, componentIslands, appManifest as isAppManifestEnabled } from "#internal/nuxt.config.mjs";
 import { entryFileName } from "#internal/entry-chunk.mjs";
 import { buildAssetsURL, publicAssetsURL } from "#internal/nuxt/paths";
+import { relative } from "pathe";
 globalThis.__buildAssetsURL = buildAssetsURL;
 globalThis.__publicAssetsURL = publicAssetsURL;
 if (process.env.NUXT_ASYNC_CONTEXT && !("AsyncLocalStorage" in globalThis)) {
@@ -30,6 +31,7 @@ const APP_TELEPORT_OPEN_TAG = HAS_APP_TELEPORTS ? `<${appTeleportTag}${propsToSt
 const APP_TELEPORT_CLOSE_TAG = HAS_APP_TELEPORTS ? `</${appTeleportTag}>` : "";
 const PAYLOAD_URL_RE = process.env.NUXT_JSON_PAYLOADS ? /^[^?]*\/_payload.json(?:\?.*)?$/ : /^[^?]*\/_payload.js(?:\?.*)?$/;
 const PAYLOAD_FILENAME = process.env.NUXT_JSON_PAYLOADS ? "_payload.json" : "_payload.js";
+let entryPath;
 export default defineRenderHandler(async (event) => {
   const nitroApp = useNitroApp();
   const ssrError = event.path.startsWith("/__nuxt_error") ? getQuery(event) : null;
@@ -109,12 +111,24 @@ export default defineRenderHandler(async (event) => {
   const NO_SCRIPTS = process.env.NUXT_NO_SCRIPTS || routeOptions.noScripts;
   const { styles, scripts } = getRequestDependencies(ssrContext, renderer.rendererContext);
   if (entryFileName && !NO_SCRIPTS) {
+    let path = entryPath;
+    if (!path) {
+      path = buildAssetsURL(entryFileName);
+      if (/^(?:\/|\.+\/)/.test(path) || hasProtocol(path, { acceptRelative: true })) {
+        entryPath = path;
+      } else {
+        path = relative(event.path.replace(/\/[^/]+$/, "/"), joinURL("/", path));
+        if (!/^(?:\/|\.+\/)/.test(path)) {
+          path = `./${path}`;
+        }
+      }
+    }
     ssrContext.head.push({
       script: [{
         tagPosition: "head",
         tagPriority: -2,
         type: "importmap",
-        innerHTML: JSON.stringify({ imports: { "#entry": buildAssetsURL(entryFileName) } })
+        innerHTML: JSON.stringify({ imports: { "#entry": path } })
       }]
     }, headEntryOptions);
   }

package/dist/index.mjs

@@ -1151,6 +1151,13 @@ const RouteInjectionPlugin = (nuxt) => createUnplugin(() => {
 
 const OPTIONAL_PARAM_RE = /^\/?:.*(?:\?|\(\.\*\)\*)$/;
 const runtimeDir = resolve(distDir, "pages/runtime");
+const pagesImportPresets = [
+  { imports: ["definePageMeta"], from: resolve(runtimeDir, "composables") },
+  { imports: ["useLink"], from: "vue-router" }
+];
+const routeRulesPresets = [
+  { imports: ["defineRouteRules"], from: resolve(runtimeDir, "composables") }
+];
 async function resolveRouterOptions(nuxt, builtInRouterOptions) {
   const context = {
     files: []
@@ -1472,13 +1479,10 @@ const pagesModule = defineNuxtModule({
       }
       nitro.options.prerender.routes = Array.from(prerenderRoutes);
     });
-    nuxt.hook("imports:extend", (imports) => {
-      imports.push(
-        { name: "definePageMeta", as: "definePageMeta", from: resolve(runtimeDir, "composables") },
-        { name: "useLink", as: "useLink", from: "vue-router" }
-      );
+    nuxt.hook("imports:sources", (sources) => {
+      sources.push(...pagesImportPresets);
       if (nuxt.options.experimental.inlineRouteRules) {
-        imports.push({ name: "defineRouteRules", as: "defineRouteRules", from: resolve(runtimeDir, "composables") });
+        sources.push(...routeRulesPresets);
       }
     });
     const componentStubPath = await resolvePath(resolve(runtimeDir, "component-stub"));
@@ -3578,6 +3582,11 @@ const TransformPlugin = ({ ctx, options, sourcemap }) => createUnplugin(() => {
   };
 });
 
+const allNuxtPresets = [
+  ...pagesImportPresets,
+  ...routeRulesPresets,
+  ...defaultPresets
+];
 const importsModule = defineNuxtModule({
   meta: {
     name: "nuxt:imports",
@@ -3663,8 +3672,8 @@ const importsModule = defineNuxtModule({
       return IMPORTS_TEMPLATE_RE.test(template.filename);
     }
     const isIgnored = createIsIgnored(nuxt);
-    const defaultImportSources = new Set(defaultPresets.flatMap((i) => i.from));
-    const defaultImports = new Set(presets.flatMap((p) => defaultImportSources.has(p.from) ? p.imports : []));
+    const nuxtImportSources = new Set(allNuxtPresets.flatMap((i) => i.from));
+    const nuxtImports = new Set(presets.flatMap((p) => nuxtImportSources.has(p.from) ? p.imports : []));
     const regenerateImports = async () => {
       await ctx.modifyDynamicImports(async (imports) => {
         imports.length = 0;
@@ -3679,9 +3688,9 @@ const importsModule = defineNuxtModule({
         }
         await nuxt.callHook("imports:extend", imports);
         for (const i of imports) {
-          if (!defaultImportSources.has(i.from)) {
+          if (!nuxtImportSources.has(i.from)) {
             const value = i.as || i.name;
-            if (defaultImports.has(value) && (!i.priority || i.priority >= 0)) {
+            if (nuxtImports.has(value) && (!i.priority || i.priority >= 0)) {
               const relativePath = isAbsolute(i.from) ? `${resolveToAlias(i.from, nuxt)}` : i.from;
               logger.error(`\`${value}\` is an auto-imported function that is in use by Nuxt. Overriding it will likely cause issues. Please consider renaming \`${value}\` in \`${relativePath}\`.`);
             }
@@ -3760,7 +3769,7 @@ function addDeclarationTemplates(ctx, options) {
   });
 }
 
-const version = "4.1.1-29284589.27dc1f24";
+const version = "4.1.1-29285142.e858eea6";
 
 const createImportProtectionPatterns = (nuxt, options) => {
   const patterns = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-nightly",
-  "version": "4.1.1-29284589.27dc1f24",
+  "version": "4.1.1-29285142.e858eea6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -67,10 +67,10 @@
     "@nuxt/cli": "npm:@nuxt/cli-nightly@latest",
     "@nuxt/devalue": "^2.0.2",
     "@nuxt/devtools": "^2.6.3",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.1.1-29284589.27dc1f24",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.1-29284589.27dc1f24",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.1.1-29285142.e858eea6",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.1-29285142.e858eea6",
     "@nuxt/telemetry": "^2.6.6",
-    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.1-29284589.27dc1f24",
+    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.1-29285142.e858eea6",
     "@unhead/vue": "^2.0.14",
     "@vue/shared": "^3.5.20",
     "c12": "^3.2.0",