@nuxt/webpack-builder 3.12.2 → 3.12.4

package/README.md

@@ -1,11 +1,11 @@
-[![Nuxt banner](./.github/assets/banner.svg)](https://nuxt.com)
+[![Nuxt banner](https://github.com/nuxt/nuxt/tree/main/.github/assets/banner.svg)](https://nuxt.com)
 
 # Nuxt
 
 <p>
   <a href="https://www.npmjs.com/package/nuxt"><img src="https://img.shields.io/npm/v/nuxt.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="Version"></a>
   <a href="https://www.npmjs.com/package/nuxt"><img src="https://img.shields.io/npm/dm/nuxt.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="Downloads"></a>
-  <a href="./LICENSE"><img src="https://img.shields.io/github/license/nuxt/nuxt.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="License"></a>
+  <a href="https://github.com/nuxt/nuxt/tree/main/LICENSE"><img src="https://img.shields.io/github/license/nuxt/nuxt.svg?style=flat&colorA=18181B&colorB=28CF8D" alt="License"></a>
   <a href="https://nuxt.com"><img src="https://img.shields.io/badge/Nuxt%20Docs-18181B?logo=nuxt.js" alt="Website"></a>
   <a href="https://chat.nuxt.dev"><img src="https://img.shields.io/badge/Nuxt%20Discord-18181B?logo=discord" alt="Discord"></a>
 </p>
@@ -34,7 +34,7 @@ It provides a number of features that make it easy to build fast, SEO-friendly,
 - 🏠 [Local Development](#local-development)
 - ⛰️ [Nuxt 2](#nuxt-2)
 - 🛟 [Professional Support](#professional-support)
-- 🔗 [Follow us](#follow-us)
+- 🔗 [Follow Us](#follow-us)
 - ⚖️ [License](#license)
 
 ---
@@ -101,23 +101,17 @@ Here are a few ways you can get involved:
 
 Follow the docs to [Set Up Your Local Development Environment](https://nuxt.com/docs/community/framework-contribution#setup) to contribute to the framework and documentation.
 
-## <a name="nuxt-2">⛰️ Nuxt 2</a>
-
-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 [v2.nuxt.com](https://v2.nuxt.com).
-
-If you expect to be using Nuxt 2 beyond the EOL (End of Life) date (June 30, 2024), and still need a maintained version that can satisfy security and browser compatibility requirements, make sure to check out [HeroDevs’ NES (Never-Ending Support) Nuxt 2](https://www.herodevs.com/support/nuxt-nes?utm_source=nuxt-github&utm_medium=nuxt-readme).
-
 ## <a name="professional-support">🛟 Professional Support</a>
 
 - Technical audit & consulting: [Nuxt Experts](https://nuxt.com/enterprise/support)
 - Custom development & more: [Nuxt Agencies Partners](https://nuxt.com/enterprise/agencies)
 
-## <a name="follow-us">🔗 Follow us</a>
+## <a name="follow-us">🔗 Follow Us</a>
 
 <p valign="center">
-  <a href="https://chat.nuxt.dev"><img width="20px" src="./.github/assets/discord.svg" alt="Discord"></a>&nbsp;&nbsp;<a href="https://twitter.nuxt.dev"><img width="20px" src="./.github/assets/twitter.svg" alt="Twitter"></a>&nbsp;&nbsp;<a href="https://github.nuxt.dev"><img width="20px" src="./.github/assets/github.svg" alt="GitHub"></a>
+  <a href="https://chat.nuxt.dev"><img width="20px" src="https://github.com/nuxt/nuxt/tree/main/.github/assets/discord.svg" alt="Discord"></a>&nbsp;&nbsp;<a href="https://twitter.nuxt.dev"><img width="20px" src="https://github.com/nuxt/nuxt/tree/main/.github/assets/twitter.svg" alt="Twitter"></a>&nbsp;&nbsp;<a href="https://github.nuxt.dev"><img width="20px" src="https://github.com/nuxt/nuxt/tree/main/.github/assets/github.svg" alt="GitHub"></a>
 </p>
 
 ## <a name="license">⚖️ License</a>
 
-[MIT](./LICENSE)
+[MIT](https://github.com/nuxt/nuxt/tree/main/LICENSE)

package/dist/index.mjs

@@ -5,7 +5,7 @@ import webpackDevMiddleware from 'webpack-dev-middleware';
 import webpackHotMiddleware from 'webpack-hot-middleware';
 import { defu } from 'defu';
 import { parseURL, parseQuery, joinURL } from 'ufo';
-import { useNuxt, logger, requireModule } from '@nuxt/kit';
+import { useNuxt, logger, tryResolveModule, requireModule } from '@nuxt/kit';
 import { pathToFileURL, fileURLToPath } from 'node:url';
 import { createUnplugin } from 'unplugin';
 import { isAbsolute, relative, join, resolve, normalize, dirname } from 'pathe';
@@ -13,7 +13,7 @@ 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 { findStaticImports, parseStaticImport, interopDefault } from 'mlly';
 import { createFsFromVolume, Volume } from 'memfs';
 import VirtualModulesPlugin from 'webpack-virtual-modules';
 import querystring from 'node:querystring';
@@ -30,9 +30,9 @@ import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
 import createResolver from 'postcss-import-resolver';
 import VueLoaderPlugin from 'vue-loader/dist/pluginWebpack5.js';
+import { mkdir, writeFile } from 'node:fs/promises';
 import { normalizeWebpackManifest } from 'vue-bundle-renderer';
 import hash$1 from 'hash-sum';
-import fse from 'fs-extra';
 
 function matchWithStringOrRegex(value, matcher) {
   if (typeof matcher === "string") {
@@ -259,8 +259,8 @@ function detectImportNames(code, composableMeta) {
     if (NUXT_IMPORT_RE.test(i.specifier)) {
       continue;
     }
-    const { namedImports, defaultImport, namespacedImport } = parseStaticImport(i);
-    for (const name in namedImports || {}) {
+    const { namedImports = {}, defaultImport, namespacedImport } = parseStaticImport(i);
+    for (const name in namedImports) {
       addName(namedImports[name], i.specifier);
     }
     if (defaultImport) {
@@ -370,12 +370,12 @@ function createWebpackConfigContext(nuxt) {
     transpile: []
   };
 }
-function applyPresets(ctx, presets) {
+async function applyPresets(ctx, presets) {
   for (const preset of toArray(presets)) {
     if (Array.isArray(preset)) {
-      preset[0](ctx, preset[1]);
+      await preset[0](ctx, preset[1]);
     } else {
-      preset(ctx);
+      await preset(ctx);
     }
   }
 }
@@ -449,8 +449,8 @@ class WarningIgnorePlugin {
   }
 }
 
-function base(ctx) {
-  applyPresets(ctx, [
+async function base(ctx) {
+  await applyPresets(ctx, [
     baseAlias,
     baseConfig,
     basePlugins,
@@ -694,29 +694,11 @@ function pug(ctx) {
 }
 
 const isPureObject = (obj) => obj !== null && !Array.isArray(obj) && typeof obj === "object";
-const ensureItemIsLast = (item) => (arr) => {
-  const index = arr.indexOf(item);
-  if (index !== -1) {
-    arr.splice(index, 1);
-    arr.push(item);
-  }
-  return arr;
-};
-const orderPresets = {
-  cssnanoLast: ensureItemIsLast("cssnano"),
-  autoprefixerLast: ensureItemIsLast("autoprefixer"),
-  autoprefixerAndCssnanoLast(names) {
-    return orderPresets.cssnanoLast(orderPresets.autoprefixerLast(names));
-  }
-};
-const getPostcssConfig = (nuxt) => {
-  function sortPlugins({ plugins, order }) {
-    const names = Object.keys(plugins);
-    if (typeof order === "string") {
-      order = orderPresets[order];
-    }
-    return typeof order === "function" ? order(names, orderPresets) : order || names;
-  }
+function sortPlugins({ plugins, order }) {
+  const names = Object.keys(plugins);
+  return typeof order === "function" ? order(names) : order || names;
+}
+async function getPostcssConfig(nuxt) {
   if (!nuxt.options.webpack.postcss || !nuxt.options.postcss) {
     return false;
   }
@@ -736,30 +718,39 @@ const getPostcssConfig = (nuxt) => {
        */
       "postcss-url": {}
     },
-    sourceMap: nuxt.options.webpack.cssSourceMap,
-    // Array, String or Function
-    order: "autoprefixerAndCssnanoLast"
+    sourceMap: nuxt.options.webpack.cssSourceMap
   });
   if (!Array.isArray(postcssOptions.plugins) && isPureObject(postcssOptions.plugins)) {
     const cwd = fileURLToPath(new URL(".", import.meta.url));
-    postcssOptions.plugins = sortPlugins(postcssOptions).map((pluginName) => {
-      const pluginFn = requireModule(pluginName, { paths: [cwd] });
+    const plugins = [];
+    for (const pluginName of sortPlugins(postcssOptions)) {
       const pluginOptions = postcssOptions.plugins[pluginName];
-      if (!pluginOptions || typeof pluginFn !== "function") {
-        return null;
+      if (!pluginOptions) {
+        continue;
       }
-      return pluginFn(pluginOptions);
-    }).filter(Boolean);
+      const path = await tryResolveModule(pluginName, nuxt.options.modulesDir);
+      let pluginFn;
+      if (path) {
+        pluginFn = await import(pathToFileURL(path).href).then(interopDefault);
+      } else {
+        console.warn(`[nuxt] could not import postcss plugin \`${pluginName}\` with ESM. Please report this as a bug.`);
+        pluginFn = requireModule(pluginName, { paths: [cwd] });
+      }
+      if (typeof pluginFn === "function") {
+        plugins.push(pluginFn(pluginOptions));
+      }
+    }
+    postcssOptions.plugins = plugins;
   }
   return {
     sourceMap: nuxt.options.webpack.cssSourceMap,
     ...nuxt.options.webpack.postcss,
     postcssOptions
   };
-};
+}
 
-function style(ctx) {
-  applyPresets(ctx, [
+async function style(ctx) {
+  await applyPresets(ctx, [
     loaders,
     extractCSS,
     minimizer
@@ -784,21 +775,21 @@ function extractCSS(ctx) {
     ...config === true ? {} : config
   }));
 }
-function loaders(ctx) {
-  ctx.config.module.rules.push(createdStyleRule("css", /\.css$/i, null, ctx));
-  ctx.config.module.rules.push(createdStyleRule("postcss", /\.p(ost)?css$/i, null, ctx));
+async function loaders(ctx) {
+  ctx.config.module.rules.push(await createdStyleRule("css", /\.css$/i, null, ctx));
+  ctx.config.module.rules.push(await createdStyleRule("postcss", /\.p(ost)?css$/i, null, ctx));
   const lessLoader = { loader: "less-loader", options: ctx.userConfig.loaders.less };
-  ctx.config.module.rules.push(createdStyleRule("less", /\.less$/i, lessLoader, ctx));
+  ctx.config.module.rules.push(await createdStyleRule("less", /\.less$/i, lessLoader, ctx));
   const sassLoader = { loader: "sass-loader", options: ctx.userConfig.loaders.sass };
-  ctx.config.module.rules.push(createdStyleRule("sass", /\.sass$/i, sassLoader, ctx));
+  ctx.config.module.rules.push(await createdStyleRule("sass", /\.sass$/i, sassLoader, ctx));
   const scssLoader = { loader: "sass-loader", options: ctx.userConfig.loaders.scss };
-  ctx.config.module.rules.push(createdStyleRule("scss", /\.scss$/i, scssLoader, ctx));
+  ctx.config.module.rules.push(await createdStyleRule("scss", /\.scss$/i, scssLoader, ctx));
   const stylusLoader = { loader: "stylus-loader", options: ctx.userConfig.loaders.stylus };
-  ctx.config.module.rules.push(createdStyleRule("stylus", /\.styl(us)?$/i, stylusLoader, ctx));
+  ctx.config.module.rules.push(await createdStyleRule("stylus", /\.styl(us)?$/i, stylusLoader, ctx));
 }
-function createdStyleRule(lang, test, processorLoader, ctx) {
+async function createdStyleRule(lang, test, processorLoader, ctx) {
   const styleLoaders = [
-    createPostcssLoadersRule(ctx),
+    await createPostcssLoadersRule(ctx),
     processorLoader
   ].filter(Boolean);
   ctx.userConfig.loaders.css.importLoaders = ctx.userConfig.loaders.cssModules.importLoaders = styleLoaders.length;
@@ -844,11 +835,11 @@ function createCssLoadersRule(ctx, cssLoaderOptions) {
     cssLoader
   ];
 }
-function createPostcssLoadersRule(ctx) {
+async function createPostcssLoadersRule(ctx) {
   if (!ctx.options.postcss) {
     return;
   }
-  const config = getPostcssConfig(ctx.nuxt);
+  const config = await getPostcssConfig(ctx.nuxt);
   if (!config) {
     return;
   }
@@ -970,10 +961,10 @@ class VueSSRClientPlugin {
       const manifest = normalizeWebpackManifest(webpackManifest);
       await this.options.nuxt.callHook("build:manifest", manifest);
       const src = JSON.stringify(manifest, null, 2);
-      await fse.mkdirp(dirname(this.options.filename));
-      await fse.writeFile(this.options.filename, src);
+      await mkdir(dirname(this.options.filename), { recursive: true });
+      await writeFile(this.options.filename, src);
       const mjsSrc = "export default " + src;
-      await fse.writeFile(this.options.filename.replace(".json", ".mjs"), mjsSrc);
+      await writeFile(this.options.filename.replace(".json", ".mjs"), mjsSrc);
     });
   }
 }
@@ -1076,8 +1067,8 @@ function vue(ctx) {
   }));
 }
 
-function nuxt(ctx) {
-  applyPresets(ctx, [
+async function nuxt(ctx) {
+  await applyPresets(ctx, [
     base,
     assets,
     esbuild,
@@ -1087,10 +1078,10 @@ function nuxt(ctx) {
   ]);
 }
 
-function client(ctx) {
+async function client(ctx) {
   ctx.name = "client";
   ctx.isClient = true;
-  applyPresets(ctx, [
+  await applyPresets(ctx, [
     nuxt,
     clientPlugins,
     clientOptimization,
@@ -1212,10 +1203,10 @@ function node(ctx) {
 }
 
 const assetPattern = /\.(?:css|s[ca]ss|png|jpe?g|gif|svg|woff2?|eot|ttf|otf|webp|webm|mp4|ogv)(?:\?.*)?$/i;
-function server(ctx) {
+async function server(ctx) {
   ctx.name = "server";
   ctx.isServer = true;
-  applyPresets(ctx, [
+  await applyPresets(ctx, [
     nuxt,
     node,
     serverStandalone,
@@ -1287,12 +1278,12 @@ function serverPlugins(ctx) {
 
 const bundle = async (nuxt) => {
   registerVirtualModules();
-  const webpackConfigs = [client, ...nuxt.options.ssr ? [server] : []].map((preset) => {
+  const webpackConfigs = await Promise.all([client, ...nuxt.options.ssr ? [server] : []].map(async (preset) => {
     const ctx = createWebpackConfigContext(nuxt);
     ctx.userConfig = defu(nuxt.options.webpack[`$${preset.name}`], ctx.userConfig);
-    applyPresets(ctx, preset);
+    await applyPresets(ctx, preset);
     return getWebpackConfig(ctx);
-  });
+  }));
   await nuxt.callHook("webpack:config", webpackConfigs);
   const mfs = nuxt.options.dev ? createMFS() : null;
   for (const config of webpackConfigs) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/webpack-builder",
-  "version": "3.12.2",
+  "version": "3.12.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -26,15 +26,14 @@
     "autoprefixer": "^10.4.19",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.0",
-    "cssnano": "^7.0.2",
+    "cssnano": "^7.0.4",
     "defu": "^6.1.4",
-    "esbuild-loader": "^4.1.0",
+    "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",
-    "fs-extra": "^11.2.0",
-    "h3": "^1.11.1",
+    "h3": "^1.12.0",
     "hash-sum": "^2.0.0",
     "lodash-es": "4.17.21",
     "magic-string": "^0.30.10",
@@ -44,7 +43,7 @@
     "ohash": "^1.1.3",
     "pathe": "^1.1.2",
     "pify": "^6.1.0",
-    "postcss": "^8.4.38",
+    "postcss": "^8.4.39",
     "postcss-import": "^16.1.0",
     "postcss-import-resolver": "^2.0.0",
     "postcss-loader": "^8.1.1",
@@ -52,30 +51,29 @@
     "pug-plain-loader": "^1.1.0",
     "std-env": "^3.7.0",
     "time-fix-plugin": "^2.0.7",
-    "ufo": "^1.5.3",
-    "unenv": "^1.9.0",
-    "unplugin": "^1.10.1",
+    "ufo": "^1.5.4",
+    "unenv": "^1.10.0",
+    "unplugin": "^1.11.0",
     "url-loader": "^4.1.1",
     "vue-bundle-renderer": "^2.1.0",
     "vue-loader": "^17.4.2",
-    "webpack": "^5.92.0",
+    "webpack": "^5.93.0",
     "webpack-bundle-analyzer": "^4.10.2",
-    "webpack-dev-middleware": "^7.2.1",
+    "webpack-dev-middleware": "^7.3.0",
     "webpack-hot-middleware": "^2.26.1",
     "webpack-virtual-modules": "^0.6.2",
     "webpackbar": "^6.0.1",
-    "@nuxt/kit": "3.12.2"
+    "@nuxt/kit": "3.12.4"
   },
   "devDependencies": {
-    "@types/fs-extra": "11.0.4",
     "@types/hash-sum": "1.0.2",
     "@types/lodash-es": "4.17.12",
     "@types/pify": "5.0.4",
     "@types/webpack-bundle-analyzer": "4.7.0",
     "@types/webpack-hot-middleware": "2.25.9",
     "unbuild": "latest",
-    "vue": "3.4.29",
-    "@nuxt/schema": "3.12.2"
+    "vue": "3.4.32",
+    "@nuxt/schema": "3.12.4"
   },
   "peerDependencies": {
     "vue": "^3.3.4"