Skip to content

Commit 3503e80

Browse files
authored
Merge pull request #323 from typed-ember/addon-ordering
fix: ember-cli-typescript-blueprints no longer claims highest priority
2 parents c0bc3d7 + 0dbf854 commit 3503e80

File tree

3 files changed

+218
-89
lines changed

3 files changed

+218
-89
lines changed

package.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,13 @@
106106
"ember-addon": {
107107
"configPath": "tests/dummy/config",
108108
"before": [
109-
"ember-cli-babel"
109+
"ember-cli-babel",
110+
"ember-qunit-decorators"
111+
],
112+
"after": [
113+
"ember-source",
114+
"ember-data",
115+
"ember-decorators"
110116
]
111117
},
112118
"prettier": {

ts/addon.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ module.exports = {
2828
// This won't be necessary in 2.x if we shift to adding the blueprints addon as a host
2929
// dependency on install.
3030
if (this.project.addons.includes(this)) {
31-
this.project.addons.push(this.addons.find(addon => addon.name === 'ember-cli-typescript-blueprints'));
31+
this.project.addons.splice(
32+
this.project.addons.map(a => a.name).indexOf('ember-cli-typescript') + 1,
33+
0,
34+
this.addons.find(addon => addon.name === 'ember-cli-typescript-blueprints'));
3235
}
3336

3437
if (this.project.isEmberCLIAddon()) {

0 commit comments

Comments
 (0)