Plugin Generator release v1.4.3

package.json

@@ -24,6 +24,7 @@
     "releaseCli": "node packages/tools/release-cli.js",
     "releaseClipper": "node packages/tools/release-clipper.js",
     "releaseDesktop": "node packages/tools/release-electron.js",
+    "releasePluginGenerator": "node packages/tools/release-plugin-generator.js",
     "setupNewRelease": "node ./packages/tools/setupNewRelease",
     "updatePluginTypes": "./packages/generator-joplin/updateTypes.sh",
     "tsc": "lerna run tsc --stream --parallel",

packages/generator-joplin/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-joplin",
-  "version": "1.4.0",
+  "version": "1.4.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

packages/generator-joplin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-joplin",
-  "version": "1.4.0",
+  "version": "1.4.3",
   "description": "Scaffolds out a new Joplin plugin",
   "homepage": "https://joplinapp.org",
   "author": {

packages/generator-joplin/publish.sh

@@ -3,3 +3,4 @@ set -e
 git pull
 npm version patch
 npm publish
+

packages/tools/release-electron.js

@@ -15,7 +15,7 @@ async function main() {
 	console.info(`New version number: ${version}`);
 
 	console.info(await execCommand('git add -A'));
-	console.info(await execCommand(`git commit -m "Electron release ${version}"`));
+	console.info(await execCommand(`git commit -m "Desktop release ${version}"`));
 	console.info(await execCommand(`git tag ${tagName}`));
 	console.info(await execCommand('git push && git push --tags'));
 

packages/tools/release-plugin-generator.js

@@ -0,0 +1,30 @@
+const { execCommand, execCommandVerbose, rootDir, gitPullTry } = require('./tool-utils.js');
+
+const genDir = `${rootDir}/packages/generator-joplin`;
+
+async function main() {
+	process.chdir(genDir);
+
+	console.info(`Running from: ${process.cwd()}`);
+
+	await gitPullTry();
+
+	const version = (await execCommand('npm version patch')).trim();
+	const tagName = `plugin-generator-${version}`;
+
+	console.info(`New version number: ${version}`);
+
+	console.info(await execCommandVerbose('npm', ['publish']));
+	await gitPullTry();
+	console.info(await execCommandVerbose('git', ['add', '-A']));
+	console.info(await execCommandVerbose('git', ['commit', '-m', `Plugin Generator release ${version}`]));
+	console.info(await execCommandVerbose('git', ['tag', tagName]));
+	console.info(await execCommandVerbose('git', ['push']));
+	console.info(await execCommandVerbose('git', ['push', '--tags']));
+}
+
+main().catch((error) => {
+	console.error('Fatal error');
+	console.error(error);
+	process.exit(1);
+});

packages/tools/tool-utils.js

@@ -203,6 +203,18 @@ async function saveGitHubUsernameCache(cache) {
 	await fs.writeFile(path, JSON.stringify(cache));
 }
 
+toolUtils.gitPullTry = async function() {
+	try {
+		await toolUtils.execCommand('git pull');
+	} catch (error) {
+		if (error.message.includes('no tracking information for the current branch')) {
+			console.info('Skipping git pull because no tracking information on current branch');
+		} else {
+			throw error;
+		}
+	}
+};
+
 toolUtils.githubUsername = async function(email, name) {
 	const cache = await loadGitHubUsernameCache();
 	const cacheKey = `${email}:${name}`;