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

Chore: Prepare v2.11

Browse Source
This commit is contained in:
Laurent Cozic 2023-03-30 17:12:27 +01:00
parent 75d204c9ca
commit f325e7694b
21 changed files with 114 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,15 +35,15 @@
], ],
"owner": "Laurent Cozic" "owner": "Laurent Cozic"
}, },
"version": "2.10.3", "version": "2.11.0",
"bin": "./main.js", "bin": "./main.js",
"engines": { "engines": {
"node": ">=10.0.0" "node": ">=10.0.0"
}, },
"dependencies": { "dependencies": {
"@joplin/lib": "~2.10", "@joplin/lib": "~2.11",
"@joplin/renderer": "~2.10", "@joplin/renderer": "~2.11",
"@joplin/utils": "~2.10", "@joplin/utils": "~2.11",
"aws-sdk": "2.1290.0", "aws-sdk": "2.1290.0",
"chalk": "4.1.2", "chalk": "4.1.2",
"compare-version": "0.1.2", "compare-version": "0.1.2",
@ -70,7 +70,7 @@
"yargs-parser": "21.1.1" "yargs-parser": "21.1.1"
}, },
"devDependencies": { "devDependencies": {
"@joplin/tools": "~2.10", "@joplin/tools": "~2.11",
"@types/fs-extra": "9.0.13", "@types/fs-extra": "9.0.13",
"@types/jest": "29.2.6", "@types/jest": "29.2.6",
"@types/node": "18.11.18", "@types/node": "18.11.18",

2
packages/app-clipper/manifest.json
View File

@ -1,7 +1,7 @@
{ {
"manifest_version": 2, "manifest_version": 2,
"name": "Joplin Web Clipper [DEV]", "name": "Joplin Web Clipper [DEV]",
"version": "2.10.0", "version": "2.11.0",
"description": "Capture and save web pages and screenshots from your browser to Joplin.", "description": "Capture and save web pages and screenshots from your browser to Joplin.",
"homepage_url": "https://joplinapp.org", "homepage_url": "https://joplinapp.org",
"content_security_policy": "script-src 'self'; object-src 'self'", "content_security_policy": "script-src 'self'; object-src 'self'",

10
packages/app-desktop/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/app-desktop", "name": "@joplin/app-desktop",
"version": "2.10.12", "version": "2.11.0",
"description": "Joplin for Desktop", "description": "Joplin for Desktop",
"main": "main.js", "main": "main.js",
"private": true, "private": true,
@ -109,7 +109,7 @@
}, },
"homepage": "https://github.com/laurent22/joplin#readme", "homepage": "https://github.com/laurent22/joplin#readme",
"devDependencies": { "devDependencies": {
"@joplin/tools": "~2.10", "@joplin/tools": "~2.11",
"@testing-library/react-hooks": "8.0.1", "@testing-library/react-hooks": "8.0.1",
"@types/jest": "29.2.6", "@types/jest": "29.2.6",
"@types/node": "18.11.18", "@types/node": "18.11.18",
@ -138,9 +138,9 @@
"@electron/remote": "2.0.9", "@electron/remote": "2.0.9",
"@fortawesome/fontawesome-free": "5.15.4", "@fortawesome/fontawesome-free": "5.15.4",
"@joeattardi/emoji-button": "4.6.4", "@joeattardi/emoji-button": "4.6.4",
"@joplin/lib": "~2.10", "@joplin/lib": "~2.11",
"@joplin/pdf-viewer": "~2.10", "@joplin/pdf-viewer": "~2.11",
"@joplin/renderer": "~2.10", "@joplin/renderer": "~2.11",
"async-mutex": "0.4.0", "async-mutex": "0.4.0",
"codemirror": "5.65.9", "codemirror": "5.65.9",
"color": "3.2.1", "color": "3.2.1",

2
packages/app-mobile/android/app/build.gradle
View File

@ -151,7 +151,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 2097685 versionCode 2097685
versionName "2.10.9" versionName "2.11.0"
// ndk { // ndk {
// abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" // abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
// } // }

8
packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
View File

@ -523,7 +523,7 @@
INFOPLIST_FILE = Joplin/Info.plist; INFOPLIST_FILE = Joplin/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 12.10.5; MARKETING_VERSION = 12.11.0;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
@ -551,7 +551,7 @@
INFOPLIST_FILE = Joplin/Info.plist; INFOPLIST_FILE = Joplin/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 12.10.5; MARKETING_VERSION = 12.11.0;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
@ -705,7 +705,7 @@
INFOPLIST_FILE = ShareExtension/Info.plist; INFOPLIST_FILE = ShareExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 12.10.5; MARKETING_VERSION = 12.11.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension; PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
@ -736,7 +736,7 @@
INFOPLIST_FILE = ShareExtension/Info.plist; INFOPLIST_FILE = ShareExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 12.10.5; MARKETING_VERSION = 12.11.0;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension; PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";

12
packages/app-mobile/ios/Podfile.lock
View File

@ -306,7 +306,7 @@ PODS:
- React-jsinspector (0.70.6) - React-jsinspector (0.70.6)
- React-logger (0.70.6): - React-logger (0.70.6):
- glog - glog
- react-native-alarm-notification (2.10.0): - react-native-alarm-notification (2.11.0):
- React - React
- react-native-camera (4.2.1): - react-native-camera (4.2.1):
- React-Core - React-Core
@ -316,7 +316,7 @@ PODS:
- React-Core - React-Core
- react-native-camera/RN (4.2.1): - react-native-camera/RN (4.2.1):
- React-Core - React-Core
- react-native-document-picker (8.1.3): - react-native-document-picker (8.1.4):
- React-Core - React-Core
- react-native-fingerprint-scanner (6.0.0): - react-native-fingerprint-scanner (6.0.0):
- React - React
@ -332,7 +332,7 @@ PODS:
- React-Core - React-Core
- react-native-rsa-native (2.0.5): - react-native-rsa-native (2.0.5):
- React - React
- react-native-saf-x (2.10.2): - react-native-saf-x (2.11.0):
- React-Core - React-Core
- react-native-safe-area-context (4.5.0): - react-native-safe-area-context (4.5.0):
- RCT-Folly - RCT-Folly
@ -714,9 +714,9 @@ SPEC CHECKSUMS:
React-jsiexecutor: b4a65947391c658450151275aa406f2b8263178f React-jsiexecutor: b4a65947391c658450151275aa406f2b8263178f
React-jsinspector: 60769e5a0a6d4b32294a2456077f59d0266f9a8b React-jsinspector: 60769e5a0a6d4b32294a2456077f59d0266f9a8b
React-logger: 1623c216abaa88974afce404dc8f479406bbc3a0 React-logger: 1623c216abaa88974afce404dc8f479406bbc3a0
react-native-alarm-notification: 0f58eaa37a4188480536fd7ab62db9b1dfba392f react-native-alarm-notification: 26527410a6162d07a9dc57f4bbc62e94ff48e65d
react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
react-native-document-picker: 958e2bc82e128be69055be261aeac8d872c8d34c react-native-document-picker: a9bd26996d1b2e4f412dd186041714c79af381d0
react-native-fingerprint-scanner: ac6656f18c8e45a7459302b84da41a44ad96dbbe react-native-fingerprint-scanner: ac6656f18c8e45a7459302b84da41a44ad96dbbe
react-native-geolocation: 69f4fd37650b8e7fee91816d395e62dd16f5ab8d react-native-geolocation: 69f4fd37650b8e7fee91816d395e62dd16f5ab8d
react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a
@ -724,7 +724,7 @@ SPEC CHECKSUMS:
react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f
react-native-netinfo: 2517ad504b3d303e90d7a431b0fcaef76d207983 react-native-netinfo: 2517ad504b3d303e90d7a431b0fcaef76d207983
react-native-rsa-native: 12132eb627797529fdb1f0d22fd0f8f9678df64a react-native-rsa-native: 12132eb627797529fdb1f0d22fd0f8f9678df64a
react-native-saf-x: db5a33862e7aec0f9f2d4cccfe7264b09b234e2e react-native-saf-x: 9bd5238d3b43d76bbec64aa82c173ac20a4bce9f
react-native-safe-area-context: 39c2d8be3328df5d437ac1700f4f3a4f75716acc react-native-safe-area-context: 39c2d8be3328df5d437ac1700f4f3a4f75716acc
react-native-slider: 33b8d190b59d4f67a541061bb91775d53d617d9d react-native-slider: 33b8d190b59d4f67a541061bb91775d53d617d9d
react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261 react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261

12
packages/app-mobile/package.json
View File

@ -2,7 +2,7 @@
"name": "@joplin/app-mobile", "name": "@joplin/app-mobile",
"description": "Joplin for Mobile", "description": "Joplin for Mobile",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"version": "2.10.0", "version": "2.11.0",
"private": true, "private": true,
"scripts": { "scripts": {
"start": "react-native start --reset-cache", "start": "react-native start --reset-cache",
@ -18,10 +18,10 @@
"postinstall": "jetify && yarn run build" "postinstall": "jetify && yarn run build"
}, },
"dependencies": { "dependencies": {
"@joplin/lib": "~2.10", "@joplin/lib": "~2.11",
"@joplin/react-native-alarm-notification": "~2.10", "@joplin/react-native-alarm-notification": "~2.11",
"@joplin/react-native-saf-x": "~2.10", "@joplin/react-native-saf-x": "~2.11",
"@joplin/renderer": "~2.10", "@joplin/renderer": "~2.11",
"@react-native-community/clipboard": "1.5.1", "@react-native-community/clipboard": "1.5.1",
"@react-native-community/datetimepicker": "6.7.5", "@react-native-community/datetimepicker": "6.7.5",
"@react-native-community/geolocation": "2.1.0", "@react-native-community/geolocation": "2.1.0",
@ -92,7 +92,7 @@
"@codemirror/search": "6.2.3", "@codemirror/search": "6.2.3",
"@codemirror/state": "6.1.4", "@codemirror/state": "6.1.4",
"@codemirror/view": "6.7.1", "@codemirror/view": "6.7.1",
"@joplin/tools": "~2.10", "@joplin/tools": "~2.11",
"@lezer/highlight": "1.1.3", "@lezer/highlight": "1.1.3",
"@types/fs-extra": "9.0.13", "@types/fs-extra": "9.0.13",
"@types/jest": "29.2.6", "@types/jest": "29.2.6",

2
packages/generator-joplin/generators/app/templates/src/manifest.json
View File

@ -1,7 +1,7 @@
{ {
"manifest_version": 1, "manifest_version": 1,
"id": "<%= pluginId %>", "id": "<%= pluginId %>",
"app_min_version": "2.10", "app_min_version": "2.11",
"version": "1.0.0", "version": "1.0.0",
"name": "<%= pluginName %>", "name": "<%= pluginName %>",
"description": "<%= pluginDescription %>", "description": "<%= pluginDescription %>",

2
packages/generator-joplin/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "generator-joplin", "name": "generator-joplin",
"version": "2.10.0", "version": "2.11.0",
"description": "Scaffolds out a new Joplin plugin", "description": "Scaffolds out a new Joplin plugin",
"homepage": "https://github.com/laurent22/joplin/tree/dev/packages/generator-joplin", "homepage": "https://github.com/laurent22/joplin/tree/dev/packages/generator-joplin",
"author": { "author": {

2
packages/htmlpack/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/htmlpack", "name": "@joplin/htmlpack",
"version": "2.10.2", "version": "2.11.0",
"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",

8
packages/lib/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/lib", "name": "@joplin/lib",
"version": "2.10.2", "version": "2.11.0",
"description": "Joplin Core library", "description": "Joplin Core library",
"author": "Laurent Cozic", "author": "Laurent Cozic",
"homepage": "", "homepage": "",
@ -34,11 +34,11 @@
"@joplin/fork-htmlparser2": "^4.1.43", "@joplin/fork-htmlparser2": "^4.1.43",
"@joplin/fork-sax": "^1.2.47", "@joplin/fork-sax": "^1.2.47",
"@joplin/fork-uslug": "^1.0.8", "@joplin/fork-uslug": "^1.0.8",
"@joplin/htmlpack": "^2.10.2", "@joplin/htmlpack": "~2.11",
"@joplin/renderer": "^2.10.2", "@joplin/renderer": "~2.11",
"@joplin/turndown": "^4.0.65", "@joplin/turndown": "^4.0.65",
"@joplin/turndown-plugin-gfm": "^1.0.47", "@joplin/turndown-plugin-gfm": "^1.0.47",
"@joplin/utils": "~2.10", "@joplin/utils": "~2.11",
"@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",

4
packages/pdf-viewer/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/pdf-viewer", "name": "@joplin/pdf-viewer",
"version": "2.10.0", "version": "2.11.0",
"description": "Provides embedded PDF viewers for Joplin", "description": "Provides embedded PDF viewers for Joplin",
"main": "dist/main.js", "main": "dist/main.js",
"types": "src/main.ts", "types": "src/main.ts",
@ -39,7 +39,7 @@
"@fortawesome/fontawesome-svg-core": "6.1.2", "@fortawesome/fontawesome-svg-core": "6.1.2",
"@fortawesome/free-solid-svg-icons": "6.1.2", "@fortawesome/free-solid-svg-icons": "6.1.2",
"@fortawesome/react-fontawesome": "0.2.0", "@fortawesome/react-fontawesome": "0.2.0",
"@joplin/lib": "~2.10", "@joplin/lib": "~2.11",
"async-mutex": "0.4.0", "async-mutex": "0.4.0",
"pdfjs-dist": "2.16.105", "pdfjs-dist": "2.16.105",
"react": "18.2.0", "react": "18.2.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.10.2", "version": "2.11.0",
"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.10.2", "@joplin/lib": "~2.11",
"@joplin/tools": "^2.10.2", "@joplin/tools": "~2.11",
"@joplin/utils": "~2.10", "@joplin/utils": "~2.11",
"fs-extra": "11.1.0", "fs-extra": "11.1.0",
"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-alarm-notification/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@joplin/react-native-alarm-notification", "name": "@joplin/react-native-alarm-notification",
"title": "React Native Alarm Notification for Joplin. Forked from https://github.com/emekalites/react-native-alarm-notification", "title": "React Native Alarm Notification for Joplin. Forked from https://github.com/emekalites/react-native-alarm-notification",
"version": "2.10.0", "version": "2.11.0",
"description": "schedule alarm with notification in react-native", "description": "schedule alarm with notification in react-native",
"main": "index.js", "main": "index.js",
"private": true, "private": true,

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.10.2", "version": "2.11.0",
"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",

2
packages/renderer/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/renderer", "name": "@joplin/renderer",
"version": "2.10.2", "version": "2.11.0",
"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",

8
packages/server/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/server", "name": "@joplin/server",
"version": "2.10.11", "version": "2.11.0",
"private": true, "private": true,
"scripts": { "scripts": {
"start-dev": "yarn run build && JOPLIN_IS_TESTING=1 nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/app.js --env dev", "start-dev": "yarn run build && JOPLIN_IS_TESTING=1 nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/app.js --env dev",
@ -23,8 +23,8 @@
"dependencies": { "dependencies": {
"@aws-sdk/client-s3": "3.241.0", "@aws-sdk/client-s3": "3.241.0",
"@fortawesome/fontawesome-free": "5.15.4", "@fortawesome/fontawesome-free": "5.15.4",
"@joplin/lib": "~2.10", "@joplin/lib": "~2.11",
"@joplin/renderer": "~2.10", "@joplin/renderer": "~2.11",
"@koa/cors": "3.1.0", "@koa/cors": "3.1.0",
"@types/uuid": "9.0.0", "@types/uuid": "9.0.0",
"bcryptjs": "2.4.3", "bcryptjs": "2.4.3",
@ -58,7 +58,7 @@
"zxcvbn": "4.4.2" "zxcvbn": "4.4.2"
}, },
"devDependencies": { "devDependencies": {
"@joplin/tools": "~2.10", "@joplin/tools": "~2.11",
"@rmp135/sql-ts": "1.16.0", "@rmp135/sql-ts": "1.16.0",
"@types/formidable": "2.0.5", "@types/formidable": "2.0.5",
"@types/fs-extra": "9.0.13", "@types/fs-extra": "9.0.13",

8
packages/tools/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/tools", "name": "@joplin/tools",
"version": "2.10.2", "version": "2.11.0",
"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.10.2", "@joplin/lib": "~2.11",
"@joplin/renderer": "^2.10.2", "@joplin/renderer": "~2.11",
"@joplin/utils": "~2.10", "@joplin/utils": "~2.11",
"@types/node-fetch": "2.6.2", "@types/node-fetch": "2.6.2",
"@types/yargs": "17.0.20", "@types/yargs": "17.0.20",
"dayjs": "1.11.7", "dayjs": "1.11.7",

1
packages/tools/setupNewRelease.ts
View File

@ -139,6 +139,7 @@ async function main() {
await updatePackageVersion(`${rootDir}/packages/renderer/package.json`, majorMinorVersion, options); await updatePackageVersion(`${rootDir}/packages/renderer/package.json`, majorMinorVersion, options);
await updatePackageVersion(`${rootDir}/packages/server/package.json`, majorMinorVersion, options); await updatePackageVersion(`${rootDir}/packages/server/package.json`, majorMinorVersion, options);
await updatePackageVersion(`${rootDir}/packages/tools/package.json`, majorMinorVersion, options); await updatePackageVersion(`${rootDir}/packages/tools/package.json`, majorMinorVersion, options);
await updatePackageVersion(`${rootDir}/packages/utils/package.json`, majorMinorVersion, options);
if (options.updateVersion) { if (options.updateVersion) {
await updateGradleVersion(`${rootDir}/packages/app-mobile/android/app/build.gradle`, majorMinorVersion); await updateGradleVersion(`${rootDir}/packages/app-mobile/android/app/build.gradle`, majorMinorVersion);

54
packages/utils/package.json
View File

@ -1,29 +1,29 @@
{ {
"name": "@joplin/utils", "name": "@joplin/utils",
"version": "2.10.0", "version": "2.11.0",
"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": {
".": "./dist/index.js", ".": "./dist/index.js",
"./net": "./dist/net.js" "./net": "./dist/net.js"
}, },
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"
}, },
"scripts": { "scripts": {
"tsc": "tsc --project tsconfig.json", "tsc": "tsc --project tsconfig.json",
"watch": "tsc --watch --preserveWatchOutput --project tsconfig.json", "watch": "tsc --watch --preserveWatchOutput --project tsconfig.json",
"test": "jest --verbose=false", "test": "jest --verbose=false",
"test-ci": "yarn test" "test-ci": "yarn test"
}, },
"author": "", "author": "",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {
"execa": "5.1.1" "execa": "5.1.1"
}, },
"devDependencies": { "devDependencies": {
"@types/jest": "29.5.0", "@types/jest": "29.5.0",
"jest": "29.5.0", "jest": "29.5.0",
"ts-jest": "29.0.5" "ts-jest": "29.0.5"
} }
} }

68
yarn.lock
View File

@ -4853,10 +4853,10 @@ __metadata:
"@electron/remote": 2.0.9 "@electron/remote": 2.0.9
"@fortawesome/fontawesome-free": 5.15.4 "@fortawesome/fontawesome-free": 5.15.4
"@joeattardi/emoji-button": 4.6.4 "@joeattardi/emoji-button": 4.6.4
"@joplin/lib": ~2.10 "@joplin/lib": ~2.11
"@joplin/pdf-viewer": ~2.10 "@joplin/pdf-viewer": ~2.11
"@joplin/renderer": ~2.10 "@joplin/renderer": ~2.11
"@joplin/tools": ~2.10 "@joplin/tools": ~2.11
"@testing-library/react-hooks": 8.0.1 "@testing-library/react-hooks": 8.0.1
"@types/jest": 29.2.6 "@types/jest": 29.2.6
"@types/node": 18.11.18 "@types/node": 18.11.18
@ -4940,11 +4940,11 @@ __metadata:
"@codemirror/search": 6.2.3 "@codemirror/search": 6.2.3
"@codemirror/state": 6.1.4 "@codemirror/state": 6.1.4
"@codemirror/view": 6.7.1 "@codemirror/view": 6.7.1
"@joplin/lib": ~2.10 "@joplin/lib": ~2.11
"@joplin/react-native-alarm-notification": ~2.10 "@joplin/react-native-alarm-notification": ~2.11
"@joplin/react-native-saf-x": ~2.10 "@joplin/react-native-saf-x": ~2.11
"@joplin/renderer": ~2.10 "@joplin/renderer": ~2.11
"@joplin/tools": ~2.10 "@joplin/tools": ~2.11
"@lezer/highlight": 1.1.3 "@lezer/highlight": 1.1.3
"@react-native-community/clipboard": 1.5.1 "@react-native-community/clipboard": 1.5.1
"@react-native-community/datetimepicker": 6.7.5 "@react-native-community/datetimepicker": 6.7.5
@ -5064,7 +5064,7 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/htmlpack@^2.10.2, @joplin/htmlpack@workspace:packages/htmlpack": "@joplin/htmlpack@workspace:packages/htmlpack, @joplin/htmlpack@~2.11":
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:
@ -5077,7 +5077,7 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/lib@^2.10.2, @joplin/lib@workspace:packages/lib, @joplin/lib@~2.10": "@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:
@ -5086,11 +5086,11 @@ __metadata:
"@joplin/fork-htmlparser2": ^4.1.43 "@joplin/fork-htmlparser2": ^4.1.43
"@joplin/fork-sax": ^1.2.47 "@joplin/fork-sax": ^1.2.47
"@joplin/fork-uslug": ^1.0.8 "@joplin/fork-uslug": ^1.0.8
"@joplin/htmlpack": ^2.10.2 "@joplin/htmlpack": ~2.11
"@joplin/renderer": ^2.10.2 "@joplin/renderer": ~2.11
"@joplin/turndown": ^4.0.65 "@joplin/turndown": ^4.0.65
"@joplin/turndown-plugin-gfm": ^1.0.47 "@joplin/turndown-plugin-gfm": ^1.0.47
"@joplin/utils": ~2.10 "@joplin/utils": ~2.11
"@types/fs-extra": 9.0.13 "@types/fs-extra": 9.0.13
"@types/jest": 29.2.6 "@types/jest": 29.2.6
"@types/js-yaml": 4.0.5 "@types/js-yaml": 4.0.5
@ -5159,14 +5159,14 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/pdf-viewer@workspace:packages/pdf-viewer, @joplin/pdf-viewer@~2.10": "@joplin/pdf-viewer@workspace:packages/pdf-viewer, @joplin/pdf-viewer@~2.11":
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@joplin/pdf-viewer@workspace:packages/pdf-viewer" resolution: "@joplin/pdf-viewer@workspace:packages/pdf-viewer"
dependencies: dependencies:
"@fortawesome/fontawesome-svg-core": 6.1.2 "@fortawesome/fontawesome-svg-core": 6.1.2
"@fortawesome/free-solid-svg-icons": 6.1.2 "@fortawesome/free-solid-svg-icons": 6.1.2
"@fortawesome/react-fontawesome": 0.2.0 "@fortawesome/react-fontawesome": 0.2.0
"@joplin/lib": ~2.10 "@joplin/lib": ~2.11
"@types/jest": 29.2.6 "@types/jest": 29.2.6
"@types/pdfjs-dist": 2.10.378 "@types/pdfjs-dist": 2.10.378
"@types/react": 16.14.35 "@types/react": 16.14.35
@ -5194,9 +5194,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.10.2 "@joplin/lib": ~2.11
"@joplin/tools": ^2.10.2 "@joplin/tools": ~2.11
"@joplin/utils": ~2.10 "@joplin/utils": ~2.11
"@types/fs-extra": 9.0.13 "@types/fs-extra": 9.0.13
"@types/jest": 29.2.6 "@types/jest": 29.2.6
"@types/node": 18.11.18 "@types/node": 18.11.18
@ -5221,7 +5221,7 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/react-native-alarm-notification@workspace:packages/react-native-alarm-notification, @joplin/react-native-alarm-notification@~2.10": "@joplin/react-native-alarm-notification@workspace:packages/react-native-alarm-notification, @joplin/react-native-alarm-notification@~2.11":
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@joplin/react-native-alarm-notification@workspace:packages/react-native-alarm-notification" resolution: "@joplin/react-native-alarm-notification@workspace:packages/react-native-alarm-notification"
dependencies: dependencies:
@ -5230,7 +5230,7 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/react-native-saf-x@workspace:packages/react-native-saf-x, @joplin/react-native-saf-x@~2.10": "@joplin/react-native-saf-x@workspace:packages/react-native-saf-x, @joplin/react-native-saf-x@~2.11":
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@joplin/react-native-saf-x@workspace:packages/react-native-saf-x" resolution: "@joplin/react-native-saf-x@workspace:packages/react-native-saf-x"
dependencies: dependencies:
@ -5245,7 +5245,7 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/renderer@^2.10.2, @joplin/renderer@workspace:packages/renderer, @joplin/renderer@~2.10": "@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:
@ -5287,9 +5287,9 @@ __metadata:
dependencies: dependencies:
"@aws-sdk/client-s3": 3.241.0 "@aws-sdk/client-s3": 3.241.0
"@fortawesome/fontawesome-free": 5.15.4 "@fortawesome/fontawesome-free": 5.15.4
"@joplin/lib": ~2.10 "@joplin/lib": ~2.11
"@joplin/renderer": ~2.10 "@joplin/renderer": ~2.11
"@joplin/tools": ~2.10 "@joplin/tools": ~2.11
"@koa/cors": 3.1.0 "@koa/cors": 3.1.0
"@rmp135/sql-ts": 1.16.0 "@rmp135/sql-ts": 1.16.0
"@types/formidable": 2.0.5 "@types/formidable": 2.0.5
@ -5343,14 +5343,14 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/tools@^2.10.2, @joplin/tools@workspace:packages/tools, @joplin/tools@~2.10": "@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.43
"@joplin/lib": ^2.10.2 "@joplin/lib": ~2.11
"@joplin/renderer": ^2.10.2 "@joplin/renderer": ~2.11
"@joplin/utils": ~2.10 "@joplin/utils": ~2.11
"@rmp135/sql-ts": 1.16.0 "@rmp135/sql-ts": 1.16.0
"@types/fs-extra": 9.0.13 "@types/fs-extra": 9.0.13
"@types/jest": 29.2.6 "@types/jest": 29.2.6
@ -5414,7 +5414,7 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@joplin/utils@workspace:packages/utils, @joplin/utils@~2.10": "@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:
@ -21136,10 +21136,10 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "joplin@workspace:packages/app-cli" resolution: "joplin@workspace:packages/app-cli"
dependencies: dependencies:
"@joplin/lib": ~2.10 "@joplin/lib": ~2.11
"@joplin/renderer": ~2.10 "@joplin/renderer": ~2.11
"@joplin/tools": ~2.10 "@joplin/tools": ~2.11
"@joplin/utils": ~2.10 "@joplin/utils": ~2.11
"@types/fs-extra": 9.0.13 "@types/fs-extra": 9.0.13
"@types/jest": 29.2.6 "@types/jest": 29.2.6
"@types/node": 18.11.18 "@types/node": 18.11.18