Merge branch 'master' into circulardependencies

devo-wm · Oct 24, 2018 · 3e706ec · 3e706ec
2 parents 942d983 + a2706cf
commit 3e706ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v3.3.0
+
+* **Added** ES Module builds
+* **Fixed** type error with typescript on array+object shorthand (gh-322)
+
 # v3.2.0
 
 * **Added** Support denormalizing from Immutable entities (gh-228)
@@ -18,8 +23,8 @@ The entire normalizr package has been rewritten from v2.x for this version. Plea
 ## Added
 
 * `schema.Entity`
-    * `processStrategy` for modifying `Entity` objects before they're moved to the `entities` stack.
-    * `mergeStrategy` for merging with multiple entities with the same ID.
+  * `processStrategy` for modifying `Entity` objects before they're moved to the `entities` stack.
+  * `mergeStrategy` for merging with multiple entities with the same ID.
 * Added `schema.Object`, with a shorthand of `{}`
 * Added `schema.Array`, with a shorthand of `[ schema ]`
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "normalizr",
-  "version": "3.2.4",
+  "version": "3.3.0",
   "description": "Normalizes and denormalizes JSON according to schema for Redux and Flux applications",
   "bugs": {
     "url": "https://github.com/paularmstrong/normalizr/issues"