@nuxt/webpack-builder 3.2.3 → 3.3.1

package/dist/index.mjs

@@ -11,6 +11,7 @@ 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, createCommonJS } from 'mlly';
 import { createFsFromVolume, Volume } from 'memfs';
 import VirtualModulesPlugin from 'webpack-virtual-modules';
@@ -21,7 +22,6 @@ import { cloneDeep, defaults as defaults$1, merge, uniq } from 'lodash-es';
 import TimeFixPlugin from 'time-fix-plugin';
 import WebpackBar from 'webpackbar';
 import FriendlyErrorsWebpackPlugin from '@nuxt/friendly-errors-webpack-plugin';
-import escapeRegExp from 'escape-string-regexp';
 import { EsbuildPlugin } from 'esbuild-loader';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
@@ -30,16 +30,12 @@ import { normalizeWebpackManifest } from 'vue-bundle-renderer';
 import hash$1 from 'hash-sum';
 import fse from 'fs-extra';
 
-const keyedFunctions = [
-  "useState",
-  "useFetch",
-  "useAsyncData",
-  "useLazyAsyncData",
-  "useLazyFetch"
-];
-const KEYED_FUNCTIONS_RE = new RegExp(`(${keyedFunctions.join("|")})`);
 const stringTypes = ["Literal", "TemplateLiteral"];
 const composableKeysPlugin = createUnplugin((options) => {
+  const composableMeta = Object.fromEntries(options.composables.map(({ name, ...meta }) => [name, meta]));
+  const maxLength = Math.max(...options.composables.map(({ argumentLength }) => argumentLength));
+  const keyedFunctions = new Set(options.composables.map(({ name }) => name));
+  const KEYED_FUNCTIONS_RE = new RegExp(`\\b(${[...keyedFunctions].map((f) => escapeRE(f)).join("|")})\\b`);
   return {
     name: "nuxt:composable-keys",
     enforce: "post",
@@ -66,28 +62,32 @@ const composableKeysPlugin = createUnplugin((options) => {
           }
           const node = _node;
           const name = "name" in node.callee && node.callee.name;
-          if (!name || !keyedFunctions.includes(name) || node.arguments.length >= 4) {
+          if (!name || !keyedFunctions.has(name) || node.arguments.length >= maxLength) {
             return;
           }
           imports = imports || detectImportNames(script);
           if (imports.has(name)) {
             return;
           }
+          const meta = composableMeta[name];
+          if (node.arguments.length >= meta.argumentLength) {
+            return;
+          }
           switch (name) {
             case "useState":
-              if (node.arguments.length >= 2 || stringTypes.includes(node.arguments[0]?.type)) {
+              if (stringTypes.includes(node.arguments[0]?.type)) {
                 return;
               }
               break;
             case "useFetch":
             case "useLazyFetch":
-              if (node.arguments.length >= 3 || stringTypes.includes(node.arguments[1]?.type)) {
+              if (stringTypes.includes(node.arguments[1]?.type)) {
                 return;
               }
               break;
             case "useAsyncData":
             case "useLazyAsyncData":
-              if (node.arguments.length >= 3 || stringTypes.includes(node.arguments[0]?.type) || stringTypes.includes(node.arguments[node.arguments.length - 1]?.type)) {
+              if (stringTypes.includes(node.arguments[0]?.type) || stringTypes.includes(node.arguments[node.arguments.length - 1]?.type)) {
                 return;
               }
               break;
@@ -340,7 +340,7 @@ function baseConfig(ctx) {
     mode: ctx.isDev ? "development" : "production",
     cache: getCache(ctx),
     output: getOutput(ctx),
-    stats: "none",
+    stats: statsMap[ctx.nuxt.options.logLevel] ?? statsMap.info,
     ...ctx.config
   };
 }
@@ -444,7 +444,7 @@ function baseTranspile(ctx) {
       }
     }
     if (typeof pattern === "string") {
-      transpile.push(new RegExp(escapeRegExp(normalize(pattern))));
+      transpile.push(new RegExp(escapeRE(normalize(pattern))));
     } else if (pattern instanceof RegExp) {
       transpile.push(pattern);
     }
@@ -481,6 +481,7 @@ function getEnv(ctx) {
     "process.env.NODE_ENV": JSON.stringify(ctx.config.mode),
     "process.mode": JSON.stringify(ctx.config.mode),
     "process.dev": options.dev,
+    __NUXT_VERSION__: JSON.stringify(ctx.nuxt._version),
     "process.env.VUE_ENV": JSON.stringify(ctx.name),
     "process.browser": ctx.isClient,
     "process.client": ctx.isClient,
@@ -492,6 +493,11 @@ function getEnv(ctx) {
   }
   return _env;
 }
+const statsMap = {
+  silent: "none",
+  info: "normal",
+  verbose: "verbose"
+};
 
 function esbuild(ctx) {
   const { config } = ctx;
@@ -999,12 +1005,7 @@ function clientPlugins(ctx) {
   if (!ctx.nuxt.options.ssr) {
     if (ctx.nuxt.options.typescript.typeCheck === true || ctx.nuxt.options.typescript.typeCheck === "build" && !ctx.nuxt.options.dev) {
       config.plugins.push(new ForkTSCheckerWebpackPlugin({
-        logger,
-        typescript: {
-          extensions: {
-            vue: { compiler: "@vue/compiler-sfc" }
-          }
-        }
+        logger
       }));
     }
   }
@@ -1105,12 +1106,7 @@ function serverPlugins(ctx) {
   }
   if (ctx.nuxt.options.typescript.typeCheck === true || ctx.nuxt.options.typescript.typeCheck === "build" && !ctx.nuxt.options.dev) {
     config.plugins.push(new ForkTSCheckerWebpackPlugin({
-      logger,
-      typescript: {
-        extensions: {
-          vue: { compiler: "@vue/compiler-sfc" }
-        }
-      }
+      logger
     }));
   }
 }
@@ -1133,7 +1129,8 @@ async function bundle(nuxt) {
     }
     config.plugins.push(composableKeysPlugin.webpack({
       sourcemap: nuxt.options.sourcemap[config.name],
-      rootDir: nuxt.options.rootDir
+      rootDir: nuxt.options.rootDir,
+      composables: nuxt.options.optimization.keyedComposables
     }));
     const compiler = webpack(config);
     if (nuxt.options.dev) {

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@nuxt/webpack-builder",
-  "version": "3.2.3",
+  "version": "3.3.1",
   "repository": "nuxt/nuxt",
   "license": "MIT",
   "type": "module",
   "types": "./dist/index.d.ts",
   "exports": {
-    ".": "./dist/index.mjs",
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs"
+    },
     "./dist/*": "./dist/*"
   },
   "files": [
@@ -15,8 +18,8 @@
   "dependencies": {
     "@babel/core": "^7.21.0",
     "@nuxt/friendly-errors-webpack-plugin": "^2.5.2",
-    "@nuxt/kit": "3.2.3",
-    "autoprefixer": "^10.4.13",
+    "@nuxt/kit": "3.3.1",
+    "autoprefixer": "^10.4.14",
     "css-loader": "^6.7.3",
     "css-minimizer-webpack-plugin": "^4.2.2",
     "cssnano": "^5.1.15",
@@ -24,14 +27,14 @@
     "escape-string-regexp": "^5.0.0",
     "estree-walker": "^3.0.3",
     "file-loader": "^6.2.0",
-    "fork-ts-checker-webpack-plugin": "^7.3.0",
+    "fork-ts-checker-webpack-plugin": "^8.0.0",
     "fs-extra": "^11.1.0",
     "hash-sum": "^2.0.0",
     "lodash-es": "^4.17.21",
     "magic-string": "^0.30.0",
     "memfs": "^3.4.13",
-    "mini-css-extract-plugin": "^2.7.2",
-    "mlly": "^1.1.1",
+    "mini-css-extract-plugin": "^2.7.3",
+    "mlly": "^1.2.0",
     "ohash": "^1.0.0",
     "pathe": "^1.1.0",
     "pify": "^6.1.0",
@@ -42,11 +45,11 @@
     "style-resources-loader": "^1.5.0",
     "time-fix-plugin": "^2.0.7",
     "ufo": "^1.1.1",
-    "unplugin": "^1.1.0",
+    "unplugin": "^1.3.0",
     "url-loader": "^4.1.1",
     "vue-bundle-renderer": "^1.0.2",
     "vue-loader": "^17.0.1",
-    "webpack": "^5.75.0",
+    "webpack": "^5.76.1",
     "webpack-bundle-analyzer": "^4.8.0",
     "webpack-dev-middleware": "^6.0.1",
     "webpack-hot-middleware": "^2.25.3",
@@ -54,7 +57,7 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@nuxt/schema": "3.2.3",
+    "@nuxt/schema": "3.3.1",
     "@types/lodash-es": "^4.17.6",
     "@types/pify": "^5.0.1",
     "@types/webpack-bundle-analyzer": "^4.6.0",