Skip to content

Commit e81c5a8

Browse files
committed
Support up to Ember 3.17
1 parent 8839838 commit e81c5a8

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

app/services/dependency-resolver.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ const {
1313
deprecate
1414
} = Ember;
1515

16-
const EMBER_VERSIONS = ['3.14.3', '3.13.4', '3.12.2', '3.11.1', '3.10.2', '3.9.1', '3.8.3', '3.7.3', '3.6.1', '3.5.1', '3.4.3', '3.3.2', '3.2.2', '3.1.4', '3.0.0', '2.18.2', '2.17.2', '2.16.2'];
17-
const EMBER_DATA_VERSIONS = ['3.14.1', '3.13.2', '3.12.5', '3.11.5', '3.10.0', '3.9.3', '3.8.1', '3.7.0', '3.6.0', '3.5.2', '3.4.2', '3.3.2', '3.2.2', '3.1.2', '3.0.4', '2.18.5', '2.17.1', '2.16.4'];
16+
const EMBER_VERSIONS = ['3.17.0', '3.16.3', '3.15.0', '3.14.3', '3.13.4', '3.12.2', '3.11.1', '3.10.2', '3.9.1', '3.8.3', '3.7.3', '3.6.1', '3.5.1', '3.4.3', '3.3.2', '3.2.2', '3.1.4', '3.0.0', '2.18.2', '2.17.2', '2.16.2'];
17+
const EMBER_DATA_VERSIONS = ['3.16.2', '3.15.1', '3.14.1', '3.13.2', '3.12.5', '3.11.5', '3.10.0', '3.9.3', '3.8.1', '3.7.0', '3.6.0', '3.5.2', '3.4.2', '3.3.2', '3.2.2', '3.1.2', '3.0.4', '2.18.5', '2.17.1', '2.16.4'];
1818

1919
const VERSION_REGEX = /^\d+.\d+.\d+(-beta\.\d+)?$/;
2020

app/services/twiddle-json.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@ export default Service.extend({
8888
updateDependencyVersion(gist, dependencyName, version) {
8989
return this._updateTwiddleJson(gist, (json) => {
9090

91-
// If Ember Data is brought in as an addon, update addon version,
92-
// else update app version.
91+
// If Ember Data is brought in as an dependency, update dependency version,
92+
// else update addon version.
9393
if (dependencyName === 'ember-data') {
94-
if (json.addons && json.addons[dependencyName]) {
95-
json.addons[dependencyName] = version;
96-
} else {
94+
if (json.dependencies[dependencyName]) {
9795
json.dependencies[dependencyName] = version;
96+
} else {
97+
json.addons[dependencyName] = version;
9898
}
9999
return json;
100100
}

blueprints/twiddle.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
},
1313
"dependencies": {
1414
"jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js",
15-
"ember": "3.14.3",
16-
"ember-template-compiler": "3.14.3",
17-
"ember-testing": "3.14.3"
15+
"ember": "3.17.0",
16+
"ember-template-compiler": "3.17.0",
17+
"ember-testing": "3.17.0"
1818
},
1919
"addons": {
20-
"ember-data": "3.14.1"
20+
"@glimmer/component": "1.0.0"
2121
}
2222
}

0 commit comments

Comments
 (0)