Skip to content

Embroider Compat (WIP) #832

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.

Sign up for GitHub

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

Draft
jeffjewiss wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Embroider Compat (WIP) #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion config/ember-try.js
View file
Open in desktop
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 @@ -47,7 +48,9 @@ module.exports = async function () {
'@ember/jquery': '^0.5.1'
}
}
}
},
embroiderSafe(),
embroiderOptimized()
]
}
}
3 changes: 2 additions & 1 deletion ember-cli-build.js
View file
Open in desktop
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) {
const app = new EmberAddon(defaults, {
Expand Down Expand Up @@ -52,5 +53,5 @@ module.exports = function (defaults) {
behave. You most likely want to be modifying `./index.js` or app's build file
*/

return app.toTree()
return maybeEmbroider(app)
}
24 changes: 24 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 12 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@
"doc": "doc",
"test": "tests"
},
"files": ["blueprints", "config/environment.js", "index.js"],
"files": [
"blueprints",
"config/environment.js",
"index.js"
],
"scripts": {
"build": "ember build",
"deploy": "ember deploy production",
Expand All @@ -51,6 +55,7 @@
"@babel/preset-env": "^7.16.0",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/test-setup": "0.50.1",
"@glimmer/component": "^1.0.0",
"@glimmer/tracking": "^1.0.0",
"broccoli-asset-rev": "^3.0.0",
Expand Down Expand Up @@ -104,10 +109,14 @@
"ember-addon": {
"configPath": "tests/dummy/config",
"demoURL": "https://jeffjewiss.github.io/ember-cli-postcss",
"before": ["broccoli-asset-rev"]
"before": [
"broccoli-asset-rev"
]
},
"standard": {
"ignore": ["testem.js"]
"ignore": [
"testem.js"
]
},
"volta": {
"node": "14.18.2"
Expand Down