mobx 6.3.5 → 6.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # mobx
2
2
 
3
+ ## 6.3.6
4
+
5
+ ### Patch Changes
6
+
7
+ - [`49468204`](https://github.com/mobxjs/mobx/commit/49468204d3bc28d15dbf383c0b7f874ca26dff30) [#3162](https://github.com/mobxjs/mobx/pull/3162) Thanks [@upsuper](https://github.com/upsuper)! - Have cancelled when reject with an error rather than a string
8
+
9
+ * [`4afb1ec2`](https://github.com/mobxjs/mobx/commit/4afb1ec24427cf8e1f768d0c6fc49d0f44f4ab8e) [#3154](https://github.com/mobxjs/mobx/pull/3154) Thanks [@urugator](https://github.com/urugator)! - `makeObservable` throws when mixing @decorator syntax with annotations
10
+
3
11
  ## 6.3.5
4
12
 
5
13
  ### Patch Changes
@@ -3325,7 +3325,7 @@ function whenPromise(predicate, opts) {
3325
3325
 
3326
3326
  cancel = function cancel() {
3327
3327
  disposer();
3328
- reject("WHEN_CANCELLED");
3328
+ reject(new Error("WHEN_CANCELLED"));
3329
3329
  };
3330
3330
  });
3331
3331
  res.cancel = cancel;
@@ -3456,7 +3456,11 @@ function makeObservable(target, annotations, options) {
3456
3456
  try {
3457
3457
  var _annotations;
3458
3458
 
3459
- // Default to decorators
3459
+ if ("development" !== "production" && annotations && target[storedAnnotationsSymbol]) {
3460
+ die("makeObservable second arg must be nullish when using decorators. Mixing @decorator syntax with annotations is not supported.");
3461
+ } // Default to decorators
3462
+
3463
+
3460
3464
  (_annotations = annotations) != null ? _annotations : annotations = collectStoredAnnotations(target); // Annotate
3461
3465
 
3462
3466
  ownKeys(annotations).forEach(function (key) {