[BUGFIX beta] Make the ember-source build work. #14658
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nathanhammond
force-pushed
the
fix-build
branch
from
6ba9925
to
f3ee405
Compare
nathanhammond
changed the title
nathanhammond
force-pushed
the
fix-build
branch
2 times, most recently
from
bcf86c0
to
148ce7f
Compare
chadhietala
reviewed
Nov 30, 2016
| jqueryPath = path.dirname(resolve.sync('jquery/package.json', { basedir: this.project.root })); | ||
| } catch (error) { | ||
| jqueryPath = path.dirname(require.resolve('jquery/package.json')); | ||
| } |
There was a problem hiding this comment.
Do we want to do a finally here and to make sure we have a jqueryPath and if not throw?
There was a problem hiding this comment.
If we don't have a jqueryPath at this point something else is going to have resulted in this breaking long before we got this far. The one in the catch statement is depended upon by ember-source itself.
nathanhammond
force-pushed
the
fix-build
branch
from
148ce7f
to
1a95068
Compare
nathanhammond
commented
Nov 30, 2016
| @@ -30,7 +30,6 @@ | |||
| "broccoli-funnel": "^1.0.6", | |||
| "broccoli-merge-trees": "^1.1.4", | |||
| "broccoli-rollup": "^1.0.3", | |||
| "broccoli-stew": "^1.2.0", | |||
There was a problem hiding this comment.
This was already in dependencies.
nathanhammond
changed the title
nathanhammond
force-pushed
the
fix-build
branch
from
1a95068
to
682ef2f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The build in 2.11.0-beta.1 is "broken" as
distdoesn't include jQuery. It should do so dynamically so that it gets SemVer drift instead of being hard-set bundled per build.It should also prefer a user-installed version of
jqueryto the version bundled withember-source.This PR:
ember-sourceif not user-specified.I think we broke this here: https://github.com/emberjs/ember.js/pull/14556/files