@nuxt/webpack-builder 3.1.1 → 3.2.0

package/README.md

@@ -114,7 +114,7 @@ Follow the docs to [Set Up Your Local Development Environment](https://nuxt.com/
 
 ## Nuxt 2
 
-You can find the code for Nuxt 2 on the [`2.x-dev` branch](https://github.com/nuxt/nuxt/tree/2.x-dev) and the documentation at [nuxtjs.org](https://nuxtjs.org).
+You can find the code for Nuxt 2 on the [`2.x` branch](https://github.com/nuxt/nuxt/tree/2.x) and the documentation at [nuxtjs.org](https://nuxtjs.org).
 
 ## Follow us
 

package/dist/index.mjs

@@ -11,24 +11,24 @@ import { isAbsolute, relative, join, resolve, normalize, dirname } from 'pathe';
 import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
 import { hash } from 'ohash';
+import { findStaticImports, parseStaticImport, createCommonJS } from 'mlly';
 import { createFsFromVolume, Volume } from 'memfs';
 import VirtualModulesPlugin from 'webpack-virtual-modules';
 import querystring from 'node:querystring';
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
+import ForkTSCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 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 esbuildLoader from 'esbuild-loader';
+import { EsbuildPlugin } from 'esbuild-loader';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
-import { createCommonJS } from 'mlly';
 import VueLoaderPlugin from 'vue-loader/dist/pluginWebpack5.js';
 import { normalizeWebpackManifest } from 'vue-bundle-renderer';
 import hash$1 from 'hash-sum';
 import fse from 'fs-extra';
-import ForkTSCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 
 const keyedFunctions = [
   "useState",
@@ -53,6 +53,7 @@ const composableKeysPlugin = createUnplugin((options) => {
       }
       const { 0: script = code, index: codeIndex = 0 } = code.match(/(?<=<script[^>]*>)[\S\s.]*?(?=<\/script>)/) || { index: 0, 0: code };
       const s = new MagicString(code);
+      let imports;
       let count = 0;
       const relativeID = isAbsolute(id) ? relative(options.rootDir, id) : id;
       walk(this.parse(script, {
@@ -68,6 +69,10 @@ const composableKeysPlugin = createUnplugin((options) => {
           if (!name || !keyedFunctions.includes(name) || node.arguments.length >= 4) {
             return;
           }
+          imports = imports || detectImportNames(script);
+          if (imports.has(name)) {
+            return;
+          }
           switch (name) {
             case "useState":
               if (node.arguments.length >= 2 || stringTypes.includes(node.arguments[0]?.type)) {
@@ -103,6 +108,27 @@ const composableKeysPlugin = createUnplugin((options) => {
     }
   };
 });
+const NUXT_IMPORT_RE = /nuxt|#app|#imports/;
+function detectImportNames(code) {
+  const imports = findStaticImports(code);
+  const names = /* @__PURE__ */ new Set();
+  for (const i of imports) {
+    if (NUXT_IMPORT_RE.test(i.specifier)) {
+      continue;
+    }
+    const { namedImports, defaultImport, namespacedImport } = parseStaticImport(i);
+    for (const name in namedImports || {}) {
+      names.add(namedImports[name]);
+    }
+    if (defaultImport) {
+      names.add(defaultImport);
+    }
+    if (namespacedImport) {
+      names.add(namespacedImport);
+    }
+  }
+  return names;
+}
 
 const defaults = {
   globalPublicPath: "__webpack_public_path__",
@@ -445,7 +471,7 @@ function getEnv(ctx) {
 function esbuild(ctx) {
   const { config } = ctx;
   const target = ctx.isServer ? "es2019" : "chrome85";
-  config.optimization.minimizer.push(new esbuildLoader.ESBuildMinifyPlugin());
+  config.optimization.minimizer.push(new EsbuildPlugin());
   config.module.rules.push(
     {
       test: /\.m?[jt]s$/i,
@@ -945,6 +971,18 @@ function clientPlugins(ctx) {
       ...options.webpack.analyze === true ? {} : options.webpack.analyze
     }));
   }
+  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" }
+          }
+        }
+      }));
+    }
+  }
 }
 
 function node(ctx) {
@@ -1041,7 +1079,14 @@ 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 }));
+    config.plugins.push(new ForkTSCheckerWebpackPlugin({
+      logger,
+      typescript: {
+        extensions: {
+          vue: { compiler: "@vue/compiler-sfc" }
+        }
+      }
+    }));
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/webpack-builder",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "repository": "nuxt/nuxt",
   "license": "MIT",
   "type": "module",
@@ -15,12 +15,12 @@
   "dependencies": {
     "@babel/core": "^7.20.12",
     "@nuxt/friendly-errors-webpack-plugin": "^2.5.2",
-    "@nuxt/kit": "3.1.1",
+    "@nuxt/kit": "3.2.0",
     "autoprefixer": "^10.4.13",
     "css-loader": "^6.7.3",
     "css-minimizer-webpack-plugin": "^4.2.2",
     "cssnano": "^5.1.14",
-    "esbuild-loader": "^2.21.0",
+    "esbuild-loader": "^3.0.0",
     "escape-string-regexp": "^5.0.0",
     "estree-walker": "^3.0.3",
     "file-loader": "^6.2.0",
@@ -44,7 +44,7 @@
     "ufo": "^1.0.1",
     "unplugin": "^1.0.1",
     "url-loader": "^4.1.1",
-    "vue-bundle-renderer": "^1.0.0",
+    "vue-bundle-renderer": "^1.0.1",
     "vue-loader": "^17.0.1",
     "webpack": "^5.75.0",
     "webpack-bundle-analyzer": "^4.7.0",
@@ -54,7 +54,7 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@nuxt/schema": "3.1.1",
+    "@nuxt/schema": "3.2.0",
     "@types/lodash-es": "^4.17.6",
     "@types/pify": "^5.0.1",
     "@types/webpack-bundle-analyzer": "^4.6.0",
@@ -62,10 +62,10 @@
     "@types/webpack-hot-middleware": "^2.25.6",
     "@types/webpack-virtual-modules": "^0",
     "unbuild": "latest",
-    "vue": "3.2.45"
+    "vue": "3.2.47"
   },
   "peerDependencies": {
-    "vue": "^3.2.45"
+    "vue": "^3.2.47"
   },
   "engines": {
     "node": "^14.16.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"