Merge e819e79 into 09d37ce

.github/ISSUE_TEMPLATE/bug.md

@@ -22,6 +22,6 @@ Please provide either a [CodeSandbox demo](https://codesandbox.io/s/82zqr6n3kj)
 
 ## Environment
 
--   **Immer version:**
--   [ ] Occurs with `setUseProxies(true)`
--   [ ] Occurs with `setUseProxies(false)` (ES5 only)
+- **Immer version:**
+- [ ] Occurs with `setUseProxies(true)`
+- [ ] Occurs with `setUseProxies(false)` (ES5 only)

.gitignore

@@ -59,4 +59,4 @@ typings/
 
 .idea
 dist/
-website/build
+website/build

.prettierrc

@@ -12,7 +12,8 @@
       "files": [".prettierrc", "*.json"],
       "options": {
         "printWidth": 200,
-        "tabWidth": 2
+        "tabWidth": 2,
+        "useTabs": false
       }
     }
   ]

.travis.yml

@@ -2,7 +2,7 @@ language: node_js
 node_js:
   - "8"
   - "10"
-#  - "node"
+  # - "node"
 env:
   - NODE_ENV=TEST
 cache:
@@ -21,7 +21,7 @@ jobs:
   include:
     - stage: deploy
       if: branch == master && !fork
-      node_js: "8.12.0" # pre-installed version
+      node_js: "8.16.0" # pre-installed version
       script:
         - yarn build
         - yarn global add semantic-release@^15

.watchmanconfig

@@ -0,0 +1 @@
+{}

__tests__/__snapshots__/base.js.snap

@@ -155,3 +155,285 @@ exports[`base functionality - proxy (no freeze) throws when Object.definePropert
 exports[`base functionality - proxy (no freeze) throws when Object.setPrototypeOf() is used on a draft 1`] = `"Object.setPrototypeOf() cannot be used on an Immer draft"`;
 
 exports[`base functionality - proxy (no freeze) throws when the draft is modified and another object is returned 1`] = `"An immer producer returned a new value *and* modified its draft. Either return a new value *or* modify the draft."`;
+
+exports[`complex nesting map / set / object modify deep object 1`] = `
+Object {
+  "map": Map {
+    "set1" => Set {
+      Object {
+        "a": 2,
+      },
+      Object {
+        "b": 2,
+      },
+    },
+    "set2" => Set {
+      Object {
+        "c": 3,
+      },
+    },
+  },
+}
+`;
+
+exports[`complex nesting map / set / object modify deep object 2`] = `
+Array [
+  Object {
+    "op": "remove",
+    "path": Array [
+      "map",
+      "set1",
+      0,
+    ],
+    "value": Object {
+      "a": 1,
+    },
+  },
+  Object {
+    "op": "add",
+    "path": Array [
+      "map",
+      "set1",
+      0,
+    ],
+    "value": Object {
+      "a": 2,
+    },
+  },
+]
+`;
+
+exports[`complex nesting map / set / object modify deep object 3`] = `
+Object {
+  "map": Map {
+    "set1" => Set {
+      Object {
+        "a": 2,
+      },
+      Object {
+        "b": 2,
+      },
+    },
+    "set2" => Set {
+      Object {
+        "c": 3,
+      },
+    },
+  },
+}
+`;
+
+exports[`complex nesting map / set / object modify deep object 4`] = `
+Array [
+  Object {
+    "op": "remove",
+    "path": Array [
+      "map",
+      "set1",
+      0,
+    ],
+    "value": Object {
+      "a": 1,
+    },
+  },
+  Object {
+    "op": "add",
+    "path": Array [
+      "map",
+      "set1",
+      0,
+    ],
+    "value": Object {
+      "a": 2,
+    },
+  },
+]
+`;
+
+exports[`complex nesting map / set / object modify deep object 5`] = `
+Object {
+  "map": Map {
+    "set1" => Set {
+      Object {
+        "a": 2,
+      },
+      Object {
+        "b": 2,
+      },
+    },
+    "set2" => Set {
+      Object {
+        "c": 3,
+      },
+    },
+  },
+}
+`;
+
+exports[`complex nesting map / set / object modify deep object 6`] = `
+Array [
+  Object {
+    "op": "remove",
+    "path": Array [
+      "map",
+      "set1",
+      0,
+    ],
+    "value": Object {
+      "a": 1,
+    },
+  },
+  Object {
+    "op": "add",
+    "path": Array [
+      "map",
+      "set1",
+      0,
+    ],
+    "value": Object {
+      "a": 2,
+    },
+  },
+]
+`;
+
+exports[`complex nesting map / set / object modify deep object 7`] = `
+Object {
+  "map": Map {
+    "set1" => Set {
+      Object {
+        "a": 2,
+      },
+      Object {
+        "b": 2,
+      },
+    },
+    "set2" => Set {
+      Object {
+        "c": 3,
+      },
+    },
+  },
+}
+`;
+
+exports[`complex nesting map / set / object modify deep object 8`] = `
+Array [
+  Object {
+    "op": "remove",
+    "path": Array [
+      "map",
+      "set1",
+      0,
+    ],
+    "value": Object {
+      "a": 1,
+    },
+  },
+  Object {
+    "op": "add",
+    "path": Array [
+      "map",
+      "set1",
+      0,
+    ],
+    "value": Object {
+      "a": 2,
+    },
+  },
+]
+`;
+
+exports[`complex nesting map / set / object modify deep object 9`] = `
+Object {
+  "map": Map {
+    "set1" => Set {
+      Object {
+        "a": 2,
+      },
+      Object {
+        "b": 2,
+      },
+    },
+    "set2" => Set {
+      Object {
+        "c": 3,
+      },
+    },
+  },
+}
+`;
+
+exports[`complex nesting map / set / object modify deep object 10`] = `
+Array [
+  Object {
+    "op": "remove",
+    "path": Array [
+      "map",
+      "set1",
+      0,
+    ],
+    "value": Object {
+      "a": 1,
+    },
+  },
+  Object {
+    "op": "add",
+    "path": Array [
+      "map",
+      "set1",
+      0,
+    ],
+    "value": Object {
+      "a": 2,
+    },
+  },
+]
+`;
+
+exports[`complex nesting map / set / object modify deep object 11`] = `
+Object {
+  "map": Map {
+    "set1" => Set {
+      Object {
+        "a": 2,
+      },
+      Object {
+        "b": 2,
+      },
+    },
+    "set2" => Set {
+      Object {
+        "c": 3,
+      },
+    },
+  },
+}
+`;
+
+exports[`complex nesting map / set / object modify deep object 12`] = `
+Array [
+  Object {
+    "op": "remove",
+    "path": Array [
+      "map",
+      "set1",
+      0,
+    ],
+    "value": Object {
+      "a": 1,
+    },
+  },
+  Object {
+    "op": "add",
+    "path": Array [
+      "map",
+      "set1",
+      0,
+    ],
+    "value": Object {
+      "a": 2,
+    },
+  },
+]
+`;