@nuxt/webpack-builder 3.14.1592 → 3.15.1

package/README.md

@@ -109,7 +109,7 @@ Follow the docs to [Set Up Your Local Development Environment](https://nuxt.com/
 ## <a name="follow-us">🔗 Follow Us</a>
 
 <p valign="center">
-  <a href="https://go.nuxt.com/discord"><img width="20px" src="https://github.com/nuxt/nuxt/tree/main/.github/assets/discord.svg" alt="Discord"></a>&nbsp;&nbsp;<a href="https://go.nuxt.com/x"><img width="20px" src="https://github.com/nuxt/nuxt/tree/main/.github/assets/twitter.svg" alt="Twitter"></a>&nbsp;&nbsp;<a href="https://go.nuxt.com/github"><img width="20px" src="https://github.com/nuxt/nuxt/tree/main/.github/assets/github.svg" alt="GitHub"></a>
+  <a href="https://go.nuxt.com/discord"><img width="20px" src="https://github.com/nuxt/nuxt/tree/main/.github/assets/discord.svg" alt="Discord"></a>&nbsp;&nbsp;<a href="https://go.nuxt.com/x"><img width="20px" src="https://github.com/nuxt/nuxt/tree/main/.github/assets/twitter.svg" alt="Twitter"></a>&nbsp;&nbsp;<a href="https://go.nuxt.com/github"><img width="20px" src="https://github.com/nuxt/nuxt/tree/main/.github/assets/github.svg" alt="GitHub"></a>&nbsp;&nbsp;<a href="https://go.nuxt.com/bluesky"><img width="20px" src="https://github.com/nuxt/nuxt/tree/main/.github/assets/bluesky.svg" alt="Bluesky"></a>
 </p>
 
 ## <a name="license">⚖️ License</a>

package/dist/index.mjs

@@ -3,25 +3,20 @@ import { fromNodeMiddleware, defineEventHandler } from 'h3';
 import webpackDevMiddleware from 'webpack-dev-middleware';
 import webpackHotMiddleware from 'webpack-hot-middleware';
 import { defu } from 'defu';
-import { parseURL, parseQuery, joinURL } from 'ufo';
+import { joinURL } from 'ufo';
 import { logger, useNuxt } from '@nuxt/kit';
-import { pathToFileURL } from 'node:url';
 import { createUnplugin } from 'unplugin';
-import { isAbsolute, relative, join, resolve, normalize, dirname } from 'pathe';
-import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
-import { hash } from 'ohash';
-import escapeRE from 'escape-string-regexp';
-import { findStaticImports, parseStaticImport } from 'mlly';
 import { webpack, WebpackBarPlugin, builder, MiniCssExtractPlugin } from '#builder';
+import { join, resolve, normalize, dirname, isAbsolute } from 'pathe';
 import { createFsFromVolume, Volume } from 'memfs';
 import querystring from 'node:querystring';
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 import ForkTSCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 import { env, nodeless } from 'unenv';
-import { cloneDeep } from 'lodash-es';
 import TimeFixPlugin from 'time-fix-plugin';
 import FriendlyErrorsWebpackPlugin from '@nuxt/friendly-errors-webpack-plugin';
+import escapeRegExp from 'escape-string-regexp';
 import { isTest } from 'std-env';
 import { EsbuildPlugin } from 'esbuild-loader';
 import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
@@ -30,246 +25,7 @@ import { createJiti } from 'jiti';
 import VueLoaderPlugin from 'vue-loader/dist/pluginWebpack5.js';
 import { mkdir, writeFile } from 'node:fs/promises';
 import { normalizeWebpackManifest } from 'vue-bundle-renderer';
-
-function matchWithStringOrRegex(value, matcher) {
-  if (typeof matcher === "string") {
-    return value === matcher;
-  } else if (matcher instanceof RegExp) {
-    return matcher.test(value);
-  }
-  return false;
-}
-
-var __defProp$4 = Object.defineProperty;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$4 = (obj, key, value) => {
-  __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-const stringTypes = ["Literal", "TemplateLiteral"];
-const NUXT_LIB_RE = /node_modules\/(?:nuxt|nuxt3|nuxt-nightly)\//;
-const SUPPORTED_EXT_RE = /\.(?:m?[jt]sx?|vue)/;
-const SCRIPT_RE = /(?<=<script[^>]*>)[\s\S]*?(?=<\/script>)/i;
-const composableKeysPlugin = createUnplugin((options) => {
-  const composableMeta = {};
-  const composableLengths = /* @__PURE__ */ new Set();
-  const keyedFunctions = /* @__PURE__ */ new Set();
-  for (const { name, ...meta } of options.composables) {
-    composableMeta[name] = meta;
-    keyedFunctions.add(name);
-    composableLengths.add(meta.argumentLength);
-  }
-  const maxLength = Math.max(...composableLengths);
-  const KEYED_FUNCTIONS_RE = new RegExp(`\\b(${[...keyedFunctions].map((f) => escapeRE(f)).join("|")})\\b`);
-  return {
-    name: "nuxt:composable-keys",
-    enforce: "post",
-    transformInclude(id) {
-      const { pathname, search } = parseURL(decodeURIComponent(pathToFileURL(id).href));
-      return !NUXT_LIB_RE.test(pathname) && SUPPORTED_EXT_RE.test(pathname) && parseQuery(search).type !== "style" && !parseQuery(search).macro;
-    },
-    transform(code, id) {
-      if (!KEYED_FUNCTIONS_RE.test(code)) {
-        return;
-      }
-      const { 0: script = code, index: codeIndex = 0 } = code.match(SCRIPT_RE) || { index: 0, 0: code };
-      const s = new MagicString(code);
-      let imports;
-      let count = 0;
-      const relativeID = isAbsolute(id) ? relative(options.rootDir, id) : id;
-      const { pathname: relativePathname } = parseURL(relativeID);
-      const ast = this.parse(script, {
-        sourceType: "module",
-        ecmaVersion: "latest"
-      });
-      let scopeTracker = new ScopeTracker();
-      const varCollector = new ScopedVarsCollector();
-      walk(ast, {
-        enter(_node) {
-          if (_node.type === "BlockStatement") {
-            scopeTracker.enterScope();
-            varCollector.refresh(scopeTracker.curScopeKey);
-          } else if (_node.type === "FunctionDeclaration" && _node.id) {
-            varCollector.addVar(_node.id.name);
-          } else if (_node.type === "VariableDeclarator") {
-            varCollector.collect(_node.id);
-          }
-        },
-        leave(_node) {
-          if (_node.type === "BlockStatement") {
-            scopeTracker.leaveScope();
-            varCollector.refresh(scopeTracker.curScopeKey);
-          }
-        }
-      });
-      scopeTracker = new ScopeTracker();
-      walk(ast, {
-        enter(_node) {
-          if (_node.type === "BlockStatement") {
-            scopeTracker.enterScope();
-          }
-          if (_node.type !== "CallExpression" || _node.callee.type !== "Identifier") {
-            return;
-          }
-          const node = _node;
-          const name = "name" in node.callee && node.callee.name;
-          if (!name || !keyedFunctions.has(name) || node.arguments.length >= maxLength) {
-            return;
-          }
-          imports = imports || detectImportNames(script, composableMeta);
-          if (imports.has(name)) {
-            return;
-          }
-          const meta = composableMeta[name];
-          if (varCollector.hasVar(scopeTracker.curScopeKey, name)) {
-            let skip = true;
-            if (meta.source) {
-              skip = !matchWithStringOrRegex(relativePathname, meta.source);
-            }
-            if (skip) {
-              return;
-            }
-          }
-          if (node.arguments.length >= meta.argumentLength) {
-            return;
-          }
-          switch (name) {
-            case "useState":
-              if (stringTypes.includes(node.arguments[0]?.type)) {
-                return;
-              }
-              break;
-            case "useFetch":
-            case "useLazyFetch":
-              if (stringTypes.includes(node.arguments[1]?.type)) {
-                return;
-              }
-              break;
-            case "useAsyncData":
-            case "useLazyAsyncData":
-              if (stringTypes.includes(node.arguments[0]?.type) || stringTypes.includes(node.arguments[node.arguments.length - 1]?.type)) {
-                return;
-              }
-              break;
-          }
-          const newCode = code.slice(codeIndex + node.start, codeIndex + node.end - 1).trim();
-          const endsWithComma = newCode[newCode.length - 1] === ",";
-          s.appendLeft(
-            codeIndex + node.end - 1,
-            (node.arguments.length && !endsWithComma ? ", " : "") + "'$" + hash(`${relativeID}-${++count}`) + "'"
-          );
-        },
-        leave(_node) {
-          if (_node.type === "BlockStatement") {
-            scopeTracker.leaveScope();
-          }
-        }
-      });
-      if (s.hasChanged()) {
-        return {
-          code: s.toString(),
-          map: options.sourcemap ? s.generateMap({ hires: true }) : void 0
-        };
-      }
-    }
-  };
-});
-class ScopeTracker {
-  constructor() {
-    // the top of the stack is not a part of current key, it is used for next level
-    __publicField$4(this, "scopeIndexStack");
-    __publicField$4(this, "curScopeKey");
-    this.scopeIndexStack = [0];
-    this.curScopeKey = "";
-  }
-  getKey() {
-    return this.scopeIndexStack.slice(0, -1).join("-");
-  }
-  enterScope() {
-    this.scopeIndexStack.push(0);
-    this.curScopeKey = this.getKey();
-  }
-  leaveScope() {
-    this.scopeIndexStack.pop();
-    this.curScopeKey = this.getKey();
-    this.scopeIndexStack[this.scopeIndexStack.length - 1]++;
-  }
-}
-class ScopedVarsCollector {
-  constructor() {
-    __publicField$4(this, "curScopeKey");
-    __publicField$4(this, "all");
-    this.all = /* @__PURE__ */ new Map();
-    this.curScopeKey = "";
-  }
-  refresh(scopeKey) {
-    this.curScopeKey = scopeKey;
-  }
-  addVar(name) {
-    let vars = this.all.get(this.curScopeKey);
-    if (!vars) {
-      vars = /* @__PURE__ */ new Set();
-      this.all.set(this.curScopeKey, vars);
-    }
-    vars.add(name);
-  }
-  hasVar(scopeKey, name) {
-    const indices = scopeKey.split("-").map(Number);
-    for (let i = indices.length; i >= 0; i--) {
-      if (this.all.get(indices.slice(0, i).join("-"))?.has(name)) {
-        return true;
-      }
-    }
-    return false;
-  }
-  collect(n) {
-    const t = n.type;
-    if (t === "Identifier") {
-      this.addVar(n.name);
-    } else if (t === "RestElement") {
-      this.collect(n.argument);
-    } else if (t === "AssignmentPattern") {
-      this.collect(n.left);
-    } else if (t === "ArrayPattern") {
-      n.elements.forEach((e) => e && this.collect(e));
-    } else if (t === "ObjectPattern") {
-      n.properties.forEach((p) => {
-        if (p.type === "RestElement") {
-          this.collect(p);
-        } else {
-          this.collect(p.value);
-        }
-      });
-    }
-  }
-}
-const NUXT_IMPORT_RE = /nuxt|#app|#imports/;
-function detectImportNames(code, composableMeta) {
-  const names = /* @__PURE__ */ new Set();
-  function addName(name, specifier) {
-    const source = composableMeta[name]?.source;
-    if (source && matchWithStringOrRegex(specifier, source)) {
-      return;
-    }
-    names.add(name);
-  }
-  for (const i of findStaticImports(code)) {
-    if (NUXT_IMPORT_RE.test(i.specifier)) {
-      continue;
-    }
-    const { namedImports = {}, defaultImport, namespacedImport } = parseStaticImport(i);
-    for (const name in namedImports) {
-      addName(namedImports[name], i.specifier);
-    }
-    if (defaultImport) {
-      addName(defaultImport, i.specifier);
-    }
-    if (namespacedImport) {
-      addName(namespacedImport, i.specifier);
-    }
-  }
-  return names;
-}
+import { hash } from 'ohash';
 
 const defaults = {
   globalPublicPath: "__webpack_public_path__",
@@ -297,16 +53,9 @@ ${options.globalPublicPath} = buildAssetsURL();
   };
 });
 
-var __defProp$3 = Object.defineProperty;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$3 = (obj, key, value) => {
-  __defNormalProp$3(obj, key + "" , value);
-  return value;
-};
 const pluginName = "ChunkErrorPlugin";
 class ChunkErrorPlugin {
-  constructor() {
-    __publicField$3(this, "script", `
+  script = `
 if (typeof ${webpack.RuntimeGlobals.require} !== "undefined") {
   var _ensureChunk = ${webpack.RuntimeGlobals.ensureChunk};
   ${webpack.RuntimeGlobals.ensureChunk} = function (chunkId) {
@@ -317,8 +66,7 @@ if (typeof ${webpack.RuntimeGlobals.require} !== "undefined") {
       throw error
     });
   };
-};`);
-  }
+};`;
   apply(compiler) {
     compiler.hooks.thisCompilation.tap(
       pluginName,
@@ -379,9 +127,6 @@ function fileName(ctx, key) {
   }
   return fileName2;
 }
-function getWebpackConfig(ctx) {
-  return cloneDeep(ctx.config);
-}
 
 function assets(ctx) {
   ctx.config.module.rules.push(
@@ -418,15 +163,9 @@ function assets(ctx) {
   );
 }
 
-var __defProp$2 = Object.defineProperty;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$2 = (obj, key, value) => {
-  __defNormalProp$2(obj, key + "" , value);
-  return value;
-};
 class WarningIgnorePlugin {
+  filter;
   constructor(filter) {
-    __publicField$2(this, "filter");
     this.filter = filter;
   }
   apply(compiler) {
@@ -446,7 +185,7 @@ async function base(ctx) {
   ]);
 }
 function baseConfig(ctx) {
-  ctx.config = {
+  ctx.config = defu({}, {
     name: ctx.name,
     entry: { app: [resolve(ctx.options.appDir, ctx.options.experimental.asyncEntry ? "entry.async" : "entry")] },
     module: { rules: [] },
@@ -464,7 +203,7 @@ function baseConfig(ctx) {
     output: getOutput(ctx),
     stats: statsMap[ctx.nuxt.options.logLevel] ?? statsMap.info,
     ...ctx.config
-  };
+  });
 }
 function basePlugins(ctx) {
   ctx.config.plugins = ctx.config.plugins || [];
@@ -565,7 +304,7 @@ function baseTranspile(ctx) {
       }
     }
     if (typeof pattern === "string") {
-      transpile.push(new RegExp(escapeRE(normalize(pattern))));
+      transpile.push(new RegExp(escapeRegExp(normalize(pattern))));
     } else if (pattern instanceof RegExp) {
       transpile.push(pattern);
     }
@@ -854,15 +593,9 @@ const isCSSRegExp = /\.css(?:\?[^.]+)?$/;
 const isCSS = (file) => isCSSRegExp.test(file);
 const isHotUpdate = (file) => file.includes("hot-update");
 
-var __defProp$1 = Object.defineProperty;
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$1 = (obj, key, value) => {
-  __defNormalProp$1(obj, key + "" , value);
-  return value;
-};
 class VueSSRClientPlugin {
+  options;
   constructor(options) {
-    __publicField$1(this, "options");
     this.options = Object.assign({
       filename: null
     }, options);
@@ -896,7 +629,7 @@ class VueSSRClientPlugin {
         }
         if (isFileJS) {
           const componentHash = hash(chunkNames.join("|"));
-          const map = assetsMapping[componentHash] || (assetsMapping[componentHash] = []);
+          const map = assetsMapping[componentHash] ||= [];
           map.push(file);
         }
       }
@@ -962,16 +695,10 @@ class VueSSRClientPlugin {
   }
 }
 
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, key + "" , value);
-  return value;
-};
 const JS_MAP_RE = /\.js\.map$/;
 class VueSSRServerPlugin {
+  options;
   constructor(options = {}) {
-    __publicField(this, "options");
     this.options = Object.assign({
       filename: null
     }, options);
@@ -1241,7 +968,7 @@ function serverStandalone(ctx) {
     resolve(ctx.nuxt.options.rootDir, ctx.nuxt.options.dir.shared)
   ];
   if (!ctx.nuxt.options.dev) {
-    external.push("#internal/nuxt/paths");
+    external.push("#internal/nuxt/paths", "#app-manifest");
   }
   if (!Array.isArray(ctx.config.externals)) {
     return;
@@ -1279,7 +1006,7 @@ const bundle = async (nuxt) => {
     const ctx = createWebpackConfigContext(nuxt);
     ctx.userConfig = defu(nuxt.options.webpack[`$${preset.name}`], ctx.userConfig);
     await applyPresets(ctx, preset);
-    return getWebpackConfig(ctx);
+    return ctx.config;
   }));
   await nuxt.callHook(`${builder}:config`, webpackConfigs);
   const mfs = nuxt.options.dev ? createMFS() : null;
@@ -1290,11 +1017,6 @@ const bundle = async (nuxt) => {
     if (config.name === "client" && nuxt.options.experimental.emitRouteChunkError && nuxt.options.builder !== "@nuxt/rspack-builder") {
       config.plugins.push(new ChunkErrorPlugin());
     }
-    config.plugins.push(composableKeysPlugin.webpack({
-      sourcemap: !!nuxt.options.sourcemap[config.name],
-      rootDir: nuxt.options.rootDir,
-      composables: nuxt.options.optimization.keyedComposables
-    }));
   }
   await nuxt.callHook(`${builder}:configResolved`, webpackConfigs);
   const compilers = webpackConfigs.map((config) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/webpack-builder",
-  "version": "3.14.1592",
+  "version": "3.15.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -34,19 +34,15 @@
     "defu": "^6.1.4",
     "esbuild-loader": "^4.2.2",
     "escape-string-regexp": "^5.0.0",
-    "estree-walker": "^3.0.3",
     "file-loader": "^6.2.0",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "h3": "^1.13.0",
-    "hash-sum": "^2.0.0",
-    "jiti": "^2.4.0",
-    "lodash-es": "4.17.21",
-    "magic-string": "^0.30.13",
-    "memfs": "^4.14.0",
+    "jiti": "^2.4.2",
+    "magic-string": "^0.30.17",
+    "memfs": "^4.14.1",
     "mini-css-extract-plugin": "^2.9.2",
-    "mlly": "^1.7.3",
     "ohash": "^1.1.4",
-    "pathe": "^1.1.2",
+    "pathe": "^2.0.0",
     "pify": "^6.1.0",
     "postcss": "^8.4.49",
     "postcss-import": "^16.1.0",
@@ -58,7 +54,7 @@
     "time-fix-plugin": "^2.0.7",
     "ufo": "^1.5.4",
     "unenv": "^1.10.0",
-    "unplugin": "^1.16.0",
+    "unplugin": "^2.1.2",
     "url-loader": "^4.1.1",
     "vue-bundle-renderer": "^2.1.1",
     "vue-loader": "^17.4.2",
@@ -67,24 +63,24 @@
     "webpack-dev-middleware": "^7.4.2",
     "webpack-hot-middleware": "^2.26.1",
     "webpackbar": "^7.0.0",
-    "@nuxt/kit": "3.14.1592"
+    "@nuxt/kit": "3.15.1"
   },
   "devDependencies": {
-    "@rspack/core": "1.1.2",
-    "@types/hash-sum": "1.0.2",
-    "@types/lodash-es": "4.17.12",
+    "@rspack/core": "1.1.8",
     "@types/pify": "5.0.4",
     "@types/webpack-bundle-analyzer": "4.7.0",
     "@types/webpack-hot-middleware": "2.25.9",
     "unbuild": "latest",
     "vue": "3.5.13",
-    "@nuxt/schema": "3.14.1592"
+    "@nuxt/schema": "3.15.1"
   },
   "peerDependencies": {
     "vue": "^3.3.4"
   },
   "engines": {
-    "node": "^14.18.0 || >=16.10.0"
+    "node": "^18.20.5 || ^20.9.0 || >=22.0.0"
   },
-  "scripts": {}
+  "scripts": {
+    "test:attw": "attw --pack"
+  }
 }