@nuxt/webpack-builder-nightly 4.3.0-29443617.eabd3fee → 4.3.0-29444675.2f04ec3a

package/dist/index.mjs

@@ -8,7 +8,7 @@ import { logger, tryImportModule, directoryToURL, resolveAlias, useNitro, useNux
 import { createUnplugin } from 'unplugin';
 import MagicString from 'magic-string';
 import { webpack, WebpackBarPlugin, builder, MiniCssExtractPlugin, TsCheckerPlugin } from '#builder';
-import { join, resolve, basename, normalize, isAbsolute } from 'pathe';
+import { join, resolve, basename, normalize, relative, isAbsolute } from 'pathe';
 import { createFsFromVolume, Volume } from 'memfs';
 import querystring from 'node:querystring';
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
@@ -23,12 +23,12 @@ import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
 import createResolver from 'postcss-import-resolver';
 import { createJiti } from 'jiti';
 import VueLoaderPlugin from 'vue-loader/dist/pluginWebpack5.js';
+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';
-import { resolveModulePath } from 'exsolve';
 import { runtimeDependencies } from 'nuxt/meta';
 
 const defaults = {
@@ -734,9 +734,15 @@ class VueSSRClientPlugin {
     this.serverDist = resolve(options.nuxt.options.buildDir, "dist/server");
     this.nuxt = options.nuxt;
   }
+  getRelativeModuleId(identifier, context) {
+    const id = identifier.replace(/\s\w+$/, "");
+    const resourceMatch = id.match(/([^!]*\.vue)(?:\?|$)/);
+    return resourceMatch && resourceMatch[1] ? normalize(relative(context, resourceMatch[1])).replace(/^\.\//, "").replace(/\\/g, "/") : id;
+  }
   apply(compiler) {
     compiler.hooks.afterEmit.tap("VueSSRClientPlugin", async (compilation) => {
       const stats = compilation.getStats().toJson();
+      const context = this.nuxt.options.srcDir;
       const initialFiles = /* @__PURE__ */ new Set();
       for (const { assets } of Object.values(stats.entrypoints)) {
         if (!assets) {
@@ -788,7 +794,7 @@ class VueSSRClientPlugin {
         if (!chunk || !chunk.files || !cid) {
           continue;
         }
-        const id = m.identifier.replace(/\s\w+$/, "");
+        const relativeId = this.getRelativeModuleId(m.identifier, context);
         const filesSet = /* @__PURE__ */ new Set();
         for (const file of chunk.files) {
           const index = fileToIndex(file);
@@ -807,11 +813,11 @@ class VueSSRClientPlugin {
           }
         }
         const files = Array.from(filesSet);
-        webpackManifest.modules[hash(id)] = files;
+        webpackManifest.modules[relativeId] = files;
         if (Array.isArray(m.modules)) {
           for (const concatenatedModule of m.modules) {
-            const id2 = hash(concatenatedModule.identifier.replace(/\s\w+$/, ""));
-            webpackManifest.modules[id2] ||= files;
+            const relativeId2 = this.getRelativeModuleId(concatenatedModule.identifier, context);
+            webpackManifest.modules[relativeId2] ||= files;
           }
         }
         if (stats.modules) {
@@ -907,7 +913,7 @@ function vue(ctx) {
   ctx.config.module.rules.push({
     test: /\.vue$/i,
     loader: "vue-loader",
-    options: ctx.userConfig.loaders.vue
+    options: { ...ctx.userConfig.loaders.vue, isServerBuild: ctx.isServer }
   });
   if (ctx.isClient) {
     ctx.config.plugins.push(new VueSSRClientPlugin({ nuxt: ctx.nuxt }));
@@ -915,6 +921,15 @@ function vue(ctx) {
     ctx.config.plugins.push(new VueSSRServerPlugin({
       filename: `${ctx.name}.manifest.json`
     }));
+    const loaderPath = resolveModulePath("#vue-module-identifier", { from: import.meta.url });
+    ctx.config.module.rules.push({
+      test: /\.vue$/i,
+      enforce: "post",
+      use: [{
+        loader: loaderPath,
+        options: { srcDir: ctx.nuxt.options.srcDir }
+      }]
+    });
   }
   ctx.config.plugins.push(new webpack.DefinePlugin({
     "__VUE_OPTIONS_API__": "true",

package/dist/loaders/vue-module-identifier.d.mts

@@ -0,0 +1,8 @@
+import { LoaderDefinitionFunction } from 'webpack';
+
+interface LoaderOptions {
+    srcDir?: string;
+}
+declare const vueModuleIdentifierLoader: LoaderDefinitionFunction<LoaderOptions>;
+
+export { vueModuleIdentifierLoader as default };

package/dist/loaders/vue-module-identifier.d.ts

@@ -0,0 +1,8 @@
+import { LoaderDefinitionFunction } from 'webpack';
+
+interface LoaderOptions {
+    srcDir?: string;
+}
+declare const vueModuleIdentifierLoader: LoaderDefinitionFunction<LoaderOptions>;
+
+export { vueModuleIdentifierLoader as default };

package/dist/loaders/vue-module-identifier.mjs

@@ -0,0 +1,18 @@
+import { relative, normalize } from 'pathe';
+
+const vueModuleIdentifierLoader = function(source) {
+  this.cacheable?.();
+  const { srcDir } = this.getOptions() || {};
+  const resourcePath = this.resourcePath || this._module?.resource;
+  if (!resourcePath || !source.includes("__exports__")) {
+    return source;
+  }
+  const context = srcDir || this.rootContext || this.context || this._compiler?.options?.context;
+  const relativePath = context ? relative(context, resourcePath) : resourcePath;
+  const moduleId = normalize(relativePath).replace(/^\.\//, "").replace(/\\/g, "/");
+  const snippet = `
+;__exports__.__moduleIdentifier = ${JSON.stringify(moduleId)};`;
+  return source + snippet;
+};
+
+export { vueModuleIdentifierLoader as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/webpack-builder-nightly",
-  "version": "4.3.0-29443617.eabd3fee",
+  "version": "4.3.0-29444675.2f04ec3a",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -12,7 +12,8 @@
   "type": "module",
   "types": "./dist/index.d.ts",
   "imports": {
-    "#builder": "./builder.mjs"
+    "#builder": "./builder.mjs",
+    "#vue-module-identifier": "./dist/loaders/vue-module-identifier.mjs"
   },
   "exports": {
     ".": {
@@ -27,7 +28,7 @@
   ],
   "dependencies": {
     "@nuxt/friendly-errors-webpack-plugin": "^2.6.0",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.3.0-29443617.eabd3fee",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.3.0-29444675.2f04ec3a",
     "autoprefixer": "^10.4.23",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.4",
@@ -71,7 +72,7 @@
     "webpackbar": "^7.0.0"
   },
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29443617.eabd3fee",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29444675.2f04ec3a",
     "@rspack/core": "1.6.8",
     "@types/webpack-bundle-analyzer": "4.7.0",
     "@types/webpack-hot-middleware": "2.25.12",
@@ -80,7 +81,7 @@
     "vue": "3.5.26"
   },
   "peerDependencies": {
-    "nuxt": "npm:nuxt-nightly@4.3.0-29443617.eabd3fee",
+    "nuxt": "npm:nuxt-nightly@4.3.0-29444675.2f04ec3a",
     "vue": "^3.3.4"
   },
   "engines": {