Merge branch 'master' into feature/es5

immerjs · Jan 2, 2018 · 9b193bc · 9b193bc
2 parents 32710af + 4d4b1c9
commit 9b193bc
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 24 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -6,7 +6,7 @@
   "semi": false,
   "singleQuote": false,
   "tabWidth": 4,
-  "trailingComma": "all",
+  "trailingComma": "none",
   "useTabs": false,
   "overrides": [
     {

diff --git a/__tests__/base.js b/__tests__/base.js
@@ -149,10 +149,10 @@ describe("base", () => {
             aProp: "hi",
             messy: {
                 nested: {
-                    yummie: true,
+                    yummie: true
                 },
-                coffee: false,
-            },
+                coffee: false
+            }
         })
         expect(nextState.messy.nested).toBe(baseState.anObject.nested)
     })
@@ -172,10 +172,10 @@ describe("base", () => {
             aProp: "hello",
             messy: {
                 nested: {
-                    yummie: true,
+                    yummie: true
                 },
-                coffee: true,
-            },
+                coffee: true
+            }
         })
         expect(nextState.messy.nested).toBe(baseState.anObject.nested)
     })
@@ -238,10 +238,10 @@ describe("base", () => {
             aProp: "hi",
             anObject: {
                 nested: {
-                    yummie: true,
+                    yummie: true
                 },
-                coffee: false,
-            },
+                coffee: false
+            }
         }
     }
 })
diff --git a/__tests__/frozen.js b/__tests__/frozen.js
@@ -4,7 +4,7 @@ import immer from ".."
 describe("auto freeze", () => {
     const baseState = {
         object: {a: 1},
-        array: [1, 2],
+        array: [1, 2]
     }
 
     it("should freeze objects after modifications", () => {

diff --git a/__tests__/performance.js b/__tests__/performance.js
@@ -15,7 +15,7 @@ describe("performance", () => {
         baseState.push({
             todo: "todo_" + i,
             done: false,
-            someThingCompletelyIrrelevant: [1, 2, 3, 4, 5, 6, 7, 8, 9, 0],
+            someThingCompletelyIrrelevant: [1, 2, 3, 4, 5, 6, 7, 8, 9, 0]
         })
     }
 
@@ -33,7 +33,7 @@ describe("performance", () => {
     const todoRecord = Record({
         todo: "",
         done: false,
-        someThingCompletelyIrrelevant: [],
+        someThingCompletelyIrrelevant: []
     })
     immutableJsBaseState = List(baseState.map(todo => todoRecord(todo)))
 
@@ -56,9 +56,9 @@ describe("performance", () => {
         const nextState = [
             ...baseState.slice(0, MAX * MODIFY_FACTOR).map(todo => ({
                 ...todo,
-                done: true,
+                done: true
             })),
-            ...baseState.slice(MAX * MODIFY_FACTOR),
+            ...baseState.slice(MAX * MODIFY_FACTOR)
         ]
     })
 

diff --git a/__tests__/readme.js b/__tests__/readme.js
@@ -6,12 +6,12 @@ describe("readme example", () => {
         const baseState = [
             {
                 todo: "Learn typescript",
-                done: true,
+                done: true
             },
             {
                 todo: "Try immer",
-                done: false,
-            },
+                done: false
+            }
         ]
 
         const nextState = immer(baseState, draft => {

diff --git a/changelog.md b/changelog.md
@@ -1,8 +1,12 @@
 # Changelog
 
+### 0.1.2 (2-1-2018)
+
+* Fixed issue where trailing commas could break consumers. Fixes [#21](https://github.com/mweststrate/immer/pull/21).
+
 ### 0.1.1 (2-1-2018)
 
-* Fixed issue where TypeScript typings were not correctly exposed. Fixes [#18](https://github.com/mweststrate/immer/pull/18).
+* Fixed issue where TypeScript typings were not correctly exposed. Fixes [#18](https://github.com/mweststrate/immer/issue/18).
 
 ### 0.1.0 (1-1-2018)
 

diff --git a/immer.js b/immer.js
@@ -61,7 +61,7 @@ function immer(baseState, thunk) {
             const copy = getOrCreateCopy(target)
             delete copy[property]
             return true
-        },
+        }
     }
 
     // creates a copy for a base object if there ain't one
@@ -101,7 +101,7 @@ function immer(baseState, thunk) {
                 Object.defineProperty(proxyTarget, CLONE_TARGET, {
                     enumerable: false,
                     value: base,
-                    configurable: true,
+                    configurable: true
                 })
             } else {
                 proxyTarget = base
@@ -167,7 +167,7 @@ function immer(baseState, thunk) {
     //values either than undefined will trigger warning;
     !Object.is(maybeVoidReturn, undefined) &&
         console.warn(
-            `Immer callback expects no return value. However ${typeof maybeVoidReturn} was returned`,
+            `Immer callback expects no return value. However ${typeof maybeVoidReturn} was returned`
         )
     // console.log(`proxies: ${revocableProxies.size}, copies: ${copies.size}`)
     // revoke all proxies
@@ -217,7 +217,7 @@ function setAutoFreeze(enableAutoFreeze) {
 }
 
 Object.defineProperty(exports, "__esModule", {
-    value: true,
+    value: true
 })
 module.exports.default = immer
 module.exports.setAutoFreeze = setAutoFreeze
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "immer",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Create your next immutable state by mutating the current one",
   "main": "immer-es5.js",
   "types": "./index.d.ts",