Skip to content

Commit f919af1

Browse files
committed
Update to ember 3.28 and address deprecations
1 parent de991a9 commit f919af1

File tree

40 files changed

+563
-381
lines changed

40 files changed

+563
-381
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
1617
.eslintcache
1718

1819
# ember-try

.eslintrc.js

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,15 @@ module.exports = {
2424
// node files
2525
{
2626
files: [
27-
'.eslintrc.js',
28-
'.prettierrc.js',
29-
'.template-lintrc.js',
30-
'ember-cli-build.js',
31-
'index.js',
32-
'testem.js',
33-
'blueprints/*/index.js',
34-
'config/**/*.js',
35-
'tests/dummy/config/**/*.js',
36-
],
37-
excludedFiles: [
38-
'addon/**',
39-
'addon-test-support/**',
40-
'app/**',
41-
'tests/dummy/app/**',
27+
'./.eslintrc.js',
28+
'./.prettierrc.js',
29+
'./.template-lintrc.js',
30+
'./ember-cli-build.js',
31+
'./index.js',
32+
'./testem.js',
33+
'./blueprints/*/index.js',
34+
'./config/**/*.js',
35+
'./tests/dummy/config/**/*.js',
4236
],
4337
parserOptions: {
4438
sourceType: 'script',
@@ -50,5 +44,10 @@ module.exports = {
5044
plugins: ['node'],
5145
extends: ['plugin:node/recommended'],
5246
},
47+
{
48+
// Test files:
49+
files: ['tests/**/*-test.{js,ts}'],
50+
extends: ['plugin:qunit/recommended'],
51+
},
5352
],
5453
};

.npmignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
/.eslintrc.js
1616
/.git/
1717
/.gitignore
18+
/.prettierignore
19+
/.prettierrc.js
1820
/.template-lintrc.js
1921
/.travis.yml
2022
/.watchmanconfig
@@ -24,6 +26,7 @@
2426
/ember-cli-build.js
2527
/testem.js
2628
/tests/
29+
/yarn-error.log
2730
/yarn.lock
2831
.gitkeep
2932

.template-lintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'octane',
4+
extends: 'recommended',
55
};

CONTRIBUTING.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88

99
## Linting
1010

11-
* `npm run lint:hbs`
12-
* `npm run lint:js`
13-
* `npm run lint:js -- --fix`
11+
* `yarn lint`
12+
* `yarn lint:fix`
1413

1514
## Running tests
1615

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ This addon's current status is "opensource, but unpolished". It lacks tests, doc
77
Compatibility
88
------------------------------------------------------------------------------
99

10-
* Ember.js v3.16 or above
11-
* Ember CLI v2.13 or above
12-
* Node.js v10 or above
10+
* Ember.js v3.24 or above
11+
* Ember CLI v3.24 or above
12+
* Node.js v12 or above
1313

1414

1515
Installation

addon/components/nav-stack/component.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import { run, scheduleOnce } from '@ember/runloop';
55
import { nextTick } from 'ember-nav-stack/utils/animation';
66
import BackSwipeRecognizer from 'ember-nav-stack/utils/back-swipe-recognizer';
77
import Hammer from 'hammerjs';
8-
// import { argument } from '@ember-decorators/argument';
9-
// import { Action, optional } from '@ember-decorators/argument/types';
108
import { Spring } from 'wobble';
119
import { getOwner } from '@ember/application';
1210
import { DEBUG } from '@glimmer/env';

addon/components/nav-stack/template.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
<div class="NavStack-header">
2323
{{#if this.parentItemHeaderComponent}}
2424
<div class="NavStack-headerContainer NavStack-parentItemHeaderContainer">
25-
{{component this.parentItemHeaderComponent class="NavStack-headerComponent"}}
25+
{{component this.parentItemHeaderComponent class="NavStack-headerComponent" back=@back}}
2626
</div>
2727
{{/if}}
2828
<div class="NavStack-headerContainer NavStack-currentHeaderContainer">
29-
{{component this.headerComponent class="NavStack-headerComponent"}}
29+
{{component this.headerComponent class="NavStack-headerComponent" back=@back}}
3030
</div>
3131
</div>
3232
{{#if this.hasFooter}}
Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/* eslint-disable ember/no-new-mixins */
2-
import Mixin from '@ember/object/mixin';
3-
import { computed } from '@ember/object';
1+
import Route from '@ember/routing/route';
2+
import { action } from '@ember/object';
3+
import { inject as service } from '@ember/service';
44

55
export function getParentRoute(router, route) {
66
// eslint-disable-next-line ember/no-private-routing-service
@@ -17,40 +17,45 @@ export function getParentRoute(router, route) {
1717
}
1818
}
1919

20-
export default Mixin.create({
21-
templateName: 'stackable',
20+
export default class StackableRoute extends Route {
21+
@service router;
22+
templateName = 'stackable';
23+
2224
getRouteComponent(/* model */) {
2325
return `routable-components/${(
2426
this.routableTemplateName || this.routeName
2527
).replace(/\./g, '/')}`;
26-
},
28+
}
29+
2730
getHeaderComponent(model) {
2831
return `${this.getRouteComponent(model)}/header`;
29-
},
30-
layerIndex: computed('_router', 'newLayer', function () {
32+
}
33+
34+
get layerIndex() {
3135
let parentRoute = getParentRoute(this._router, this);
3236
let parentRouteLayerIndex = parentRoute.get('layerIndex');
3337
let currentLayerIndex = parentRouteLayerIndex || 0;
3438
if (this.newLayer === true) {
3539
return currentLayerIndex + 1;
3640
}
3741
return currentLayerIndex;
38-
}),
42+
}
43+
3944
setupController(controller, model) {
40-
this._super(controller, model);
45+
super.setupController(controller, model);
4146
controller.setProperties({
4247
layerIndex: this.layerIndex,
4348
routeComponent: this.getRouteComponent(model),
4449
headerComponent: this.getHeaderComponent(model),
4550
routeName: this.routeName,
4651
});
47-
},
52+
}
53+
4854
getParentRouteName() {
4955
return getParentRoute(this._router, this).routeName;
50-
},
51-
actions: {
52-
back() {
53-
this.transitionTo(this.getParentRouteName());
54-
},
55-
},
56-
});
56+
}
57+
58+
@action back() {
59+
this.router.transitionTo(this.getParentRouteName());
60+
}
61+
}

addon/services/nav-stacks.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { A } from '@ember/array';
22
import Service from '@ember/service';
3-
import { run, next } from '@ember/runloop';
3+
import { next, scheduleOnce } from '@ember/runloop';
44
import EmberObject from '@ember/object';
55
import { Promise as EmberPromise } from 'rsvp';
66
import { buildWaiter } from '@ember/test-waiters';
@@ -65,6 +65,10 @@ export default class NavStacks extends Service {
6565
return this._runningTransitions;
6666
}
6767

68+
isRunningTransitions() {
69+
return this._runningTransitions > 0;
70+
}
71+
6872
waitUntilTransitionIdle() {
6973
if (this._waitingPromise) {
7074
return this._waitingPromise;
@@ -89,7 +93,7 @@ export default class NavStacks extends Service {
8993
}
9094

9195
_schedule() {
92-
run.scheduleOnce('afterRender', this, this._process);
96+
scheduleOnce('afterRender', this, this._process);
9397
}
9498

9599
_process() {
@@ -109,7 +113,7 @@ export default class NavStacks extends Service {
109113
}
110114
set(this, 'stacks', EmberObject.create(newStacks));
111115
if (this.isInitialRender === true) {
112-
run.next(this, this._clearIsInitialRender);
116+
next(this, this._clearIsInitialRender);
113117
}
114118
this._listeners.invoke('stackItemsDidChange');
115119
this.didUpdate();

0 commit comments

Comments
 (0)