Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test ember-cli-head against embroider build #86

Merged
merged 3 commits into from
Sep 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
- lts-3.8
- lts-3.4
- lts-2.18
- embroider
steps:
- name: Checkout
uses: actions/checkout@v1
Expand Down
10 changes: 10 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,16 @@ module.exports = async function() {
edition: 'classic'
}
}
},
{
name: 'ember-embroider',
npm: {
devDependencies: {
'@embroider/core': '*',
'@embroider/webpack': '*',
'@embroider/compat': '*',
},
},
}
]
};
Expand Down
11 changes: 11 additions & 0 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,16 @@ module.exports = function(defaults) {
behave. You most likely want to be modifying `./index.js` or app's build file
*/

if ('@embroider/webpack' in app.dependencies()) {
const { Webpack } = require('@embroider/webpack'); // eslint-disable-line
return require('@embroider/compat') // eslint-disable-line
.compatBuild(app, Webpack, {
staticAddonTestSupportTrees: true,
staticAddonTrees: true,
staticHelpers: true,
staticComponents: true,
});
}

return app.toTree();
};
3 changes: 2 additions & 1 deletion fastboot-tests/fastboot-1.0-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ const setupTest = require('ember-fastboot-addon-tests').setupTest;

describe('FastBoot 2.0', function() {
setupTest('fastboot', {
emberCliFastbootVersion: '2.0.0'
emberCliFastbootVersion: '2.0.0',
emberVersion: 'latest'
});

it('index page', function() {
Expand Down
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@
"publishConfig": {
"registry": "https://registry.npmjs.org"
},
"resolutions": {
"fastboot": "3.1.0"
},
"ember": {
"edition": "octane"
},
Expand Down
Loading