feat(prerelease): added logic to bump local dependencies on prereleases (#49)

Author: davikawasaki

lib/createInlinePluginCreator.js

@@ -86,6 +86,7 @@ function createInlinePluginCreator(packages, multiContext, synchronizer, flags)
 		 */
 		const analyzeCommits = async (pluginOptions, context) => {
 			const firstParentBranch = flags.firstParent ? context.branch.name : undefined;
+			pkg._preRelease = context.branch.prerelease || null;
 
 			// Filter commits by directory.
 			commits = await getCommitsFiltered(cwd, dir, context.lastRelease.gitHead, firstParentBranch);

lib/updateDeps.js

@@ -17,6 +17,19 @@ const getNextVersion = (pkg) => {
 		: lastVersion || "1.0.0";
 };
 
+/**
+ * Resolve next package version on prereleases.
+ *
+ * @param {Package} pkg Package object.
+ * @returns {string|undefined} Next pkg version.
+ * @internal
+ */
+const getNextPreVersion = (pkg) => {
+	const lastVersion = pkg._lastRelease && pkg._lastRelease.version;
+
+	return lastVersion ? semver.inc(lastVersion, "prerelease", pkg._preRelease) : `1.0.0-${pkg._preRelease}.1`;
+};
+
 /**
  * Resolve package release type taking into account the cascading dependency update.
  *
@@ -90,7 +103,12 @@ const getDependentRelease = (pkg, bumpStrategy, releaseStrategy, ignore) => {
 			// 1. Any local dep package itself has changed
 			// 2. Any local dep package has local deps that have changed.
 			const nextType = resolveReleaseType(p, bumpStrategy, releaseStrategy,[...ignore, ...localDeps]);
-			const nextVersion = getNextVersion(p);
+			
+			// Set the nextVersion fallback to the last local dependency package last version
+			let nextVersion = p._lastRelease && p._lastRelease.version;
+
+			// Update the nextVersion only if there is a next type to be bumped
+			if (nextType) nextVersion = p._preRelease ? getNextPreVersion(p) : getNextVersion(p);
 			const lastVersion = pkg._lastRelease && pkg._lastRelease.version;
 
 			// 3. And this change should correspond to manifest updating rule.
@@ -169,6 +187,7 @@ const updateManifestDeps = (pkg) => {
 
 module.exports = {
 	getNextVersion,
+	getNextPreVersion,
 	updateManifestDeps,
 	resolveReleaseType,
 	resolveNextVersion,

test/fixtures/yarnWorkspaces2Packages/package.json

@@ -0,0 +1,20 @@
+{
+	"name": "msr-test-yarn",
+	"author": "Dave Houlbrooke <[email protected]",
+	"version": "0.0.0-semantically-released",
+	"private": true,
+	"license": "0BSD",
+	"engines": {
+		"node": ">=8.3"
+	},
+	"workspaces": [
+		"packages/*"
+	],
+	"release": {
+		"plugins": [
+			"@semantic-release/commit-analyzer",
+			"@semantic-release/release-notes-generator"
+		],
+		"noCi": true
+	}
+}

test/fixtures/yarnWorkspaces2Packages/packages/c/.releaserc.json

@@ -0,0 +1,3 @@
+{
+	"tagFormat": "multi-semantic-release-test-c@v${version}"
+}

test/fixtures/yarnWorkspaces2Packages/packages/c/package.json

@@ -0,0 +1,7 @@
+{
+	"name": "msr-test-c",
+	"version": "0.0.0",
+	"dependencies": {
+		"msr-test-d": "*"
+	}
+}

test/fixtures/yarnWorkspaces2Packages/packages/d/package.json

@@ -0,0 +1,4 @@
+{
+	"name": "msr-test-d",
+	"version": "0.0.0"
+}

test/helpers/file.js

@@ -1,5 +1,5 @@
 const { basename, join } = require("path");
-const { copyFileSync, existsSync, mkdirSync, lstatSync, readdirSync, readFileSync } = require("fs");
+const { copyFileSync, existsSync, mkdirSync, lstatSync, readdirSync, readFileSync, writeFileSync } = require("fs");
 
 // Deep copy a directory.
 function copyDirectory(source, target) {
@@ -37,8 +37,16 @@ function isDirectory(path) {
 	return typeof path === "string" && existsSync(path) && lstatSync(path).isDirectory();
 }
 
+// Creates testing files on all specified folders.
+function createNewTestingFiles(folders, cwd) {
+	folders.forEach((fld) => {
+		writeFileSync(`${cwd}/${fld}test.txt`, fld);
+	});
+}
+
 // Exports.
 module.exports = {
 	copyDirectory,
 	isDirectory,
+	createNewTestingFiles,
 };

test/helpers/git.js

@@ -65,9 +65,10 @@ function gitInitRemote() {
  * _Created in a temp folder._
  *
  * @param {string} cwd The cwd to create and set the origin for.
+ * @param {string} releaseBranch="null" Optional branch to be added in case of prerelease is activated for a branch.
  * @return {Promise<string>} Promise that resolves to string URL of the of the remote origin.
  */
-function gitInitOrigin(cwd) {
+function gitInitOrigin(cwd, releaseBranch = null) {
 	// Check params.
 	check(cwd, "cwd: absolute");
 
@@ -76,6 +77,13 @@ function gitInitOrigin(cwd) {
 
 	// Set origin on local repo.
 	execa.sync("git", ["remote", "add", "origin", url], { cwd });
+
+	// Set up a release branch. Return to master afterwards.
+	if (releaseBranch) {
+		execa.sync("git", ["checkout", "-b", releaseBranch], { cwd });
+		execa.sync("git", ["checkout", "master"], { cwd });
+	}
+
 	execa.sync("git", ["push", "--all", "origin"], { cwd });
 
 	// Return URL for remote.