self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Merge branch 'release-2.11' into dev

Browse Source
This commit is contained in:
Laurent Cozic 2023-06-27 10:33:22 +01:00
commit 295756a528
15 changed files with 69 additions and 59 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" "owner": "Laurent Cozic"
}, },
"version": "2.11.0", "version": "2.11.1",
"bin": "./main.js", "bin": "./main.js",
"engines": { "engines": {
"node": ">=10.0.0" "node": ">=10.0.0"

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

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

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

@ -2,7 +2,7 @@
"name": "@joplin/fork-sax", "name": "@joplin/fork-sax",
"description": "An evented streaming XML parser in JavaScript", "description": "An evented streaming XML parser in JavaScript",
"author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)", "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
"version": "1.2.47", "version": "1.2.48",
"main": "lib/sax.js", "main": "lib/sax.js",
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"

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

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

4
packages/htmlpack/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/htmlpack", "name": "@joplin/htmlpack",
"version": "2.11.0", "version": "2.11.1",
"description": "Pack an HTML file and all its linked resources into a single HTML file", "description": "Pack an HTML file and all its linked resources into a single HTML file",
"main": "dist/index.js", "main": "dist/index.js",
"types": "src/index.ts", "types": "src/index.ts",
@ -14,7 +14,7 @@
"author": "Laurent Cozic", "author": "Laurent Cozic",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@joplin/fork-htmlparser2": "^4.1.43", "@joplin/fork-htmlparser2": "^4.1.44",
"css": "3.0.0", "css": "3.0.0",
"datauri": "4.1.0", "datauri": "4.1.0",
"fs-extra": "11.1.1", "fs-extra": "11.1.1",

18
packages/lib/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/lib", "name": "@joplin/lib",
"version": "2.11.0", "version": "2.11.1",
"description": "Joplin Core library", "description": "Joplin Core library",
"author": "Laurent Cozic", "author": "Laurent Cozic",
"homepage": "", "homepage": "",
@ -31,14 +31,14 @@
"dependencies": { "dependencies": {
"@aws-sdk/client-s3": "3.296.0", "@aws-sdk/client-s3": "3.296.0",
"@aws-sdk/s3-request-presigner": "3.296.0", "@aws-sdk/s3-request-presigner": "3.296.0",
"@joplin/fork-htmlparser2": "^4.1.43", "@joplin/fork-htmlparser2": "^4.1.44",
"@joplin/fork-sax": "^1.2.47", "@joplin/fork-sax": "^1.2.48",
"@joplin/fork-uslug": "^1.0.8", "@joplin/fork-uslug": "^1.0.9",
"@joplin/htmlpack": "~2.11", "@joplin/htmlpack": "^2.11.1",
"@joplin/renderer": "~2.11", "@joplin/renderer": "^2.11.1",
"@joplin/turndown": "^4.0.65", "@joplin/turndown": "^4.0.66",
"@joplin/turndown-plugin-gfm": "^1.0.47", "@joplin/turndown-plugin-gfm": "^1.0.48",
"@joplin/utils": "~2.11", "@joplin/utils": "^2.11.1",
"@types/nanoid": "3.0.0", "@types/nanoid": "3.0.0",
"async-mutex": "0.4.0", "async-mutex": "0.4.0",
"base-64": "1.0.0", "base-64": "1.0.0",

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

@ -1,6 +1,6 @@
{ {
"name": "@joplin/plugin-repo-cli", "name": "@joplin/plugin-repo-cli",
"version": "2.11.0", "version": "2.11.1",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"bin": "./dist/index.js", "bin": "./dist/index.js",
@ -18,9 +18,9 @@
"author": "", "author": "",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {
"@joplin/lib": "~2.11", "@joplin/lib": "^2.11.1",
"@joplin/tools": "~2.11", "@joplin/tools": "^2.11.1",
"@joplin/utils": "~2.11", "@joplin/utils": "^2.11.1",
"fs-extra": "11.1.1", "fs-extra": "11.1.1",
"gh-release-assets": "2.0.1", "gh-release-assets": "2.0.1",
"node-fetch": "2.6.7", "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", "name": "@joplin/react-native-saf-x",
"version": "2.11.0", "version": "2.11.1",
"description": "a module to help work with scoped storages on android easily", "description": "a module to help work with scoped storages on android easily",
"main": "src/index", "main": "src/index",
"react-native": "src/index", "react-native": "src/index",

6
packages/renderer/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/renderer", "name": "@joplin/renderer",
"version": "2.11.0", "version": "2.11.1",
"description": "The Joplin note renderer, used the mobile and desktop application", "description": "The Joplin note renderer, used the mobile and desktop application",
"repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer", "repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer",
"main": "index.js", "main": "index.js",
@ -26,8 +26,8 @@
"typescript": "5.0.2" "typescript": "5.0.2"
}, },
"dependencies": { "dependencies": {
"@joplin/fork-htmlparser2": "^4.1.43", "@joplin/fork-htmlparser2": "^4.1.44",
"@joplin/fork-uslug": "^1.0.8", "@joplin/fork-uslug": "^1.0.9",
"font-awesome-filetypes": "2.1.0", "font-awesome-filetypes": "2.1.0",
"fs-extra": "11.1.1", "fs-extra": "11.1.1",
"highlight.js": "11.8.0", "highlight.js": "11.8.0",

10
packages/tools/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/tools", "name": "@joplin/tools",
"version": "2.11.0", "version": "2.11.1",
"description": "Various tools for Joplin", "description": "Various tools for Joplin",
"main": "index.js", "main": "index.js",
"author": "Laurent Cozic", "author": "Laurent Cozic",
@ -20,9 +20,9 @@
}, },
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {
"@joplin/lib": "~2.11", "@joplin/lib": "^2.11.1",
"@joplin/renderer": "~2.11", "@joplin/renderer": "^2.11.1",
"@joplin/utils": "~2.11", "@joplin/utils": "^2.11.1",
"compare-versions": "3.6.0", "compare-versions": "3.6.0",
"dayjs": "1.11.8", "dayjs": "1.11.8",
"execa": "4.1.0", "execa": "4.1.0",
@ -42,7 +42,7 @@
"yargs": "17.7.2" "yargs": "17.7.2"
}, },
"devDependencies": { "devDependencies": {
"@joplin/fork-htmlparser2": "^4.1.43", "@joplin/fork-htmlparser2": "^4.1.44",
"@rmp135/sql-ts": "1.16.0", "@rmp135/sql-ts": "1.16.0",
"@types/fs-extra": "11.0.1", "@types/fs-extra": "11.0.1",
"@types/jest": "29.5.1", "@types/jest": "29.5.1",

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

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

2
packages/turndown/package.json
View File

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

2
packages/utils/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/utils", "name": "@joplin/utils",
"version": "2.11.0", "version": "2.11.1",
"description": "Utilities for Joplin", "description": "Utilities for Joplin",
"repository": "https://github.com/laurent22/joplin/tree/dev/packages/utils", "repository": "https://github.com/laurent22/joplin/tree/dev/packages/utils",
"exports": { "exports": {

10
readme/changelog_cli.md
View File

@ -1,5 +1,15 @@
# Joplin terminal app changelog # Joplin terminal app changelog
## [cli-v2.11.1](https://github.com/laurent22/joplin/releases/tag/cli-v2.11.1) - 2023-06-27T09:28:01Z
- Improved: Updated packages aws, buildTools, domutils (v3.1.0), fs-extra (v11.1.1), jsdom (v21.1.2), markdown-it-multimd-table (v4.2.2), nanoid (v3.3.6), node-persist (v3.1.3), open (v8.4.2), reselect (v4.1.8), sass (v1.62.1), sharp (v0.32.1), sqlite3 (v5.1.6), tar (v6.1.15), turndown (v7.1.2), yargs (v17.7.2)
- Improved: Upgrade E2EE encryption method to AES-256 (#7686)
- Improved: When resetting the master password, also create a new master key with that password (e647775)
- Fixed: Allow certain HTML anchor tags (#8286)
- Fixed: Encode the non-ASCII characters in OneDrive URI (#7868) (#7851 by Self Not Found)
- Fixed: Fix OneDrive sync attempting to call method on `null` variable (#7987) (#7986 by Henry Heino)
- Fixed: Improve selection of active E2EE key (#8254)
## [cli-v2.10.3](https://github.com/laurent22/joplin/releases/tag/cli-v2.10.3) - 2023-02-26T13:03:59Z ## [cli-v2.10.3](https://github.com/laurent22/joplin/releases/tag/cli-v2.10.3) - 2023-02-26T13:03:59Z
- Fixed: Fixed "sync" command when calling it in non-interactive mode (d157b9c) - Fixed: Fixed "sync" command when calling it in non-interactive mode (d157b9c)

56
yarn.lock
View File

@ -4453,7 +4453,7 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/fork-htmlparser2@^4.1.43, @joplin/fork-htmlparser2@workspace:packages/fork-htmlparser2": "@joplin/fork-htmlparser2@^4.1.44, @joplin/fork-htmlparser2@workspace:packages/fork-htmlparser2":
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@joplin/fork-htmlparser2@workspace:packages/fork-htmlparser2" resolution: "@joplin/fork-htmlparser2@workspace:packages/fork-htmlparser2"
dependencies: dependencies:
@ -4475,7 +4475,7 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/fork-sax@^1.2.47, @joplin/fork-sax@workspace:packages/fork-sax": "@joplin/fork-sax@^1.2.48, @joplin/fork-sax@workspace:packages/fork-sax":
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@joplin/fork-sax@workspace:packages/fork-sax" resolution: "@joplin/fork-sax@workspace:packages/fork-sax"
dependencies: dependencies:
@ -4484,7 +4484,7 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/fork-uslug@^1.0.8, @joplin/fork-uslug@workspace:packages/fork-uslug": "@joplin/fork-uslug@^1.0.9, @joplin/fork-uslug@workspace:packages/fork-uslug":
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@joplin/fork-uslug@workspace:packages/fork-uslug" resolution: "@joplin/fork-uslug@workspace:packages/fork-uslug"
dependencies: dependencies:
@ -4494,11 +4494,11 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/htmlpack@workspace:packages/htmlpack, @joplin/htmlpack@~2.11": "@joplin/htmlpack@^2.11.1, @joplin/htmlpack@workspace:packages/htmlpack":
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@joplin/htmlpack@workspace:packages/htmlpack" resolution: "@joplin/htmlpack@workspace:packages/htmlpack"
dependencies: dependencies:
"@joplin/fork-htmlparser2": ^4.1.43 "@joplin/fork-htmlparser2": ^4.1.44
"@types/fs-extra": 11.0.1 "@types/fs-extra": 11.0.1
css: 3.0.0 css: 3.0.0
datauri: 4.1.0 datauri: 4.1.0
@ -4507,20 +4507,20 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/lib@workspace:packages/lib, @joplin/lib@~2.11": "@joplin/lib@^2.11.1, @joplin/lib@workspace:packages/lib, @joplin/lib@~2.11":
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@joplin/lib@workspace:packages/lib" resolution: "@joplin/lib@workspace:packages/lib"
dependencies: dependencies:
"@aws-sdk/client-s3": 3.296.0 "@aws-sdk/client-s3": 3.296.0
"@aws-sdk/s3-request-presigner": 3.296.0 "@aws-sdk/s3-request-presigner": 3.296.0
"@joplin/fork-htmlparser2": ^4.1.43 "@joplin/fork-htmlparser2": ^4.1.44
"@joplin/fork-sax": ^1.2.47 "@joplin/fork-sax": ^1.2.48
"@joplin/fork-uslug": ^1.0.8 "@joplin/fork-uslug": ^1.0.9
"@joplin/htmlpack": ~2.11 "@joplin/htmlpack": ^2.11.1
"@joplin/renderer": ~2.11 "@joplin/renderer": ^2.11.1
"@joplin/turndown": ^4.0.65 "@joplin/turndown": ^4.0.66
"@joplin/turndown-plugin-gfm": ^1.0.47 "@joplin/turndown-plugin-gfm": ^1.0.48
"@joplin/utils": ~2.11 "@joplin/utils": ^2.11.1
"@types/fs-extra": 11.0.1 "@types/fs-extra": 11.0.1
"@types/jest": 29.5.1 "@types/jest": 29.5.1
"@types/js-yaml": 4.0.5 "@types/js-yaml": 4.0.5
@ -4624,9 +4624,9 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@joplin/plugin-repo-cli@workspace:packages/plugin-repo-cli" resolution: "@joplin/plugin-repo-cli@workspace:packages/plugin-repo-cli"
dependencies: dependencies:
"@joplin/lib": ~2.11 "@joplin/lib": ^2.11.1
"@joplin/tools": ~2.11 "@joplin/tools": ^2.11.1
"@joplin/utils": ~2.11 "@joplin/utils": ^2.11.1
"@types/fs-extra": 11.0.1 "@types/fs-extra": 11.0.1
"@types/jest": 29.5.1 "@types/jest": 29.5.1
"@types/node": 18.15.13 "@types/node": 18.15.13
@ -4675,12 +4675,12 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/renderer@workspace:packages/renderer, @joplin/renderer@~2.11": "@joplin/renderer@^2.11.1, @joplin/renderer@workspace:packages/renderer, @joplin/renderer@~2.11":
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@joplin/renderer@workspace:packages/renderer" resolution: "@joplin/renderer@workspace:packages/renderer"
dependencies: dependencies:
"@joplin/fork-htmlparser2": ^4.1.43 "@joplin/fork-htmlparser2": ^4.1.44
"@joplin/fork-uslug": ^1.0.8 "@joplin/fork-uslug": ^1.0.9
"@types/jest": 29.5.1 "@types/jest": 29.5.1
"@types/node": 18.15.13 "@types/node": 18.15.13
font-awesome-filetypes: 2.1.0 font-awesome-filetypes: 2.1.0
@ -4773,14 +4773,14 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/tools@workspace:packages/tools, @joplin/tools@~2.11": "@joplin/tools@^2.11.1, @joplin/tools@workspace:packages/tools, @joplin/tools@~2.11":
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@joplin/tools@workspace:packages/tools" resolution: "@joplin/tools@workspace:packages/tools"
dependencies: dependencies:
"@joplin/fork-htmlparser2": ^4.1.43 "@joplin/fork-htmlparser2": ^4.1.44
"@joplin/lib": ~2.11 "@joplin/lib": ^2.11.1
"@joplin/renderer": ~2.11 "@joplin/renderer": ^2.11.1
"@joplin/utils": ~2.11 "@joplin/utils": ^2.11.1
"@rmp135/sql-ts": 1.16.0 "@rmp135/sql-ts": 1.16.0
"@types/fs-extra": 11.0.1 "@types/fs-extra": 11.0.1
"@types/jest": 29.5.1 "@types/jest": 29.5.1
@ -4816,7 +4816,7 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/turndown-plugin-gfm@^1.0.47, @joplin/turndown-plugin-gfm@workspace:packages/turndown-plugin-gfm": "@joplin/turndown-plugin-gfm@^1.0.48, @joplin/turndown-plugin-gfm@workspace:packages/turndown-plugin-gfm":
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@joplin/turndown-plugin-gfm@workspace:packages/turndown-plugin-gfm" resolution: "@joplin/turndown-plugin-gfm@workspace:packages/turndown-plugin-gfm"
dependencies: dependencies:
@ -4828,7 +4828,7 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/turndown@^4.0.65, @joplin/turndown@workspace:packages/turndown": "@joplin/turndown@^4.0.66, @joplin/turndown@workspace:packages/turndown":
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@joplin/turndown@workspace:packages/turndown" resolution: "@joplin/turndown@workspace:packages/turndown"
dependencies: dependencies:
@ -4845,7 +4845,7 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/utils@workspace:packages/utils, @joplin/utils@~2.11": "@joplin/utils@^2.11.1, @joplin/utils@workspace:packages/utils, @joplin/utils@~2.11":
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@joplin/utils@workspace:packages/utils" resolution: "@joplin/utils@workspace:packages/utils"
dependencies: dependencies: