@nuxt/webpack-builder-nightly 5.0.0-29740135.daae2228 → 5.0.0-29740294.24eec37d

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import { createRequire } from "node:module";
 import pify from "pify";
 import { defu } from "defu";
-import { pathToFileURL } from "node:url";
-import { basename, isAbsolute, join, normalize, relative, resolve } from "pathe";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { basename, dirname, isAbsolute, join, normalize, relative, resolve } from "pathe";
 import { joinURL, withTrailingSlash } from "ufo";
 import { bundlerDiagnostics, configDiagnostics, directoryToURL, logger, resolveAlias, setBuildOutput, useNitro, useNuxt } from "@nuxt/kit";
 import { createUnplugin } from "unplugin";
@@ -16,6 +16,8 @@ import { Volume, createFsFromVolume } from "memfs";
 import querystring from "node:querystring";
 import { BundleAnalyzerPlugin } from "webpack-bundle-analyzer";
 import { defineEnv } from "unenv";
+import { parseNodeModulePath } from "mlly";
+import { resolveModulePath } from "exsolve";
 import TimeFixPlugin from "time-fix-plugin";
 import FriendlyErrorsWebpackPlugin from "@nuxt/friendly-errors-webpack-plugin";
 import escapeRegExp from "escape-string-regexp";
@@ -23,12 +25,10 @@ import { EsbuildPlugin } from "esbuild-loader";
 import CssMinimizerPlugin from "css-minimizer-webpack-plugin";
 import createResolver from "postcss-import-resolver";
 import { createJiti } from "jiti";
-import { resolveModulePath } from "exsolve";
 import { mkdir, writeFile } from "node:fs/promises";
 import { normalizeWebpackManifest, precomputeDependencies } from "vue-bundle-renderer";
 import { hash } from "ohash";
 import { serialize } from "seroval";
-import { parseNodeModulePath } from "mlly";
 //#region src/plugins/dynamic-base.ts
 const ENTRY_RE = /import ["']#build\/css["'];/;
 const DynamicBasePlugin = createUnplugin(() => {
@@ -765,8 +765,39 @@ function baseAlias(ctx) {
 		ctx.alias["nitropack/runtime"] = resolve(ctx.nuxt.options.buildDir, "nitro.client.mjs");
 	}
 }
+/**
+* The `node_modules` directories that hold a package's dependencies, given a file
+* resolved inside it. Covers both the isolated pnpm layout (dependencies are symlinked
+* into the package's `.pnpm` group) and the hoisted/workspace layout (dependencies live
+* in the package's own `node_modules`).
+*/
+function packageDependencyDirs(entry) {
+	if (!entry) return [];
+	const dirs = /* @__PURE__ */ new Set();
+	const groupDir = parseNodeModulePath(entry).dir;
+	if (groupDir) dirs.add(resolve(groupDir));
+	let dir = dirname(entry);
+	while (dir !== dirname(dir)) {
+		if (existsSync(resolve(dir, "package.json"))) {
+			dirs.add(resolve(dir, "node_modules"));
+			break;
+		}
+		dir = dirname(dir);
+	}
+	return [...dirs].filter((dir) => existsSync(dir));
+}
+const builderModulesDirs = packageDependencyDirs(fileURLToPath(import.meta.url));
 function baseResolve(ctx) {
-	const webpackModulesDir = ["node_modules"].concat(ctx.options.modulesDir);
+	const webpackModulesDir = ["node_modules", ...ctx.options.modulesDir];
+	const from = ctx.options.modulesDir.map(directoryToURL);
+	const runtimeModulesDirs = ["nuxt/package.json", "@nuxt/nitro-server/package.json"].flatMap((id) => packageDependencyDirs(resolveModulePath(id, {
+		from,
+		try: true
+	})));
+	const resolveModules = [...webpackModulesDir];
+	for (const dir of [...runtimeModulesDirs, ...builderModulesDirs]) if (!resolveModules.includes(dir)) resolveModules.push(dir);
+	const resolveLoaderModules = [...webpackModulesDir];
+	for (const dir of builderModulesDirs) if (!resolveLoaderModules.includes(dir)) resolveLoaderModules.push(dir);
 	ctx.config.resolve = {
 		extensions: [
 			".wasm",
@@ -779,12 +810,12 @@ function baseResolve(ctx) {
 			".tsx"
 		],
 		alias: ctx.alias,
-		modules: webpackModulesDir,
+		modules: resolveModules,
 		fullySpecified: false,
 		...ctx.config.resolve
 	};
 	ctx.config.resolveLoader = {
-		modules: webpackModulesDir,
+		modules: resolveLoaderModules,
 		...ctx.config.resolveLoader
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/webpack-builder-nightly",
-  "version": "5.0.0-29740135.daae2228",
+  "version": "5.0.0-29740294.24eec37d",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -26,7 +26,7 @@
   ],
   "dependencies": {
     "@nuxt/friendly-errors-webpack-plugin": "^2.6.0",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@5.0.0-29740135.daae2228",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@5.0.0-29740294.24eec37d",
     "@vue/compiler-sfc": "3.5.40",
     "autoprefixer": "^10.5.4",
     "css-loader": "^7.1.4",
@@ -71,7 +71,7 @@
     "webpackbar": "^7.0.0"
   },
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@5.0.0-29740135.daae2228",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@5.0.0-29740294.24eec37d",
     "@rspack/core": "2.1.4",
     "@types/webpack-bundle-analyzer": "4.7.0",
     "@types/webpack-hot-middleware": "2.25.12",
@@ -82,7 +82,7 @@
     "vue": "3.5.40"
   },
   "peerDependencies": {
-    "nuxt": "npm:nuxt-nightly@5.0.0-29740135.daae2228",
+    "nuxt": "npm:nuxt-nightly@5.0.0-29740294.24eec37d",
     "vue": "^3.3.4"
   },
   "engines": {