Merge tag '6.2.0' into develop

v6.2.0

Author: titouanmathis

CHANGELOG.md

@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [v6.2.0](https://github.com/studiometa/webpack-config/compare/6.1.0..6.2.0) (2024-10-03)
+
 ### Added
 
 - Export presets from the root package entrypoint ([55ba53d](https://github.com/studiometa/webpack-config/commit/55ba53d))

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "studiometa/webpack-config",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "description": "PHP Helpers for @studiometa/webpack-config",
   "type": "library",
   "require": {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config-root",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "private": true,
   "type": "module",
   "workspaces": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config-demo",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "private": true,
   "type": "module",
   "scripts": {

packages/demo/package.json

@@ -1,3 +1,6 @@
+/**
+ * @returns {Promise<object>}
+ */
 export async function data() {
   return {
     head: {

packages/demo/src/templates/pages/index.js

@@ -1,3 +1,6 @@
+/**
+ *
+ */
 export async function data({ slug } = {}) {
   return {
     bar: 'This is the default post data loader',

packages/demo/src/templates/pages/posts/[slug].js

@@ -1,5 +1,8 @@
 import { data as defaultData } from './[slug].js';
 
+/**
+ *
+ */
 export async function data({ slug } = {}) {
   const mainData = await defaultData({ slug });
   return {

packages/demo/src/templates/pages/posts/bar.js

@@ -1,3 +1,6 @@
+/**
+ * @returns {Promise<{ foo: string[] }>}
+ */
 export async function data() {
   return {
     foo: ['foo', 'buz'],

packages/demo/src/templates/pages/posts/hello-world.js

@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config-preset-markdown",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "publishConfig": {
     "access": "public"
   },

packages/preset-markdown/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config-preset-prototyping",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "publishConfig": {
     "access": "public"
   },

packages/preset-prototyping/package.json

@@ -148,27 +148,22 @@ export function prototyping(options) {
 
       const extendTwig = typeof opts.twig.extend === 'function' ? opts.twig.extend : () => {};
       opts.twig.functions = {
-        ...(opts?.twig?.functions || {}),
-        // eslint-disable-next-line camelcase
+        ...opts?.twig?.functions,
         html_styles(styles) {
           return Html.renderStyleAttribute(styles);
         },
-        // eslint-disable-next-line camelcase
         html_attributes(attributes) {
           return Html.renderAttributes(attributes);
         },
-        // eslint-disable-next-line camelcase
         html_classes(classes) {
           return Html.renderClass(classes);
         },
-        // eslint-disable-next-line camelcase
         merge_html_attributes(attributes = {}, defaultAttributes = {}, requiredAttributes = {}) {
           return Html.mergeAttributes(attributes, defaultAttributes, requiredAttributes);
         },
         dump(...args) {
           return args.map((arg) => `<pre>${JSON.stringify(arg, null, 2)}</pre>`).join('\n');
         },
-        // eslint-disable-next-line camelcase
         is_dev() {
           return isDev;
         },
@@ -298,9 +293,7 @@ export function prototyping(options) {
             cache: true,
             template: `${templatePath}?${params}`,
             templateParameters: {
-              // eslint-disable-next-line camelcase
               updated_at: stats.mtime,
-              // eslint-disable-next-line camelcase
               created_at: stats.birthtime,
               template: file,
               ...Object.fromEntries(params.entries()),
@@ -366,9 +359,7 @@ export function prototyping(options) {
             cache: true,
             template: `${templatePath}?${params}`,
             templateParameters: {
-              // eslint-disable-next-line camelcase
               created_at: stats.birthtime,
-              // eslint-disable-next-line camelcase
               updated_at: stats.mtime,
               template: file,
               ...Object.fromEntries(params.entries()),

packages/preset-prototyping/src/index.js

@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config-preset-vue-2",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "publishConfig": {
     "access": "public"
   },

packages/preset-vue-2/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config-preset-vue-3",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "publishConfig": {
     "access": "public"
   },

packages/preset-vue-3/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "description": "A basic webpack config",
   "type": "module",
   "main": "src/index.js",

packages/webpack-config/package.json

@@ -18,7 +18,7 @@ export default async function dev(options = {}) {
   const server = await getServer(config);
 
   const webpackBar = webpackConfig.plugins.find(
-    (plugin) => plugin.constructor.name === 'WebpackBarPlugin'
+    (plugin) => plugin.constructor.name === 'WebpackBarPlugin',
   );
 
   let webpackBarHasRunOnce = false;
@@ -68,7 +68,7 @@ export default async function dev(options = {}) {
     Object.entries(webpackConfig.entry).map(([name, value]) => [
       name,
       ['webpack-hot-middleware/client?reload=true', ...(Array.isArray(value) ? value : [value])],
-    ])
+    ]),
   );
 
   const bundler = webpack(webpackConfig);
@@ -84,7 +84,7 @@ export default async function dev(options = {}) {
         assets: true,
         colors: true,
         excludeAssets: [/\.map$/, /hot-update/, /^manifest\.(js|json)$/],
-      })
+      }),
     );
     console.log('');
     console.log('');

packages/webpack-config/src/dev.js

@@ -38,7 +38,6 @@ const {
 
 /**
  * Define the configuration.
- *
  * @template {import('./index').MetaConfig} T
  * @param   {T} config
  * @returns {T}
@@ -49,13 +48,12 @@ export function defineConfig(config) {
 
 /**
  * Get the generated Webpack configuration.
- *
- * @param {Object} options
+ * @param {object} options
  * @param {'production'|'development'} [options.mode]
  * @returns {import('webpack').Configuration}
  */
 export function getWebpackConfig({ mode = process.env.NODE_ENV } = {}) {
-  const config = getMetaConfig({ target: [target] });
+  const config = getMetaConfig({ mode });
   return mode === 'production' ? getWebpackProdConfig(config) : getWebpackDevConfig(config);
 }
 

packages/webpack-config/src/index.js

@@ -16,7 +16,7 @@ function createCertificates() {
 
   const cachePath = path.join(
     process.env.PWD,
-    'node_modules/.cache/@studiometa/webpack-config/certificates/'
+    'node_modules/.cache/@studiometa/webpack-config/certificates/',
   );
 
   execSync(`mkdir -p ${cachePath}`);

packages/webpack-config/src/presets/https.js

@@ -22,15 +22,14 @@ export default function tailwindcss(options = {}) {
           path: require.resolve('tailwindcss', { paths: [configPath] }),
           configViewerPath: '/_tailwind',
         },
-        options
+        options,
       );
 
       if (isDev) {
         const { default: createServer } = await import('tailwind-config-viewer/server/index.js');
         await extendBrowsersync(config, async (bsConfig) => {
           const tailwindConfigViewerServer = createServer({
             tailwindConfigProvider: () =>
-              // eslint-disable-next-line import/no-dynamic-require
               require(findUpSync(['tailwind.config.js', 'tailwind.config.cjs'])),
           }).asMiddleware();
 
@@ -44,8 +43,8 @@ export default function tailwindcss(options = {}) {
           bsConfig.infos.push(
             (url) =>
               `Tailwind Viewer runnning at ${chalk.blue(
-                withTrailingSlash(url + opts.configViewerPath)
-              )}`
+                withTrailingSlash(url + opts.configViewerPath),
+              )}`,
           );
         });
       }
@@ -76,7 +75,7 @@ export default function tailwindcss(options = {}) {
           }
 
           const postcssIndex = rule.use.findIndex(
-            (use) => use === 'postcss-loader' || use.loader === 'postcss-loader'
+            (use) => use === 'postcss-loader' || use.loader === 'postcss-loader',
           );
 
           if (postcssIndex > -1) {

packages/webpack-config/src/presets/tailwindcss.js

@@ -12,7 +12,7 @@ export default function yaml(options = {}) {
     {
       loaderOptions: {},
     },
-    options
+    options,
   );
 
   return {

packages/webpack-config/src/presets/yaml.js

@@ -6,7 +6,6 @@
 
 /**
  * Extends the `server` configuration property.
- *
  * @param {MetaConfig} config
  * @param {(config:BrowsersyncOptions, instance:BrowserSyncInstance)=> void} fn
  */

packages/webpack-config/src/utils/extend-browsersync-config.js

@@ -5,11 +5,11 @@
 
 /**
  * Extends the `webpack` configuration property.
- *
  * @param {MetaConfig}   config
  * @param {(config:WebpackConfig, isDev: boolean) => Promise<void>} fn
  */
 export default async function extendWebpackConfig(config, fn) {
+  // eslint-disable-next-line no-empty-function
   const oldWebpackConfig = typeof config.webpack === 'function' ? config.webpack : () => {};
 
   config.webpack = async (webpackConfig, isDev) => {

packages/webpack-config/src/utils/extend-webpack-config.js

@@ -53,7 +53,7 @@ async function getConfig(metaConfig) {
         const [fileGlob, callback] = glob;
         if (typeof callback !== 'function') {
           throw new Error(
-            'A watch item should implement the following schema: [glob:string, callback:function]'
+            'A watch item should implement the following schema: [glob:string, callback:function]',
           );
         }
         instance.watch(fileGlob, { cwd: metaConfig.context }, (event, file) => {