Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-3.2' into dev

pull/11665/head
Laurent Cozic 2025-01-16 15:24:19 +00:00
parent 519f3f5898 ca64451503
commit 6a1b498e96
16 changed files with 72 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app-cli/package.json
View File

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

2
packages/fork-htmlparser2/package.json
View File

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

2
packages/fork-sax/package.json
View File

@ -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.60",
"version": "1.2.61",
"main": "lib/sax.js",
"publishConfig": {
"access": "public"

2
packages/fork-uslug/package.json
View File

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

4
packages/htmlpack/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/htmlpack",
"version": "3.2.4",
"version": "3.2.5",
"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.4.0",
"@joplin/fork-htmlparser2": "^4.1.56",
"@joplin/fork-htmlparser2": "^4.1.57",
"datauri": "4.1.0",
"fs-extra": "11.2.0",
"html-entities": "1.4.0"

20
packages/lib/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/lib",
"version": "3.2.4",
"version": "3.2.5",
"description": "Joplin Core library",
"author": "Laurent Cozic",
"homepage": "",
@ -43,15 +43,15 @@
"@adobe/css-tools": "4.4.0",
"@aws-sdk/client-s3": "3.296.0",
"@aws-sdk/s3-request-presigner": "3.296.0",
"@joplin/fork-htmlparser2": "^4.1.56",
"@joplin/fork-sax": "^1.2.60",
"@joplin/fork-uslug": "^1.0.21",
"@joplin/htmlpack": "^3.2.4",
"@joplin/onenote-converter": "^3.2.4",
"@joplin/renderer": "^3.2.4",
"@joplin/turndown": "^4.0.78",
"@joplin/turndown-plugin-gfm": "^1.0.60",
"@joplin/utils": "^3.2.4",
"@joplin/fork-htmlparser2": "^4.1.57",
"@joplin/fork-sax": "^1.2.61",
"@joplin/fork-uslug": "^1.0.22",
"@joplin/htmlpack": "^3.2.5",
"@joplin/onenote-converter": "^3.2.5",
"@joplin/renderer": "^3.2.5",
"@joplin/turndown": "^4.0.79",
"@joplin/turndown-plugin-gfm": "^1.0.61",
"@joplin/utils": "^3.2.5",
"@types/nanoid": "3.0.0",
"adm-zip": "0.5.16",
"async-mutex": "0.5.0",

2
packages/onenote-converter/package.json
View File

@ -4,7 +4,7 @@
"access": "public"
},
"description": "Used to import a OneNote archive into Joplin",
"version": "3.2.4",
"version": "3.2.5",
"license": "AGPL-3.0-or-later",
"repository": "https://github.com/laurent22/joplin/tree/dev/packages/onenote-converter",
"main": "./pkg/onenote_converter.js",

8
packages/plugin-repo-cli/package.json
View File

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

2
packages/react-native-saf-x/package.json
View File

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

8
packages/renderer/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/renderer",
"version": "3.2.4",
"version": "3.2.5",
"description": "The Joplin note renderer, used the mobile and desktop application",
"repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer",
"main": "index.js",
@ -30,9 +30,9 @@
"typescript": "5.4.5"
},
"dependencies": {
"@joplin/fork-htmlparser2": "^4.1.56",
"@joplin/fork-uslug": "^1.0.21",
"@joplin/utils": "^3.2.4",
"@joplin/fork-htmlparser2": "^4.1.57",
"@joplin/fork-uslug": "^1.0.22",
"@joplin/utils": "^3.2.5",
"font-awesome-filetypes": "2.1.0",
"fs-extra": "11.2.0",
"highlight.js": "11.10.0",

10
packages/tools/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/tools",
"version": "3.2.4",
"version": "3.2.5",
"description": "Various tools for Joplin",
"main": "index.js",
"author": "Laurent Cozic",
@ -21,9 +21,9 @@
},
"license": "AGPL-3.0-or-later",
"dependencies": {
"@joplin/lib": "^3.2.4",
"@joplin/renderer": "^3.2.4",
"@joplin/utils": "^3.2.4",
"@joplin/lib": "^3.2.5",
"@joplin/renderer": "^3.2.5",
"@joplin/utils": "^3.2.5",
"compare-versions": "6.1.1",
"dayjs": "1.11.12",
"execa": "4.1.0",
@ -45,7 +45,7 @@
},
"devDependencies": {
"@docusaurus/plugin-sitemap": "2.4.3",
"@joplin/fork-htmlparser2": "^4.1.56",
"@joplin/fork-htmlparser2": "^4.1.57",
"@rmp135/sql-ts": "1.18.1",
"@types/fs-extra": "11.0.4",
"@types/jest": "29.5.12",

2
packages/turndown-plugin-gfm/package.json
View File

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

2
packages/turndown/package.json
View File

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

4
packages/utils/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/utils",
"version": "3.2.4",
"version": "3.2.5",
"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.56",
"@joplin/fork-htmlparser2": "^4.1.57",
"async-mutex": "0.5.0",
"dayjs": "1.11.12",
"execa": "5.1.1",

5
readme/about/changelog/cli.md
View File

@ -1,5 +1,10 @@
# Joplin Terminal App Changelog
## [cli-v3.2.3](https://github.com/laurent22/joplin/releases/tag/cli-v3.2.3) - 2025-01-16T01:14:35Z
- Improved: Updated packages @rollup/plugin-node-resolve (v15.2.4), adm-zip (v0.5.16)
- Fixed: Revert deprecation warning suppression (#11620) (#11577 by [@pedr](https://github.com/pedr))
## [cli-v3.2.2](https://github.com/laurent22/joplin/releases/tag/cli-v3.2.2) - 2024-12-12T15:44:50Z
- Improved: Make Sharp package optional (388d124)

64
yarn.lock
View File

@ -8533,7 +8533,7 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/fork-htmlparser2@^4.1.56, @joplin/fork-htmlparser2@workspace:packages/fork-htmlparser2":
"@joplin/fork-htmlparser2@^4.1.57, @joplin/fork-htmlparser2@workspace:packages/fork-htmlparser2":
version: 0.0.0-use.local
resolution: "@joplin/fork-htmlparser2@workspace:packages/fork-htmlparser2"
dependencies:
@ -8554,7 +8554,7 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/fork-sax@^1.2.60, @joplin/fork-sax@workspace:packages/fork-sax":
"@joplin/fork-sax@^1.2.61, @joplin/fork-sax@workspace:packages/fork-sax":
version: 0.0.0-use.local
resolution: "@joplin/fork-sax@workspace:packages/fork-sax"
dependencies:
@ -8563,7 +8563,7 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/fork-uslug@^1.0.21, @joplin/fork-uslug@workspace:packages/fork-uslug":
"@joplin/fork-uslug@^1.0.22, @joplin/fork-uslug@workspace:packages/fork-uslug":
version: 0.0.0-use.local
resolution: "@joplin/fork-uslug@workspace:packages/fork-uslug"
dependencies:
@ -8573,12 +8573,12 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/htmlpack@^3.2.4, @joplin/htmlpack@workspace:packages/htmlpack":
"@joplin/htmlpack@^3.2.5, @joplin/htmlpack@workspace:packages/htmlpack":
version: 0.0.0-use.local
resolution: "@joplin/htmlpack@workspace:packages/htmlpack"
dependencies:
"@adobe/css-tools": 4.4.0
"@joplin/fork-htmlparser2": ^4.1.56
"@joplin/fork-htmlparser2": ^4.1.57
"@types/fs-extra": 11.0.4
datauri: 4.1.0
fs-extra: 11.2.0
@ -8586,22 +8586,22 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/lib@^3.2.4, @joplin/lib@workspace:packages/lib, @joplin/lib@~3.2":
"@joplin/lib@^3.2.5, @joplin/lib@workspace:packages/lib, @joplin/lib@~3.2":
version: 0.0.0-use.local
resolution: "@joplin/lib@workspace:packages/lib"
dependencies:
"@adobe/css-tools": 4.4.0
"@aws-sdk/client-s3": 3.296.0
"@aws-sdk/s3-request-presigner": 3.296.0
"@joplin/fork-htmlparser2": ^4.1.56
"@joplin/fork-sax": ^1.2.60
"@joplin/fork-uslug": ^1.0.21
"@joplin/htmlpack": ^3.2.4
"@joplin/onenote-converter": ^3.2.4
"@joplin/renderer": ^3.2.4
"@joplin/turndown": ^4.0.78
"@joplin/turndown-plugin-gfm": ^1.0.60
"@joplin/utils": ^3.2.4
"@joplin/fork-htmlparser2": ^4.1.57
"@joplin/fork-sax": ^1.2.61
"@joplin/fork-uslug": ^1.0.22
"@joplin/htmlpack": ^3.2.5
"@joplin/onenote-converter": ^3.2.5
"@joplin/renderer": ^3.2.5
"@joplin/turndown": ^4.0.79
"@joplin/turndown-plugin-gfm": ^1.0.61
"@joplin/utils": ^3.2.5
"@testing-library/react-hooks": 8.0.1
"@types/adm-zip": 0.5.5
"@types/fs-extra": 11.0.4
@ -8678,7 +8678,7 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/onenote-converter@^3.2.4, @joplin/onenote-converter@workspace:packages/onenote-converter":
"@joplin/onenote-converter@^3.2.5, @joplin/onenote-converter@workspace:packages/onenote-converter":
version: 0.0.0-use.local
resolution: "@joplin/onenote-converter@workspace:packages/onenote-converter"
dependencies:
@ -8722,9 +8722,9 @@ __metadata:
version: 0.0.0-use.local
resolution: "@joplin/plugin-repo-cli@workspace:packages/plugin-repo-cli"
dependencies:
"@joplin/lib": ^3.2.4
"@joplin/tools": ^3.2.4
"@joplin/utils": ^3.2.4
"@joplin/lib": ^3.2.5
"@joplin/tools": ^3.2.5
"@joplin/utils": ^3.2.5
"@types/fs-extra": 11.0.4
"@types/jest": 29.5.12
"@types/node": 18.19.56
@ -8773,13 +8773,13 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/renderer@^3.2.4, @joplin/renderer@workspace:packages/renderer, @joplin/renderer@~3.2":
"@joplin/renderer@^3.2.5, @joplin/renderer@workspace:packages/renderer, @joplin/renderer@~3.2":
version: 0.0.0-use.local
resolution: "@joplin/renderer@workspace:packages/renderer"
dependencies:
"@joplin/fork-htmlparser2": ^4.1.56
"@joplin/fork-uslug": ^1.0.21
"@joplin/utils": ^3.2.4
"@joplin/fork-htmlparser2": ^4.1.57
"@joplin/fork-uslug": ^1.0.22
"@joplin/utils": ^3.2.5
"@types/jest": 29.5.12
"@types/markdown-it": 13.0.9
"@types/node": 18.19.56
@ -8877,15 +8877,15 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/tools@^3.2.4, @joplin/tools@workspace:packages/tools, @joplin/tools@~3.2":
"@joplin/tools@^3.2.5, @joplin/tools@workspace:packages/tools, @joplin/tools@~3.2":
version: 0.0.0-use.local
resolution: "@joplin/tools@workspace:packages/tools"
dependencies:
"@docusaurus/plugin-sitemap": 2.4.3
"@joplin/fork-htmlparser2": ^4.1.56
"@joplin/lib": ^3.2.4
"@joplin/renderer": ^3.2.4
"@joplin/utils": ^3.2.4
"@joplin/fork-htmlparser2": ^4.1.57
"@joplin/lib": ^3.2.5
"@joplin/renderer": ^3.2.5
"@joplin/utils": ^3.2.5
"@rmp135/sql-ts": 1.18.1
"@types/fs-extra": 11.0.4
"@types/jest": 29.5.12
@ -8927,7 +8927,7 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/turndown-plugin-gfm@^1.0.60, @joplin/turndown-plugin-gfm@workspace:packages/turndown-plugin-gfm":
"@joplin/turndown-plugin-gfm@^1.0.61, @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:
@ -8939,7 +8939,7 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/turndown@^4.0.78, @joplin/turndown@workspace:packages/turndown":
"@joplin/turndown@^4.0.79, @joplin/turndown@workspace:packages/turndown":
version: 0.0.0-use.local
resolution: "@joplin/turndown@workspace:packages/turndown"
dependencies:
@ -8956,11 +8956,11 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/utils@^3.2.4, @joplin/utils@workspace:packages/utils, @joplin/utils@~3.2":
"@joplin/utils@^3.2.5, @joplin/utils@workspace:packages/utils, @joplin/utils@~3.2":
version: 0.0.0-use.local
resolution: "@joplin/utils@workspace:packages/utils"
dependencies:
"@joplin/fork-htmlparser2": ^4.1.56
"@joplin/fork-htmlparser2": ^4.1.57
"@types/fs-extra": 11.0.4
"@types/jest": 29.5.12
"@types/markdown-it": 13.0.9