Merge branch 'release/6.0.2'

studiometa · Apr 29, 2024 · dcde0bb · dcde0bb
2 parents 62f24ec + 398267b
commit dcde0bb
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [v6.0.2](https://github.com/studiometa/webpack-config/compare/6.0.1..6.0.2) (2024-04-29)
+
+### Fixed
+
+- Fix a dependency conflict ([629b170](https://github.com/studiometa/webpack-config/commit/629b170))
+
 ## [v6.0.1](https://github.com/studiometa/webpack-config/compare/6.0.0..6.0.1) (2024-04-15)
 
 ### Removed

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "studiometa/webpack-config",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "PHP Helpers for @studiometa/webpack-config",
   "type": "library",
   "require": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config-root",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "private": true,
   "type": "module",
   "workspaces": [

diff --git a/packages/demo/package.json b/packages/demo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config-demo",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "private": true,
   "type": "module",
   "scripts": {

diff --git a/packages/preset-markdown/package.json b/packages/preset-markdown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config-preset-markdown",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/preset-prototyping/package.json b/packages/preset-prototyping/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config-preset-prototyping",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/preset-vue-2/package.json b/packages/preset-vue-2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config-preset-vue-2",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/preset-vue-3/package.json b/packages/preset-vue-3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config-preset-vue-3",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/webpack-config/package.json b/packages/webpack-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "A basic webpack config",
   "type": "module",
   "main": "src/index.js",
@@ -45,6 +45,7 @@
   },
   "dependencies": {
     "@soda/friendly-errors-webpack-plugin": "^1.8.1",
+    "ajv": "8.12.0",
     "autoprefixer": "^10.4.19",
     "browser-sync": "^3.0.2",
     "cac": "^6.7.14",