nuxt-nightly 4.1.1-29283391.911ce76c → 4.1.1-29285117.56aa16c3

package/dist/app/plugins/router.js

@@ -179,7 +179,7 @@ export default defineNuxtPlugin({
           }
           for (const middleware of middlewareEntries) {
             if (import.meta.dev) {
-              nuxtApp._processingMiddleware = middleware.name || true;
+              nuxtApp._processingMiddleware = middleware._path || true;
             }
             const result = await nuxtApp.runWithContext(() => middleware(to, from));
             if (import.meta.server) {

package/dist/index.mjs

@@ -62,9 +62,9 @@ async function isDirectory$1(path) {
 }
 const logger = useLogger("nuxt");
 function resolveToAlias(path, nuxt = tryUseNuxt()) {
-  return reverseResolveAlias(path, { ...nuxt?.options.alias || {}, ...strippedAtAliases }).pop() || path;
+  return reverseResolveAlias(path, { ...nuxt?.options.alias || {}, ...strippedAtAliases$1 }).pop() || path;
 }
-const strippedAtAliases = {
+const strippedAtAliases$1 = {
   "@": "",
   "@@": ""
 };
@@ -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-29283391.911ce76c";
+const version = "4.1.1-29285117.56aa16c3";
 
 const createImportProtectionPatterns = (nuxt, options) => {
   const patterns = [];
@@ -6365,14 +6374,35 @@ const layoutTemplate = {
 };
 const middlewareTemplate = {
   filename: "middleware.mjs",
-  getContents({ app }) {
+  getContents({ app, nuxt }) {
     const globalMiddleware = app.middleware.filter((mw) => mw.global);
     const namedMiddleware = app.middleware.filter((mw) => !mw.global);
-    const namedMiddlewareObject = genObjectFromRawEntries(namedMiddleware.map((mw) => [mw.name, genDynamicImport(mw.path)]));
+    const alias = nuxt.options.dev ? { ...nuxt?.options.alias || {}, ...strippedAtAliases } : {};
     return [
       ...globalMiddleware.map((mw) => genImport(mw.path, genSafeVariableName(mw.name))),
-      `export const globalMiddleware = ${genArrayFromRaw(globalMiddleware.map((mw) => genSafeVariableName(mw.name)))}`,
-      `export const namedMiddleware = ${namedMiddlewareObject}`
+      ...!nuxt.options.dev ? [
+        `export const globalMiddleware = ${genArrayFromRaw(globalMiddleware.map((mw) => genSafeVariableName(mw.name)))}`,
+        `export const namedMiddleware = ${genObjectFromRawEntries(namedMiddleware.map((mw) => [mw.name, genDynamicImport(mw.path)]))}`
+      ] : [
+        `const _globalMiddleware = ${genObjectFromRawEntries(globalMiddleware.map((mw) => [reverseResolveAlias(mw.path, alias).pop() || mw.path, genSafeVariableName(mw.name)]))}`,
+        `for (const path in _globalMiddleware) {`,
+        `  Object.defineProperty(_globalMiddleware[path], '_path', { value: path })`,
+        `}`,
+        `export const globalMiddleware = Object.values(_globalMiddleware)`,
+        `const _namedMiddleware = ${genArrayFromRaw(namedMiddleware.map((mw) => ({
+          name: genString(mw.name),
+          path: genString(reverseResolveAlias(mw.path, alias).pop() || mw.path),
+          import: genDynamicImport(mw.path)
+        })))}`,
+        `for (const mw of _namedMiddleware) {`,
+        `  const i = mw.import`,
+        `  mw.import = () => i().then(r => {`,
+        `    Object.defineProperty(r.default || r, '_path', { value: mw.path })`,
+        `    return r`,
+        `  })`,
+        `}`,
+        `export const namedMiddleware = Object.fromEntries(_namedMiddleware.map(mw => [mw.name, mw.import]))`
+      ]
     ].join("\n");
   }
 };
@@ -6654,6 +6684,10 @@ const buildTypeTemplate = {
     return declarations;
   }
 };
+const strippedAtAliases = {
+  "@": "",
+  "@@": ""
+};
 
 const defaultTemplates = {
   __proto__: null,

package/dist/pages/runtime/plugins/router.js

@@ -166,7 +166,7 @@ const plugin = defineNuxtPlugin({
           }
           try {
             if (import.meta.dev) {
-              nuxtApp._processingMiddleware = (typeof entry === "string" ? entry : middleware.name) || true;
+              nuxtApp._processingMiddleware = middleware._path || (typeof entry === "string" ? entry : true);
             }
             const result = await nuxtApp.runWithContext(() => middleware(to, from));
             if (import.meta.server || !nuxtApp.payload.serverRendered && nuxtApp.isHydrating) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-nightly",
-  "version": "4.1.1-29283391.911ce76c",
+  "version": "4.1.1-29285117.56aa16c3",
   "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-29283391.911ce76c",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.1-29283391.911ce76c",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.1.1-29285117.56aa16c3",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.1-29285117.56aa16c3",
     "@nuxt/telemetry": "^2.6.6",
-    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.1-29283391.911ce76c",
+    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.1.1-29285117.56aa16c3",
     "@unhead/vue": "^2.0.14",
     "@vue/shared": "^3.5.20",
     "c12": "^3.2.0",