Revert enableMapSet

__tests__/__prod_snapshots__/plugins.js.snap

@@ -1,5 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`error when using Maps 1`] = `"[Immer] minified error nr: 0. Full error at: https://bit.ly/3cXEKWf"`;
+
 exports[`error when using patches - 1 1`] = `"[Immer] minified error nr: 0. Full error at: https://bit.ly/3cXEKWf"`;
 
 exports[`error when using patches - 2 1`] = `"[Immer] minified error nr: 0. Full error at: https://bit.ly/3cXEKWf"`;

__tests__/__snapshots__/plugins.js.snap

@@ -1,5 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`error when using Maps 1`] = `"[Immer] The plugin for 'MapSet' has not been loaded into Immer. To enable the plugin, import and call \`enableMapSet()\` when initializing your application."`;
+
 exports[`error when using patches - 1 1`] = `"[Immer] The plugin for 'Patches' has not been loaded into Immer. To enable the plugin, import and call \`enablePatches()\` when initializing your application."`;
 
 exports[`error when using patches - 2 1`] = `"[Immer] The plugin for 'Patches' has not been loaded into Immer. To enable the plugin, import and call \`enablePatches()\` when initializing your application."`;

__tests__/base.js

@@ -5,15 +5,17 @@ import {
 	original,
 	isDraft,
 	immerable,
-	enablePatches
+	enablePatches,
+	enableMapSet
 } from "../src/immer"
 import {each, shallowCopy, DRAFT_STATE} from "../src/internal"
 import deepFreeze from "deep-freeze"
 import * as lodash from "lodash"
 
-jest.setTimeout(1000)
-
 enablePatches()
+enableMapSet()
+
+jest.setTimeout(1000)
 
 const isProd = process.env.NODE_ENV === "production"
 

__tests__/current.js

@@ -5,9 +5,12 @@ import {
 	isDraft,
 	produce,
 	original,
-	freeze
+	freeze,
+	enableMapSet
 } from "../src/immer"
 
+enableMapSet()
+
 runTests("proxy", true)
 
 const isProd = process.env.NODE_ENV === "production"

__tests__/empty.ts

@@ -1,6 +1,14 @@
-import {produce, immerable, applyPatches, enablePatches} from "../src/immer"
+import {
+	produce,
+	produceWithPatches,
+	immerable,
+	enableMapSet,
+	enablePatches,
+	applyPatches
+} from "../src/immer"
 import {DRAFT_STATE, Patch} from "../src/internal"
 
+enableMapSet()
 enablePatches()
 
 test("empty stub test", () => {

__tests__/flow/flow.js.flow

@@ -1,13 +1,15 @@
 // @flow
 import {
     produce,
+    enableMapSet,
     setAutoFreeze,
     produce as produce2,
     applyPatches,
     Patch,
     original
 } from "../../dist/index.js.flow"
 
+enableMapSet()
 setAutoFreeze(true)
 
 // we really don't want this code to actually execute..

__tests__/frozen.js

@@ -1,5 +1,13 @@
 "use strict"
-import {produce, setUseProxies, setAutoFreeze, freeze} from "../src/immer"
+import {
+	produce,
+	setUseProxies,
+	setAutoFreeze,
+	freeze,
+	enableMapSet
+} from "../src/immer"
+
+enableMapSet()
 
 const {isFrozen} = Object
 

__tests__/map-set.js

@@ -5,10 +5,12 @@ import {
 	original,
 	isDraft,
 	immerable,
-	enablePatches
+	enablePatches,
+	enableMapSet
 } from "../src/immer"
 import {each, shallowCopy, isEnumerable, DRAFT_STATE} from "../src/utils/common"
 
+enableMapSet()
 enablePatches()
 
 jest.setTimeout(1000)
@@ -283,6 +285,7 @@ function runBaseTest(name, autoFreeze, useListener) {
 				mapType1 = draft.constructor
 			})
 
+			enableMapSet()
 			let mapType2
 			produce(new Map(), draft => {
 				mapType2 = draft.constructor

__tests__/patch.js

@@ -6,10 +6,12 @@ import {
 	isDraft,
 	immerable,
 	nothing,
-	enablePatches
+	enablePatches,
+	enableMapSet
 } from "../src/immer"
 
 enablePatches()
+enableMapSet()
 
 jest.setTimeout(1000)
 

__tests__/plugins.js

@@ -1,5 +1,11 @@
 import {produce, produceWithPatches, applyPatches} from "../src/immer"
 
+test("error when using Maps", () => {
+	expect(() => {
+		produce(new Map(), function() {})
+	}).toThrowErrorMatchingSnapshot()
+})
+
 test("error when using patches - 1", () => {
 	expect(() => {
 		produce(

__tests__/produce.ts

@@ -7,9 +7,11 @@ import {
 	Draft,
 	Immutable,
 	Immer,
+	enableMapSet,
 	enablePatches
 } from "../src/immer"
 
+enableMapSet()
 enablePatches()
 
 interface State {

__tests__/readme.js

@@ -4,10 +4,12 @@ import {
 	applyPatches,
 	immerable,
 	produceWithPatches,
-	setAutoFreeze,
-	enablePatches
+	enableMapSet,
+	enablePatches,
+	setAutoFreeze
 } from "../src/immer"
 
+enableMapSet()
 enablePatches()
 
 describe("readme example", () => {

__tests__/regressions.js

@@ -1,5 +1,14 @@
 "use strict"
-import {Immer, nothing, original, isDraft, immerable} from "../src/immer"
+import {
+	Immer,
+	nothing,
+	original,
+	isDraft,
+	immerable,
+	enableMapSet
+} from "../src/immer"
+
+enableMapSet()
 
 runBaseTest("proxy (no freeze)", true, false)
 runBaseTest("proxy (autofreeze)", true, true)

package.json

@@ -31,7 +31,7 @@
     "build:flow": "cpx 'src/types/index.js.flow' dist -v",
     "publish-docs": "cd website && GIT_USER=mweststrate USE_SSH=true yarn docusaurus deploy",
     "start": "cd website && yarn start",
-    "test:size": "yarn build && yarn import-size --report . produce enablePatches",
+    "test:size": "yarn build && yarn import-size --report . produce enableMapSet enablePatches",
     "test:sizequick": "tsdx build --name immer --format esm && yarn import-size . produce"
   },
   "husky": {

src/core/immerClass.ts

@@ -23,9 +23,7 @@ import {
 	getCurrentScope,
 	NOTHING,
 	freeze,
-	current,
-	proxyMap,
-	proxySet
+	current
 } from "../internal"
 
 interface ProducersFns {
@@ -204,9 +202,9 @@ export function createProxy<T extends Objectish>(
 ): Drafted<T, ImmerState> {
 	// precondition: createProxy should be guarded by isDraftable, so we know we can safely draft
 	const draft: Drafted = isMap(value)
-		? proxyMap(value, parent)
+		? getPlugin("MapSet").proxyMap_(value, parent)
 		: isSet(value)
-		? proxySet(value, parent)
+		? getPlugin("MapSet").proxySet_(value, parent)
 		: createProxyProxy(value, parent)
 
 	const scope = parent ? parent.scope_ : getCurrentScope()