chore(build): change contents saved to package.json #4785
Conversation
The same contents saved to bower.json were being saved to package.json, generating an invalid package.json since the main attribute was an array instead of a string. Now this has been changed, and the package.json generated for distribution contains the same contents of the package.json file in the source code. Fixes angular-ui#4743
|
Hi, Do you know when this pull will go in to master branch? |
|
@sbruno the code looks good to me, I have to ask you to squash your commits into one, then I'll merge this. Thanks and sorry if it took so long 😃 ! |
|
@imbalind I have never done that. From what I've read the squash is to group many commits in a single one, but my change is just one commit. The others are just merges to update the branch. What should I do? Should I rebase picking all the commits? |
…eight Change the way pixelsToSeeRow variable is calculated. This way is possible to have different heights for rows and column headers.
in the line edited, the function that's being referred too must call setSavePromise, returning a promise as previously stated does not do anything as the result from events is ignored and not accessible to the caller.
…into fix-package-json
|
@sbruno yeah, I usually rebase following this answer: http://stackoverflow.com/a/5189600/2453383 and then push, as per this answer: http://stackoverflow.com/a/5668050/2453383 |
|
@imbalind sorry, I did something but I see no difference. If this is not ok for merging can you apply the changes to some fork of you? The change is very simple. |
|
@sbruno yeah 😄, I understand how you feel! I had to try several times before getting to know git enough! I had to open a new PR but you will still be the author of the commit 😉 |
|
Replaced by squashed version: #4976. |
The same contents saved to bower.json were being saved to package.json by the lib\grunt\plugins.js file, generating an invalid package.json since the main attribute was an array instead of a string. Now this has been changed, and the package.json generated for distribution contains the same contents of the package.json file in the source code.
Fixes #4743