nuxt-nightly 4.2.3-29430410.6b7fc747 → 4.2.3-29430444.708dbe51

package/dist/index.mjs

@@ -3837,7 +3837,7 @@ function addDeclarationTemplates(ctx, options) {
   });
 }
 
-const version = "4.2.3-29430410.6b7fc747";
+const version = "4.2.3-29430444.708dbe51";
 
 function createImportProtectionPatterns(nuxt, options) {
   const patterns = [];
@@ -4013,7 +4013,6 @@ const DevOnlyPlugin = (options) => createUnplugin(() => {
 
 const ALIAS_RE = /(?<=['"])[~@]{1,2}(?=\/)/g;
 const ALIAS_RE_SINGLE = /(?<=['"])[~@]{1,2}(?=\/)/;
-const ALIAS_ID_RE = /^[~@]{1,2}\//;
 const LayerAliasingPlugin = (options) => createUnplugin((_options, meta) => {
   const aliases = {};
   for (const layer of options.layers) {
@@ -4057,9 +4056,6 @@ const LayerAliasingPlugin = (options) => createUnplugin((_options, meta) => {
     vite: {
       resolveId: {
         order: "pre",
-        filter: {
-          id: ALIAS_ID_RE
-        },
         async handler(id, importer) {
           if (!importer) {
             return;
@@ -4599,50 +4595,39 @@ function ResolveDeepImportsPlugin(nuxt) {
   return {
     name: "nuxt:resolve-bare-imports",
     enforce: "post",
-    resolveId: {
-      filter: {
-        id: {
-          exclude: [
-            // absolute path
-            /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Z]:[/\\]/i,
-            ...exclude.map((e) => new RegExp("^" + escapeRE(e)))
-          ]
-        }
-      },
-      async handler(id, importer) {
-        if (!importer || !isAbsolute(importer) && !VIRTUAL_RE.test(importer)) {
-          return;
-        }
-        const normalisedId = resolveAlias$1(normalize(id), nuxt.options.alias);
-        const isNuxtTemplate = importer.startsWith("virtual:nuxt");
-        const normalisedImporter = (isNuxtTemplate ? decodeURIComponent(importer) : importer).replace(VIRTUAL_RE, "");
-        if (nuxt.options.experimental.templateImportResolution !== false && isNuxtTemplate) {
-          const template = nuxt.options.build.templates.find((t) => resolve(nuxt.options.buildDir, t.filename) === normalisedImporter);
-          if (template?._path) {
-            const res2 = await this.resolve?.(normalisedId, template._path, { skipSelf: true });
-            if (res2 !== void 0 && res2 !== null) {
-              return res2;
-            }
+    async resolveId(id, importer) {
+      if (!importer || isAbsolute(id) || !isAbsolute(importer) && !VIRTUAL_RE.test(importer) || exclude.some((e) => id.startsWith(e))) {
+        return;
+      }
+      const normalisedId = resolveAlias$1(normalize(id), nuxt.options.alias);
+      const isNuxtTemplate = importer.startsWith("virtual:nuxt");
+      const normalisedImporter = (isNuxtTemplate ? decodeURIComponent(importer) : importer).replace(VIRTUAL_RE, "");
+      if (nuxt.options.experimental.templateImportResolution !== false && isNuxtTemplate) {
+        const template = nuxt.options.build.templates.find((t) => resolve(nuxt.options.buildDir, t.filename) === normalisedImporter);
+        if (template?._path) {
+          const res2 = await this.resolve?.(normalisedId, template._path, { skipSelf: true });
+          if (res2 !== void 0 && res2 !== null) {
+            return res2;
           }
         }
-        const dir = parseNodeModulePath(normalisedImporter).dir || pkgDir;
-        const res = await this.resolve?.(normalisedId, dir, { skipSelf: true });
-        if (res !== void 0 && res !== null) {
-          return res;
-        }
-        const environmentConditions = conditions[this.environment.name] ||= resolveConditions(this.environment);
-        const path = resolveModulePath(id, {
-          from: [dir, ...nuxt.options.modulesDir].map((d) => directoryToURL(d)),
-          suffixes: ["", "index"],
-          conditions: environmentConditions,
-          try: true
-        });
-        if (!path) {
-          logger.debug("Could not resolve id", id, importer);
-          return null;
-        }
-        return normalize(path);
       }
+      const dir = parseNodeModulePath(normalisedImporter).dir || pkgDir;
+      const res = await this.resolve?.(normalisedId, dir, { skipSelf: true });
+      if (res !== void 0 && res !== null) {
+        return res;
+      }
+      const environmentConditions = conditions[this.environment.name] ||= resolveConditions(this.environment);
+      const path = resolveModulePath(id, {
+        from: [dir, ...nuxt.options.modulesDir].map((d) => directoryToURL(d)),
+        suffixes: ["", "index"],
+        conditions: environmentConditions,
+        try: true
+      });
+      if (!path) {
+        logger.debug("Could not resolve id", id, importer);
+        return null;
+      }
+      return normalize(path);
     }
   };
 }
@@ -4970,17 +4955,15 @@ const VirtualFSPlugin = (nuxt, options) => createUnplugin((_, meta) => {
         }
       }
     },
-    load: {
-      filter: {
-        id: PREFIX_RE
-      },
-      handler(id) {
-        const key = withoutQuery(withoutPrefix(decodeURIComponent(id)));
-        return {
-          code: nuxt.vfs[key] || "",
-          map: null
-        };
-      }
+    loadInclude(id) {
+      return PREFIX_RE.test(id) && withoutQuery(withoutPrefix(decodeURIComponent(id))) in nuxt.vfs;
+    },
+    load(id) {
+      const key = withoutQuery(withoutPrefix(decodeURIComponent(id)));
+      return {
+        code: nuxt.vfs[key] || "",
+        map: null
+      };
     }
   };
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-nightly",
-  "version": "4.2.3-29430410.6b7fc747",
+  "version": "4.2.3-29430444.708dbe51",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -67,11 +67,11 @@
     "@dxup/nuxt": "^0.2.2",
     "@nuxt/cli": "npm:@nuxt/cli-nightly@latest",
     "@nuxt/devtools": "^3.1.1",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.2.3-29430410.6b7fc747",
-    "@nuxt/nitro-server": "npm:@nuxt/nitro-server-nightly@4.2.3-29430410.6b7fc747",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.3-29430410.6b7fc747",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.2.3-29430444.708dbe51",
+    "@nuxt/nitro-server": "npm:@nuxt/nitro-server-nightly@4.2.3-29430444.708dbe51",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.3-29430444.708dbe51",
     "@nuxt/telemetry": "^2.6.6",
-    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.2.3-29430410.6b7fc747",
+    "@nuxt/vite-builder": "npm:@nuxt/vite-builder-nightly@4.2.3-29430444.708dbe51",
     "@unhead/vue": "^2.0.19",
     "@vue/shared": "^3.5.25",
     "c12": "^3.3.2",