fix ie11

immerjs · Oct 25, 2019 · ffd8769 · ffd8769
1 parent ff25a83
commit ffd8769
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -59,4 +59,4 @@ typings/
 
 .idea
 dist/
-website/build
+website/build
diff --git a/index.html b/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta http-equiv="X-UA-Compatible" content="ie=edge" />
+		<title>Test in Browser</title>
+		<script src="https://cdn.jsdelivr.net/npm/[email protected]/index.min.js"></script>
+		<script src="./dist/immer.umd.js"></script>
+	</head>
+	<body>
+		<script>
+			try {
+				const result = immer.produce(new Map([[1, 2]]), function(draft) {
+					draft.set(1, 3)
+				})
+
+				console.log(result)
+			} catch (err) {
+				alert(err)
+			}
+		</script>
+	</body>
+</html>
diff --git a/src/common.js b/src/common.js
@@ -142,13 +142,15 @@ export function is(x, y) {
 	}
 }
 
-const hasMap = typeof Map !== "undefined"
+export const hasSymbol = typeof Symbol !== "undefined"
+
+export const hasMap = typeof Map !== "undefined"
 
 export function isMap(target) {
 	return hasMap && target instanceof Map
 }
 
-const hasSet = typeof Set !== "undefined"
+export const hasSet = typeof Set !== "undefined"
 
 export function isSet(target) {
 	return hasSet && target instanceof Set

diff --git a/src/es5.js b/src/es5.js
@@ -8,6 +8,7 @@ import {
 	isEnumerable,
 	isMap,
 	isSet,
+	hasSymbol,
 	shallowCopy,
 	DRAFT_STATE,
 	iterateMapValues,
@@ -160,7 +161,7 @@ function proxyProperty(draft, prop, enumerable) {
 function proxyMap(target) {
 	Object.defineProperties(target, mapTraps)
 
-	if (typeof Symbol !== undefined) {
+	if (hasSymbol) {
 		Object.defineProperty(
 			target,
 			Symbol.iterator,
@@ -227,7 +228,7 @@ const mapTraps = finalizeTraps({
 function proxySet(target) {
 	Object.defineProperties(target, setTraps)
 
-	if (typeof Symbol !== undefined) {
+	if (hasSymbol) {
 		Object.defineProperty(
 			target,
 			Symbol.iterator,

diff --git a/src/immer.js b/src/immer.js
@@ -78,7 +78,7 @@ export class Immer {
 				if (hasError) scope.revoke()
 				else scope.leave()
 			}
-			if (result instanceof Promise) {
+			if (typeof Promise !== "undefined" && result instanceof Promise) {
 				return result.then(
 					result => {
 						scope.usePatches(patchListener)

diff --git a/src/proxy.js b/src/proxy.js
@@ -8,6 +8,7 @@ import {
 	isDraft,
 	isMap,
 	isSet,
+	hasSymbol,
 	shallowCopy,
 	makeIterable,
 	DRAFT_STATE,
@@ -258,7 +259,7 @@ const mapTraps = makeTrapsForGetters({
 	keys: state => () => latest(state).keys(),
 	values: iterateMapValues,
 	entries: iterateMapValues,
-	[Symbol.iterator]: iterateMapValues
+	[hasSymbol && Symbol.iterator]: iterateMapValues
 })
 
 const iterateSetValues = makeIterateSetValues(createProxy)
@@ -296,7 +297,7 @@ const setTraps = makeTrapsForGetters({
 	keys: iterateSetValues,
 	values: iterateSetValues,
 	entries: iterateSetValues,
-	[Symbol.iterator]: iterateSetValues
+	[hasSymbol && Symbol.iterator]: iterateSetValues
 })
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,4 +59,4 @@ typings/ @@
     .idea
     dist/
-    website/build
+    website/build