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.

Sign up for GitHub

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 Support for Older Ember Versions #86

Merged
merged 1 commit into from
Mar 13, 2025
Merged

Remove Support for Older Ember Versions #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions addon/modifiers/did-insert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { setModifierManager, capabilities } from '@ember/modifier';
import { macroCondition, dependencySatisfies } from '@embroider/macros';

/**
The `{{did-insert}}` element modifier is activated when an element is
Expand Down Expand Up @@ -47,12 +46,7 @@ import { macroCondition, dependencySatisfies } from '@embroider/macros';
*/
export default setModifierManager(
() => ({
capabilities: capabilities(
macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-beta.1'))
? '3.22'
: '3.13',
{ disableAutoTracking: true },
),
capabilities: capabilities('3.22', { disableAutoTracking: true }),

createModifier() {},

Expand Down
63 changes: 14 additions & 49 deletions addon/modifiers/did-update.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,5 @@
import { setModifierManager, capabilities } from '@ember/modifier';
import {
macroCondition,
dependencySatisfies,
importSync,
} from '@embroider/macros';

const untrack = (function () {
if (macroCondition(dependencySatisfies('ember-source', '> 3.27.0-beta.1'))) {
// ember-source@3.27 shipped "real modules" by default, so we can just use
// importSync to get @glimmer/validator directly
return importSync('@glimmer/validator').untrack;
} else if (
macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-alpha.1'))
) {
// we can access `window.Ember` here because it wasn't deprecated until at least 3.27
// eslint-disable-next-line no-undef
return Ember.__loader.require('@glimmer/validator').untrack;
} else {
// nothing needed here, we do not call `untrack` in this case
}
})();
import { untrack } from '@glimmer/validator';

/**
The `{{did-update}}` element modifier is activated when any of its arguments
Expand Down Expand Up @@ -79,47 +59,32 @@ const untrack = (function () {
*/
export default setModifierManager(
() => ({
capabilities: macroCondition(
dependencySatisfies('ember-source', '>= 3.22.0-alpha.1'),
)
? capabilities('3.22', { disableAutoTracking: false })
: capabilities('3.13', { disableAutoTracking: true }),

capabilities: capabilities('3.22', { disableAutoTracking: false }),
createModifier() {
return { element: null };
},
installModifier(state, element, args) {
// save element into state bucket
state.element = element;

if (
macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-alpha.1'))
) {
// Consume individual properties to entangle tracking.
// https://github.com/emberjs/ember.js/issues/19277
// https://github.com/ember-modifier/ember-modifier/pull/63#issuecomment-815908201
args.positional.forEach(() => {});
args.named && Object.values(args.named);
}
// Consume individual properties to entangle tracking.
// https://github.com/emberjs/ember.js/issues/19277
// https://github.com/ember-modifier/ember-modifier/pull/63#issuecomment-815908201
args.positional.forEach(() => {});
args.named && Object.values(args.named);
},

updateModifier({ element }, args) {
let [fn, ...positional] = args.positional;

if (
macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-alpha.1'))
) {
// Consume individual properties to entangle tracking.
// https://github.com/emberjs/ember.js/issues/19277
// https://github.com/ember-modifier/ember-modifier/pull/63#issuecomment-815908201
args.positional.forEach(() => {});
args.named && Object.values(args.named);
untrack(() => {
fn(element, positional, args.named);
});
} else {
// Consume individual properties to entangle tracking.
// https://github.com/emberjs/ember.js/issues/19277
// https://github.com/ember-modifier/ember-modifier/pull/63#issuecomment-815908201
args.positional.forEach(() => {});
args.named && Object.values(args.named);
untrack(() => {
fn(element, positional, args.named);
}
});
},

destroyModifier() {},
Expand Down
9 changes: 1 addition & 8 deletions addon/modifiers/will-destroy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { setModifierManager, capabilities } from '@ember/modifier';
import { macroCondition, dependencySatisfies } from '@embroider/macros';

/**
The `{{will-destroy}}` element modifier is activated immediately before the element
Expand Down Expand Up @@ -41,13 +40,7 @@ import { macroCondition, dependencySatisfies } from '@embroider/macros';
*/
export default setModifierManager(
() => ({
capabilities: capabilities(
macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-beta.1'))
? '3.22'
: '3.13',
{ disableAutoTracking: true },
),

capabilities: capabilities('3.22', { disableAutoTracking: true }),
createModifier() {
return { element: null };
},
Expand Down
4 changes: 1 addition & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@
},
"dependencies": {
"@babel/core": "^7.25.2",
"@embroider/macros": "^1.0.0",
"ember-cli-babel": "^8.2.0",
"ember-modifier-manager-polyfill": "^1.2.0"
"ember-cli-babel": "^8.2.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.25.1",
Expand Down
Loading