mobx 6.3.5 → 6.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mobx",
-    "version": "6.3.5",
+    "version": "6.3.6",
     "description": "Simple, scalable state management.",
     "source": "src/mobx.ts",
     "main": "dist/index.js",

package/src/api/makeObservable.ts

@@ -12,7 +12,8 @@ import {
     die,
     ownKeys,
     extendObservable,
-    addHiddenProp
+    addHiddenProp,
+    storedAnnotationsSymbol
 } from "../internal"
 
 // Hack based on https://github.com/Microsoft/TypeScript/issues/14829#issuecomment-322267089
@@ -30,6 +31,11 @@ export function makeObservable<T extends object, AdditionalKeys extends Property
     const adm: ObservableObjectAdministration = asObservableObject(target, options)[$mobx]
     startBatch()
     try {
+        if (__DEV__ && annotations && target[storedAnnotationsSymbol]) {
+            die(
+                `makeObservable second arg must be nullish when using decorators. Mixing @decorator syntax with annotations is not supported.`
+            )
+        }
         // Default to decorators
         annotations ??= collectStoredAnnotations(target)
 

package/src/api/when.ts

@@ -72,7 +72,7 @@ function whenPromise(
         let disposer = _when(predicate, resolve, { ...opts, onError: reject })
         cancel = () => {
             disposer()
-            reject("WHEN_CANCELLED")
+            reject(new Error("WHEN_CANCELLED"))
         }
     })
     ;(res as any).cancel = cancel