Skip to content

Commit

Permalink
[CLEANUP beta] Remove usages of `deprecateMutationsInTrackingTransact…
Browse files Browse the repository at this point in the history
…ion`

* removes deprecation of mutations during helper compute
* removes deprecation of mutations during unknownProperty
  • Loading branch information
rwjblue committed Sep 29, 2021
1 parent 5f515c2 commit dc125e9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 41 deletions.
29 changes: 2 additions & 27 deletions packages/@ember/-internals/glimmer/lib/helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,9 @@ import { Factory, Owner, setOwner } from '@ember/-internals/owner';
import { FrameworkObject } from '@ember/-internals/runtime';
import { getDebugName, symbol } from '@ember/-internals/utils';
import { join } from '@ember/runloop';
import { DEBUG } from '@glimmer/env';
import { Arguments, Dict, HelperManager } from '@glimmer/interfaces';
import { getInternalHelperManager, helperCapabilities, setHelperManager } from '@glimmer/manager';
import {
consumeTag,
createTag,
deprecateMutationsInTrackingTransaction,
dirtyTag,
} from '@glimmer/validator';
import { consumeTag, createTag, dirtyTag } from '@glimmer/validator';

export const RECOMPUTE_TAG = symbol('RECOMPUTE_TAG');

Expand Down Expand Up @@ -175,16 +169,9 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
}

getValue({ instance, args }: ClassicHelperStateBucket) {
let ret;
let { positional, named } = args;

if (DEBUG) {
deprecateMutationsInTrackingTransaction!(() => {
ret = instance.compute(positional as unknown[], named);
});
} else {
ret = instance.compute(positional as unknown[], named);
}
let ret = instance.compute(positional as unknown[], named);

consumeTag(instance[RECOMPUTE_TAG]);

Expand Down Expand Up @@ -225,18 +212,6 @@ class SimpleClassicHelperManager implements HelperManager<() => unknown> {
createHelper(definition: Wrapper, args: Arguments) {
let { compute } = definition;

if (DEBUG) {
return () => {
let ret;

deprecateMutationsInTrackingTransaction!(() => {
ret = compute.call(null, args.positional as unknown[], args.named);
});

return ret;
};
}

return () => compute.call(null, args.positional as unknown[], args.named);
}

Expand Down
16 changes: 2 additions & 14 deletions packages/@ember/-internals/metal/lib/property_get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,7 @@
import { isEmberArray, setProxy, symbol } from '@ember/-internals/utils';
import { assert } from '@ember/debug';
import { DEBUG } from '@glimmer/env';
import {
consumeTag,
deprecateMutationsInTrackingTransaction,
isTracking,
tagFor,
track,
} from '@glimmer/validator';
import { consumeTag, isTracking, tagFor, track } from '@glimmer/validator';
import { isPath } from './path_cache';

export const PROXY_CONTENT = symbol('PROXY_CONTENT');
Expand Down Expand Up @@ -118,13 +112,7 @@ export function _getProp(obj: object, keyName: string) {
!(keyName in obj) &&
typeof (obj as MaybeHasUnknownProperty).unknownProperty === 'function'
) {
if (DEBUG) {
deprecateMutationsInTrackingTransaction!(() => {
value = (obj as MaybeHasUnknownProperty).unknownProperty!(keyName);
});
} else {
value = (obj as MaybeHasUnknownProperty).unknownProperty!(keyName);
}
value = (obj as MaybeHasUnknownProperty).unknownProperty!(keyName);
}

if (isTracking()) {
Expand Down

0 comments on commit dc125e9

Please sign in to comment.