@nuxt/vite-builder-nightly 4.2.0-29344661.0b65203b → 4.2.0-29344722.285eac31

package/dist/index.d.mts

@@ -1,13 +1,12 @@
 import { ViteConfig } from 'nuxt/schema';
-import { EnvironmentOptions } from 'vite';
 import { NuxtBuilder } from '@nuxt/schema';
 
 declare const bundle: NuxtBuilder['bundle'];
 
 declare module 'nuxt/schema' {
     interface ViteOptions extends ViteConfig {
-        $client?: EnvironmentOptions;
-        $server?: EnvironmentOptions;
+        $client?: ViteConfig;
+        $server?: ViteConfig;
         viteNode?: {
             maxRetryAttempts?: number;
             /** in milliseconds */

package/dist/index.d.ts

@@ -1,13 +1,12 @@
 import { ViteConfig } from 'nuxt/schema';
-import { EnvironmentOptions } from 'vite';
 import { NuxtBuilder } from '@nuxt/schema';
 
 declare const bundle: NuxtBuilder['bundle'];
 
 declare module 'nuxt/schema' {
     interface ViteOptions extends ViteConfig {
-        $client?: EnvironmentOptions;
-        $server?: EnvironmentOptions;
+        $client?: ViteConfig;
+        $server?: ViteConfig;
         viteNode?: {
             maxRetryAttempts?: number;
             /** in milliseconds */

package/dist/index.mjs

@@ -1,14 +1,15 @@
 import fs, { existsSync, readFileSync } from 'node:fs';
 import * as vite from 'vite';
-import { isCSSRequest, createLogger, mergeConfig, createBuilder, createServer } from 'vite';
-import { dirname, normalize, join, resolve, relative, basename, isAbsolute } from 'pathe';
-import { tryUseNuxt, useNitro, logger, useNuxt, resolvePath, getLayerDirectories, createIsIgnored } from '@nuxt/kit';
+import { isCSSRequest, createLogger } from 'vite';
+import { dirname, normalize, resolve, join, relative, basename, isAbsolute } from 'pathe';
+import { useNitro, logger, useNuxt, resolvePath, getLayerDirectories, createIsIgnored } from '@nuxt/kit';
 import { findStaticImports, 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';
 import { filename as filename$1 } from 'pathe/utils';
 import { resolveModulePath } from 'exsolve';
+import vuePlugin from '@vitejs/plugin-vue';
+import viteJsxPlugin from '@vitejs/plugin-vue-jsx';
+import { defineEnv } from 'unenv';
 import { pathToFileURL, fileURLToPath } from 'node:url';
 import MagicString from 'magic-string';
 import { unlink, mkdir, writeFile, rm, readFile } from 'node:fs/promises';
@@ -30,7 +31,6 @@ import { isBuiltin } from 'node:module';
 import { createJiti } from 'jiti';
 import { genImport, genArrayFromRaw, genObjectFromRawEntries } from 'knitwork';
 import replacePlugin from '@rollup/plugin-replace';
-import { defineEnv } from 'unenv';
 
 function isVue(id, opts = {}) {
   const { search } = parseURL(decodeURIComponent(pathToFileURL(id).href));
@@ -209,9 +209,8 @@ if (/(?:chunks|shared)$/.test(_distDir)) {
 }
 const distDir = _distDir;
 
-function getManifest(nuxt, viteServer, clientEntry) {
+function getManifest(nuxt, ssrServer, clientEntry) {
   const css = /* @__PURE__ */ new Set();
-  const ssrServer = nuxt.options.experimental.viteEnvironmentApi ? viteServer.environments.ssr : viteServer;
   for (const key of ssrServer.moduleGraph.urlToModuleMap.keys()) {
     if (isCSS(key)) {
       const query = getQuery(key);
@@ -293,8 +292,9 @@ function useInvalidates() {
 function ViteNodePlugin(nuxt) {
   let socketServer;
   const socketPath = generateSocketPath();
+  let viteNodeServerOptions;
   const { invalidates, markInvalidate, markInvalidates } = useInvalidates();
-  async function cleanupSocket() {
+  const cleanupSocket = async () => {
     if (socketServer && socketServer.listening) {
       await new Promise((resolveClose) => socketServer.close(() => resolveClose()));
     }
@@ -304,16 +304,17 @@ function ViteNodePlugin(nuxt) {
       } catch {
       }
     }
-  }
+  };
   return {
     name: "nuxt:vite-node-server",
     enforce: "post",
+    applyToEnvironment: (environment) => environment.name === "client",
     configureServer(clientServer) {
-      if (!tryUseNuxt()) {
-        return;
-      }
-      function resolveServer(ssrServer) {
-        const viteNodeServerOptions = {
+      nuxt.hook("vite:serverCreated", (ssrServer, ctx) => {
+        if (!ctx.isServer) {
+          return;
+        }
+        viteNodeServerOptions = {
           socketPath,
           root: nuxt.options.srcDir,
           entryPath: resolveServerEntry(ssrServer.config),
@@ -327,17 +328,11 @@ function ViteNodePlugin(nuxt) {
         };
         process.env.NUXT_VITE_NODE_OPTIONS = JSON.stringify(viteNodeServerOptions);
         socketServer = createViteNodeSocketServer(nuxt, ssrServer, clientServer, invalidates, viteNodeServerOptions);
-      }
-      if (nuxt.options.experimental.viteEnvironmentApi) {
-        resolveServer(clientServer);
-      } else {
-        nuxt.hook("vite:serverCreated", (ssrServer, ctx) => ctx.isServer ? resolveServer(ssrServer) : void 0);
-      }
+      });
       nuxt.hook("close", cleanupSocket);
-      const client = nuxt.options.experimental.viteEnvironmentApi ? clientServer.environments.client : clientServer;
       nuxt.hook("app:templatesGenerated", (_app, changedTemplates) => {
         for (const template of changedTemplates) {
-          const mods = client.moduleGraph.getModulesByFile(`virtual:nuxt:${encodeURIComponent(template.dst)}`);
+          const mods = clientServer.moduleGraph.getModulesByFile(`virtual:nuxt:${encodeURIComponent(template.dst)}`);
           for (const mod of mods || []) {
             markInvalidate(mod);
           }
@@ -349,7 +344,15 @@ function ViteNodePlugin(nuxt) {
       });
     },
     async buildEnd() {
-      await cleanupSocket();
+      if (socketServer && socketServer.listening) {
+        await new Promise((resolveClose) => socketServer.close(() => resolveClose()));
+      }
+      if (socketPath && !socketPath.startsWith("\\\\.\\pipe\\")) {
+        try {
+          await unlink(socketPath);
+        } catch {
+        }
+      }
     }
   };
 }
@@ -387,20 +390,19 @@ function createViteNodeSocketServer(nuxt, ssrServer, clientServer, invalidates,
           }
           case "resolve": {
             const { id: resolveId, importer } = request.payload;
-            if (!resolveId) {
+            if (!resolveId || !ssrServer) {
               throw createError({ statusCode: 400, message: "Missing id for resolve" });
             }
-            const ssrNode = nuxt.options.experimental.viteEnvironmentApi ? ssrServer.environments.ssr.pluginContainer : getNode(ssrServer);
-            const resolvedResult = await ssrNode.resolveId(resolveId, importer).catch(() => null);
+            const resolvedResult = await getNode(ssrServer).resolveId(resolveId, importer).catch(() => null);
             sendResponse(socket, request.id, resolvedResult);
             return;
           }
           case "module": {
-            if (request.payload.moduleId === "/") {
+            if (request.payload.moduleId === "/" || !ssrServer) {
               throw createError({ statusCode: 400, message: "Invalid moduleId" });
             }
-            const ssrNode = nuxt.options.experimental.viteEnvironmentApi ? ssrServer.environments.ssr : getNode(ssrServer);
-            const response = await ssrNode.fetchModule(request.payload.moduleId).catch(async (err) => {
+            const node = getNode(ssrServer);
+            const response = await node.fetchModule(request.payload.moduleId).catch(async (err) => {
               const errorData = {
                 code: "VITE_ERROR",
                 id: request.payload.moduleId,
@@ -412,8 +414,7 @@ function createViteNodeSocketServer(nuxt, ssrServer, clientServer, invalidates,
               }
               if (!errorData.frame && err.code === "PARSE_ERROR") {
                 try {
-                  const clientNode = nuxt.options.experimental.viteEnvironmentApi ? ssrServer.environments.client : getNode(ssrServer);
-                  errorData.frame = await clientNode.transformRequest(request.payload.moduleId).then((res) => `${err.message || ""}
+                  errorData.frame = await node.transformRequest(request.payload.moduleId, "web").then((res) => `${err.message || ""}
 ${res?.code}`).catch(() => void 0);
                 } catch {
                 }
@@ -940,9 +941,6 @@ function DevServerPlugin(nuxt) {
           }
         }));
       });
-      if (nuxt.options.experimental.viteEnvironmentApi) {
-        await nuxt.callHook("vite:serverCreated", viteServer, { isClient: true, isServer: true });
-      }
       const mw = {
         route: "",
         handle: (req, res, next) => {
@@ -1014,7 +1012,7 @@ async function VitePluginCheckerPlugin(nuxt, environment) {
       resolveTSConfig(nuxt.options.rootDir)
     ]);
     const supportsProjects = await readTSConfig(tsconfigPath).then((r) => !!r.references?.length);
-    const environments = ["client", nuxt.options.ssr ? "ssr" : void 0].filter((name) => environment ? name === environment : !!name);
+    const environments = ["client", nuxt.options.ssr ? "ssr" : void 0].filter((name) => name === environment);
     return environments.map((envName) => ({
       applyToEnvironment: (environment2) => environment2.name === envName,
       ...checker({
@@ -1027,10 +1025,34 @@ async function VitePluginCheckerPlugin(nuxt, environment) {
   }
 }
 
-const clientEnvironment = (nuxt, entry) => {
-  return {
+async function buildClient(nuxt, ctx) {
+  const nodeCompat = nuxt.options.experimental.clientNodeCompat ? {
+    alias: defineEnv({ nodeCompat: true, resolve: true }).env.alias,
+    define: { global: "globalThis" }
+  } : { define: {} };
+  const clientConfig = vite.mergeConfig(ctx.config, vite.mergeConfig({
+    configFile: false,
+    base: nuxt.options.dev ? joinURL(nuxt.options.app.baseURL.replace(/^\.\//, "/") || "/", nuxt.options.app.buildAssetsDir) : "./",
+    css: {
+      devSourcemap: !!nuxt.options.sourcemap.client
+    },
+    define: {
+      "process.env.NODE_ENV": JSON.stringify(ctx.config.mode),
+      "process.server": false,
+      "process.client": true,
+      "process.browser": true,
+      "process.nitro": false,
+      "process.prerender": false,
+      "import.meta.server": false,
+      "import.meta.client": true,
+      "import.meta.browser": true,
+      "import.meta.nitro": false,
+      "import.meta.prerender": false,
+      "module.hot": false,
+      ...nodeCompat.define
+    },
     optimizeDeps: {
-      entries: [entry],
+      entries: [ctx.entry],
       include: [],
       // We exclude Vue and Nuxt common dependencies from optimization
       // as they already ship ESM.
@@ -1074,40 +1096,15 @@ const clientEnvironment = (nuxt, entry) => {
         "#app-manifest"
       ]
     },
-    define: {
-      "process.env.NODE_ENV": JSON.stringify(nuxt.options.vite.mode),
-      "process.server": false,
-      "process.client": true,
-      "process.browser": true,
-      "process.nitro": false,
-      "process.prerender": false,
-      "import.meta.server": false,
-      "import.meta.client": true,
-      "import.meta.browser": true,
-      "import.meta.nitro": false,
-      "import.meta.prerender": false,
-      "module.hot": false,
-      ...nuxt.options.experimental.clientNodeCompat ? { global: "globalThis" } : {}
-    },
+    cacheDir: resolve(nuxt.options.rootDir, ctx.config.cacheDir ?? "node_modules/.cache/vite", "client"),
     build: {
-      sourcemap: nuxt.options.sourcemap.client ? nuxt.options.vite.build?.sourcemap ?? nuxt.options.sourcemap.client : false,
+      sourcemap: nuxt.options.sourcemap.client ? ctx.config.build?.sourcemap ?? nuxt.options.sourcemap.client : false,
       manifest: "manifest.json",
       outDir: resolve(nuxt.options.buildDir, "dist/client"),
       rollupOptions: {
-        input: { entry }
+        input: { entry: ctx.entry }
       }
-    }
-  };
-};
-
-async function buildClient(nuxt, ctx) {
-  const clientConfig = vite.mergeConfig(ctx.config, vite.mergeConfig({
-    configFile: false,
-    base: nuxt.options.dev ? joinURL(nuxt.options.app.baseURL.replace(/^\.\//, "/") || "/", nuxt.options.app.buildAssetsDir) : "./",
-    css: {
-      devSourcemap: !!nuxt.options.sourcemap.client
     },
-    cacheDir: resolve(nuxt.options.rootDir, ctx.config.cacheDir ?? "node_modules/.cache/vite", "client"),
     plugins: [
       DevStyleSSRPlugin({
         srcDir: nuxt.options.srcDir,
@@ -1130,8 +1127,7 @@ async function buildClient(nuxt, ctx) {
         clientFiles: [ctx.entry]
       },
       middlewareMode: true
-    },
-    ...clientEnvironment(nuxt, ctx.entry)
+    }
   }, nuxt.options.vite.$client || {}));
   clientConfig.customLogger = createViteLogger(clientConfig);
   await nuxt.callHook("vite:extendConfig", clientConfig, { isClient: true, isServer: false });
@@ -1209,6 +1205,25 @@ async function writeManifest(ctx) {
   }
 }
 
+function transpile(envs) {
+  const nuxt = useNuxt();
+  const transpile2 = [];
+  for (let pattern of nuxt.options.build.transpile) {
+    if (typeof pattern === "function") {
+      const result = pattern(envs);
+      if (result) {
+        pattern = result;
+      }
+    }
+    if (typeof pattern === "string") {
+      transpile2.push(new RegExp(escapeStringRegexp(normalize(pattern))));
+    } else if (pattern instanceof RegExp) {
+      transpile2.push(pattern);
+    }
+  }
+  return transpile2;
+}
+
 const SourcemapPreserverPlugin = (nuxt) => {
   let outputDir;
   const ids = /* @__PURE__ */ new Set();
@@ -1288,48 +1303,67 @@ function VueFeatureFlagsPlugin(nuxt) {
   };
 }
 
-function transpile(envs) {
-  const nuxt = useNuxt();
-  const transpile2 = [];
-  for (let pattern of nuxt.options.build.transpile) {
-    if (typeof pattern === "function") {
-      const result = pattern(envs);
-      if (result) {
-        pattern = result;
-      }
-    }
-    if (typeof pattern === "string") {
-      transpile2.push(new RegExp(escapeStringRegexp(normalize(pattern))));
-    } else if (pattern instanceof RegExp) {
-      transpile2.push(pattern);
-    }
-  }
-  return transpile2;
-}
-
-function ssr(nuxt) {
-  return {
-    external: [
-      "nitro/runtime",
-      // TODO: remove in v5
-      "#internal/nitro",
-      "#internal/nitro/utils"
+async function buildServer(nuxt, ctx) {
+  const serverEntry = nuxt.options.ssr ? ctx.entry : await resolvePath(resolve(nuxt.options.appDir, "entry-spa"));
+  const serverConfig = vite.mergeConfig(ctx.config, vite.mergeConfig({
+    configFile: false,
+    base: nuxt.options.dev ? joinURL(nuxt.options.app.baseURL.replace(/^\.\//, "/") || "/", nuxt.options.app.buildAssetsDir) : void 0,
+    css: {
+      devSourcemap: !!nuxt.options.sourcemap.server
+    },
+    plugins: [
+      VueFeatureFlagsPlugin(nuxt),
+      // tell rollup's nitro build about the original sources of the generated vite server build
+      SourcemapPreserverPlugin(nuxt),
+      VitePluginCheckerPlugin(nuxt, "ssr")
     ],
-    noExternal: [
-      ...transpile({ isServer: true, isDev: nuxt.options.dev }),
-      "/__vue-jsx",
-      "#app",
-      /^nuxt(\/|$)/,
-      /(nuxt|nuxt3|nuxt-nightly)\/(dist|src|app)/
-    ]
-  };
-}
-function ssrEnvironment(nuxt, serverEntry) {
-  return {
+    define: {
+      "process.server": true,
+      "process.client": false,
+      "process.browser": false,
+      "import.meta.server": true,
+      "import.meta.client": false,
+      "import.meta.browser": false,
+      "window": "undefined",
+      "document": "undefined",
+      "navigator": "undefined",
+      "location": "undefined",
+      "XMLHttpRequest": "undefined"
+    },
+    optimizeDeps: {
+      noDiscovery: true,
+      include: void 0
+    },
+    environments: {
+      ssr: {
+        resolve: {
+          conditions: nuxt._nitro?.options.exportConditions
+        }
+      }
+    },
+    resolve: {
+      conditions: nuxt._nitro?.options.exportConditions
+    },
+    ssr: {
+      external: [
+        "nitro/runtime",
+        // TODO: remove in v5
+        "#internal/nitro",
+        "#internal/nitro/utils"
+      ],
+      noExternal: [
+        ...transpile({ isServer: true, isDev: nuxt.options.dev }),
+        "/__vue-jsx",
+        "#app",
+        /^nuxt(\/|$)/,
+        /(nuxt|nuxt3|nuxt-nightly)\/(dist|src|app)/
+      ]
+    },
+    cacheDir: resolve(nuxt.options.rootDir, ctx.config.cacheDir ?? "node_modules/.cache/vite", "server"),
     build: {
       // we'll display this in nitro build output
       reportCompressedSize: false,
-      sourcemap: nuxt.options.sourcemap.server ? nuxt.options.vite.build?.sourcemap ?? nuxt.options.sourcemap.server : false,
+      sourcemap: nuxt.options.sourcemap.server ? ctx.config.build?.sourcemap ?? nuxt.options.sourcemap.server : false,
       outDir: resolve(nuxt.options.buildDir, "dist/server"),
       ssr: true,
       rollupOptions: {
@@ -1348,6 +1382,7 @@ function ssrEnvironment(nuxt, serverEntry) {
         output: {
           entryFileNames: "[name].mjs",
           format: "module",
+          // @ts-expect-error non-public property
           ...vite.rolldownVersion ? {} : {
             generatedCode: {
               symbols: true,
@@ -1366,52 +1401,6 @@ function ssrEnvironment(nuxt, serverEntry) {
         }
       }
     },
-    define: {
-      "process.server": true,
-      "process.client": false,
-      "process.browser": false,
-      "import.meta.server": true,
-      "import.meta.client": false,
-      "import.meta.browser": false,
-      "window": "undefined",
-      "document": "undefined",
-      "navigator": "undefined",
-      "location": "undefined",
-      "XMLHttpRequest": "undefined"
-    },
-    resolve: {
-      conditions: useNitro().options.exportConditions
-    }
-  };
-}
-
-async function buildServer(nuxt, ctx) {
-  const serverEntry = nuxt.options.ssr ? ctx.entry : await resolvePath(resolve(nuxt.options.appDir, "entry-spa"));
-  const serverConfig = vite.mergeConfig(ctx.config, vite.mergeConfig({
-    configFile: false,
-    base: nuxt.options.dev ? joinURL(nuxt.options.app.baseURL.replace(/^\.\//, "/") || "/", nuxt.options.app.buildAssetsDir) : void 0,
-    css: {
-      devSourcemap: !!nuxt.options.sourcemap.server
-    },
-    plugins: [
-      VueFeatureFlagsPlugin(nuxt),
-      // tell rollup's nitro build about the original sources of the generated vite server build
-      SourcemapPreserverPlugin(nuxt),
-      VitePluginCheckerPlugin(nuxt, "ssr")
-    ],
-    optimizeDeps: {
-      noDiscovery: true,
-      include: void 0
-    },
-    environments: {
-      ssr: {
-        resolve: {
-          conditions: nuxt._nitro?.options.exportConditions
-        }
-      }
-    },
-    ssr: ssr(nuxt),
-    cacheDir: resolve(nuxt.options.rootDir, ctx.config.cacheDir ?? "node_modules/.cache/vite", "server"),
     server: {
       warmup: {
         ssrFiles: [serverEntry]
@@ -1419,8 +1408,7 @@ async function buildServer(nuxt, ctx) {
       // https://github.com/vitest-dev/vitest/issues/229#issuecomment-1002685027
       preTransformRequests: false,
       hmr: false
-    },
-    ...ssrEnvironment(nuxt, serverEntry)
+    }
   }, nuxt.options.vite.$server || {}));
   serverConfig.customLogger = createViteLogger(serverConfig, { hideOutput: !nuxt.options.dev });
   await nuxt.callHook("vite:extendConfig", serverConfig, { isClient: false, isServer: true });
@@ -1584,7 +1572,7 @@ function SSRStylesPlugin(nuxt) {
   return {
     name: "ssr-styles",
     configResolved(config) {
-      if (!config.build.ssr || nuxt.options.experimental.viteEnvironmentApi) {
+      if (!config.build.ssr) {
         entry = resolveClientEntry(config);
       }
     },
@@ -1940,72 +1928,6 @@ function NodeCompatAliasPlugin() {
   };
 }
 
-function ClientManifestPlugin(nuxt) {
-  let clientEntry;
-  let key;
-  let disableCssCodeSplit;
-  return {
-    name: "nuxt:client-manifest",
-    // needs to run after server build (or after client build if there is no server build)
-    applyToEnvironment: (environment) => environment.name === "ssr",
-    configResolved(config) {
-      clientEntry = resolveClientEntry(config);
-      key = relative(config.root, clientEntry);
-      disableCssCodeSplit = config.build?.cssCodeSplit === false;
-    },
-    async closeBundle() {
-      const devClientManifest = {
-        "@vite/client": {
-          isEntry: true,
-          file: "@vite/client",
-          css: [],
-          module: true,
-          resourceType: "script"
-        },
-        ...nuxt.options.features.noScripts === "all" ? {} : {
-          [clientEntry]: {
-            isEntry: true,
-            file: clientEntry,
-            module: true,
-            resourceType: "script"
-          }
-        }
-      };
-      const clientDist = resolve(nuxt.options.buildDir, "dist/client");
-      const serverDist = resolve(nuxt.options.buildDir, "dist/server");
-      const manifestFile = resolve(clientDist, "manifest.json");
-      const clientManifest = nuxt.options.dev ? devClientManifest : JSON.parse(readFileSync(manifestFile, "utf-8"));
-      const manifestEntries = Object.values(clientManifest);
-      const buildAssetsDir = withTrailingSlash(withoutLeadingSlash(nuxt.options.app.buildAssetsDir));
-      const BASE_RE = new RegExp(`^${escapeStringRegexp(buildAssetsDir)}`);
-      for (const entry of manifestEntries) {
-        entry.file &&= entry.file.replace(BASE_RE, "");
-        for (const item of ["css", "assets"]) {
-          entry[item] &&= entry[item].map((i) => i.replace(BASE_RE, ""));
-        }
-      }
-      await mkdir(serverDist, { recursive: true });
-      if (disableCssCodeSplit) {
-        for (const entry of manifestEntries) {
-          if (entry.file?.endsWith(".css")) {
-            clientManifest[key].css ||= [];
-            clientManifest[key].css.push(entry.file);
-            break;
-          }
-        }
-      }
-      const manifest = normalizeViteManifest(clientManifest);
-      await nuxt.callHook("build:manifest", manifest);
-      const precomputed = precomputeDependencies(manifest);
-      await writeFile(resolve(serverDist, "client.manifest.mjs"), "export default " + serialize(manifest), "utf8");
-      await writeFile(resolve(serverDist, "client.precomputed.mjs"), "export default " + serialize(precomputed), "utf8");
-      if (!nuxt.options.dev) {
-        await rm(manifestFile, { force: true });
-      }
-    }
-  };
-}
-
 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"));
@@ -2039,188 +1961,94 @@ const bundle = async (nuxt) => {
   const mockEmpty = resolveModulePath("mocked-exports/empty", { from: import.meta.url });
   const helper = nuxt.options.nitro.imports !== false ? "" : "globalThis.";
   const isIgnored = createIsIgnored(nuxt);
-  const serverEntry = nuxt.options.ssr ? entry : await resolvePath(resolve(nuxt.options.appDir, "entry-spa"));
-  const config = mergeConfig(
-    {
-      base: nuxt.options.dev ? joinURL(nuxt.options.app.baseURL.replace(/^\.\//, "/") || "/", nuxt.options.app.buildAssetsDir) : void 0,
-      logLevel: logLevelMap[nuxt.options.logLevel] ?? logLevelMap.info,
-      experimental: {
-        renderBuiltUrl: (filename2, { type, hostType, ssr: ssr2 }) => {
-          if (hostType !== "js") {
-            return { relative: true };
-          }
-          if (!ssr2) {
-            if (type === "asset") {
+  const ctx = {
+    nuxt,
+    entry,
+    config: vite.mergeConfig(
+      {
+        logLevel: logLevelMap[nuxt.options.logLevel] ?? logLevelMap.info,
+        experimental: {
+          renderBuiltUrl: (filename2, { type, hostType, ssr }) => {
+            if (hostType !== "js") {
               return { relative: true };
             }
-            return { runtime: `globalThis.__publicAssetsURL(${JSON.stringify(filename2)})` };
-          }
-          if (type === "public") {
-            return { runtime: `${helper}__publicAssetsURL(${JSON.stringify(filename2)})` };
-          }
-          if (type === "asset") {
-            const relativeFilename = filename2.replace(withTrailingSlash(withoutLeadingSlash(nuxt.options.app.buildAssetsDir)), "");
-            return { runtime: `${helper}__buildAssetsURL(${JSON.stringify(relativeFilename)})` };
-          }
-        }
-      },
-      ...nuxt.options.experimental.viteEnvironmentApi ? {
-        builder: {
-          async buildApp(builder) {
-            const environments = Object.values(builder.environments);
-            for (const environment of environments) {
-              logger.restoreAll();
-              await builder.build(environment);
-              logger.wrapAll();
-              await nuxt.callHook("vite:compiled");
+            if (!ssr) {
+              if (type === "asset") {
+                return { relative: true };
+              }
+              return { runtime: `globalThis.__publicAssetsURL(${JSON.stringify(filename2)})` };
+            }
+            if (type === "public") {
+              return { runtime: `${helper}__publicAssetsURL(${JSON.stringify(filename2)})` };
+            }
+            if (type === "asset") {
+              const relativeFilename = filename2.replace(withTrailingSlash(withoutLeadingSlash(nuxt.options.app.buildAssetsDir)), "");
+              return { runtime: `${helper}__buildAssetsURL(${JSON.stringify(relativeFilename)})` };
             }
           }
         },
-        environments: {
-          client: {
-            consumer: "client",
-            keepProcessEnv: false,
-            dev: {
-              warmup: [entry]
-            },
-            ...clientEnvironment(nuxt, entry)
+        resolve: {
+          alias: {
+            [basename(nuxt.options.dir.assets)]: resolve(nuxt.options.srcDir, nuxt.options.dir.assets),
+            ...nuxt.options.alias,
+            "#app": nuxt.options.appDir,
+            "web-streams-polyfill/ponyfill/es2018": mockEmpty,
+            // Cannot destructure property 'AbortController' of ..
+            "abort-controller": mockEmpty
           },
-          ssr: {
-            consumer: "server",
-            dev: {
-              warmup: [serverEntry]
-            },
-            ...ssrEnvironment(nuxt, serverEntry)
-          }
+          dedupe: [
+            "vue"
+          ]
         },
-        ssr: ssr(nuxt)
-      } : {},
-      resolve: {
-        alias: {
-          [basename(nuxt.options.dir.assets)]: resolve(nuxt.options.srcDir, nuxt.options.dir.assets),
-          ...nuxt.options.alias,
-          "#app": nuxt.options.appDir,
-          "web-streams-polyfill/ponyfill/es2018": mockEmpty,
-          // Cannot destructure property 'AbortController' of ..
-          "abort-controller": mockEmpty
+        css: await resolveCSSOptions(nuxt),
+        define: {
+          __NUXT_VERSION__: JSON.stringify(nuxt._version),
+          __NUXT_ASYNC_CONTEXT__: nuxt.options.experimental.asyncContext
         },
-        dedupe: [
-          "vue"
-        ]
-      },
-      // TODO: devSourcemap
-      css: await resolveCSSOptions(nuxt),
-      define: {
-        __NUXT_VERSION__: JSON.stringify(nuxt._version),
-        __NUXT_ASYNC_CONTEXT__: nuxt.options.experimental.asyncContext
-      },
-      build: {
-        copyPublicDir: false,
-        rollupOptions: {
-          output: {
-            sourcemapIgnoreList: (relativeSourcePath) => {
-              return relativeSourcePath.includes("node_modules") || relativeSourcePath.includes(nuxt.options.buildDir);
-            },
-            sanitizeFileName: sanitizeFilePath,
-            // https://github.com/vitejs/vite/tree/main/packages/vite/src/node/build.ts#L464-L478
-            assetFileNames: nuxt.options.dev ? void 0 : (chunk) => withoutLeadingSlash(join(nuxt.options.app.buildAssetsDir, `${sanitizeFilePath(filename$1(chunk.names[0]))}.[hash].[ext]`))
+        build: {
+          copyPublicDir: false,
+          rollupOptions: {
+            output: {
+              sourcemapIgnoreList: (relativeSourcePath) => {
+                return relativeSourcePath.includes("node_modules") || relativeSourcePath.includes(nuxt.options.buildDir);
+              },
+              sanitizeFileName: sanitizeFilePath,
+              // https://github.com/vitejs/vite/tree/main/packages/vite/src/node/build.ts#L464-L478
+              assetFileNames: nuxt.options.dev ? void 0 : (chunk) => withoutLeadingSlash(join(nuxt.options.app.buildAssetsDir, `${sanitizeFilePath(filename$1(chunk.names[0]))}.[hash].[ext]`))
+            }
+          },
+          // @ts-expect-error non-public property
+          watch: vite.rolldownVersion ? { exclude: [...nuxt.options.ignore, /[\\/]node_modules[\\/]/] } : {
+            chokidar: { ...nuxt.options.watchers.chokidar, ignored: [isIgnored, /[\\/]node_modules[\\/]/] },
+            exclude: nuxt.options.ignore
           }
         },
-        // @ts-expect-error non-public property
-        watch: vite.rolldownVersion ? { exclude: [...nuxt.options.ignore, /[\\/]node_modules[\\/]/] } : {
-          chokidar: { ...nuxt.options.watchers.chokidar, ignored: [isIgnored, /[\\/]node_modules[\\/]/] },
-          exclude: nuxt.options.ignore
-        }
-      },
-      plugins: [
-        ...nuxt.options.experimental.viteEnvironmentApi ? [
-          vuePlugin(viteConfig.vue),
-          viteJsxPlugin(viteConfig.vueJsx),
-          ViteNodePlugin(nuxt),
-          ClientManifestPlugin(nuxt),
-          DevServerPlugin(nuxt)
-        ] : [],
-        // add resolver for files in public assets directories
-        PublicDirsPlugin({
-          dev: nuxt.options.dev,
-          baseURL: nuxt.options.app.baseURL
-        }),
-        ReplacePlugin(),
-        LayerDepOptimizePlugin(nuxt),
-        SSRStylesPlugin(nuxt),
-        EnvironmentsPlugin(nuxt),
-        ...nuxt.options.experimental.viteEnvironmentApi ? [
-          // Add type-checking
-          VitePluginCheckerPlugin(nuxt),
-          // server-only plugins
-          VueFeatureFlagsPlugin(nuxt),
-          // tell rollup's nitro build about the original sources of the generated vite server build
-          SourcemapPreserverPlugin(nuxt),
-          // client-only plugins
-          DevStyleSSRPlugin({
-            srcDir: nuxt.options.srcDir,
-            buildAssetsURL: joinURL(nuxt.options.app.baseURL, nuxt.options.app.buildAssetsDir)
+        plugins: [
+          // add resolver for files in public assets directories
+          PublicDirsPlugin({
+            dev: nuxt.options.dev,
+            baseURL: nuxt.options.app.baseURL
           }),
-          RuntimePathsPlugin(),
-          // Type checking client panel
-          TypeCheckPlugin(nuxt),
-          ModulePreloadPolyfillPlugin(),
-          // ensure changes in chunks do not invalidate whole build
-          StableEntryPlugin(nuxt),
-          AnalyzePlugin(nuxt)
-        ] : []
-      ],
-      appType: "custom",
-      server: {
-        middlewareMode: true,
-        watch: { ...nuxt.options.watchers.chokidar, ignored: [isIgnored, /[\\/]node_modules[\\/]/] },
-        fs: {
-          allow: [...new Set(allowDirs)]
+          ReplacePlugin(),
+          LayerDepOptimizePlugin(nuxt),
+          SSRStylesPlugin(nuxt),
+          EnvironmentsPlugin(nuxt)
+        ],
+        server: {
+          watch: { ...nuxt.options.watchers.chokidar, ignored: [isIgnored, /[\\/]node_modules[\\/]/] },
+          fs: {
+            allow: [...new Set(allowDirs)]
+          }
         }
-      }
-    },
-    nuxt.options.experimental.viteEnvironmentApi ? {
-      ...viteConfig,
-      environments: {
-        ssr: $server,
-        client: $client
-      }
-    } : viteConfig
-  );
+      },
+      viteConfig
+    )
+  };
   if (!nuxt.options.dev) {
-    config.server.watch = void 0;
-    config.build.watch = void 0;
+    ctx.config.server.watch = void 0;
+    ctx.config.build.watch = void 0;
   }
-  const ctx = { nuxt, entry, config };
   await nuxt.callHook("vite:extend", ctx);
-  if (nuxt.options.experimental.viteEnvironmentApi) {
-    await handleEnvironments(nuxt, config);
-  } else {
-    await handleSerialBuilds(nuxt, ctx);
-  }
-};
-async function handleEnvironments(nuxt, config) {
-  config.customLogger = createViteLogger(config);
-  config.configFile = false;
-  for (const environment of ["client", "ssr"]) {
-    const environments = { [environment]: config.environments[environment] };
-    const strippedConfig = { ...config, environments };
-    const ctx = { isServer: environment === "ssr", isClient: environment === "client" };
-    await nuxt.hooks.callHook("vite:extendConfig", strippedConfig, ctx);
-    await nuxt.hooks.callHook("vite:configResolved", strippedConfig, ctx);
-  }
-  if (!nuxt.options.dev) {
-    const builder = await createBuilder(config);
-    await builder.buildApp();
-    return;
-  }
-  await withLogs(async () => {
-    const server = await createServer(config);
-    await server.environments.ssr.pluginContainer.buildStart({});
-  }, "Vite dev server built");
-  await writeDevServer(nuxt);
-}
-async function handleSerialBuilds(nuxt, ctx) {
   nuxt.hook("vite:serverCreated", (server, env) => {
     if (nuxt.options.vite.warmupEntry !== false) {
       useNitro().hooks.hookOnce("compiled", () => {
@@ -2231,7 +2059,7 @@ async function handleSerialBuilds(nuxt, ctx) {
   });
   await withLogs(() => buildClient(nuxt, ctx), "Vite client built", nuxt.options.dev);
   await withLogs(() => buildServer(nuxt, ctx), "Vite server built", nuxt.options.dev);
-}
+};
 async function withLogs(fn, message, enabled = true) {
   if (!enabled) {
     return fn();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/vite-builder-nightly",
-  "version": "4.2.0-29344661.0b65203b",
+  "version": "4.2.0-29344722.285eac31",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -21,7 +21,7 @@
     "dist"
   ],
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.0-29344661.0b65203b",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.0-29344722.285eac31",
     "nitropack": "2.12.7",
     "rolldown": "1.0.0-beta.42",
     "rollup": "4.52.4",
@@ -29,7 +29,7 @@
     "vue": "3.5.22"
   },
   "dependencies": {
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.2.0-29344661.0b65203b",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.2.0-29344722.285eac31",
     "@rollup/plugin-replace": "^6.0.2",
     "@vitejs/plugin-vue": "^6.0.1",
     "@vitejs/plugin-vue-jsx": "^5.1.1",
@@ -61,7 +61,7 @@
     "vue-bundle-renderer": "^2.2.0"
   },
   "peerDependencies": {
-    "nuxt": "npm:nuxt-nightly@4.2.0-29344661.0b65203b",
+    "nuxt": "npm:nuxt-nightly@4.2.0-29344722.285eac31",
     "rolldown": "^1.0.0-beta.38",
     "vue": "^3.3.4"
   },