Skip to content

Commit b507ca3

Browse files
committed
Make edition=octane in ember-cli-fastboot for Ember v4 compatibility
1 parent 193e13d commit b507ca3

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

packages/ember-cli-fastboot/config/ember-try.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ module.exports = async function () {
8686
}),
8787
},
8888
npm: {
89+
devDependencies: {
90+
'ember-source': '~3.28.0',
91+
},
8992
ember: {
9093
edition: 'classic',
9194
},

packages/ember-cli-fastboot/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
"registry": "https://registry.npmjs.org/"
108108
},
109109
"ember": {
110-
"edition": "classic"
110+
"edition": "octane"
111111
},
112112
"ember-addon": {
113113
"configPath": "tests/dummy/config",

packages/ember-cli-fastboot/tests/dummy/config/optional-features.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"application-template-wrapper": true,
2+
"application-template-wrapper": false,
33
"default-async-observers": true,
44
"jquery-integration": false,
55
"template-only-glimmer-components": true

packages/ember-cli-fastboot/tests/integration/instance-initializers/clear-double-boot-test.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ module('Instance-initializer: clear-double-boot', function(hooks) {
2121

2222
test('It can handle bad markup', async function(assert) {
2323
this.set('BAD_HTML', `
24-
<script type="x/boundary" id="fastboot-body-start"></script>
25-
<div id="content-in-between">
26-
<em><em>
24+
<div class="wrapper">
25+
<script type="x/boundary" id="fastboot-body-start"></script>
26+
<div id="content-in-between">
27+
<em><em>
28+
</div>
29+
<script type="x/boundary" id="fastboot-body-end"></script>
2730
</div>
28-
<script type="x/boundary" id="fastboot-body-end"></script>
2931
`);
3032

3133
// render the whole tree dynamically to more closely mimc bad markup cases

0 commit comments

Comments
 (0)