automattic / newspack-scripts Goto Github PK

Due to issue with dependency resolving, you might end up a different version of prettier in project's node_modules and node_modules/newspack-scripts/node_modules.
To fix this and make newspack-scripts use to "root" version of prettier, remove the offending prettier version in a postinstall hook script:

"postinstall": "rm -rf node_modules/newspack-scripts/node_modules/prettier"

This might be caused by version resolving being thrown off by aliasing prettier to wp-prettier as npm:[email protected].

Technically it seems like the overrides option should take care of that, but I did not have any luck with using it.

The post-release script tries to determine if the release if a hotfix, or a regular release.

• in case of a hotfix release, alpha branch will be updated with the latest (hotfix) release, so that it contains both what was on alpha and the hotfix
• in case of a regular release (alpha -> release), the alpha branch will be reset on top of release, to provide a clean slate for next alpha release

The detection does not seem to work, though - see this post-release run.

Also, perhaps related: the post-release master sync (so that the master branch has the latest version numbers in package.json and other files) resulted in alpha version being merged – Automattic/newspack-plugin@4a9c3fc

The post-fix merge is too aggressive. The assumption behind it is that the changes on master are already on release, and so a --strategy-option=theirs (a "force our changes" merge) is ok.

However, if the changes on release are from a hotfix, that is directly commited (not from master, via alpha, as is the usual way), the delta will be different – and if a file was both

• edited in the hotfix
• edited on master after last release

then the post-release merge will overwrite the changes from master. Example.

Proposed solution

The post-release script should

1. checkout master
2. pick the auto-updated files (package.json etc) from release
3. do a regular merge
4. if there's a conflict, abort merge and notify the team