From 73f0f861a557cb441ac1a1b6e21136e245f2f864 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Wed, 29 Sep 2021 15:31:37 +0100 Subject: [PATCH 1/6] ios-v12.4.1 --- .../ios/Joplin.xcodeproj/project.pbxproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj index e5c112c99b..67e9a0ded2 100644 --- a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj +++ b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj @@ -486,13 +486,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements; - CURRENT_PROJECT_VERSION = 72; + CURRENT_PROJECT_VERSION = 73; DEVELOPMENT_TEAM = A9BXAFS6CT; ENABLE_BITCODE = NO; INFOPLIST_FILE = Joplin/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 12.4.0; + MARKETING_VERSION = 12.4.1; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -514,12 +514,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements; - CURRENT_PROJECT_VERSION = 72; + CURRENT_PROJECT_VERSION = 73; DEVELOPMENT_TEAM = A9BXAFS6CT; INFOPLIST_FILE = Joplin/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 12.4.0; + MARKETING_VERSION = 12.4.1; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -659,14 +659,14 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 72; + CURRENT_PROJECT_VERSION = 73; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = A9BXAFS6CT; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = ShareExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 12.4.0; + MARKETING_VERSION = 12.4.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension; @@ -690,14 +690,14 @@ CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 72; + CURRENT_PROJECT_VERSION = 73; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = A9BXAFS6CT; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = ShareExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 12.4.0; + MARKETING_VERSION = 12.4.1; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension; PRODUCT_NAME = "$(TARGET_NAME)"; From 9dabac0afe67ea9a026d2d9674776121fedf6076 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Wed, 29 Sep 2021 16:09:02 +0100 Subject: [PATCH 2/6] lockfile --- packages/app-mobile/ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app-mobile/ios/Podfile.lock b/packages/app-mobile/ios/Podfile.lock index 567ef2ad44..2e82642d72 100644 --- a/packages/app-mobile/ios/Podfile.lock +++ b/packages/app-mobile/ios/Podfile.lock @@ -488,7 +488,7 @@ SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b - FBReactNativeSpec: d2f54de51f69366bd1f5c1fb9270698dce678f8d + FBReactNativeSpec: 6da2c8ff1ebe6b6cf4510fcca58c24c4d02b16fc glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62 JoplinCommonShareExtension: 270b4f8eb4e22828eeda433a04ed689fc1fd09b5 JoplinRNShareExtension: 7137e9787374e1b0797ecbef9103d1588d90e403 From eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Wed, 29 Sep 2021 16:16:40 +0100 Subject: [PATCH 3/6] Releasing sub-packages --- packages/fork-htmlparser2/package-lock.json | 2 +- packages/fork-htmlparser2/package.json | 2 +- packages/fork-sax/package-lock.json | 2 +- packages/fork-sax/package.json | 2 +- packages/htmlpack/package-lock.json | 2 +- packages/htmlpack/package.json | 4 ++-- packages/lib/package-lock.json | 2 +- packages/lib/package.json | 12 ++++++------ packages/plugin-repo-cli/package-lock.json | 2 +- packages/plugin-repo-cli/package.json | 6 +++--- packages/renderer/package-lock.json | 2 +- packages/renderer/package.json | 4 ++-- packages/tools/package-lock.json | 2 +- packages/tools/package.json | 10 +++++----- packages/turndown-plugin-gfm/package-lock.json | 2 +- packages/turndown-plugin-gfm/package.json | 2 +- packages/turndown/package-lock.json | 2 +- packages/turndown/package.json | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/packages/fork-htmlparser2/package-lock.json b/packages/fork-htmlparser2/package-lock.json index a49e9bd0d0..51975acfc4 100644 --- a/packages/fork-htmlparser2/package-lock.json +++ b/packages/fork-htmlparser2/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/fork-htmlparser2", - "version": "4.1.34", + "version": "4.1.35", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/fork-htmlparser2/package.json b/packages/fork-htmlparser2/package.json index 2b973d54ff..a83677b696 100644 --- a/packages/fork-htmlparser2/package.json +++ b/packages/fork-htmlparser2/package.json @@ -1,7 +1,7 @@ { "name": "@joplin/fork-htmlparser2", "description": "Fast & forgiving HTML/XML/RSS parser", - "version": "4.1.34", + "version": "4.1.35", "author": "Felix Boehm ", "publishConfig": { "access": "public" diff --git a/packages/fork-sax/package-lock.json b/packages/fork-sax/package-lock.json index 31b53f8487..4a7134b1df 100644 --- a/packages/fork-sax/package-lock.json +++ b/packages/fork-sax/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/fork-sax", - "version": "1.2.38", + "version": "1.2.39", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/fork-sax/package.json b/packages/fork-sax/package.json index f7eeb89885..55e0ac523c 100644 --- a/packages/fork-sax/package.json +++ b/packages/fork-sax/package.json @@ -2,7 +2,7 @@ "name": "@joplin/fork-sax", "description": "An evented streaming XML parser in JavaScript", "author": "Isaac Z. Schlueter (http://blog.izs.me/)", - "version": "1.2.38", + "version": "1.2.39", "main": "lib/sax.js", "publishConfig": { "access": "public" diff --git a/packages/htmlpack/package-lock.json b/packages/htmlpack/package-lock.json index bf923d0e69..b3275af7c5 100644 --- a/packages/htmlpack/package-lock.json +++ b/packages/htmlpack/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/htmlpack", - "version": "1.0.0", + "version": "1.0.1", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/htmlpack/package.json b/packages/htmlpack/package.json index 24f813596c..5824e92b2a 100644 --- a/packages/htmlpack/package.json +++ b/packages/htmlpack/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/htmlpack", - "version": "1.0.0", + "version": "1.0.1", "description": "Pack an HTML file and all its linked resources into a single HTML file", "main": "dist/index.js", "scripts": { @@ -10,7 +10,7 @@ "author": "Laurent Czoic", "license": "MIT", "dependencies": { - "@joplin/fork-htmlparser2": "^4.1.34", + "@joplin/fork-htmlparser2": "^4.1.35", "css": "^3.0.0", "datauri": "^4.1.0", "fs-extra": "^10.0.0", diff --git a/packages/lib/package-lock.json b/packages/lib/package-lock.json index a484a68362..d1abb494d1 100644 --- a/packages/lib/package-lock.json +++ b/packages/lib/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/lib", - "version": "2.4.1", + "version": "2.4.2", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/lib/package.json b/packages/lib/package.json index 72daa4b070..3e7e36f07c 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/lib", - "version": "2.4.1", + "version": "2.4.2", "description": "Joplin Core library", "author": "Laurent Cozic", "homepage": "", @@ -26,11 +26,11 @@ "typescript": "^4.0.5" }, "dependencies": { - "@joplin/fork-htmlparser2": "^4.1.34", - "@joplin/fork-sax": "^1.2.38", - "@joplin/renderer": "^2.4.1", - "@joplin/turndown": "^4.0.56", - "@joplin/turndown-plugin-gfm": "^1.0.38", + "@joplin/fork-htmlparser2": "^4.1.35", + "@joplin/fork-sax": "^1.2.39", + "@joplin/renderer": "^2.4.2", + "@joplin/turndown": "^4.0.57", + "@joplin/turndown-plugin-gfm": "^1.0.39", "async-mutex": "^0.1.3", "aws-sdk": "^2.588.0", "base-64": "^0.1.0", diff --git a/packages/plugin-repo-cli/package-lock.json b/packages/plugin-repo-cli/package-lock.json index 387975a6e7..ea6041712a 100644 --- a/packages/plugin-repo-cli/package-lock.json +++ b/packages/plugin-repo-cli/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/plugin-repo-cli", - "version": "2.4.1", + "version": "2.4.2", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/plugin-repo-cli/package.json b/packages/plugin-repo-cli/package.json index 6acaa212a8..911308e0d5 100644 --- a/packages/plugin-repo-cli/package.json +++ b/packages/plugin-repo-cli/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/plugin-repo-cli", - "version": "2.4.1", + "version": "2.4.2", "description": "", "main": "index.js", "bin": { @@ -19,8 +19,8 @@ "author": "", "license": "MIT", "dependencies": { - "@joplin/lib": "^2.4.1", - "@joplin/tools": "^2.4.1", + "@joplin/lib": "^2.4.2", + "@joplin/tools": "^2.4.2", "fs-extra": "^9.0.1", "gh-release-assets": "^2.0.0", "node-fetch": "^2.6.1", diff --git a/packages/renderer/package-lock.json b/packages/renderer/package-lock.json index a4b8e25232..bb509e6073 100644 --- a/packages/renderer/package-lock.json +++ b/packages/renderer/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/renderer", - "version": "2.4.1", + "version": "2.4.2", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 6314fc6b75..159e06d274 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/renderer", - "version": "2.4.1", + "version": "2.4.2", "description": "The Joplin note renderer, used the mobile and desktop application", "repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer", "main": "index.js", @@ -24,7 +24,7 @@ "typescript": "^4.0.5" }, "dependencies": { - "@joplin/fork-htmlparser2": "^4.1.34", + "@joplin/fork-htmlparser2": "^4.1.35", "font-awesome-filetypes": "^2.1.0", "fs-extra": "^8.1.0", "highlight.js": "^11.2.0", diff --git a/packages/tools/package-lock.json b/packages/tools/package-lock.json index 9dfedfeb0d..fa0df6f2ad 100644 --- a/packages/tools/package-lock.json +++ b/packages/tools/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/tools", - "version": "2.4.1", + "version": "2.4.2", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/tools/package.json b/packages/tools/package.json index 2ea0af962f..ebd4744b34 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/tools", - "version": "2.4.1", + "version": "2.4.2", "description": "Various tools for Joplin", "main": "index.js", "author": "Laurent Cozic", @@ -20,8 +20,8 @@ }, "license": "MIT", "dependencies": { - "@joplin/lib": "^2.4.1", - "@joplin/renderer": "^2.4.1", + "@joplin/lib": "^2.4.2", + "@joplin/renderer": "^2.4.2", "execa": "^4.1.0", "fs-extra": "^4.0.3", "gettext-parser": "^1.3.0", @@ -41,11 +41,11 @@ "devDependencies": { "@rmp135/sql-ts": "^1.6.0", "@types/fs-extra": "^9.0.6", + "@types/jest": "^26.0.15", "@types/mustache": "^0.8.32", "@types/node": "^14.14.6", - "@types/jest": "^26.0.15", - "jest": "^26.6.3", "gulp": "^4.0.2", + "jest": "^26.6.3", "sass": "^1.39.2", "sqlite3": "^5.0.0", "typescript": "^4.1.3" diff --git a/packages/turndown-plugin-gfm/package-lock.json b/packages/turndown-plugin-gfm/package-lock.json index 50962c9612..cae5b6bcd7 100644 --- a/packages/turndown-plugin-gfm/package-lock.json +++ b/packages/turndown-plugin-gfm/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/turndown-plugin-gfm", - "version": "1.0.38", + "version": "1.0.39", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/turndown-plugin-gfm/package.json b/packages/turndown-plugin-gfm/package.json index 724cc601ed..06be08bd31 100644 --- a/packages/turndown-plugin-gfm/package.json +++ b/packages/turndown-plugin-gfm/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "1.0.38", + "version": "1.0.39", "author": "Dom Christie", "main": "lib/turndown-plugin-gfm.cjs.js", "devDependencies": { diff --git a/packages/turndown/package-lock.json b/packages/turndown/package-lock.json index 5957124f16..b6a2c8b1a7 100644 --- a/packages/turndown/package-lock.json +++ b/packages/turndown/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/turndown", - "version": "4.0.56", + "version": "4.0.57", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/turndown/package.json b/packages/turndown/package.json index c334d00d2b..4109dbf937 100644 --- a/packages/turndown/package.json +++ b/packages/turndown/package.json @@ -1,7 +1,7 @@ { "name": "@joplin/turndown", "description": "A library that converts HTML to Markdown", - "version": "4.0.56", + "version": "4.0.57", "author": "Dom Christie", "main": "lib/turndown.cjs.js", "publishConfig": { From c7cc5cc1a99dcb19f65a417af08874167c35b426 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Wed, 29 Sep 2021 16:22:20 +0100 Subject: [PATCH 4/6] publish --- packages/fork-htmlparser2/package.json | 2 +- packages/fork-sax/package.json | 2 +- packages/htmlpack/package.json | 4 +++- packages/lib/package.json | 2 +- packages/plugin-repo-cli/package.json | 3 ++- packages/renderer/package.json | 2 +- packages/tools/package.json | 2 +- packages/turndown-plugin-gfm/package.json | 2 +- packages/turndown/package.json | 2 +- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/fork-htmlparser2/package.json b/packages/fork-htmlparser2/package.json index a83677b696..165e70a231 100644 --- a/packages/fork-htmlparser2/package.json +++ b/packages/fork-htmlparser2/package.json @@ -65,5 +65,5 @@ "prettier": { "tabWidth": 4 }, - "gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2" + "gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14" } diff --git a/packages/fork-sax/package.json b/packages/fork-sax/package.json index 55e0ac523c..c3c62482c9 100644 --- a/packages/fork-sax/package.json +++ b/packages/fork-sax/package.json @@ -18,5 +18,5 @@ "standard": "^8.6.0", "tap": "^10.5.1" }, - "gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2" + "gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14" } diff --git a/packages/htmlpack/package.json b/packages/htmlpack/package.json index 5824e92b2a..4e2026e8c7 100644 --- a/packages/htmlpack/package.json +++ b/packages/htmlpack/package.json @@ -3,6 +3,7 @@ "version": "1.0.1", "description": "Pack an HTML file and all its linked resources into a single HTML file", "main": "dist/index.js", + "private": true, "scripts": { "tsc": "tsc --project tsconfig.json", "watch": "tsc --watch --project tsconfig.json" @@ -18,5 +19,6 @@ }, "devDependencies": { "@types/fs-extra": "^9.0.6" - } + }, + "gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14" } diff --git a/packages/lib/package.json b/packages/lib/package.json index 3e7e36f07c..257cdf01ce 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -85,5 +85,5 @@ "word-wrap": "^1.2.3", "xml2js": "^0.4.19" }, - "gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2" + "gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14" } diff --git a/packages/plugin-repo-cli/package.json b/packages/plugin-repo-cli/package.json index 911308e0d5..d2fbd4675b 100644 --- a/packages/plugin-repo-cli/package.json +++ b/packages/plugin-repo-cli/package.json @@ -32,5 +32,6 @@ "@types/node": "^14.14.6", "jest": "^26.6.3", "typescript": "^4.1.3" - } + }, + "gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14" } diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 159e06d274..e7019c8ae0 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -48,5 +48,5 @@ "mermaid": "^8.12.1", "uslug": "git+https://github.com/laurent22/uslug.git#emoji-support" }, - "gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2" + "gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14" } diff --git a/packages/tools/package.json b/packages/tools/package.json index ebd4744b34..f7bb82b8d4 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -50,5 +50,5 @@ "sqlite3": "^5.0.0", "typescript": "^4.1.3" }, - "gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2" + "gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14" } diff --git a/packages/turndown-plugin-gfm/package.json b/packages/turndown-plugin-gfm/package.json index 06be08bd31..d1d0f9eeea 100644 --- a/packages/turndown-plugin-gfm/package.json +++ b/packages/turndown-plugin-gfm/package.json @@ -41,5 +41,5 @@ "build-test": "browserify test/turndown-plugin-gfm-test.js --outfile test/turndown-plugin-gfm-test.browser.js", "prepare": "npm run build" }, - "gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2" + "gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14" } diff --git a/packages/turndown/package.json b/packages/turndown/package.json index 4109dbf937..f9d886b527 100644 --- a/packages/turndown/package.json +++ b/packages/turndown/package.json @@ -48,5 +48,5 @@ "build-test": "browserify test/turndown-test.js --outfile test/turndown-test.browser.js", "prepare": "npm run build" }, - "gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2" + "gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14" } From c831c7bf6f7c797b86d871f68f769d662b323734 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Wed, 29 Sep 2021 16:23:56 +0100 Subject: [PATCH 5/6] Releasing sub-packages --- packages/fork-htmlparser2/package-lock.json | 2 +- packages/fork-htmlparser2/package.json | 2 +- packages/fork-sax/package-lock.json | 2 +- packages/fork-sax/package.json | 2 +- packages/lib/package-lock.json | 2 +- packages/lib/package.json | 12 ++++++------ packages/plugin-repo-cli/package-lock.json | 2 +- packages/plugin-repo-cli/package.json | 6 +++--- packages/renderer/package-lock.json | 2 +- packages/renderer/package.json | 4 ++-- packages/tools/package-lock.json | 2 +- packages/tools/package.json | 6 +++--- packages/turndown-plugin-gfm/package-lock.json | 2 +- packages/turndown-plugin-gfm/package.json | 2 +- packages/turndown/package-lock.json | 2 +- packages/turndown/package.json | 2 +- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/fork-htmlparser2/package-lock.json b/packages/fork-htmlparser2/package-lock.json index 51975acfc4..4f811b47e8 100644 --- a/packages/fork-htmlparser2/package-lock.json +++ b/packages/fork-htmlparser2/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/fork-htmlparser2", - "version": "4.1.35", + "version": "4.1.36", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/fork-htmlparser2/package.json b/packages/fork-htmlparser2/package.json index 165e70a231..9db860ab4d 100644 --- a/packages/fork-htmlparser2/package.json +++ b/packages/fork-htmlparser2/package.json @@ -1,7 +1,7 @@ { "name": "@joplin/fork-htmlparser2", "description": "Fast & forgiving HTML/XML/RSS parser", - "version": "4.1.35", + "version": "4.1.36", "author": "Felix Boehm ", "publishConfig": { "access": "public" diff --git a/packages/fork-sax/package-lock.json b/packages/fork-sax/package-lock.json index 4a7134b1df..88aff98a6f 100644 --- a/packages/fork-sax/package-lock.json +++ b/packages/fork-sax/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/fork-sax", - "version": "1.2.39", + "version": "1.2.40", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/fork-sax/package.json b/packages/fork-sax/package.json index c3c62482c9..39bbbf3306 100644 --- a/packages/fork-sax/package.json +++ b/packages/fork-sax/package.json @@ -2,7 +2,7 @@ "name": "@joplin/fork-sax", "description": "An evented streaming XML parser in JavaScript", "author": "Isaac Z. Schlueter (http://blog.izs.me/)", - "version": "1.2.39", + "version": "1.2.40", "main": "lib/sax.js", "publishConfig": { "access": "public" diff --git a/packages/lib/package-lock.json b/packages/lib/package-lock.json index d1abb494d1..7615dfa451 100644 --- a/packages/lib/package-lock.json +++ b/packages/lib/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/lib", - "version": "2.4.2", + "version": "2.4.3", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/lib/package.json b/packages/lib/package.json index 257cdf01ce..ad59ae400a 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/lib", - "version": "2.4.2", + "version": "2.4.3", "description": "Joplin Core library", "author": "Laurent Cozic", "homepage": "", @@ -26,11 +26,11 @@ "typescript": "^4.0.5" }, "dependencies": { - "@joplin/fork-htmlparser2": "^4.1.35", - "@joplin/fork-sax": "^1.2.39", - "@joplin/renderer": "^2.4.2", - "@joplin/turndown": "^4.0.57", - "@joplin/turndown-plugin-gfm": "^1.0.39", + "@joplin/fork-htmlparser2": "^4.1.36", + "@joplin/fork-sax": "^1.2.40", + "@joplin/renderer": "^2.4.3", + "@joplin/turndown": "^4.0.58", + "@joplin/turndown-plugin-gfm": "^1.0.40", "async-mutex": "^0.1.3", "aws-sdk": "^2.588.0", "base-64": "^0.1.0", diff --git a/packages/plugin-repo-cli/package-lock.json b/packages/plugin-repo-cli/package-lock.json index ea6041712a..99271065ff 100644 --- a/packages/plugin-repo-cli/package-lock.json +++ b/packages/plugin-repo-cli/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/plugin-repo-cli", - "version": "2.4.2", + "version": "2.4.3", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/plugin-repo-cli/package.json b/packages/plugin-repo-cli/package.json index d2fbd4675b..3eeb469166 100644 --- a/packages/plugin-repo-cli/package.json +++ b/packages/plugin-repo-cli/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/plugin-repo-cli", - "version": "2.4.2", + "version": "2.4.3", "description": "", "main": "index.js", "bin": { @@ -19,8 +19,8 @@ "author": "", "license": "MIT", "dependencies": { - "@joplin/lib": "^2.4.2", - "@joplin/tools": "^2.4.2", + "@joplin/lib": "^2.4.3", + "@joplin/tools": "^2.4.3", "fs-extra": "^9.0.1", "gh-release-assets": "^2.0.0", "node-fetch": "^2.6.1", diff --git a/packages/renderer/package-lock.json b/packages/renderer/package-lock.json index bb509e6073..31d5f15e86 100644 --- a/packages/renderer/package-lock.json +++ b/packages/renderer/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/renderer", - "version": "2.4.2", + "version": "2.4.3", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/renderer/package.json b/packages/renderer/package.json index e7019c8ae0..b57ac8bbc7 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/renderer", - "version": "2.4.2", + "version": "2.4.3", "description": "The Joplin note renderer, used the mobile and desktop application", "repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer", "main": "index.js", @@ -24,7 +24,7 @@ "typescript": "^4.0.5" }, "dependencies": { - "@joplin/fork-htmlparser2": "^4.1.35", + "@joplin/fork-htmlparser2": "^4.1.36", "font-awesome-filetypes": "^2.1.0", "fs-extra": "^8.1.0", "highlight.js": "^11.2.0", diff --git a/packages/tools/package-lock.json b/packages/tools/package-lock.json index fa0df6f2ad..ab59d68c30 100644 --- a/packages/tools/package-lock.json +++ b/packages/tools/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/tools", - "version": "2.4.2", + "version": "2.4.3", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/tools/package.json b/packages/tools/package.json index f7bb82b8d4..6d16381717 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/tools", - "version": "2.4.2", + "version": "2.4.3", "description": "Various tools for Joplin", "main": "index.js", "author": "Laurent Cozic", @@ -20,8 +20,8 @@ }, "license": "MIT", "dependencies": { - "@joplin/lib": "^2.4.2", - "@joplin/renderer": "^2.4.2", + "@joplin/lib": "^2.4.3", + "@joplin/renderer": "^2.4.3", "execa": "^4.1.0", "fs-extra": "^4.0.3", "gettext-parser": "^1.3.0", diff --git a/packages/turndown-plugin-gfm/package-lock.json b/packages/turndown-plugin-gfm/package-lock.json index cae5b6bcd7..072852fe12 100644 --- a/packages/turndown-plugin-gfm/package-lock.json +++ b/packages/turndown-plugin-gfm/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/turndown-plugin-gfm", - "version": "1.0.39", + "version": "1.0.40", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/turndown-plugin-gfm/package.json b/packages/turndown-plugin-gfm/package.json index d1d0f9eeea..efa25a0848 100644 --- a/packages/turndown-plugin-gfm/package.json +++ b/packages/turndown-plugin-gfm/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "1.0.39", + "version": "1.0.40", "author": "Dom Christie", "main": "lib/turndown-plugin-gfm.cjs.js", "devDependencies": { diff --git a/packages/turndown/package-lock.json b/packages/turndown/package-lock.json index b6a2c8b1a7..89ef79b32d 100644 --- a/packages/turndown/package-lock.json +++ b/packages/turndown/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/turndown", - "version": "4.0.57", + "version": "4.0.58", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/turndown/package.json b/packages/turndown/package.json index f9d886b527..4d92105da3 100644 --- a/packages/turndown/package.json +++ b/packages/turndown/package.json @@ -1,7 +1,7 @@ { "name": "@joplin/turndown", "description": "A library that converts HTML to Markdown", - "version": "4.0.57", + "version": "4.0.58", "author": "Dom Christie", "main": "lib/turndown.cjs.js", "publishConfig": { From 3a9867db33ec8388ac6bc1fa031ec218252317e9 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Wed, 29 Sep 2021 16:29:06 +0100 Subject: [PATCH 6/6] CLI v2.4.1 --- packages/app-cli/package-lock.json | 4 ++-- packages/app-cli/package.json | 2 +- readme/changelog_cli.md | 11 +++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/packages/app-cli/package-lock.json b/packages/app-cli/package-lock.json index 620f4e6470..5d85d7bf8c 100644 --- a/packages/app-cli/package-lock.json +++ b/packages/app-cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "joplin", - "version": "2.3.2", + "version": "2.4.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "joplin", - "version": "2.3.2", + "version": "2.4.1", "license": "MIT", "dependencies": { "aws-sdk": "^2.588.0", diff --git a/packages/app-cli/package.json b/packages/app-cli/package.json index cd20a23af7..fb9d0d8cd8 100644 --- a/packages/app-cli/package.json +++ b/packages/app-cli/package.json @@ -33,7 +33,7 @@ ], "owner": "Laurent Cozic" }, - "version": "2.4.0", + "version": "2.4.1", "bin": { "joplin": "./main.js" }, diff --git a/readme/changelog_cli.md b/readme/changelog_cli.md index 80ee4c633d..fd5257e894 100644 --- a/readme/changelog_cli.md +++ b/readme/changelog_cli.md @@ -1,5 +1,16 @@ # Joplin terminal app changelog +## [cli-v2.4.1](https://github.com/laurent22/joplin/releases/tag/cli-v2.4.1) - 2021-09-29T15:28:01Z + +- New: Add a way to disable a master key (7faa58e) +- New: Add support for single master password, to simplify handling of multiple encryption keys (ce89ee5) +- New: Added "None" sync target to allow disabling synchronisation (f5f05e6) +- Improved: Allow importing certain corrupted ENEX files (f144dae) +- Improved: Improved sync locks so that they do not prevent upgrading a sync target (06ed58b) +- Fixed: Fixed file paths when exporting as HTML (#5325) +- Fixed: Misinterpreted search term after filter in quotation marks (#5445) (#5444 by [@JackGruber](https://github.com/JackGruber)) +- Fixed: Setting note contents using "set" command does not update note timestamp (#5435) + ## [cli-v2.3.2](https://github.com/laurent22/joplin/releases/tag/cli-v2.3.2) - 2021-08-16T09:38:40Z - Improved: Improved E2EE usability by making its state a property of the sync target (#5276)