CLI v1.4.9

package.json

@@ -23,6 +23,7 @@
     "linkChecker": "linkchecker https://joplinapp.org",
     "releaseDesktop": "node packages/tools/release-electron.js",
     "releaseAndroid": "node packages/tools/release-android.js",
+    "releaseCli": "node packages/tools/release-cli.js",
     "publishAll": "git pull && lerna version --no-git-tag-version && gulp completePublishAll"
   },
   "husky": {

packages/app-cli/gulpfile.js

@@ -10,15 +10,23 @@ const tasks = {
 	// updateIgnoredTypeScriptBuild: require('../Tools/gulp/tasks/updateIgnoredTypeScriptBuild'),
 };
 
+async function makePackagePublic(filePath) {
+	const text = await fs.readFile(filePath, 'utf8');
+	const obj = JSON.parse(text);
+	delete obj.private;
+	await fs.writeFile(filePath, JSON.stringify(obj), 'utf8');
+}
+
 tasks.prepareBuild = {
 	fn: async () => {
 		const buildDir = `${__dirname}/build`;
 		await utils.copyDir(`${__dirname}/app`, buildDir, {
 			excluded: ['node_modules'],
 		});
-		// await utils.copyDir(`${__dirname}/locales-build`, `${buildDir}/locales`);
+
-		// await tasks.copyLib.fn();
 		await utils.copyFile(`${__dirname}/package.json`, `${buildDir}/package.json`);
+		await makePackagePublic(`${buildDir}/package.json`);
+
 		await utils.copyFile(`${__dirname}/package-lock.json`, `${buildDir}/package-lock.json`);
 		await utils.copyFile(`${__dirname}/gulpfile.js`, `${buildDir}/gulpfile.js`);
 

packages/app-cli/package-lock.json

@@ -1,6 +1,6 @@
 {
-  "name": "@joplinapp/app-cli",
+  "name": "joplin",
-  "version": "1.4.0",
+  "version": "1.4.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

packages/app-cli/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@joplinapp/app-cli",
+  "name": "joplin",
   "description": "Joplin CLI Client",
   "license": "MIT",
   "author": "Laurent Cozic",
@@ -7,7 +7,6 @@
   "scripts": {
     "test": "node node_modules/jasmine/bin/jasmine.js --fail-fast=true --config=tests/support/jasmine.json",
     "test-ci": "node node_modules/jasmine/bin/jasmine.js --config=tests/support/jasmine.json",
-    "postinstall": "npm run build",
     "build": "gulp build",
     "start": "gulp build -L && node \"build/main.js\" --stack-trace-enabled --log-level debug --env dev",
     "tsc": "node node_modules/typescript/bin/tsc --project tsconfig.json",
@@ -31,7 +30,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.4.0",
+  "version": "1.4.9",
   "bin": {
     "joplin": "./main.js"
   },

packages/tools/git-changelog.js

@@ -23,6 +23,8 @@ async function gitLog(sinceTag) {
 
 	const output = [];
 	for (const line of lines) {
+		if (!line.trim()) continue;
+
 		const splitted = line.split('::::DIV::::');
 		const commit = splitted[0];
 		const authorEmail = splitted[1];
@@ -45,7 +47,7 @@ async function gitLog(sinceTag) {
 
 async function gitTags() {
 	const lines = await execCommand('git tag --sort=committerdate');
-	return lines.split('\n').map(l => l.trim());
+	return lines.split('\n').map(l => l.trim()).filter(l => !!l);
 }
 
 function platformFromTag(tagName) {
@@ -54,7 +56,8 @@ function platformFromTag(tagName) {
 	if (tagName.indexOf('ios') >= 0) return 'ios';
 	if (tagName.indexOf('clipper') === 0) return 'clipper';
 	if (tagName.indexOf('cli') === 0) return 'cli';
-	throw new Error(`Could not determine platform from tag: ${tagName}`);
+	if (tagName.indexOf('plugin-generator') === 0) return 'plugin-generator';
+	throw new Error(`Could not determine platform from tag: "${tagName}"`);
 }
 
 // function tagPrefixFromPlatform(platform) {

packages/tools/release-cli.js

@@ -1,9 +1,7 @@
-const { execCommand } = require('./tool-utils.js');
+const { execCommand, rootDir } = require('./tool-utils.js');
-const path = require('path');
 const fs = require('fs-extra');
 const moment = require('moment');
 
-const rootDir = path.dirname(__dirname);
 const appDir = `${rootDir}/packages/app-cli`;
 const changelogPath = `${rootDir}/readme/changelog_cli.md`;
 
@@ -52,27 +50,26 @@ async function insertChangelog(tag, changelog) {
 async function main() {
 	process.chdir(appDir);
 
-	const newVersion = await execCommand('npm version patch');
+	const newVersion = (await execCommand('npm version patch')).trim();
 	console.info(`Building ${newVersion}...`);
 	const newTag = `cli-${newVersion}`;
 
 	await execCommand('git pull');
 	await execCommand('touch app/main.js');
 	await execCommand('npm run build');
-	// await execCommand('cp package.json build/');
+	await execCommand('cp ../../README.md build/');
-	await execCommand('cp ../README.md build/');
 
 	process.chdir(`${appDir}/build`);
 
 	await execCommand('npm publish');
 
-	const changelog = await execCommand(`node ${rootDir}/packages/tools/git-changelog ${newTag}`);
+	const changelog = (await execCommand(`node ${rootDir}/packages/tools/git-changelog ${newTag}`)).trim();
 
 	const newChangelog = await insertChangelog(newTag, changelog);
 
 	await fs.writeFile(changelogPath, newChangelog);
 
-	const defaultEditor = await execCommand('echo $EDITOR');
+	const defaultEditor = (await execCommand('echo $EDITOR')).trim();
 
 	const finalCmds = [
 		'git pull',

readme/changelog_cli.md

@@ -1,5 +1,22 @@
 # Joplin terminal app changelog
 
+## [cli-v1.4.9](https://github.com/laurent22/joplin/releases/tag/cli-v1.4.9) - 2020-11-26T15:00:37Z
+
+- Improved: Allow exporting conflict notes (#4095)
+- Improved: Allow lowercase filters when doing search
+- Improved: Refresh sidebar and notes when moving note outside of conflict folder
+- Fixed: Fix handling of new line escaping when using external edit
+- Fixed: Fixed importing certain ENEX files that contain invalid dates
+
+## [cli-v1.4.3](https://github.com/laurent22/joplin/releases/tag/cli-v1.4.3) - 2020-11-06T21:19:29Z
+
+IMPORTANT: If you use the web API, please note that there are a few breaking changes in this release. See here for more information: https://github.com/laurent22/joplin/pull/3983#issue-509624899
+
+- New: API: Adds ability to paginate data (#3983)
+- Fixed: Display proper error message when decryption worker cannot be started (#4000)
+- Fixed: Fixed OneDrive authentication
+- Fixed: Fixed sync issue when importing ENEX files that contain new line characters in the source URL attribute (#3955)
+
 ## [cli-v1.3.3](https://github.com/laurent22/joplin/releases/tag/cli-v1.3.3) - 2020-10-23T16:00:38Z
 
 - Improved: Added support for a custom S3 URL (#3921) (#3691 by [@aaron](https://github.com/aaron))