Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow mobx to run in web worker #2184

Merged
merged 4 commits into from
Oct 31, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
- Fix running mobx in web worker [#2184](https://github.com/mobxjs/mobx/pull/2184/files)
- Fixed flow typings for Facebook's Flow. A new `CancellablePromise` Flow type is exported.

# 5.14.2
Expand Down
32 changes: 18 additions & 14 deletions src/core/globalstate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,24 @@ export class MobXGlobals {
suppressReactionErrors = false
}

declare const window: any
declare const self: any

const mockGlobal = {}

export function getGlobal() {
if (typeof window !== "undefined") {
return window
}
if (typeof global !== "undefined") {
return global
}
if (typeof self !== "undefined") {
return self
}
return mockGlobal
}

let canMergeGlobalState = true
let isolateCalled = false

Expand Down Expand Up @@ -198,17 +216,3 @@ export function resetGlobalState() {
if (persistentKeys.indexOf(key as any) === -1) globalState[key] = defaultGlobals[key]
globalState.allowStateChanges = !globalState.enforceActions
}

declare const window: any

const mockGlobal = {}

export function getGlobal() {
if (typeof window !== "undefined") {
return window
}
if (typeof global !== "undefined") {
return global
}
return mockGlobal
}