Android release v1.4.6

package.json

@@ -7,25 +7,23 @@
   },
   "license": "MIT",
   "scripts": {
-    "buildApiDoc": "npm start --prefix=packages/app-cli -- apidoc ../../readme/api/references/rest_api.md",
-    "buildPluginDoc": "typedoc --name 'Joplin Plugin API Documentation' --mode file -theme './Assets/PluginDocTheme/' --readme './Assets/PluginDocTheme/index.md' --excludeNotExported --excludeExternals --excludePrivate --excludeProtected --out docs/api/references/plugin_api packages/lib/services/plugins/api/",
-    "buildWebsite": "npm run buildApiDoc && node ./packages/tools/build-website.js && npm run buildPluginDoc",
-    "clean": "lerna clean -y && lerna run clean",
-    "generatePluginTypes": "rm -rf ./plugin_types && node node_modules/typescript/bin/tsc --declaration --declarationDir ./plugin_types --project tsconfig.json",
-    "linkChecker": "linkchecker https://joplinapp.org",
-    "linter-ci": "./node_modules/.bin/eslint --resolve-plugins-relative-to . --quiet --ext .js --ext .jsx --ext .ts --ext .tsx",
-    "linter-precommit": "./node_modules/.bin/eslint --resolve-plugins-relative-to . --fix --ext .js --ext .jsx --ext .ts --ext .tsx",
     "linter": "./node_modules/.bin/eslint --resolve-plugins-relative-to . --fix --quiet --ext .js --ext .jsx --ext .ts --ext .tsx",
+    "linter-precommit": "./node_modules/.bin/eslint --resolve-plugins-relative-to . --fix --ext .js --ext .jsx --ext .ts --ext .tsx",
+    "linter-ci": "./node_modules/.bin/eslint --resolve-plugins-relative-to . --quiet --ext .js --ext .jsx --ext .ts --ext .tsx",
     "postinstall": "lerna bootstrap --no-ci && npm run tsc",
-    "publishAll": "git pull && lerna version --no-git-tag-version && gulp completePublishAll",
-    "releaseAndroid": "node packages/tools/release-android.js",
-    "releaseCli": "node packages/tools/release-cli.js",
-    "releaseClipper": "node packages/tools/release-clipper.js",
-    "releaseDesktop": "node packages/tools/release-electron.js",
-    "setupNewRelease": "node ./packages/tools/setupNewRelease",
     "tsc": "lerna run tsc --stream --parallel",
+    "watch": "lerna run watch --stream --parallel",
     "updateIgnored": "gulp updateIgnoredTypeScriptBuild",
-    "watch": "lerna run watch --stream --parallel"
+    "buildPluginDoc": "typedoc --name 'Joplin Plugin API Documentation' --mode file -theme './Assets/PluginDocTheme/' --readme './Assets/PluginDocTheme/index.md' --excludeNotExported --excludeExternals --excludePrivate --excludeProtected --out docs/api/references/plugin_api packages/lib/services/plugins/api/",
+    "buildApiDoc": "npm start --prefix=packages/app-cli -- apidoc ../../readme/api/references/rest_api.md",
+    "buildWebsite": "npm run buildApiDoc && node ./packages/tools/build-website.js && npm run buildPluginDoc",
+    "generatePluginTypes": "rm -rf ./plugin_types && node node_modules/typescript/bin/tsc --declaration --declarationDir ./plugin_types --project tsconfig.json",
+    "setupNewRelease": "node ./packages/tools/setupNewRelease",
+    "clean": "lerna clean -y && lerna run clean",
+    "linkChecker": "linkchecker https://joplinapp.org",
+    "releaseDesktop": "node packages/tools/release-electron.js",
+    "releaseAndroid": "node packages/tools/release-android.js",
+    "publishAll": "git pull && lerna version --no-git-tag-version && gulp completePublishAll"
   },
   "husky": {
     "hooks": {

packages/app-cli/gulpfile.js

@@ -10,23 +10,15 @@ 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",
-  "version": "1.4.3",
+  "version": "1.3.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

packages/app-cli/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "joplin",
+  "name": "@joplinapp/app-cli",
   "description": "Joplin CLI Client",
   "license": "MIT",
   "author": "Laurent Cozic",
@@ -7,6 +7,7 @@
   "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",
@@ -30,7 +31,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.4.3",
+  "version": "1.4.0",
   "bin": {
     "joplin": "./main.js"
   },

packages/app-clipper/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Joplin Web Clipper [DEV]",
-    "version": "1.4.2",
+    "version": "1.4.0",
     "description": "Capture and save web pages and screenshots from your browser to Joplin.",
     "homepage_url": "https://joplinapp.org",
     "content_security_policy": "script-src 'self'; object-src 'self'",

packages/app-clipper/package.json

@@ -1,9 +1,6 @@
 {
   "name": "@joplinapp/app-clipper",
   "private": true,
-  "scripts": {
-    "postinstall": "cd popup && npm install"
-  },
   "version": "1.0.8",
   "description": "Joplin Web Clipper",
   "main": "main.js",

packages/app-desktop/package.json

@@ -7,6 +7,7 @@
   "scripts": {
     "dist": "node_modules/.bin/electron-builder",
     "build": "gulp build",
+    "preinstall": "node tools/unlinkReact",
     "postinstall": "npm run build && gulp electronRebuild",
     "tsc": "node node_modules/typescript/bin/tsc --project tsconfig.json",
     "watch": "node node_modules/typescript/bin/tsc --watch --project tsconfig.json",

packages/app-desktop/tools/electronRebuild.js

@@ -1,50 +1,50 @@
-const execCommand = function(command) {
-	const exec = require('child_process').exec;
+// const execCommand = function(command) {
+// 	const exec = require('child_process').exec;
 
-	console.info(`Running: ${command}`);
+// 	console.info(`Running: ${command}`);
 
-	return new Promise((resolve, reject) => {
-		exec(command, (error, stdout) => {
-			if (error) {
-				if (error.signal == 'SIGTERM') {
-					resolve('Process was killed');
-				} else {
-					reject(error);
-				}
-			} else {
-				resolve(stdout.trim());
-			}
-		});
-	});
-};
+// 	return new Promise((resolve, reject) => {
+// 		exec(command, (error, stdout) => {
+// 			if (error) {
+// 				if (error.signal == 'SIGTERM') {
+// 					resolve('Process was killed');
+// 				} else {
+// 					reject(error);
+// 				}
+// 			} else {
+// 				resolve(stdout.trim());
+// 			}
+// 		});
+// 	});
+// };
 
-const isWindows = () => {
-	return process && process.platform === 'win32';
-};
+// const isWindows = () => {
+// 	return process && process.platform === 'win32';
+// };
 
 async function main() {
 	// electron-rebuild --arch ia32 && electron-rebuild --arch x64
 
-	// console.warn('ELECTRON REBUILD IS DISABLED!!!!!!!!!!!!!!!!!!!!!!!!');
-	// return;
+	console.warn('!!!!!!!!!!!!!!!!!!!!!!!!ELECTRON REBUILD IS DISABLED!!!!!!!!!!!!!!!!!!!!!!!!');
+	return;
 
-	let exePath = `${__dirname}/../node_modules/.bin/electron-rebuild`;
-	if (isWindows()) exePath += '.cmd';
+	// let exePath = `${__dirname}/../node_modules/.bin/electron-rebuild`;
+	// if (isWindows()) exePath += '.cmd';
 
-	process.chdir(`${__dirname}/..`);
+	// process.chdir(`${__dirname}/..`);
 
-	if (isWindows()) {
-		// const promises = [
-		// 	execCommand([`"${exePath}"`, '--arch ia32'].join(' ')),
-		// 	execCommand([`"${exePath}"`, '--arch x64'].join(' ')),
-		// ];
+	// if (isWindows()) {
+	// 	// const promises = [
+	// 	// 	execCommand([`"${exePath}"`, '--arch ia32'].join(' ')),
+	// 	// 	execCommand([`"${exePath}"`, '--arch x64'].join(' ')),
+	// 	// ];
 
-		// await Promise.all(promises);
-		console.info(await execCommand([`"${exePath}"`, '--arch ia32'].join(' ')));
-		console.info(await execCommand([`"${exePath}"`, '--arch x64'].join(' ')));
-	} else {
-		console.info(await execCommand([`"${exePath}"`].join(' ')));
-	}
+	// 	// await Promise.all(promises);
+	// 	console.info(await execCommand([`"${exePath}"`, '--arch ia32'].join(' ')));
+	// 	console.info(await execCommand([`"${exePath}"`, '--arch x64'].join(' ')));
+	// } else {
+	// 	console.info(await execCommand([`"${exePath}"`].join(' ')));
+	// }
 }
 
 module.exports = main;

packages/app-mobile/package.json

@@ -9,6 +9,7 @@
     "build": "gulp build",
     "tsc": "node node_modules/typescript/bin/tsc --project tsconfig.json",
     "watch": "node node_modules/typescript/bin/tsc --watch --project tsconfig.json",
+    "preinstall": "node tools/unlinkReact.js",
     "clean": "node tools/clean.js",
     "postinstall": "jetify && npm run build"
   },

packages/tools/release-cli.js

@@ -1,7 +1,9 @@
-const { execCommand, rootDir } = require('./tool-utils.js');
+const { execCommand } = 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`;
 
@@ -57,7 +59,8 @@ async function main() {
 	await execCommand('git pull');
 	await execCommand('touch app/main.js');
 	await execCommand('npm run build');
-	await execCommand('cp ../../README.md build/');
+	// await execCommand('cp package.json build/');
+	await execCommand('cp ../README.md build/');
 
 	process.chdir(`${appDir}/build`);
 

packages/tools/release-clipper.js

@@ -1,9 +1,9 @@
 const fs = require('fs-extra');
-const { execCommand, rootDir } = require('./tool-utils.js');
+const { execCommand } = require('./tool-utils.js');
 const md5File = require('md5-file/promise');
 const glob = require('glob');
 
-const clipperDir = `${rootDir}/packages/app-clipper`;
+const clipperDir   = `${__dirname}/../packages/app-clipper`;
 const tmpSourceDirName = 'Clipper-source';
 
 async function copyDir(baseSourceDir, sourcePath, baseDestDir) {

readme/changelog_cli.md

@@ -1,14 +1,5 @@
 # Joplin terminal app changelog
 
-## [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))