Skip to content

Don't run addon-import blueprint if project.isModuleUnification()#7702

Merged
mixonic merged 1 commit intoember-cli:masterfrom
GavinJoyce:gj/mu-addon-import
Apr 1, 2018
Merged

Don't run addon-import blueprint if project.isModuleUnification()#7702
mixonic merged 1 commit intoember-cli:masterfrom
GavinJoyce:gj/mu-addon-import

Conversation

@GavinJoyce
Copy link
Copy Markdown
Contributor

@GavinJoyce GavinJoyce commented Mar 26, 2018

Required for emberjs/ember.js#16397 (comment). Module unification addons don't have an /app path. This PR prevents the default addon-import blueprint from running when project.isModuleUnification() === true.

TODO:

  • tests (hopefully there are existing tests somewhere)
  • refactor (as the line we're modifying is already too complex)

CI failures look unrelated: #7716

@GavinJoyce GavinJoyce changed the title [WIP] Don't create addon export if project.isModuleUnification() [WIP] Don't run addon-import blueprint if project.isModuleUnification() Mar 26, 2018
@GavinJoyce GavinJoyce force-pushed the gj/mu-addon-import branch 2 times, most recently from eb32963 to 5c54d87 Compare March 30, 2018 10:39
@GavinJoyce GavinJoyce changed the title [WIP] Don't run addon-import blueprint if project.isModuleUnification() Don't run addon-import blueprint if project.isModuleUnification() Mar 30, 2018
@GavinJoyce GavinJoyce changed the title Don't run addon-import blueprint if project.isModuleUnification() [TODO] Don't run addon-import blueprint if project.isModuleUnification() Mar 30, 2018
@GavinJoyce GavinJoyce changed the title [TODO] Don't run addon-import blueprint if project.isModuleUnification() Don't run addon-import blueprint if project.isModuleUnification() Mar 31, 2018
@GavinJoyce
Copy link
Copy Markdown
Contributor Author

This is ready for review

@mixonic
Copy link
Copy Markdown
Member

mixonic commented Mar 31, 2018

@GavinJoyce I kicked a build here but I'm not sure why it is failing. Doesn't seem related.

Your change here makes sense to me, and I chatted it over with @Turbo87 as well.

@GavinJoyce GavinJoyce force-pushed the gj/mu-addon-import branch from 65cdf47 to 7b6be06 Compare April 1, 2018 10:41
@GavinJoyce
Copy link
Copy Markdown
Contributor Author

now 🍏 after a rebase

@mixonic mixonic merged commit 3292f7d into ember-cli:master Apr 1, 2018
@GavinJoyce GavinJoyce deleted the gj/mu-addon-import branch April 1, 2018 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants