Apply missing changes for 4.13.4#2880
Conversation
add Gitter link to Readme.md
|
LGTM |
|
@tunniclm can you split these changes out into separate commits to be consistent with these sorts of changes in the past? |
|
@ritch Sure :) |
NOTE: Version 4.14.4 was originally released to NPM based on the expressjs/express repository (a, now deleted, github fork of this repository which appears to have been based on commit 4fb3653). The following commits (ancestors to this one) recreate the changes to History.md and package.json: f9b4654 Order lists alphabetically 99573b7 build: mocha@2.3.4 04ba299 build: express-session@~1.13.0 65be7f3 build: cookie-parser@~1.4.1 25e11db build: body-parser@~1.14.2 65d00eb build: istanbul@0.4.2 0ab5984 deps: serve-static@~1.10.2 69b0ff5 deps: send@0.13.1 6255bec deps: range-parser@~1.0.3 66140b4 deps: proxy-addr@~1.0.10 31e73fc deps: parseurl@~1.3.1 40744ef deps: methods@~1.1.2 4e333fb deps: merge-descriptors@1.0.1 914fb8f deps: finalhandler@0.4.1 1827559 deps: escape-html@~1.0.3 fcefa48 deps: depd@~1.1.0 47dd5d6 deps: content-disposition@0.5.1 There were also changes to Readme.md, but these have not been included in this series of commits as they change a number of links to point to the now deleted repository (see expressjs#2861 and expressjs#2862). This series of commits should move the repository forward to a point where we can be happy most of the changes from 4.13.4 are included which is a prerequisite to releasing the next release. I hope this helps with any potential future confusion regarding the differences between the npm package for 4.13.4 and what is in this repository (for example, the differences to Readme.md, the missing/different commit hashes, etc).
tunniclm
force-pushed
the
apply-missing-4.13.4
branch
from
8fe9c1e to
dbdca77
Compare
|
@ritch updated |
|
Note, commit dbdca77 includes a detailed message regarding the commit series. |
|
Perhaps the last commit should not update the version in the package.json, since its not derived from the actual 4.13.4 commit. and doesn't have the same SHA or the same exact contents as the 4.13.4 published version. If @dougwilson still has the commit he published from on one of his machines, he can push that to this repo, or a fork of this repo, and it can be tagged, and then all npmjs publishes will have a matching commit and tag, and history will be consistent. Either way, perhaps the last commit should be changed to 'Update version to 4.13.5', and it could get immediately tagged and published. Then the latest published package, |
|
History.md should probably be updated as well |
|
@sam-github , @jordonias : Agreed. The 2 potential ways to go then would be: (a) get @dougwilson 's original commits, if he still has them (I prefer this, for the historical consistency and being able to use a correct tag that matches the npm release), or (b) don't have release 4.14.4 in this repo at all (no tag, no exact commit for that version) and make a new release 4.13.5 based on commits like those currently in this pr that merge the relevant updates in. (And so we'd have a History.md without 4.14.4, or maybe a note about why it is skipped in this repo). I hope that summarises things accurately -- comments welcome! |
|
If we don't get a commit from @dougwilson, would this pr be okay to merge? Is there anything else that is missing, or just the version change in the package.json and History.md? |
|
@dougwilson : Are you able to provide the original 4.13.4 release commit? If not, I propose we merge (with the version update) this and make a new release 4.13.5 on Thursday. |
@tunniclm I wouldn't count on it. |
|
I uploaded them to the repository in #2862 two weeks ago. |
|
Commits has been pushed up from @ljharb's fork. |
|
Thank you! |
|
@dougwilson I didn't realise you had pushed the commit somewhere or when. There was a mention of doing it in the other issue, but I didn't spot a comment saying it was done, or a link to where it was pushed. Anyway, it's all good now! Thanks |
|
Hi @tunniclm, sorry there was no link. I think it was mentioned they were there in #2862 (comment) and sorry again for no link, I guess there was an assumption of where a forked repo would end up being (and the pushes were in my public GitHub activity feed). |
8 participants
package.json:
History.md:
Related to: #2861
Related to: #2862
I'm hoping this PR will be helpful to including the deps updates from the NPM release 4.13.4 into the main line. Let me know any comments so I can fix it as necessary.