Skip to content

fix(ember): Fix backwards compatibility with Embroider changes #3230

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

Merged
merged 3 commits into from
Feb 4, 2021
Merged

fix(ember): Fix backwards compatibility with Embroider changes #3230

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a0824d
fix(ember): Fix backwards compatibility with Embroider changes
k-fish Feb 2, 2021
ef45be9
Merge remote-tracking branch 'origin/master' into fix/ember-embroider…
k-fish Feb 2, 2021
f69389d
Wrap require for config file in try/catch
k-fish Feb 3, 2021
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
15 changes: 15 additions & 0 deletions packages/ember/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,21 @@ module.exports = {
},
},

getAddonConfig(app) {
const config = require(app.options.configPath)(app.env);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it always given that configPath will be at least defined? If not, then we should either wrap it in try/catch or if (!app.options || app.options.configPath)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

config path should be always defined, since it's pulling the conventional config/environment.js which should always exist, but I think we can wrap this in try/catch anyway in case someone has an edge case 👍

return config['@sentry/ember'] || {};
},

included() {
this._super.included.apply(this, arguments);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same question here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This super call should be fine.

const app = this._findHost(this);
if (!('@embroider/core' in app.dependencies())) {
const addonConfig = this.getAddonConfig(app);
const options = Object.assign({}, addonConfig);
this.options['@embroider/macros'].setOwnConfig.sentryConfig = options;
}
},

contentFor(type, config) {
const addonConfig = config['@sentry/ember'] || {};
const app = this._findHost(this);
Expand Down
2 changes: 0 additions & 2 deletions packages/ember/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@
"devDependencies": {
"@ember/optional-features": "^1.3.0",
"@embroider/compat": "^0.35.1",
"@embroider/core": "^0.35.1",
"@embroider/webpack": "^0.35.1",
"@glimmer/component": "^1.0.0",
"@glimmer/tracking": "^1.0.0",
"@sentry-internal/eslint-config-sdk": "6.0.4",
Expand Down