@nuxt/vite-builder-nightly 4.3.0-29437273.f9c092c5 → 4.3.0-29439165.ec1da219

package/dist/index.mjs

@@ -3,8 +3,8 @@ import { performance } from 'node:perf_hooks';
 import * as vite from 'vite';
 import { isCSSRequest, createLogger, mergeConfig, createBuilder, createServer } from 'vite';
 import { normalize, join, relative, dirname, basename, resolve, isAbsolute } from 'pathe';
-import { tryUseNuxt, useNitro, logger, useNuxt, resolvePath, getLayerDirectories, createIsIgnored } from '@nuxt/kit';
-import { findStaticImports, sanitizeFilePath } from 'mlly';
+import { tryUseNuxt, useNitro, logger, useNuxt, resolvePath, getLayerDirectories, resolveAlias, directoryToURL, tryImportModule, createIsIgnored } from '@nuxt/kit';
+import { findStaticImports, parseNodeModulePath, sanitizeFilePath } from 'mlly';
 import viteJsxPlugin from '@vitejs/plugin-vue-jsx';
 import vuePlugin from '@vitejs/plugin-vue';
 import { parseURL, parseQuery, joinURL, getQuery, withLeadingSlash, withTrailingSlash, withoutLeadingSlash, withoutBase } from 'ufo';
@@ -33,6 +33,7 @@ import { createJiti } from 'jiti';
 import { genImport, genArrayFromRaw, genObjectFromRawEntries } from 'knitwork';
 import replacePlugin from '@rollup/plugin-replace';
 import { defineEnv } from 'unenv';
+import { runtimeDependencies } from 'nuxt/meta';
 
 function isVue(id, opts = {}) {
   const { search } = parseURL(decodeURIComponent(pathToFileURL(id).href));
@@ -2101,6 +2102,136 @@ function ClientManifestPlugin(nuxt) {
   };
 }
 
+const VIRTUAL_RE = /^\0?virtual:(?:nuxt:)?/;
+function ResolveDeepImportsPlugin(nuxt) {
+  const exclude = ["virtual:", "\0virtual:", "/__skip_vite", "@vitest/"];
+  const conditions = {};
+  function resolveConditions(environment) {
+    const resolvedConditions = /* @__PURE__ */ new Set([nuxt.options.dev ? "development" : "production", ...environment.config.resolve.conditions]);
+    if (resolvedConditions.has("browser")) {
+      resolvedConditions.add("web");
+      resolvedConditions.add("import");
+      resolvedConditions.add("module");
+      resolvedConditions.add("default");
+    }
+    if (environment.config.mode === "test") {
+      resolvedConditions.add("import");
+      resolvedConditions.add("require");
+    }
+    return [...resolvedConditions];
+  }
+  return {
+    name: "nuxt:resolve-bare-imports",
+    enforce: "post",
+    resolveId: {
+      filter: {
+        id: {
+          exclude: [
+            // absolute path
+            /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Z]:[/\\]/i,
+            ...exclude.map((e) => new RegExp("^" + escapeStringRegexp(e)))
+          ]
+        }
+      },
+      async handler(id, importer) {
+        if (!importer || !isAbsolute(importer) && !VIRTUAL_RE.test(importer)) {
+          return;
+        }
+        const normalisedId = resolveAlias(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 || nuxt.options.appDir;
+        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);
+      }
+    }
+  };
+}
+
+function ResolveExternalsPlugin(nuxt) {
+  let external = /* @__PURE__ */ new Set();
+  const nitro = useNitro();
+  return {
+    name: "nuxt:resolve-externals",
+    enforce: "pre",
+    async config() {
+      const { runtimeDependencies: runtimeNitroDependencies = [] } = await tryImportModule("nitropack/runtime/meta", {
+        url: new URL(import.meta.url)
+      }) || {};
+      external = /* @__PURE__ */ new Set([
+        // explicit dependencies we use in our ssr renderer - these can be inlined (if necessary) in the nitro build
+        "unhead",
+        "@unhead/vue",
+        "@nuxt/devalue",
+        "rou3",
+        "unstorage",
+        // ensure we only have one version of vue if nitro is going to inline anyway
+        ...nitro.options.inlineDynamicImports ? ["vue", "@vue/server-renderer"] : [],
+        ...runtimeDependencies,
+        // dependencies we might share with nitro - these can be inlined (if necessary) in the nitro build
+        ...runtimeNitroDependencies
+      ]);
+      return {
+        optimizeDeps: {
+          exclude: Array.from(external)
+        }
+      };
+    },
+    applyToEnvironment(environment) {
+      if (nuxt.options.dev || environment.name !== "ssr") {
+        return false;
+      }
+      return {
+        name: "nuxt:resolve-externals:external",
+        resolveId: {
+          filter: {
+            id: [...external].map((dep) => new RegExp("^" + escapeStringRegexp(dep) + "$"))
+          },
+          async handler(id, importer) {
+            const res = await this.resolve?.(id, importer, { skipSelf: true });
+            if (res !== void 0 && res !== null) {
+              if (res.id === id) {
+                res.id = resolveModulePath(res.id, {
+                  try: true,
+                  from: importer,
+                  extensions: nuxt.options.extensions
+                }) || res.id;
+              }
+              return {
+                ...res,
+                external: "absolute"
+              };
+            }
+          }
+        }
+      };
+    }
+  };
+}
+
 const bundle = async (nuxt) => {
   const useAsyncEntry = nuxt.options.experimental.asyncEntry || nuxt.options.dev;
   const entry = await resolvePath(resolve(nuxt.options.appDir, useAsyncEntry ? "entry.async" : "entry"));
@@ -2228,6 +2359,9 @@ const bundle = async (nuxt) => {
         }
       },
       plugins: [
+        // add resolver for modules used in virtual files
+        ResolveDeepImportsPlugin(nuxt),
+        ResolveExternalsPlugin(nuxt),
         ...nuxt.options.experimental.viteEnvironmentApi ? [
           vuePlugin(viteConfig.vue),
           viteJsxPlugin(viteConfig.vueJsx),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/vite-builder-nightly",
-  "version": "4.3.0-29437273.f9c092c5",
+  "version": "4.3.0-29439165.ec1da219",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -25,7 +25,7 @@
     "dist"
   ],
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29437273.f9c092c5",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29439165.ec1da219",
     "nitropack": "2.12.9",
     "rolldown": "1.0.0-beta.54",
     "rollup": "4.53.4",
@@ -33,7 +33,7 @@
     "vue": "3.5.25"
   },
   "dependencies": {
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.3.0-29437273.f9c092c5",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.3.0-29439165.ec1da219",
     "@rollup/plugin-replace": "^6.0.3",
     "@vitejs/plugin-vue": "^6.0.3",
     "@vitejs/plugin-vue-jsx": "^5.1.2",
@@ -65,7 +65,7 @@
     "vue-bundle-renderer": "^2.2.0"
   },
   "peerDependencies": {
-    "nuxt": "npm:nuxt-nightly@4.3.0-29437273.f9c092c5",
+    "nuxt": "npm:nuxt-nightly@4.3.0-29439165.ec1da219",
     "rolldown": "^1.0.0-beta.38",
     "vue": "^3.3.4"
   },