CLI v3.0.1

packages/app-cli/package.json

@@ -35,7 +35,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "3.0.0",
+  "version": "3.0.1",
   "bin": "./main.js",
   "engines": {
     "node": ">=10.0.0"

packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj

@@ -503,13 +503,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 118;
+				CURRENT_PROJECT_VERSION = 119;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 13.0.4;
+				MARKETING_VERSION = 13.0.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -534,12 +534,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 118;
+				CURRENT_PROJECT_VERSION = 119;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 13.0.4;
+				MARKETING_VERSION = 13.0.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -724,14 +724,14 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 118;
+				CURRENT_PROJECT_VERSION = 119;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 13.0.4;
+				MARKETING_VERSION = 13.0.5;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_LDFLAGS = (
@@ -762,14 +762,14 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 118;
+				CURRENT_PROJECT_VERSION = 119;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 13.0.4;
+				MARKETING_VERSION = 13.0.5;
 				MTL_FAST_MATH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

packages/fork-htmlparser2/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joplin/fork-htmlparser2",
   "description": "Fast & forgiving HTML/XML/RSS parser",
-  "version": "4.1.51",
+  "version": "4.1.52",
   "author": "Felix Boehm <me@feedic.com>",
   "publishConfig": {
     "access": "public"

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 <i@izs.me> (http://blog.izs.me/)",
-  "version": "1.2.55",
+  "version": "1.2.56",
   "main": "lib/sax.js",
   "publishConfig": {
     "access": "public"

packages/fork-uslug/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/fork-uslug",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "A permissive slug generator that works with unicode.",
   "author": "Jeremy Selier <jerem.selier@gmail.com>",
   "publishConfig": {

packages/htmlpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/htmlpack",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Pack an HTML file and all its linked resources into a single HTML file",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -15,7 +15,7 @@
   "license": "MIT",
   "dependencies": {
     "@adobe/css-tools": "4.3.3",
-    "@joplin/fork-htmlparser2": "^4.1.51",
+    "@joplin/fork-htmlparser2": "^4.1.52",
     "datauri": "4.1.0",
     "fs-extra": "11.2.0",
     "html-entities": "1.4.0"

packages/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/lib",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Joplin Core library",
   "author": "Laurent Cozic",
   "homepage": "",
@@ -40,14 +40,14 @@
     "@adobe/css-tools": "4.3.3",
     "@aws-sdk/client-s3": "3.296.0",
     "@aws-sdk/s3-request-presigner": "3.296.0",
-    "@joplin/fork-htmlparser2": "^4.1.51",
-    "@joplin/fork-sax": "^1.2.55",
-    "@joplin/fork-uslug": "^1.0.16",
-    "@joplin/htmlpack": "~3.0",
-    "@joplin/renderer": "~3.0",
-    "@joplin/turndown": "^4.0.73",
-    "@joplin/turndown-plugin-gfm": "^1.0.55",
-    "@joplin/utils": "~3.0",
+    "@joplin/fork-htmlparser2": "^4.1.52",
+    "@joplin/fork-sax": "^1.2.56",
+    "@joplin/fork-uslug": "^1.0.17",
+    "@joplin/htmlpack": "^3.0.1",
+    "@joplin/renderer": "^3.0.1",
+    "@joplin/turndown": "^4.0.74",
+    "@joplin/turndown-plugin-gfm": "^1.0.56",
+    "@joplin/utils": "^3.0.1",
     "@types/nanoid": "3.0.0",
     "async-mutex": "0.4.1",
     "base-64": "1.0.0",

packages/plugin-repo-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/plugin-repo-cli",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "",
   "main": "index.js",
   "bin": "./dist/index.js",
@@ -18,9 +18,9 @@
   "author": "",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@joplin/lib": "~3.0",
-    "@joplin/tools": "~3.0",
-    "@joplin/utils": "~3.0",
+    "@joplin/lib": "^3.0.1",
+    "@joplin/tools": "^3.0.1",
+    "@joplin/utils": "^3.0.1",
     "fs-extra": "11.2.0",
     "gh-release-assets": "2.0.1",
     "node-fetch": "2.6.7",

packages/react-native-saf-x/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/react-native-saf-x",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "a module to help work with scoped storages on android easily",
   "main": "src/index",
   "react-native": "src/index",

packages/renderer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/renderer",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "The Joplin note renderer, used the mobile and desktop application",
   "repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer",
   "main": "index.js",
@@ -28,9 +28,9 @@
     "typescript": "5.2.2"
   },
   "dependencies": {
-    "@joplin/fork-htmlparser2": "^4.1.51",
-    "@joplin/fork-uslug": "^1.0.16",
-    "@joplin/utils": "~3.0",
+    "@joplin/fork-htmlparser2": "^4.1.52",
+    "@joplin/fork-uslug": "^1.0.17",
+    "@joplin/utils": "^3.0.1",
     "font-awesome-filetypes": "2.1.0",
     "fs-extra": "11.2.0",
     "highlight.js": "11.9.0",

packages/tools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/tools",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Various tools for Joplin",
   "main": "index.js",
   "author": "Laurent Cozic",
@@ -20,9 +20,9 @@
   },
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@joplin/lib": "~3.0",
-    "@joplin/renderer": "~3.0",
-    "@joplin/utils": "~3.0",
+    "@joplin/lib": "^3.0.1",
+    "@joplin/renderer": "^3.0.1",
+    "@joplin/utils": "^3.0.1",
     "compare-versions": "6.1.0",
     "dayjs": "1.11.10",
     "execa": "4.1.0",
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@docusaurus/plugin-sitemap": "2.4.3",
-    "@joplin/fork-htmlparser2": "^4.1.51",
+    "@joplin/fork-htmlparser2": "^4.1.52",
     "@rmp135/sql-ts": "1.18.1",
     "@types/fs-extra": "11.0.4",
     "@types/jest": "29.5.8",

packages/turndown-plugin-gfm/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.0.55",
+  "version": "1.0.56",
   "author": "Dom Christie",
   "main": "lib/turndown-plugin-gfm.cjs.js",
   "devDependencies": {

packages/turndown/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joplin/turndown",
   "description": "A library that converts HTML to Markdown",
-  "version": "4.0.73",
+  "version": "4.0.74",
   "author": "Dom Christie",
   "main": "lib/turndown.cjs.js",
   "publishConfig": {

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/utils",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Utilities for Joplin",
   "repository": "https://github.com/laurent22/joplin/tree/dev/packages/utils",
   "exports": {
@@ -32,7 +32,7 @@
   "author": "",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@joplin/fork-htmlparser2": "^4.1.51",
+    "@joplin/fork-htmlparser2": "^4.1.52",
     "async-mutex": "0.4.1",
     "execa": "5.1.1",
     "fs-extra": "11.2.0",

readme/about/changelog/cli.md

@@ -1,5 +1,24 @@
 # Joplin Terminal App Changelog
 
+## [cli-v3.0.1](https://github.com/laurent22/joplin/releases/tag/cli-v3.0.1) - 2024-07-02T18:42:44Z
+
+- Improved: Add trash folder (#9671) (#483)
+- Improved: Allow deleting notes and notebooks permanently (#10107) (#10090 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
+- Improved: Avoid unnecessary requests if Joplin Cloud credentials are empty (#10256 by [@pedr](https://github.com/pedr))
+- Improved: Bump @codemirror/view version. (#10174 by [@itzTheMeow](https://github.com/itzTheMeow))
+- Improved: Change Joplin Cloud login process (#9722 by [@pedr](https://github.com/pedr))
+- Improved: Clarify that the "restore" command is to restore items from the trash (8cb9c08)
+- Improved: Do not repeat failed requests with ENOTFOUND error (#6173)
+- Improved: Don't render empty title page for Fountain (#10631 by [@XPhyro](https://github.com/XPhyro))
+- Improved: Improved log formatting and allow saving last lines of log to memory (74bc9b3)
+- Improved: Improves formatting of log statements (aac8d58)
+- Improved: Log user actions (deletions) (#9585) (#9465 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
+- Improved: Set min version for synchronising to 3.0.0 (e4b8976)
+- Improved: Updated packages @adobe/css-tools (v4.3.3), chokidar (v3.6.0), follow-redirects (v1.15.6), jsdom (v23), react, sass (v1.71.0), style-to-js (v1.1.11), terminal-kit (v3.0.2), tesseract.js (v5.0.5), turndown (v7.1.3)
+- Fixed: After deleting the last note from the conflicts folder, the application state is invalid (#10189)
+- Fixed: ENEX does not import correctly when title of note matches the name of the attachment (#10125)
+- Fixed: English: Use the plural form of a localization for negative and zero items (#10582) (#10581 by [@personalizedrefrigerator](https://github.com/personalizedrefrigerator))
+
 ## [cli-v2.14.1](https://github.com/laurent22/joplin/releases/tag/cli-v2.14.1) - 2024-03-01T19:08:28Z
 
 - Improved: Allow setting a minimum app version on the sync target (#9778)

readme/about/changelog/ios.md

@@ -1,5 +1,10 @@
 # Joplin iOS Changelog
 
+## [ios-v13.0.5](https://github.com/laurent22/joplin/releases/tag/ios-v13.0.5) - 2024-07-01T15:47:53Z
+
+- Improved: Set min version for synchronising to 3.0.0 (e4b8976)
+- Fixed: Show notification in case Joplin Cloud credential is not valid anymore (#10649) (#10645 by [@pedr](https://github.com/pedr))
+
 ## [ios-v13.0.4](https://github.com/laurent22/joplin/releases/tag/ios-v13.0.4) - 2024-06-29T10:21:04Z
 
 - Updated German and Chinese translation

yarn.lock

@@ -6807,7 +6807,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/fork-htmlparser2@^4.1.51, @joplin/fork-htmlparser2@workspace:packages/fork-htmlparser2":
+"@joplin/fork-htmlparser2@^4.1.52, @joplin/fork-htmlparser2@workspace:packages/fork-htmlparser2":
   version: 0.0.0-use.local
   resolution: "@joplin/fork-htmlparser2@workspace:packages/fork-htmlparser2"
   dependencies:
@@ -6828,7 +6828,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/fork-sax@^1.2.55, @joplin/fork-sax@workspace:packages/fork-sax":
+"@joplin/fork-sax@^1.2.56, @joplin/fork-sax@workspace:packages/fork-sax":
   version: 0.0.0-use.local
   resolution: "@joplin/fork-sax@workspace:packages/fork-sax"
   dependencies:
@@ -6837,7 +6837,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/fork-uslug@^1.0.16, @joplin/fork-uslug@workspace:packages/fork-uslug":
+"@joplin/fork-uslug@^1.0.17, @joplin/fork-uslug@workspace:packages/fork-uslug":
   version: 0.0.0-use.local
   resolution: "@joplin/fork-uslug@workspace:packages/fork-uslug"
   dependencies:
@@ -6847,12 +6847,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/htmlpack@workspace:packages/htmlpack, @joplin/htmlpack@~3.0":
+"@joplin/htmlpack@^3.0.1, @joplin/htmlpack@workspace:packages/htmlpack":
   version: 0.0.0-use.local
   resolution: "@joplin/htmlpack@workspace:packages/htmlpack"
   dependencies:
     "@adobe/css-tools": 4.3.3
-    "@joplin/fork-htmlparser2": ^4.1.51
+    "@joplin/fork-htmlparser2": ^4.1.52
     "@types/fs-extra": 11.0.4
     datauri: 4.1.0
     fs-extra: 11.2.0
@@ -6860,21 +6860,21 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/lib@workspace:packages/lib, @joplin/lib@~3.0":
+"@joplin/lib@^3.0.1, @joplin/lib@workspace:packages/lib, @joplin/lib@~3.0":
   version: 0.0.0-use.local
   resolution: "@joplin/lib@workspace:packages/lib"
   dependencies:
     "@adobe/css-tools": 4.3.3
     "@aws-sdk/client-s3": 3.296.0
     "@aws-sdk/s3-request-presigner": 3.296.0
-    "@joplin/fork-htmlparser2": ^4.1.51
-    "@joplin/fork-sax": ^1.2.55
-    "@joplin/fork-uslug": ^1.0.16
-    "@joplin/htmlpack": ~3.0
-    "@joplin/renderer": ~3.0
-    "@joplin/turndown": ^4.0.73
-    "@joplin/turndown-plugin-gfm": ^1.0.55
-    "@joplin/utils": ~3.0
+    "@joplin/fork-htmlparser2": ^4.1.52
+    "@joplin/fork-sax": ^1.2.56
+    "@joplin/fork-uslug": ^1.0.17
+    "@joplin/htmlpack": ^3.0.1
+    "@joplin/renderer": ^3.0.1
+    "@joplin/turndown": ^4.0.74
+    "@joplin/turndown-plugin-gfm": ^1.0.56
+    "@joplin/utils": ^3.0.1
     "@testing-library/react-hooks": 8.0.1
     "@types/fs-extra": 11.0.4
     "@types/jest": 29.5.8
@@ -6983,9 +6983,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@joplin/plugin-repo-cli@workspace:packages/plugin-repo-cli"
   dependencies:
-    "@joplin/lib": ~3.0
-    "@joplin/tools": ~3.0
-    "@joplin/utils": ~3.0
+    "@joplin/lib": ^3.0.1
+    "@joplin/tools": ^3.0.1
+    "@joplin/utils": ^3.0.1
     "@types/fs-extra": 11.0.4
     "@types/jest": 29.5.8
     "@types/node": 18.19.26
@@ -7034,13 +7034,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/renderer@workspace:packages/renderer, @joplin/renderer@~3.0":
+"@joplin/renderer@^3.0.1, @joplin/renderer@workspace:packages/renderer, @joplin/renderer@~3.0":
   version: 0.0.0-use.local
   resolution: "@joplin/renderer@workspace:packages/renderer"
   dependencies:
-    "@joplin/fork-htmlparser2": ^4.1.51
-    "@joplin/fork-uslug": ^1.0.16
-    "@joplin/utils": ~3.0
+    "@joplin/fork-htmlparser2": ^4.1.52
+    "@joplin/fork-uslug": ^1.0.17
+    "@joplin/utils": ^3.0.1
     "@types/jest": 29.5.8
     "@types/markdown-it": 13.0.7
     "@types/node": 18.19.26
@@ -7138,15 +7138,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/tools@workspace:packages/tools, @joplin/tools@~3.0":
+"@joplin/tools@^3.0.1, @joplin/tools@workspace:packages/tools, @joplin/tools@~3.0":
   version: 0.0.0-use.local
   resolution: "@joplin/tools@workspace:packages/tools"
   dependencies:
     "@docusaurus/plugin-sitemap": 2.4.3
-    "@joplin/fork-htmlparser2": ^4.1.51
-    "@joplin/lib": ~3.0
-    "@joplin/renderer": ~3.0
-    "@joplin/utils": ~3.0
+    "@joplin/fork-htmlparser2": ^4.1.52
+    "@joplin/lib": ^3.0.1
+    "@joplin/renderer": ^3.0.1
+    "@joplin/utils": ^3.0.1
     "@rmp135/sql-ts": 1.18.1
     "@types/fs-extra": 11.0.4
     "@types/jest": 29.5.8
@@ -7186,7 +7186,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/turndown-plugin-gfm@^1.0.55, @joplin/turndown-plugin-gfm@workspace:packages/turndown-plugin-gfm":
+"@joplin/turndown-plugin-gfm@^1.0.56, @joplin/turndown-plugin-gfm@workspace:packages/turndown-plugin-gfm":
   version: 0.0.0-use.local
   resolution: "@joplin/turndown-plugin-gfm@workspace:packages/turndown-plugin-gfm"
   dependencies:
@@ -7198,7 +7198,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/turndown@^4.0.73, @joplin/turndown@workspace:packages/turndown":
+"@joplin/turndown@^4.0.74, @joplin/turndown@workspace:packages/turndown":
   version: 0.0.0-use.local
   resolution: "@joplin/turndown@workspace:packages/turndown"
   dependencies:
@@ -7215,26 +7215,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/utils@npm:~2.12":
-  version: 2.12.1
-  resolution: "@joplin/utils@npm:2.12.1"
-  dependencies:
-    async-mutex: 0.4.0
-    execa: 5.1.1
-    fs-extra: 11.1.1
-    glob: 10.3.3
-    moment: 2.29.4
-    node-fetch: 2.6.7
-    sprintf-js: 1.1.2
-  checksum: dab823a7bb5d6d13c3d85c67dc669861aa0cdb89cee28cddceb280b43a235d7e058813b9724468b58532489fde25e0857098afe322286bd914e6096d1dc7ece7
-  languageName: node
-  linkType: hard
-
-"@joplin/utils@workspace:packages/utils, @joplin/utils@~3.0":
+"@joplin/utils@^3.0.1, @joplin/utils@workspace:packages/utils, @joplin/utils@~3.0":
   version: 0.0.0-use.local
   resolution: "@joplin/utils@workspace:packages/utils"
   dependencies:
-    "@joplin/fork-htmlparser2": ^4.1.51
+    "@joplin/fork-htmlparser2": ^4.1.52
     "@types/fs-extra": 11.0.4
     "@types/jest": 29.5.8
     "@types/markdown-it": 13.0.7
@@ -7253,6 +7238,21 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@joplin/utils@npm:~2.12":
+  version: 2.12.1
+  resolution: "@joplin/utils@npm:2.12.1"
+  dependencies:
+    async-mutex: 0.4.0
+    execa: 5.1.1
+    fs-extra: 11.1.1
+    glob: 10.3.3
+    moment: 2.29.4
+    node-fetch: 2.6.7
+    sprintf-js: 1.1.2
+  checksum: dab823a7bb5d6d13c3d85c67dc669861aa0cdb89cee28cddceb280b43a235d7e058813b9724468b58532489fde25e0857098afe322286bd914e6096d1dc7ece7
+  languageName: node
+  linkType: hard
+
 "@jridgewell/gen-mapping@npm:^0.1.0":
   version: 0.1.1
   resolution: "@jridgewell/gen-mapping@npm:0.1.1"