From cb540a5abb9a61aca4e08437f13c51850ca3ad77 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Sat, 2 Mar 2024 11:04:23 +0000 Subject: [PATCH] Chore: Setup new release 3.0 --- packages/app-cli/package.json | 10 +- packages/app-clipper/manifest.json | 2 +- packages/app-desktop/package.json | 14 +-- packages/app-mobile/android/app/build.gradle | 2 +- .../ios/Joplin.xcodeproj/project.pbxproj | 8 +- packages/app-mobile/package.json | 16 +-- packages/default-plugins/package.json | 4 +- packages/editor/package.json | 4 +- .../app/templates/src/manifest.json | 4 +- packages/generator-joplin/package.json | 2 +- packages/htmlpack/package.json | 2 +- packages/lib/package.json | 8 +- packages/pdf-viewer/package.json | 4 +- packages/plugin-repo-cli/package.json | 8 +- .../package.json | 2 +- packages/react-native-saf-x/package.json | 2 +- packages/renderer/package.json | 4 +- packages/server/package.json | 10 +- packages/tools/package.json | 8 +- packages/utils/package.json | 2 +- yarn.lock | 116 +++++++++--------- 21 files changed, 116 insertions(+), 116 deletions(-) diff --git a/packages/app-cli/package.json b/packages/app-cli/package.json index e1906a8af4..1a7c9cfb6a 100644 --- a/packages/app-cli/package.json +++ b/packages/app-cli/package.json @@ -35,15 +35,15 @@ ], "owner": "Laurent Cozic" }, - "version": "2.14.1", + "version": "3.0.0", "bin": "./main.js", "engines": { "node": ">=10.0.0" }, "dependencies": { - "@joplin/lib": "~2.14", - "@joplin/renderer": "~2.14", - "@joplin/utils": "~2.14", + "@joplin/lib": "~3.0", + "@joplin/renderer": "~3.0", + "@joplin/utils": "~3.0", "aws-sdk": "2.1340.0", "chalk": "4.1.2", "compare-version": "0.1.2", @@ -70,7 +70,7 @@ "yargs-parser": "21.1.1" }, "devDependencies": { - "@joplin/tools": "~2.14", + "@joplin/tools": "~3.0", "@types/fs-extra": "11.0.4", "@types/jest": "29.5.8", "@types/node": "18.19.8", diff --git a/packages/app-clipper/manifest.json b/packages/app-clipper/manifest.json index 12b9ecd9a2..5e2822895f 100644 --- a/packages/app-clipper/manifest.json +++ b/packages/app-clipper/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Joplin Web Clipper [DEV]", - "version": "2.14.0", + "version": "3.0.0", "description": "Capture and save web pages and screenshots from your browser to Joplin.", "homepage_url": "https://joplinapp.org", "content_security_policy": "script-src 'self'; object-src 'self'", diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json index af4136447d..6cc7917360 100644 --- a/packages/app-desktop/package.json +++ b/packages/app-desktop/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/app-desktop", - "version": "2.14.17", + "version": "3.0.0", "description": "Joplin for Desktop", "main": "main.js", "private": true, @@ -121,8 +121,8 @@ "devDependencies": { "7zip-bin": "5.2.0", "@electron/rebuild": "3.3.0", - "@joplin/default-plugins": "~2.14", - "@joplin/tools": "~2.14", + "@joplin/default-plugins": "~3.0", + "@joplin/tools": "~3.0", "@playwright/test": "1.40.1", "@testing-library/react-hooks": "8.0.1", "@types/jest": "29.5.8", @@ -148,10 +148,10 @@ "@electron/remote": "2.0.12", "@fortawesome/fontawesome-free": "5.15.4", "@joeattardi/emoji-button": "4.6.4", - "@joplin/editor": "~2.14", - "@joplin/lib": "~2.14", - "@joplin/renderer": "~2.14", - "@joplin/utils": "~2.14", + "@joplin/editor": "~3.0", + "@joplin/lib": "~3.0", + "@joplin/renderer": "~3.0", + "@joplin/utils": "~3.0", "@sentry/electron": "4.17.0", "@types/mustache": "4.2.5", "async-mutex": "0.4.1", diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle index c7141c5c43..b40d58b6dd 100644 --- a/packages/app-mobile/android/app/build.gradle +++ b/packages/app-mobile/android/app/build.gradle @@ -111,7 +111,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 2097739 - versionName "2.14.9" + versionName "3.0.0" ndk { abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" } diff --git a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj index 932c40fa10..d6a29585f8 100644 --- a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj +++ b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj @@ -529,7 +529,7 @@ INFOPLIST_FILE = Joplin/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 12.14.6; + MARKETING_VERSION = 13.0.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -557,7 +557,7 @@ INFOPLIST_FILE = Joplin/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 12.14.6; + MARKETING_VERSION = 13.0.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -711,7 +711,7 @@ INFOPLIST_FILE = ShareExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 12.14.6; + MARKETING_VERSION = 13.0.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension; @@ -742,7 +742,7 @@ INFOPLIST_FILE = ShareExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 12.14.6; + MARKETING_VERSION = 13.0.0; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/packages/app-mobile/package.json b/packages/app-mobile/package.json index eeace4de9b..340667b057 100644 --- a/packages/app-mobile/package.json +++ b/packages/app-mobile/package.json @@ -2,7 +2,7 @@ "name": "@joplin/app-mobile", "description": "Joplin for Mobile", "license": "AGPL-3.0-or-later", - "version": "2.14.0", + "version": "3.0.0", "private": true, "scripts": { "start": "BROWSERSLIST_IGNORE_OLD_DATA=true react-native start --reset-cache", @@ -19,12 +19,12 @@ }, "dependencies": { "@bam.tech/react-native-image-resizer": "3.0.7", - "@joplin/editor": "~2.14", - "@joplin/lib": "~2.14", - "@joplin/react-native-alarm-notification": "~2.14", - "@joplin/react-native-saf-x": "~2.14", - "@joplin/renderer": "~2.14", - "@joplin/utils": "~2.14", + "@joplin/editor": "~3.0", + "@joplin/lib": "~3.0", + "@joplin/react-native-alarm-notification": "~3.0", + "@joplin/react-native-saf-x": "~3.0", + "@joplin/renderer": "~3.0", + "@joplin/utils": "~3.0", "@react-native-community/clipboard": "1.5.1", "@react-native-community/datetimepicker": "7.6.2", "@react-native-community/geolocation": "3.1.0", @@ -87,7 +87,7 @@ "@babel/core": "7.20.2", "@babel/preset-env": "7.20.2", "@babel/runtime": "7.20.0", - "@joplin/tools": "~2.14", + "@joplin/tools": "~3.0", "@js-draw/material-icons": "1.16.1", "@testing-library/jest-native": "5.4.3", "@testing-library/react-native": "12.3.3", diff --git a/packages/default-plugins/package.json b/packages/default-plugins/package.json index 45611f5fb5..fe3689ff37 100644 --- a/packages/default-plugins/package.json +++ b/packages/default-plugins/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/default-plugins", - "version": "2.14.0", + "version": "3.0.0", "description": "Default plugins bundler", "private": true, "scripts": { @@ -18,7 +18,7 @@ "typescript": "5.2.2" }, "dependencies": { - "@joplin/utils": "~2.14", + "@joplin/utils": "~3.0", "fs-extra": "11.2.0", "yargs": "17.7.2" } diff --git a/packages/editor/package.json b/packages/editor/package.json index d0ffdb580a..15ccd99fc3 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/editor", - "version": "2.14.0", + "version": "3.0.0", "description": "Web-based markdown editor", "private": true, "scripts": { @@ -14,7 +14,7 @@ "url": "git+https://github.com/laurent22/joplin.git" }, "devDependencies": { - "@joplin/lib": "~2.14", + "@joplin/lib": "~3.0", "@testing-library/react-hooks": "8.0.1", "@types/jest": "29.5.8", "@types/react": "18.2.48", diff --git a/packages/generator-joplin/generators/app/templates/src/manifest.json b/packages/generator-joplin/generators/app/templates/src/manifest.json index 0e608540fb..dceb62e96e 100644 --- a/packages/generator-joplin/generators/app/templates/src/manifest.json +++ b/packages/generator-joplin/generators/app/templates/src/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "id": "<%= pluginId %>", - "app_min_version": "2.14", + "app_min_version": "3.0", "version": "1.0.0", "name": "<%= pluginName %>", "description": "<%= pluginDescription %>", @@ -13,4 +13,4 @@ "screenshots": [], "icons": {}, "promo_tile": {} -} +} \ No newline at end of file diff --git a/packages/generator-joplin/package.json b/packages/generator-joplin/package.json index ebf67c1b3f..8a6328a66f 100644 --- a/packages/generator-joplin/package.json +++ b/packages/generator-joplin/package.json @@ -1,6 +1,6 @@ { "name": "generator-joplin", - "version": "2.14.0", + "version": "3.0.0", "description": "Scaffolds out a new Joplin plugin", "homepage": "https://github.com/laurent22/joplin/tree/dev/packages/generator-joplin", "author": { diff --git a/packages/htmlpack/package.json b/packages/htmlpack/package.json index 529be280e1..ef1cf03ed1 100644 --- a/packages/htmlpack/package.json +++ b/packages/htmlpack/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/htmlpack", - "version": "2.14.1", + "version": "3.0.0", "description": "Pack an HTML file and all its linked resources into a single HTML file", "main": "dist/index.js", "types": "src/index.ts", diff --git a/packages/lib/package.json b/packages/lib/package.json index d584c02393..186b083cc2 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/lib", - "version": "2.14.1", + "version": "3.0.0", "description": "Joplin Core library", "author": "Laurent Cozic", "homepage": "", @@ -39,11 +39,11 @@ "@joplin/fork-htmlparser2": "^4.1.51", "@joplin/fork-sax": "^1.2.55", "@joplin/fork-uslug": "^1.0.16", - "@joplin/htmlpack": "^2.14.1", - "@joplin/renderer": "^2.14.1", + "@joplin/htmlpack": "~3.0", + "@joplin/renderer": "~3.0", "@joplin/turndown": "^4.0.73", "@joplin/turndown-plugin-gfm": "^1.0.55", - "@joplin/utils": "^2.14.1", + "@joplin/utils": "~3.0", "@types/nanoid": "3.0.0", "async-mutex": "0.4.1", "base-64": "1.0.0", diff --git a/packages/pdf-viewer/package.json b/packages/pdf-viewer/package.json index 61f4991cfb..2352e4e31e 100644 --- a/packages/pdf-viewer/package.json +++ b/packages/pdf-viewer/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/pdf-viewer", - "version": "2.14.0", + "version": "3.0.0", "description": "Provides embedded PDF viewers for Joplin", "main": "dist/main.js", "types": "src/main.ts", @@ -39,7 +39,7 @@ "@fortawesome/fontawesome-svg-core": "6.1.2", "@fortawesome/free-solid-svg-icons": "6.1.2", "@fortawesome/react-fontawesome": "0.2.0", - "@joplin/lib": "~2.14", + "@joplin/lib": "~3.0", "async-mutex": "0.4.1", "pdfjs-dist": "2.16.105", "react": "18.2.0", diff --git a/packages/plugin-repo-cli/package.json b/packages/plugin-repo-cli/package.json index def5399d6c..4cb70afcf3 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.14.1", + "version": "3.0.0", "description": "", "main": "index.js", "bin": "./dist/index.js", @@ -18,9 +18,9 @@ "author": "", "license": "AGPL-3.0-or-later", "dependencies": { - "@joplin/lib": "^2.14.1", - "@joplin/tools": "^2.14.1", - "@joplin/utils": "^2.14.1", + "@joplin/lib": "~3.0", + "@joplin/tools": "~3.0", + "@joplin/utils": "~3.0", "fs-extra": "11.2.0", "gh-release-assets": "2.0.1", "node-fetch": "2.6.7", diff --git a/packages/react-native-alarm-notification/package.json b/packages/react-native-alarm-notification/package.json index c24919a8c7..33fb10da19 100644 --- a/packages/react-native-alarm-notification/package.json +++ b/packages/react-native-alarm-notification/package.json @@ -1,7 +1,7 @@ { "name": "@joplin/react-native-alarm-notification", "title": "React Native Alarm Notification for Joplin. Forked from https://github.com/emekalites/react-native-alarm-notification", - "version": "2.14.0", + "version": "3.0.0", "description": "schedule alarm with notification in react-native", "main": "index.js", "private": true, diff --git a/packages/react-native-saf-x/package.json b/packages/react-native-saf-x/package.json index 63134f0c9c..e476b74f90 100644 --- a/packages/react-native-saf-x/package.json +++ b/packages/react-native-saf-x/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/react-native-saf-x", - "version": "2.14.1", + "version": "3.0.0", "description": "a module to help work with scoped storages on android easily", "main": "src/index", "react-native": "src/index", diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 539ab885c3..5ea574f2ac 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/renderer", - "version": "2.14.1", + "version": "3.0.0", "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,7 +30,7 @@ "dependencies": { "@joplin/fork-htmlparser2": "^4.1.51", "@joplin/fork-uslug": "^1.0.16", - "@joplin/utils": "^2.14.1", + "@joplin/utils": "~3.0", "font-awesome-filetypes": "2.1.0", "fs-extra": "11.2.0", "highlight.js": "11.9.0", diff --git a/packages/server/package.json b/packages/server/package.json index e8315c523e..a5a4c9a28b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/server", - "version": "2.14.2", + "version": "3.0.0", "private": true, "scripts": { "start-dev": "yarn build && JOPLIN_IS_TESTING=1 nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/app.js --env dev", @@ -24,9 +24,9 @@ "dependencies": { "@aws-sdk/client-s3": "3.296.0", "@fortawesome/fontawesome-free": "5.15.4", - "@joplin/lib": "~2.14", - "@joplin/renderer": "~2.14", - "@joplin/utils": "~2.14", + "@joplin/lib": "~3.0", + "@joplin/renderer": "~3.0", + "@joplin/utils": "~3.0", "@koa/cors": "3.4.3", "@types/uuid": "9.0.7", "bcryptjs": "2.4.3", @@ -60,7 +60,7 @@ "zxcvbn": "4.4.2" }, "devDependencies": { - "@joplin/tools": "~2.14", + "@joplin/tools": "~3.0", "@rmp135/sql-ts": "1.18.1", "@types/bcryptjs": "2.4.6", "@types/formidable": "2.0.6", diff --git a/packages/tools/package.json b/packages/tools/package.json index 890cb13333..dce67732a0 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/tools", - "version": "2.14.1", + "version": "3.0.0", "description": "Various tools for Joplin", "main": "index.js", "author": "Laurent Cozic", @@ -20,9 +20,9 @@ }, "license": "AGPL-3.0-or-later", "dependencies": { - "@joplin/lib": "^2.14.1", - "@joplin/renderer": "^2.14.1", - "@joplin/utils": "^2.14.1", + "@joplin/lib": "~3.0", + "@joplin/renderer": "~3.0", + "@joplin/utils": "~3.0", "compare-versions": "6.1.0", "dayjs": "1.11.10", "execa": "4.1.0", diff --git a/packages/utils/package.json b/packages/utils/package.json index 380798d1df..acd80b296a 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/utils", - "version": "2.14.1", + "version": "3.0.0", "description": "Utilities for Joplin", "repository": "https://github.com/laurent22/joplin/tree/dev/packages/utils", "exports": { diff --git a/yarn.lock b/yarn.lock index 9aa088b2cd..c1af8ecc5b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6531,12 +6531,12 @@ __metadata: "@electron/remote": 2.0.12 "@fortawesome/fontawesome-free": 5.15.4 "@joeattardi/emoji-button": 4.6.4 - "@joplin/default-plugins": ~2.14 - "@joplin/editor": ~2.14 - "@joplin/lib": ~2.14 - "@joplin/renderer": ~2.14 - "@joplin/tools": ~2.14 - "@joplin/utils": ~2.14 + "@joplin/default-plugins": ~3.0 + "@joplin/editor": ~3.0 + "@joplin/lib": ~3.0 + "@joplin/renderer": ~3.0 + "@joplin/tools": ~3.0 + "@joplin/utils": ~3.0 "@playwright/test": 1.40.1 "@sentry/electron": 4.17.0 "@testing-library/react-hooks": 8.0.1 @@ -6608,13 +6608,13 @@ __metadata: "@babel/preset-env": 7.20.2 "@babel/runtime": 7.20.0 "@bam.tech/react-native-image-resizer": 3.0.7 - "@joplin/editor": ~2.14 - "@joplin/lib": ~2.14 - "@joplin/react-native-alarm-notification": ~2.14 - "@joplin/react-native-saf-x": ~2.14 - "@joplin/renderer": ~2.14 - "@joplin/tools": ~2.14 - "@joplin/utils": ~2.14 + "@joplin/editor": ~3.0 + "@joplin/lib": ~3.0 + "@joplin/react-native-alarm-notification": ~3.0 + "@joplin/react-native-saf-x": ~3.0 + "@joplin/renderer": ~3.0 + "@joplin/tools": ~3.0 + "@joplin/utils": ~3.0 "@js-draw/material-icons": 1.16.1 "@react-native-community/clipboard": 1.5.1 "@react-native-community/datetimepicker": 7.6.2 @@ -6705,11 +6705,11 @@ __metadata: languageName: unknown linkType: soft -"@joplin/default-plugins@workspace:packages/default-plugins, @joplin/default-plugins@~2.14": +"@joplin/default-plugins@workspace:packages/default-plugins, @joplin/default-plugins@~3.0": version: 0.0.0-use.local resolution: "@joplin/default-plugins@workspace:packages/default-plugins" dependencies: - "@joplin/utils": ~2.14 + "@joplin/utils": ~3.0 "@types/yargs": 17.0.32 fs-extra: 11.2.0 ts-node: 10.9.2 @@ -6740,7 +6740,7 @@ __metadata: languageName: unknown linkType: soft -"@joplin/editor@workspace:packages/editor, @joplin/editor@~2.14": +"@joplin/editor@workspace:packages/editor, @joplin/editor@~3.0": version: 0.0.0-use.local resolution: "@joplin/editor@workspace:packages/editor" dependencies: @@ -6755,7 +6755,7 @@ __metadata: "@codemirror/search": 6.5.5 "@codemirror/state": 6.3.3 "@codemirror/view": 6.22.3 - "@joplin/lib": ~2.14 + "@joplin/lib": ~3.0 "@lezer/common": 1.1.2 "@lezer/highlight": 1.2.0 "@lezer/markdown": 1.1.2 @@ -6812,7 +6812,7 @@ __metadata: languageName: unknown linkType: soft -"@joplin/htmlpack@^2.14.1, @joplin/htmlpack@workspace:packages/htmlpack": +"@joplin/htmlpack@workspace:packages/htmlpack, @joplin/htmlpack@~3.0": version: 0.0.0-use.local resolution: "@joplin/htmlpack@workspace:packages/htmlpack" dependencies: @@ -6825,7 +6825,7 @@ __metadata: languageName: unknown linkType: soft -"@joplin/lib@^2.14.1, @joplin/lib@workspace:packages/lib, @joplin/lib@~2.14": +"@joplin/lib@workspace:packages/lib, @joplin/lib@~3.0": version: 0.0.0-use.local resolution: "@joplin/lib@workspace:packages/lib" dependencies: @@ -6835,11 +6835,11 @@ __metadata: "@joplin/fork-htmlparser2": ^4.1.51 "@joplin/fork-sax": ^1.2.55 "@joplin/fork-uslug": ^1.0.16 - "@joplin/htmlpack": ^2.14.1 - "@joplin/renderer": ^2.14.1 + "@joplin/htmlpack": ~3.0 + "@joplin/renderer": ~3.0 "@joplin/turndown": ^4.0.73 "@joplin/turndown-plugin-gfm": ^1.0.55 - "@joplin/utils": ^2.14.1 + "@joplin/utils": ~3.0 "@types/fs-extra": 11.0.4 "@types/jest": 29.5.8 "@types/js-yaml": 4.0.9 @@ -6917,7 +6917,7 @@ __metadata: "@fortawesome/fontawesome-svg-core": 6.1.2 "@fortawesome/free-solid-svg-icons": 6.1.2 "@fortawesome/react-fontawesome": 0.2.0 - "@joplin/lib": ~2.14 + "@joplin/lib": ~3.0 "@types/jest": 29.5.8 "@types/pdfjs-dist": 2.10.378 "@types/react": 18.2.48 @@ -6945,9 +6945,9 @@ __metadata: version: 0.0.0-use.local resolution: "@joplin/plugin-repo-cli@workspace:packages/plugin-repo-cli" dependencies: - "@joplin/lib": ^2.14.1 - "@joplin/tools": ^2.14.1 - "@joplin/utils": ^2.14.1 + "@joplin/lib": ~3.0 + "@joplin/tools": ~3.0 + "@joplin/utils": ~3.0 "@types/fs-extra": 11.0.4 "@types/jest": 29.5.8 "@types/node": 18.19.8 @@ -6972,7 +6972,7 @@ __metadata: languageName: unknown linkType: soft -"@joplin/react-native-alarm-notification@workspace:packages/react-native-alarm-notification, @joplin/react-native-alarm-notification@~2.14": +"@joplin/react-native-alarm-notification@workspace:packages/react-native-alarm-notification, @joplin/react-native-alarm-notification@~3.0": version: 0.0.0-use.local resolution: "@joplin/react-native-alarm-notification@workspace:packages/react-native-alarm-notification" dependencies: @@ -6981,7 +6981,7 @@ __metadata: languageName: unknown linkType: soft -"@joplin/react-native-saf-x@workspace:packages/react-native-saf-x, @joplin/react-native-saf-x@~2.14": +"@joplin/react-native-saf-x@workspace:packages/react-native-saf-x, @joplin/react-native-saf-x@~3.0": version: 0.0.0-use.local resolution: "@joplin/react-native-saf-x@workspace:packages/react-native-saf-x" dependencies: @@ -6996,13 +6996,13 @@ __metadata: languageName: unknown linkType: soft -"@joplin/renderer@^2.14.1, @joplin/renderer@workspace:packages/renderer, @joplin/renderer@~2.14": +"@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": ^2.14.1 + "@joplin/utils": ~3.0 "@types/jest": 29.5.8 "@types/markdown-it": 13.0.7 "@types/node": 18.19.8 @@ -7040,10 +7040,10 @@ __metadata: dependencies: "@aws-sdk/client-s3": 3.296.0 "@fortawesome/fontawesome-free": 5.15.4 - "@joplin/lib": ~2.14 - "@joplin/renderer": ~2.14 - "@joplin/tools": ~2.14 - "@joplin/utils": ~2.14 + "@joplin/lib": ~3.0 + "@joplin/renderer": ~3.0 + "@joplin/tools": ~3.0 + "@joplin/utils": ~3.0 "@koa/cors": 3.4.3 "@rmp135/sql-ts": 1.18.1 "@types/bcryptjs": 2.4.6 @@ -7098,15 +7098,15 @@ __metadata: languageName: unknown linkType: soft -"@joplin/tools@^2.14.1, @joplin/tools@workspace:packages/tools, @joplin/tools@~2.14": +"@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": ^2.14.1 - "@joplin/renderer": ^2.14.1 - "@joplin/utils": ^2.14.1 + "@joplin/lib": ~3.0 + "@joplin/renderer": ~3.0 + "@joplin/utils": ~3.0 "@rmp135/sql-ts": 1.18.1 "@types/fs-extra": 11.0.4 "@types/jest": 29.5.8 @@ -7175,7 +7175,22 @@ __metadata: languageName: unknown linkType: soft -"@joplin/utils@^2.14.1, @joplin/utils@workspace:packages/utils, @joplin/utils@~2.14": +"@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": version: 0.0.0-use.local resolution: "@joplin/utils@workspace:packages/utils" dependencies: @@ -7198,21 +7213,6 @@ __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" @@ -26969,10 +26969,10 @@ __metadata: version: 0.0.0-use.local resolution: "joplin@workspace:packages/app-cli" dependencies: - "@joplin/lib": ~2.14 - "@joplin/renderer": ~2.14 - "@joplin/tools": ~2.14 - "@joplin/utils": ~2.14 + "@joplin/lib": ~3.0 + "@joplin/renderer": ~3.0 + "@joplin/tools": ~3.0 + "@joplin/utils": ~3.0 "@types/fs-extra": 11.0.4 "@types/jest": 29.5.8 "@types/node": 18.19.8