@nuxt/kit-nightly 4.1.4-29330540.040aff11 → 4.1.4-29331062.94e6fbb7

package/dist/index.mjs

@@ -843,20 +843,19 @@ async function loadNuxtConfig(opts) {
     cwd: opts.cwd || process.cwd()
   })).map((d) => d.endsWith("/") ? d.substring(0, d.length - 1) : d).sort((a, b) => b.localeCompare(a));
   opts.overrides = defu$1(opts.overrides, { _extends: localLayers });
-  const globalSelf = globalThis;
-  globalSelf.defineNuxtConfig = (c) => c;
-  const { configFile, layers = [], cwd, config: nuxtConfig, meta } = await loadConfig({
-    name: "nuxt",
-    configFile: "nuxt.config",
-    rcFile: ".nuxtrc",
-    extend: { extendKey: ["theme", "_extends", "extends"] },
-    dotenv: true,
-    globalRc: true,
-    // @ts-expect-error TODO: fix type in c12, it should accept createDefu directly
-    merger,
-    ...opts
-  });
-  delete globalSelf.defineNuxtConfig;
+  const { configFile, layers = [], cwd, config: nuxtConfig, meta } = await withDefineNuxtConfig(
+    () => loadConfig({
+      name: "nuxt",
+      configFile: "nuxt.config",
+      rcFile: ".nuxtrc",
+      extend: { extendKey: ["theme", "_extends", "extends"] },
+      dotenv: true,
+      globalRc: true,
+      // @ts-expect-error TODO: fix type in c12, it should accept createDefu directly
+      merger,
+      ...opts
+    })
+  );
   nuxtConfig.rootDir ||= cwd;
   nuxtConfig._nuxtConfigFile = configFile;
   nuxtConfig._nuxtConfigFiles = [configFile];
@@ -924,6 +923,23 @@ async function loadNuxtSchema(cwd) {
   const schemaPath = resolveModuleURL("@nuxt/schema", { try: true, from: urls }) ?? "@nuxt/schema";
   return await import(schemaPath).then((r) => r.NuxtConfigSchema);
 }
+async function withDefineNuxtConfig(fn) {
+  const key = "defineNuxtConfig";
+  const globalSelf = globalThis;
+  if (!globalSelf[key]) {
+    globalSelf[key] = (c) => c;
+    globalSelf[key].count = 0;
+  }
+  globalSelf[key].count++;
+  try {
+    return await fn();
+  } finally {
+    globalSelf[key].count--;
+    if (!globalSelf[key].count) {
+      delete globalSelf[key];
+    }
+  }
+}
 
 function extendNuxtSchema(def) {
   const nuxt = useNuxt();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit-nightly",
-  "version": "4.1.4-29330540.040aff11",
+  "version": "4.1.4-29331062.94e6fbb7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -47,7 +47,7 @@
     "untyped": "^2.0.0"
   },
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.4-29330540.040aff11",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.1.4-29331062.94e6fbb7",
     "@rspack/core": "1.5.8",
     "@types/semver": "7.7.1",
     "hookable": "5.5.3",