Skip to content

Commit de3f855

Browse files
authored
Merge pull request #458 from ember-learn/fix-ci
add @ember/string to ember-try beta and canary
2 parents f6969dc + a35f13c commit de3f855

File tree

4 files changed

+15
-29
lines changed

4 files changed

+15
-29
lines changed

config/ember-try.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ module.exports = async function () {
5454
npm: {
5555
devDependencies: {
5656
'ember-source': await getChannelURL('beta'),
57+
'@ember/string': '*',
5758
},
5859
overrides: {
5960
'ember-source': '$ember-source',
@@ -65,6 +66,7 @@ module.exports = async function () {
6566
npm: {
6667
devDependencies: {
6768
'ember-source': await getChannelURL('canary'),
69+
'@ember/string': '*',
6870
},
6971
overrides: {
7072
'ember-source': '$ember-source',
@@ -118,6 +120,7 @@ module.exports = async function () {
118120
devDependencies: {
119121
'ember-source': await getChannelURL('release'),
120122
'ember-deprecation-error': '*',
123+
'@ember/string': '*',
121124
},
122125
overrides: {
123126
'ember-source': '$ember-source',

package-lock.json

Lines changed: 10 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,11 @@
7676
"ember-cli-terser": "^4.0.2",
7777
"ember-decorators-polyfill": "^1.1.5",
7878
"ember-disable-prototype-extensions": "^1.1.3",
79-
"ember-export-application-global": "^2.0.1",
8079
"ember-fetch": "^8.1.1",
8180
"ember-load-initializers": "^2.1.2",
8281
"ember-maybe-import-regenerator": "^0.1.6",
8382
"ember-native-dom-helpers": "^0.6.2",
84-
"ember-page-title": "^6.2.2",
83+
"ember-page-title": "^7.0.0",
8584
"ember-qunit": "^5.1.5",
8685
"ember-resolver": "^8.0.3",
8786
"ember-scroll": "^1.0.3",

tests/dummy/config/environment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = function (environment) {
66
modulePrefix: 'dummy',
77
environment,
88
rootURL: '/',
9-
locationType: 'auto',
9+
locationType: 'history',
1010

1111
EmberENV: {
1212
FEATURES: {

0 commit comments

Comments
 (0)