Skip to content

Commit 15338ba

Browse files
author
Anass OUMIRI
authored
Merge pull request #244 from nickschot/drop-old-ember
Drop support for Ember < 3.24
2 parents b7ea5ae + 60e0ddc commit 15338ba

File tree

6 files changed

+37
-83
lines changed

6 files changed

+37
-83
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
needs: [lint, basic-tests]
4343
strategy:
4444
matrix:
45-
ember: [lts-3.8, lts-3.12, lts-3.16, lts-3.24, release, beta, canary]
45+
ember: [lts-3.24, release, beta, canary]
4646
runs-on: ubuntu-latest
4747
steps:
4848
- uses: actions/checkout@v1

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ npm install --save-dev ember-autofocus-modifier
8787
Compatibility
8888
------------------------------------------------------------------------------
8989

90-
* Ember.js v3.4 or above
90+
* Ember.js v3.24 or above
9191
* Ember CLI v2.13 or above
9292
* Node.js v12 or above
9393

config/ember-try.js

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,6 @@ module.exports = async function () {
77
return {
88
useYarn: true,
99
scenarios: [
10-
{
11-
name: 'ember-lts-3.8',
12-
npm: {
13-
devDependencies: {
14-
'ember-source': '~3.8.0',
15-
},
16-
},
17-
},
18-
{
19-
name: 'ember-lts-3.12',
20-
npm: {
21-
devDependencies: {
22-
'ember-source': '~3.12.0',
23-
},
24-
},
25-
},
26-
{
27-
name: 'ember-lts-3.16',
28-
npm: {
29-
devDependencies: {
30-
'ember-source': '~3.16.0',
31-
},
32-
},
33-
},
34-
{
35-
name: 'ember-lts-3.20',
36-
npm: {
37-
devDependencies: {
38-
'ember-source': '~3.20.5',
39-
},
40-
},
41-
},
4210
{
4311
name: 'ember-lts-3.24',
4412
npm: {

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@
5050
"ember-cli-inject-live-reload": "^2.1.0",
5151
"ember-cli-sri": "^2.1.1",
5252
"ember-cli-terser": "^4.0.2",
53-
"ember-compatibility-helpers": "^1.2.5",
54-
"ember-decorators-polyfill": "^1.1.5",
5553
"ember-disable-prototype-extensions": "^1.1.3",
5654
"ember-export-application-global": "^2.0.0",
5755
"ember-load-initializers": "^2.1.2",

tests/integration/modifiers/autofocus-test.js

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { render } from '@ember/test-helpers';
22
import { setupRenderingTest } from 'ember-qunit';
33
import { module, test } from 'qunit';
4-
import { gte } from 'ember-compatibility-helpers';
54

65
import Component from '@glimmer/component';
76
import { tracked } from '@glimmer/tracking';
@@ -205,41 +204,39 @@ module('Integration | Modifier | autofocus', function (hooks) {
205204
.isNotFocused('The third non related input are not focused');
206205
});
207206

208-
if (gte('3.16.0')) {
209-
test('should not cause rerender assertions on Glimmer components when a focus modifier is present', async function (assert) {
210-
class FooButtonComponent extends Component {
211-
@tracked bar;
207+
test('should not cause rerender assertions on Glimmer components when a focus modifier is present', async function (assert) {
208+
class FooButtonComponent extends Component {
209+
@tracked bar;
212210

213-
@action
214-
updateBar() {
215-
this.bar = !this.bar;
216-
}
211+
@action
212+
updateBar() {
213+
this.bar = !this.bar;
217214
}
218-
setComponentTemplate(
219-
hbs`
220-
<button
221-
{{on "focus" this.updateBar}}
222-
...attributes
223-
>
224-
Foo: {{this.bar}}
225-
</button>
226-
`,
227-
FooButtonComponent
228-
);
229-
this.owner.register('component:foo-button', FooButtonComponent);
230-
231-
await render(hbs`
232-
<div {{autofocus "input,button"}}>
233-
<span>this is not a focusable element</span>
234-
<FooButton data-test-foo/>
235-
<input data-test-input-1 />
236-
</div>
237-
`);
238-
239-
assert.dom('[data-test-foo]').isFocused('The button element is focused');
240-
assert
241-
.dom('[data-test-input-1]')
242-
.isNotFocused('The first non related input is not focused');
243-
});
244-
}
215+
}
216+
setComponentTemplate(
217+
hbs`
218+
<button
219+
{{on "focus" this.updateBar}}
220+
...attributes
221+
>
222+
Foo: {{this.bar}}
223+
</button>
224+
`,
225+
FooButtonComponent
226+
);
227+
this.owner.register('component:foo-button', FooButtonComponent);
228+
229+
await render(hbs`
230+
<div {{autofocus "input,button"}}>
231+
<span>this is not a focusable element</span>
232+
<FooButton data-test-foo/>
233+
<input data-test-input-1 />
234+
</div>
235+
`);
236+
237+
assert.dom('[data-test-foo]').isFocused('The button element is focused');
238+
assert
239+
.dom('[data-test-input-1]')
240+
.isNotFocused('The first non related input is not focused');
241+
});
245242
});

yarn.lock

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6786,7 +6786,7 @@ ember-cli-babel@^6.0.0-beta.4:
67866786
ember-cli-version-checker "^2.1.2"
67876787
semver "^5.5.0"
67886788

6789-
ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
6789+
ember-cli-babel@^7.0.0, ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
67906790
version "7.26.6"
67916791
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39"
67926792
integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ==
@@ -7109,7 +7109,7 @@ ember-cli@~3.28.4:
71097109
workerpool "^6.1.4"
71107110
yam "^1.0.0"
71117111

7112-
ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.5:
7112+
ember-compatibility-helpers@^1.1.2:
71137113
version "1.2.5"
71147114
resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.5.tgz#b8363b1d5b8725afa9a4fe2b2986ac28626c6f23"
71157115
integrity sha512-7cddkQQp8Rs2Mqrj0xqZ0uO7eC9tBCKyZNcP2iE1RxQqOGPv8fiPkj1TUeidUB/Qe80lstoVXWMEuqqhW7Yy9A==
@@ -7129,15 +7129,6 @@ ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1, ember-co
71297129
fs-extra "^9.1.0"
71307130
semver "^5.4.1"
71317131

7132-
ember-decorators-polyfill@^1.1.5:
7133-
version "1.1.5"
7134-
resolved "https://registry.yarnpkg.com/ember-decorators-polyfill/-/ember-decorators-polyfill-1.1.5.tgz#49203c302ea4486618ba4866923ec657cf2c9f3d"
7135-
integrity sha512-O154i8sLoVjsiKzSqxGRfHGr+N+drT6mRrLDbNgJCnW/V5uLg/ppZFpUsrdxuXnp5Q9us3OfXV1nX2CH+7bUpA==
7136-
dependencies:
7137-
ember-cli-babel "^7.1.2"
7138-
ember-cli-version-checker "^3.1.3"
7139-
ember-compatibility-helpers "^1.2.0"
7140-
71417132
ember-destroyable-polyfill@^2.0.2:
71427133
version "2.0.2"
71437134
resolved "https://registry.yarnpkg.com/ember-destroyable-polyfill/-/ember-destroyable-polyfill-2.0.2.tgz#2cc7532bd3c00e351b4da9b7fc683f4daff79671"

0 commit comments

Comments
 (0)