chore: Update changelog

survivejs · Oct 7, 2020 · 5d11101 · 5d11101
1 parent d0d50d4
commit 5d11101
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.2.0 / 2020-10-07
+
+- Feature - Support advanced merging cases through `mergeWithRules` #146 #149
+
 ## 5.1.4 / 2020-09-09
 
 - Fix - Expose `CustomizeRule` for TypeScript users #147
@@ -102,17 +106,17 @@ merge.smart(
     loaders: [
       {
         test: /\.js$/,
-        loaders: ["babel"],
-      },
-    ],
+        loaders: ["babel"]
+      }
+    ]
   },
   {
     loaders: [
       {
         test: /\.js$/,
-        loaders: ["react-hot", "babel"],
-      },
-    ],
+        loaders: ["react-hot", "babel"]
+      }
+    ]
   }
 );
 // will become
@@ -121,8 +125,8 @@ merge.smart(
     {
       test: /\.js$/,
       // order of second argument is respected
-      loaders: ["react-hot", "babel"],
-    },
+      loaders: ["react-hot", "babel"]
+    }
   ];
 }
 ```
@@ -183,10 +187,10 @@ const output = merge.smartStrategy(
 
 ```javascript
 const a = {
-  entry: ["foo"],
+  entry: ["foo"]
 };
 const b = {
-  entry: [],
+  entry: []
 };
 
 merge(a, b); // Yields a result, not b like before.