Skip to content

Upgrade ember-source to master in new blueprint#7976

Merged
kellyselden merged 1 commit intoember-cli:masterfrom
dcyriller:update-mu-ember-source
Aug 21, 2018
Merged

Upgrade ember-source to master in new blueprint#7976
kellyselden merged 1 commit intoember-cli:masterfrom
dcyriller:update-mu-ember-source

Conversation

@dcyriller
Copy link
Copy Markdown
Contributor

@dcyriller dcyriller commented Aug 14, 2018

This fixes a bug some MU experimenters ran into.

How to reproduce
Create a new MU app with latest ember-cli and generate a route / service.

When doing EMBER_CLI_MODULE_UNIFICATION=true ember new my-app, users get a project with an outdated version of ember-source (from March).

Then, EMBER_CLI_MODULE_UNIFICATION=true ember generate route foo do not have the expected behavior, it generates the files inside app directory.

@dcyriller
Copy link
Copy Markdown
Contributor Author

dcyriller commented Aug 14, 2018

If using master branch of ember-source is not an issue, we could do the same for ember-data.

EDIT: switched to canary build (instead of master branch)

@dcyriller dcyriller changed the title Upgrade ember-source to master in new blueprint WIP: Upgrade ember-source to master in new blueprint Aug 14, 2018
@dcyriller dcyriller changed the title WIP: Upgrade ember-source to master in new blueprint Upgrade ember-source to master in new blueprint Aug 14, 2018
@CodingItWrong
Copy link
Copy Markdown
Contributor

@dcyriller I tried making this change locally in a project to see if it helps. It does allow me to generate both routes and services correctly in the src folder. But when I attempt to run ember serve I get this error:

Cannot find module '/Users/josh/apps/temp/my-mu-app/node_modules/ember-source/dist/ember-template-compiler.js'

In fact, I don't see an ember-source/dist folder at all. I don't know much about node modules, but it looks like maybe it is expecting it to be built, but it's not.

@dcyriller
Copy link
Copy Markdown
Contributor Author

@CodingItWrong I updated the PR with ember-source's canary build (instead of master branch). This also fixes the tests. I should have used it in the first place. Could you give it another try?

Especially, bump ember-source canary version
@CodingItWrong
Copy link
Copy Markdown
Contributor

@dcyriller yup, using that updated canary build works for me! i as a non-merge-access person approve this PR 👍 hehe. Much appreciated!!!!

@CodingItWrong
Copy link
Copy Markdown
Contributor

Ping to reviewers—can someone review and merge this PR?

@kellyselden kellyselden merged commit a5ab5cb into ember-cli:master Aug 21, 2018
@kellyselden
Copy link
Copy Markdown
Member

LGTM thanks.

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.

4 participants