From e15be686b44f7ca5f36feff7da62e1ad9d079625 Mon Sep 17 00:00:00 2001
From: xaviergonz <xaviergonz@gmail.com>
Date: Fri, 4 Oct 2019 08:10:30 +0200
Subject: [PATCH] fix for 2135

---
 src/core/action.ts      | 15 ++++++++++-----
 src/core/globalstate.ts | 10 ----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/core/action.ts b/src/core/action.ts
index c798e7699..257e7af47 100644
--- a/src/core/action.ts
+++ b/src/core/action.ts
@@ -13,6 +13,11 @@ import {
 } from "../internal"
 import { allowStateReadsStart, allowStateReadsEnd } from "./derivation"
 
+// we don't use globalState for these in order to avoid possible issues with multiple
+// mobx versions
+let currentActionId = 0
+let nextActionId = 1
+
 export interface IAction {
     isMobxAction: boolean
 }
@@ -78,18 +83,18 @@ export function _startAction(actionName: string, scope: any, args?: IArguments):
         prevAllowStateReads,
         notifySpy,
         startTime,
-        actionId: globalState.nextActionId++,
-        parentActionId: globalState.currentActionId
+        actionId: nextActionId++,
+        parentActionId: currentActionId
     }
-    globalState.currentActionId = runInfo.actionId
+    currentActionId = runInfo.actionId
     return runInfo
 }
 
 export function _endAction(runInfo: IActionRunInfo) {
-    if (globalState.currentActionId !== runInfo.actionId) {
+    if (currentActionId !== runInfo.actionId) {
         fail("invalid action stack. did you forget to finish an action?")
     }
-    globalState.currentActionId = runInfo.parentActionId
+    currentActionId = runInfo.parentActionId
 
     if (runInfo.error !== undefined) {
         globalState.suppressReactionErrors = true
diff --git a/src/core/globalstate.ts b/src/core/globalstate.ts
index 1b6cdad25..5fca8627d 100644
--- a/src/core/globalstate.ts
+++ b/src/core/globalstate.ts
@@ -139,16 +139,6 @@ export class MobXGlobals {
      * they are not the cause, see: https://github.com/mobxjs/mobx/issues/1836
      */
     suppressReactionErrors = false
-
-    /*
-     * Current action id.
-     */
-    currentActionId = 0
-
-    /*
-     * Next action id.
-     */
-    nextActionId = 1
 }
 
 let canMergeGlobalState = true