Skip to content

Commit

Permalink
Support Embroider (#540)
Browse files Browse the repository at this point in the history
* Support Embroider

* eump e-d

* some updates

* add to try scenario

* update to newer syntax
  • Loading branch information
snewcomer authored Apr 19, 2021
1 parent 1fe459d commit 81e66c5
Show file tree
Hide file tree
Showing 5 changed files with 2,038 additions and 1,971 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ jobs:
ember-lts-3.16,
ember-lts-3.20,
ember-beta,
ember-canary
ember-canary,
embroider-safe,
embroider-optimized,
]
steps:
- uses: actions/checkout@v2
Expand Down
3 changes: 3 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';

const getChannelURL = require('ember-source-channel-url');
const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');

module.exports = async function () {
return {
Expand Down Expand Up @@ -86,6 +87,8 @@ module.exports = async function () {
},
},
},
embroiderSafe(),
embroiderOptimized(),
],
};
};
5 changes: 3 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';

const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
const { maybeEmbroider } = require('@embroider/test-setup');

module.exports = function (defaults) {
let app = new EmberAddon(defaults, {
Expand All @@ -12,7 +13,7 @@ module.exports = function (defaults) {
addon, located in `/tests/dummy`
This build file does *not* influence how the addon or the app using it
behave. You most likely want to be modifying `./index.js` or app's build file
*/
*/

return app.toTree();
return maybeEmbroider(app);
};
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
},
"devDependencies": {
"@ember/optional-features": "^1.0.0",
"@embroider/test-setup": "^0.39.1",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.22.0",
Expand Down Expand Up @@ -78,5 +79,8 @@
},
"ember-addon": {
"configPath": "tests/dummy/config"
},
"volta": {
"node": "10.22.0"
}
}
Loading

0 comments on commit 81e66c5

Please sign in to comment.