Make sure isolateGlobalState is called first, fixes#1869

mobxjs · Jan 21, 2019 · 44dd3c2 · 44dd3c2
1 parent 379e1f0
commit 44dd3c2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/api/configure.ts b/src/api/configure.ts
@@ -18,6 +18,9 @@ export function configure(options: {
         arrayBuffer,
         reactionScheduler
     } = options
+    if (options.isolateGlobalState === true) {
+        isolateGlobalState()
+    }
     if (enforceActions !== undefined) {
         if (typeof enforceActions === "boolean" || enforceActions === "strict")
             deprecated(
@@ -48,9 +51,6 @@ export function configure(options: {
     if (computedRequiresReaction !== undefined) {
         globalState.computedRequiresReaction = !!computedRequiresReaction
     }
-    if (options.isolateGlobalState === true) {
-        isolateGlobalState()
-    }
     if (disableErrorBoundaries !== undefined) {
         if (disableErrorBoundaries === true)
             console.warn(

diff --git a/test/base/strict-mode.js b/test/base/strict-mode.js
@@ -240,3 +240,12 @@ test("warn on unsafe reads", function() {
         mobx.configure({ computedRequiresReaction: false })
     }
 })
+
+test("#1869", function() {
+    const x = mobx.observable.box(3)
+    mobx.configure({ enforceActions: "always", isolateGlobalState: true })
+    expect(() => {
+        x.set(4)
+    }).toThrow("Since strict-mode is enabled")
+    mobx._resetGlobalState() // should preserve strict mode
+})