@nuxt/webpack-builder 4.0.0-0 → 4.0.0-alpha.1

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import pify from 'pify';
-import { join, resolve, normalize, dirname, isAbsolute } from 'pathe';
+import { join, resolve, basename, normalize, dirname, isAbsolute } from 'pathe';
 import { fromNodeMiddleware, defineEventHandler, handleCors, getRequestHeader, createError, setHeader } from 'h3';
 import webpackDevMiddleware from 'webpack-dev-middleware';
 import webpackHotMiddleware from 'webpack-hot-middleware';
@@ -271,11 +271,14 @@ function basePlugins(ctx) {
 function baseAlias(ctx) {
   ctx.alias = {
     "#app": ctx.options.appDir,
+    [basename(ctx.nuxt.options.dir.assets)]: resolve(ctx.nuxt.options.srcDir, ctx.nuxt.options.dir.assets),
     ...ctx.options.alias,
     ...ctx.alias
   };
   if (ctx.isClient) {
     ctx.alias["nitro/runtime"] = resolve(ctx.nuxt.options.buildDir, "nitro.client.mjs");
+    ctx.alias["#internal/nitro"] = resolve(ctx.nuxt.options.buildDir, "nitro.client.mjs");
+    ctx.alias["nitropack/runtime"] = resolve(ctx.nuxt.options.buildDir, "nitro.client.mjs");
   }
 }
 function baseResolve(ctx) {
@@ -967,13 +970,18 @@ function serverStandalone(ctx) {
     "#",
     ...ctx.options.build.transpile
   ];
-  const external = [
+  const external = /* @__PURE__ */ new Set([
     "nitro/runtime",
+    // TODO: remove in v5
+    "#internal/nitro",
+    "nitropack/runtime",
     "#shared",
     resolve(ctx.nuxt.options.rootDir, ctx.nuxt.options.dir.shared)
-  ];
+  ]);
   if (!ctx.nuxt.options.dev) {
-    external.push("#internal/nuxt/paths", "#internal/nuxt/app-config", "#app-manifest");
+    external.add("#internal/nuxt/paths");
+    external.add("#internal/nuxt/app-config");
+    external.add("#app-manifest");
   }
   if (!Array.isArray(ctx.config.externals)) {
     return;
@@ -982,7 +990,7 @@ function serverStandalone(ctx) {
     if (!request) {
       return cb(void 0, false);
     }
-    if (external.includes(request)) {
+    if (external.has(request)) {
       return cb(void 0, true);
     }
     if (request[0] === "." || isAbsolute(request) || inline.find((prefix) => typeof prefix === "string" && request.startsWith(prefix)) || assetPattern.test(request)) {
@@ -1011,6 +1019,7 @@ const HELPER_DYNAMIC = `\0${PLUGIN_NAME}.mjs`;
 const DYNAMIC_REQUIRE_RE = /import\((?:.*\+\s*)?"\.\/" ?\+(.*)\).then/g;
 const BACKWARD_SLASH_RE = /\\/g;
 function dynamicRequire({ dir, ignore, inline }) {
+  const filesToIgnore = new Set(ignore);
   return {
     name: PLUGIN_NAME,
     transform(code, _id) {
@@ -1038,7 +1047,7 @@ function dynamicRequire({ dir, ignore, inline }) {
       let files = [];
       try {
         const wpManifest = resolve(dir, "./server.manifest.json");
-        files = await importModule(wpManifest).then((r) => Object.keys(r.files).filter((file) => !ignore.includes(file)));
+        files = await importModule(wpManifest).then((r) => Object.keys(r.files).filter((file) => !filesToIgnore.has(file)));
       } catch {
         files = await glob("**/*.{cjs,mjs,js}", {
           cwd: dir,
@@ -1113,8 +1122,13 @@ const bundle = async (nuxt) => {
     });
     const prerenderRollupPlugins = nitro.options._config.rollupConfig.plugins;
     const rollupPlugins = nitro.options.rollupConfig.plugins;
-    prerenderRollupPlugins.push(dynamicRequirePlugin);
-    rollupPlugins.push(dynamicRequirePlugin);
+    for (const plugins of [prerenderRollupPlugins, rollupPlugins]) {
+      const existingPlugin = plugins.findIndex((i) => i && "name" in i && i.name === "dynamic-require");
+      if (existingPlugin >= 0) {
+        plugins.splice(existingPlugin, 1);
+      }
+      plugins.push(dynamicRequirePlugin);
+    }
   }
   await nuxt.callHook(`${builder}:config`, webpackConfigs);
   const mfs = nuxt.options.dev ? createMFS() : null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/webpack-builder",
-  "version": "4.0.0-0",
+  "version": "4.0.0-alpha.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -40,12 +40,12 @@
     "jiti": "^2.4.2",
     "knitwork": "^1.2.0",
     "magic-string": "^0.30.17",
-    "memfs": "^4.17.1",
+    "memfs": "^4.17.2",
     "mini-css-extract-plugin": "^2.9.2",
     "ohash": "^2.0.11",
     "pathe": "^2.0.3",
     "pify": "^6.1.0",
-    "postcss": "^8.5.3",
+    "postcss": "^8.5.4",
     "postcss-import": "^16.1.0",
     "postcss-import-resolver": "^2.0.0",
     "postcss-loader": "^8.1.1",
@@ -53,10 +53,10 @@
     "pug-plain-loader": "^1.1.0",
     "std-env": "^3.9.0",
     "time-fix-plugin": "^2.0.7",
-    "tinyglobby": "^0.2.13",
+    "tinyglobby": "^0.2.14",
     "ufo": "^1.6.1",
-    "unenv": "^2.0.0-rc.15",
-    "unplugin": "^2.3.3",
+    "unenv": "^2.0.0-rc.17",
+    "unplugin": "^2.3.5",
     "url-loader": "^4.1.1",
     "vue-bundle-renderer": "^2.1.1",
     "vue-loader": "^17.4.2",
@@ -65,16 +65,16 @@
     "webpack-dev-middleware": "^7.4.2",
     "webpack-hot-middleware": "^2.26.1",
     "webpackbar": "^7.0.0",
-    "@nuxt/kit": "4.0.0-0"
+    "@nuxt/kit": "4.0.0-alpha.1"
   },
   "devDependencies": {
-    "@rspack/core": "1.3.9",
+    "@rspack/core": "1.3.13",
     "@types/webpack-bundle-analyzer": "4.7.0",
     "@types/webpack-hot-middleware": "2.25.9",
-    "rollup": "4.40.2",
+    "rollup": "4.41.1",
     "unbuild": "3.5.0",
-    "vue": "3.5.13",
-    "@nuxt/schema": "4.0.0-0"
+    "vue": "3.5.16",
+    "@nuxt/schema": "4.0.0-alpha.1"
   },
   "peerDependencies": {
     "vue": "^3.3.4"