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

Remove deprecated Modifier Manager version 3.13 #1329

Merged
merged 1 commit into from
Aug 25, 2021
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
Original file line number Diff line number Diff line change
Expand Up @@ -282,81 +282,6 @@ abstract class ModifierManagerTest extends RenderTest {
}
}

class ModifierManagerTest313 extends ModifierManagerTest {
static suiteName = 'Basic Custom Modifier Manager: 3.13';

CustomModifierManager = class CustomModifierManager implements ModifierManager<CustomModifier> {
capabilities = modifierCapabilities('3.13');

constructor(public owner: Owner) {}

createModifier(
Modifier: { create(owner: Owner, args: Arguments): CustomModifier },
args: Arguments
) {
return Modifier.create(this.owner, args);
}

installModifier(instance: CustomModifier, element: Element, args: Arguments) {
instance.element = element;
instance.args = args;
instance.didInsertElement();
}

updateModifier(instance: CustomModifier, args: Arguments) {
instance.args = args;
instance.didUpdate();
}

destroyModifier(instance: CustomModifier) {
instance.willDestroyElement();
}
};

@test 'modifers consume all arguments'(assert: Assert) {
let insertCount = 0;
let updateCount = 0;

let foo = this.defineModifier(
class extends CustomModifier {
didInsertElement() {
insertCount++;

// consume qux
// eslint-disable-next-line no-unused-expressions
this.args.named.qux;
}

didUpdate() {
updateCount++;

// consume qux
// eslint-disable-next-line no-unused-expressions
this.args.named.qux;
}
}
);

let Main = defineComponent({ foo }, '<h1 {{foo bar=@bar qux=@qux}}>hello world</h1>');
let args = trackedObj({ bar: 'bar', qux: 'qux' });

this.renderComponent(Main, args);

this.assertHTML(`<h1>hello world</h1>`);

assert.equal(insertCount, 1);
assert.equal(updateCount, 0);

args.bar = 'other bar';
this.rerender();
assert.equal(updateCount, 1);

args.qux = 'quuuuxxxxxx';
this.rerender();
assert.equal(updateCount, 2);
}
}

class ModifierManagerTest322 extends ModifierManagerTest {
static suiteName = 'Basic Custom Modifier Manager: 3.22';

Expand Down Expand Up @@ -488,4 +413,3 @@ class ModifierManagerTest322 extends ModifierManagerTest {
}

jitSuite(ModifierManagerTest322);
jitSuite(ModifierManagerTest313);
6 changes: 3 additions & 3 deletions packages/@glimmer/manager/lib/public/modifier.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ export function modifierCapabilities<Version extends keyof ModifierCapabilitiesV
managerAPI: Version,
optionalFeatures: ModifierCapabilitiesVersions[Version] = {}
): ModifierCapabilities {
if (DEBUG && managerAPI !== '3.13' && managerAPI !== '3.22') {
if (DEBUG && managerAPI !== '3.22') {
throw new Error('Invalid modifier manager compatibility specified');
}

return buildCapabilities({
disableAutoTracking: Boolean(optionalFeatures.disableAutoTracking),
useArgsProxy: managerAPI === '3.13' ? false : true,
useArgsProxy: true,

// This capability is used in Ember, exclusively in resolution mode. See the
// Ember glimmer resolver for details.
passFactoryToCreate: managerAPI === '3.13',
passFactoryToCreate: false,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That this and line 46 above are now hard-coded likely points to further possible removals.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call, fixed in #1334

});
}

Expand Down