diff --git a/package.json b/package.json index cb0647865..7776e9e0a 100644 --- a/package.json +++ b/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": { diff --git a/packages/app-cli/gulpfile.js b/packages/app-cli/gulpfile.js index 75c124536..8c70046c5 100644 --- a/packages/app-cli/gulpfile.js +++ b/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`); diff --git a/packages/app-cli/package-lock.json b/packages/app-cli/package-lock.json index 336c827dc..aec66db84 100644 --- a/packages/app-cli/package-lock.json +++ b/packages/app-cli/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplinapp/app-cli", - "version": "1.4.0", + "version": "1.4.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/app-cli/package.json b/packages/app-cli/package.json index 48e60c6f8..39e976c58 100644 --- a/packages/app-cli/package.json +++ b/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.3", "bin": { "joplin": "./main.js" }, diff --git a/packages/tools/release-cli.js b/packages/tools/release-cli.js index 450f7511f..b3edd5ed3 100644 --- a/packages/tools/release-cli.js +++ b/packages/tools/release-cli.js @@ -1,9 +1,7 @@ -const { execCommand } = require('./tool-utils.js'); -const path = require('path'); +const { execCommand, rootDir } = require('./tool-utils.js'); 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`; @@ -59,8 +57,7 @@ async function main() { 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`); diff --git a/readme/changelog_cli.md b/readme/changelog_cli.md index d02e3b725..eb783543e 100644 --- a/readme/changelog_cli.md +++ b/readme/changelog_cli.md @@ -1,5 +1,14 @@ # 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))