Skip to content

Commit 57c3327

Browse files
authored
Merge pull request #756 from emberjs/embroider-test-scenario
Add Embroider test scenario.
2 parents edf62a1 + e664b8f commit 57c3327

File tree

3 files changed

+26
-0
lines changed

3 files changed

+26
-0
lines changed

.github/workflows/ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
- ember-canary
5252
- ember-classic
5353
- ember-default-with-jquery
54+
- ember-default-with-embroider
5455

5556
steps:
5657
- uses: actions/checkout@v2

config/ember-try.js

+10
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,16 @@ module.exports = async function () {
103103
devDependencies: {},
104104
},
105105
},
106+
{
107+
name: 'ember-default-with-embroider',
108+
npm: {
109+
devDependencies: {
110+
'@embroider/core': 'latest',
111+
'@embroider/webpack': 'latest',
112+
'@embroider/compat': 'latest',
113+
},
114+
},
115+
},
106116
],
107117
};
108118
};

ember-cli-build.js

+15
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,21 @@ module.exports = function (defaults) {
1010
},
1111
});
1212

13+
if ('@embroider/webpack' in app.dependencies()) {
14+
const { Webpack } = require('@embroider/webpack'); // eslint-disable-line
15+
return require('@embroider/compat') // eslint-disable-line
16+
.compatBuild(app, Webpack, {
17+
staticAddonTestSupportTrees: true,
18+
staticAddonTrees: true,
19+
20+
// disabled because we need to be able to register custom non-resolved components
21+
// and helpers in tests; see https://github.com/embroider-build/embroider/issues/522
22+
// for more context
23+
staticHelpers: false,
24+
staticComponents: false,
25+
});
26+
}
27+
1328
/*
1429
This build file specifies the options for the dummy test app of this
1530
addon, located in `/tests/dummy`

0 commit comments

Comments
 (0)