1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00

Setup new release 2.7

This commit is contained in:
Laurent Cozic 2021-12-27 17:56:59 +01:00
parent de569bd995
commit 26883d31da
16 changed files with 218 additions and 58 deletions

View File

@ -6,7 +6,7 @@ Various scripts are provided to deploy the Joplin applications, scripts and tool
Before new releases are created, all version numbers must be updated. This is done using the `setupNewRelease` script and passing it the new major.minor version number. For example:
yarn run setupNewRelease -- 1.8
yarn run setupNewRelease 1.8
Patch numbers are going to be incremented automatically when releasing each individual package.

View File

@ -33,14 +33,14 @@
],
"owner": "Laurent Cozic"
},
"version": "2.6.2",
"version": "2.7.0",
"bin": "./main.js",
"engines": {
"node": ">=10.0.0"
},
"dependencies": {
"@joplin/lib": "~2.6",
"@joplin/renderer": "~2.6",
"@joplin/lib": "~2.7",
"@joplin/renderer": "~2.7",
"aws-sdk": "^2.588.0",
"chalk": "^4.1.0",
"compare-version": "^0.1.2",
@ -67,7 +67,7 @@
"yargs-parser": "^7.0.0"
},
"devDependencies": {
"@joplin/tools": "~2.6",
"@joplin/tools": "~2.7",
"@types/fs-extra": "^9.0.6",
"@types/jest": "^26.0.15",
"@types/node": "^14.14.6",

View File

@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "Joplin Web Clipper [DEV]",
"version": "2.6.0",
"version": "2.7.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'",

View File

@ -1,6 +1,6 @@
{
"name": "@joplin/app-desktop",
"version": "2.6.10",
"version": "2.7.0",
"description": "Joplin for Desktop",
"main": "main.js",
"private": true,
@ -105,7 +105,7 @@
},
"homepage": "https://github.com/laurent22/joplin#readme",
"devDependencies": {
"@joplin/tools": "~2.6",
"@joplin/tools": "~2.7",
"@testing-library/react-hooks": "^3.4.2",
"@types/jest": "^26.0.15",
"@types/node": "^14.14.6",
@ -137,8 +137,8 @@
"@electron/remote": "^2.0.1",
"@fortawesome/fontawesome-free": "^5.13.0",
"@joeattardi/emoji-button": "^4.6.0",
"@joplin/lib": "~2.6",
"@joplin/renderer": "~2.6",
"@joplin/lib": "~2.7",
"@joplin/renderer": "~2.7",
"async-mutex": "^0.1.3",
"codemirror": "^5.56.0",
"color": "^3.1.2",

View File

@ -147,7 +147,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 2097665
versionName "2.6.9"
versionName "2.7.0"
ndk {
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
}

View File

@ -498,7 +498,7 @@
INFOPLIST_FILE = Joplin/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 12.6.2;
MARKETING_VERSION = 12.7.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
@ -526,7 +526,7 @@
INFOPLIST_FILE = Joplin/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 12.6.2;
MARKETING_VERSION = 12.7.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
@ -674,7 +674,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.6.2;
MARKETING_VERSION = 12.7.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
@ -705,7 +705,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.6.2;
MARKETING_VERSION = 12.7.0;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
PRODUCT_NAME = "$(TARGET_NAME)";

View File

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

View File

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

View File

@ -1,6 +1,6 @@
{
"name": "@joplin/htmlpack",
"version": "2.6.1",
"version": "2.7.0",
"description": "Pack an HTML file and all its linked resources into a single HTML file",
"main": "dist/index.js",
"types": "src/index.ts",

View File

@ -1,6 +1,6 @@
{
"name": "@joplin/lib",
"version": "2.6.3",
"version": "2.7.0",
"description": "Joplin Core library",
"author": "Laurent Cozic",
"homepage": "",
@ -33,8 +33,8 @@
"@joplin/fork-htmlparser2": "^4.1.39",
"@joplin/fork-sax": "^1.2.43",
"@joplin/fork-uslug": "^1.0.4",
"@joplin/htmlpack": "~2.6",
"@joplin/renderer": "~2.6",
"@joplin/htmlpack": "~2.7",
"@joplin/renderer": "~2.7",
"@joplin/turndown": "^4.0.61",
"@joplin/turndown-plugin-gfm": "^1.0.43",
"async-mutex": "^0.1.3",

View File

@ -1,6 +1,6 @@
{
"name": "@joplin/plugin-repo-cli",
"version": "2.6.9",
"version": "2.7.0",
"description": "",
"main": "index.js",
"bin": "./dist/index.js",
@ -18,8 +18,8 @@
"author": "",
"license": "MIT",
"dependencies": {
"@joplin/lib": "^2.6.3",
"@joplin/tools": "^2.6.3",
"@joplin/lib": "~2.7",
"@joplin/tools": "~2.7",
"fs-extra": "^9.0.1",
"gh-release-assets": "^2.0.0",
"node-fetch": "^2.6.1",

View File

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

View File

@ -1,6 +1,6 @@
{
"name": "@joplin/server",
"version": "2.6.14",
"version": "2.7.0",
"private": true,
"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",
@ -23,8 +23,8 @@
"dependencies": {
"@aws-sdk/client-s3": "^3.40.0",
"@fortawesome/fontawesome-free": "^5.15.1",
"@joplin/lib": "~2.6",
"@joplin/renderer": "~2.6",
"@joplin/lib": "~2.7",
"@joplin/renderer": "~2.7",
"@koa/cors": "^3.1.0",
"@types/uuid": "^8.3.1",
"bcryptjs": "^2.4.3",
@ -57,7 +57,7 @@
"zxcvbn": "^4.4.2"
},
"devDependencies": {
"@joplin/tools": "~2.6",
"@joplin/tools": "~2.7",
"@rmp135/sql-ts": "^1.7.0",
"@types/fs-extra": "^8.0.0",
"@types/jest": "^26.0.15",

View File

@ -1,6 +1,6 @@
{
"name": "@joplin/tools",
"version": "2.6.3",
"version": "2.7.0",
"description": "Various tools for Joplin",
"main": "index.js",
"author": "Laurent Cozic",
@ -20,8 +20,8 @@
},
"license": "MIT",
"dependencies": {
"@joplin/lib": "^2.6.3",
"@joplin/renderer": "^2.6.3",
"@joplin/lib": "~2.7",
"@joplin/renderer": "~2.7",
"dayjs": "^1.10.7",
"execa": "^4.1.0",
"fs-extra": "^4.0.3",
@ -37,7 +37,7 @@
"sharp": "^0.25.2",
"source-map-support": "^0.5.19",
"uri-template": "^1.0.1",
"yargs": "^16.0.3"
"yargs": "16.0.3"
},
"devDependencies": {
"@rmp135/sql-ts": "^1.6.0",

View File

@ -111,6 +111,8 @@ async function main() {
const majorMinorVersion = argv._[0];
console.info(`New version: ${majorMinorVersion}`);
const options: Options = {
updateVersion: argv.updateVersion !== '0',
updateDependenciesVersion: argv.updateDependenciesVersion !== '0',

208
yarn.lock
View File

@ -2896,9 +2896,9 @@ __metadata:
"@electron/remote": ^2.0.1
"@fortawesome/fontawesome-free": ^5.13.0
"@joeattardi/emoji-button": ^4.6.0
"@joplin/lib": ~2.6
"@joplin/renderer": ~2.6
"@joplin/tools": ~2.6
"@joplin/lib": ~2.7
"@joplin/renderer": ~2.7
"@joplin/tools": ~2.7
"@testing-library/react-hooks": ^3.4.2
"@types/jest": ^26.0.15
"@types/node": ^14.14.6
@ -3088,7 +3088,7 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/htmlpack@workspace:packages/htmlpack, @joplin/htmlpack@~2.6":
"@joplin/htmlpack@^2.6.1, @joplin/htmlpack@workspace:packages/htmlpack, @joplin/htmlpack@~2.7":
version: 0.0.0-use.local
resolution: "@joplin/htmlpack@workspace:packages/htmlpack"
dependencies:
@ -3101,7 +3101,7 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/lib@^2.6.3, @joplin/lib@workspace:packages/lib, @joplin/lib@~2.6":
"@joplin/lib@^2.6.3, @joplin/lib@workspace:packages/lib, @joplin/lib@~2.7":
version: 0.0.0-use.local
resolution: "@joplin/lib@workspace:packages/lib"
dependencies:
@ -3110,8 +3110,8 @@ __metadata:
"@joplin/fork-htmlparser2": ^4.1.39
"@joplin/fork-sax": ^1.2.43
"@joplin/fork-uslug": ^1.0.4
"@joplin/htmlpack": ~2.6
"@joplin/renderer": ~2.6
"@joplin/htmlpack": ~2.7
"@joplin/renderer": ~2.7
"@joplin/turndown": ^4.0.61
"@joplin/turndown-plugin-gfm": ^1.0.43
"@types/fs-extra": ^9.0.6
@ -3181,12 +3181,82 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/lib@npm:~2.6":
version: 2.6.3
resolution: "@joplin/lib@npm:2.6.3"
dependencies:
"@aws-sdk/client-s3": ^3.34.0
"@aws-sdk/s3-request-presigner": ^3.34.0
"@joplin/fork-htmlparser2": ^4.1.39
"@joplin/fork-sax": ^1.2.43
"@joplin/htmlpack": ^2.6.1
"@joplin/renderer": ^2.6.3
"@joplin/turndown": ^4.0.61
"@joplin/turndown-plugin-gfm": ^1.0.43
async-mutex: ^0.1.3
base-64: ^0.1.0
base64-stream: ^1.0.0
builtin-modules: ^3.1.0
chokidar: ^3.4.3
color: 3.1.2
compare-versions: ^3.6.0
css: ^3.0.0
diff-match-patch: ^1.0.4
es6-promise-pool: ^2.5.0
fast-deep-equal: ^3.1.3
follow-redirects: ^1.2.4
form-data: ^2.1.4
fs-extra: ^5.0.0
html-entities: ^1.2.1
html-minifier: ^3.5.15
image-data-uri: ^2.0.0
image-type: ^3.0.0
immer: ^7.0.14
js-yaml: ^4.1.0
levenshtein: ^1.0.5
lodash: ^4.17.20
markdown-it: ^10.0.0
md5: ^2.2.1
md5-file: ^4.0.0
moment: ^2.29.1
multiparty: ^4.2.1
mustache: ^4.0.1
nanoid: ^3.1.12
node-fetch: ^1.7.1
node-notifier: ^8.0.0
node-persist: ^2.1.0
node-rsa: ^1.1.1
promise: ^7.1.1
query-string: 4.3.4
re-reselect: ^4.0.0
read-chunk: ^2.1.0
redux: ^3.7.2
relative: ^3.0.2
reselect: ^4.0.0
server-destroy: ^1.0.1
sprintf-js: ^1.1.2
sqlite3: ^5.0.2
string-padding: ^1.0.2
string-to-stream: ^1.1.0
tar: ^4.4.10
tcp-port-used: ^0.1.2
uglifycss: 0.0.29
url-parse: ^1.4.7
uslug: "git+https://github.com/laurent22/uslug.git#emoji-support"
uuid: ^3.0.1
valid-url: ^1.0.9
word-wrap: ^1.2.3
xml2js: ^0.4.19
checksum: d0208121688057f179fe52a61a3442ce63fe82f3ef65d1fa27a7d21e2912048f7009daa464d44ec00f5fa980d3cf33ae0ec869598357ed96225aed20dcc1dcd0
languageName: node
linkType: hard
"@joplin/plugin-repo-cli@workspace:packages/plugin-repo-cli":
version: 0.0.0-use.local
resolution: "@joplin/plugin-repo-cli@workspace:packages/plugin-repo-cli"
dependencies:
"@joplin/lib": ^2.6.3
"@joplin/tools": ^2.6.3
"@joplin/lib": ~2.7
"@joplin/tools": ~2.7
"@types/fs-extra": ^9.0.6
"@types/jest": ^26.0.15
"@types/node": ^14.14.6
@ -3211,7 +3281,7 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/renderer@^2.6.3, @joplin/renderer@workspace:packages/renderer, @joplin/renderer@~2.6":
"@joplin/renderer@^2.6.3, @joplin/renderer@workspace:packages/renderer, @joplin/renderer@~2.7":
version: 0.0.0-use.local
resolution: "@joplin/renderer@workspace:packages/renderer"
dependencies:
@ -3245,15 +3315,46 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/renderer@npm:~2.6":
version: 2.6.3
resolution: "@joplin/renderer@npm:2.6.3"
dependencies:
"@joplin/fork-htmlparser2": ^4.1.39
font-awesome-filetypes: ^2.1.0
fs-extra: ^8.1.0
highlight.js: ^11.2.0
html-entities: ^1.2.1
json-stringify-safe: ^5.0.1
katex: ^0.13.3
markdown-it: ^10.0.0
markdown-it-abbr: ^1.0.4
markdown-it-anchor: ^5.2.5
markdown-it-deflist: ^2.0.3
markdown-it-emoji: ^1.4.0
markdown-it-expand-tabs: ^1.0.13
markdown-it-footnote: ^3.0.2
markdown-it-ins: ^3.0.0
markdown-it-mark: ^3.0.0
markdown-it-multimd-table: ^4.0.1
markdown-it-sub: ^1.0.0
markdown-it-sup: ^1.0.0
markdown-it-toc-done-right: ^4.1.0
md5: ^2.2.1
mermaid: ^8.13.5
uslug: "git+https://github.com/laurent22/uslug.git#emoji-support"
checksum: d72adc250939c425175d61956e7060dc2fca77a00b49cfcd41cc3ff5a44de1c891c0c3be3232ba761efc67129726df155fb8626398feedc5eebdbce9094bc5c5
languageName: node
linkType: hard
"@joplin/server@workspace:packages/server":
version: 0.0.0-use.local
resolution: "@joplin/server@workspace:packages/server"
dependencies:
"@aws-sdk/client-s3": ^3.40.0
"@fortawesome/fontawesome-free": ^5.15.1
"@joplin/lib": ~2.6
"@joplin/renderer": ~2.6
"@joplin/tools": ~2.6
"@joplin/lib": ~2.7
"@joplin/renderer": ~2.7
"@joplin/tools": ~2.7
"@koa/cors": ^3.1.0
"@rmp135/sql-ts": ^1.7.0
"@types/fs-extra": ^8.0.0
@ -3303,12 +3404,37 @@ __metadata:
languageName: unknown
linkType: soft
"@joplin/tools@^2.6.3, @joplin/tools@workspace:packages/tools, @joplin/tools@~2.6":
version: 0.0.0-use.local
resolution: "@joplin/tools@workspace:packages/tools"
"@joplin/tools@npm:~2.6":
version: 2.6.3
resolution: "@joplin/tools@npm:2.6.3"
dependencies:
"@joplin/lib": ^2.6.3
"@joplin/renderer": ^2.6.3
execa: ^4.1.0
fs-extra: ^4.0.3
gettext-parser: ^1.3.0
glob: ^7.1.6
markdown-it: ^8.4.1
md5-file: ^4.0.0
moment: ^2.24.0
mustache: ^2.3.0
node-fetch: ^1.7.3
relative: ^3.0.2
request: ^2.88.0
sharp: ^0.25.2
source-map-support: ^0.5.19
uri-template: ^1.0.1
yargs: ^16.0.3
checksum: d9320b87b43336b8fdc446e144e9dd913fa4de13704c14cdfac0a885f11a8e84824e5e73eb5f20380bdc68e010d738a0cf3203ade445f7765c51d143f2bb4d35
languageName: node
linkType: hard
"@joplin/tools@workspace:packages/tools, @joplin/tools@~2.7":
version: 0.0.0-use.local
resolution: "@joplin/tools@workspace:packages/tools"
dependencies:
"@joplin/lib": ~2.7
"@joplin/renderer": ~2.7
"@rmp135/sql-ts": ^1.6.0
"@types/fs-extra": ^9.0.6
"@types/jest": ^26.0.15
@ -3335,7 +3461,7 @@ __metadata:
sqlite3: ^5.0.0
typescript: ^4.1.3
uri-template: ^1.0.1
yargs: ^16.0.3
yargs: 16.0.3
languageName: unknown
linkType: soft
@ -9228,7 +9354,7 @@ __metadata:
languageName: node
linkType: hard
"cliui@npm:^7.0.2":
"cliui@npm:^7.0.0, cliui@npm:^7.0.2":
version: 7.0.4
resolution: "cliui@npm:7.0.4"
dependencies:
@ -12705,7 +12831,7 @@ __metadata:
languageName: node
linkType: hard
"escalade@npm:^3.1.1":
"escalade@npm:^3.0.2, escalade@npm:^3.1.1":
version: 3.1.1
resolution: "escalade@npm:3.1.1"
checksum: a3e2a99f07acb74b3ad4989c48ca0c3140f69f923e56d0cba0526240ee470b91010f9d39001f2a4a313841d237ede70a729e92125191ba5d21e74b106800b133
@ -15904,6 +16030,13 @@ __metadata:
languageName: node
linkType: hard
"highlight.js@npm:^11.2.0":
version: 11.3.1
resolution: "highlight.js@npm:11.3.1"
checksum: 9adaaa1fe5aaae0ca522f9355bc2a7387f76ab362f88c32c86879b99f606619a9aa33c32ffc94cd893987e71ba5d2de6f3e325ed9e8eac65e5872d251e8cba3a
languageName: node
linkType: hard
"highlight.js@npm:~9.12.0":
version: 9.12.0
resolution: "highlight.js@npm:9.12.0"
@ -18380,9 +18513,9 @@ __metadata:
version: 0.0.0-use.local
resolution: "joplin@workspace:packages/app-cli"
dependencies:
"@joplin/lib": ~2.6
"@joplin/renderer": ~2.6
"@joplin/tools": ~2.6
"@joplin/lib": ~2.7
"@joplin/renderer": ~2.7
"@joplin/tools": ~2.7
"@types/fs-extra": ^9.0.6
"@types/jest": ^26.0.15
"@types/node": ^14.14.6
@ -21730,7 +21863,7 @@ __metadata:
languageName: node
linkType: hard
"node-emoji@npm:1.11.0":
"node-emoji@npm:1.11.0, node-emoji@npm:^1.11.0":
version: 1.11.0
resolution: "node-emoji@npm:1.11.0"
dependencies:
@ -29968,6 +30101,16 @@ __metadata:
languageName: node
linkType: hard
"uslug@git+https://github.com/laurent22/uslug.git#emoji-support":
version: 1.0.4
resolution: "uslug@https://github.com/laurent22/uslug.git#commit=8c12bc7678eaefa752e673ea9cfbc0b1a14d7237"
dependencies:
node-emoji: ^1.11.0
unorm: ">= 1.0.0"
checksum: 9ed2a3b18f25090aec7468d60b8fa0b2172029d6bb8e917079971758cb67a68c9a591f2a42aa447124849dae8aaea2fa9873d38c9e792cc2e9c3c05329f59fb3
languageName: node
linkType: hard
"utf8-byte-length@npm:^1.0.1":
version: 1.0.4
resolution: "utf8-byte-length@npm:1.0.4"
@ -30956,7 +31099,7 @@ __metadata:
languageName: node
linkType: hard
"y18n@npm:^5.0.5":
"y18n@npm:^5.0.1, y18n@npm:^5.0.5":
version: 5.0.8
resolution: "y18n@npm:5.0.8"
checksum: 54f0fb95621ee60898a38c572c515659e51cc9d9f787fb109cef6fde4befbe1c4602dc999d30110feee37456ad0f1660fa2edcfde6a9a740f86a290999550d30
@ -31027,7 +31170,7 @@ __metadata:
languageName: node
linkType: hard
"yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.3":
"yargs-parser@npm:^20.0.0, yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.3":
version: 20.2.9
resolution: "yargs-parser@npm:20.2.9"
checksum: 8bb69015f2b0ff9e17b2c8e6bfe224ab463dd00ca211eece72a4cd8a906224d2703fb8a326d36fdd0e68701e201b2a60ed7cf81ce0fd9b3799f9fe7745977ae3
@ -31098,6 +31241,21 @@ __metadata:
languageName: node
linkType: hard
"yargs@npm:16.0.3":
version: 16.0.3
resolution: "yargs@npm:16.0.3"
dependencies:
cliui: ^7.0.0
escalade: ^3.0.2
get-caller-file: ^2.0.5
require-directory: ^2.1.1
string-width: ^4.2.0
y18n: ^5.0.1
yargs-parser: ^20.0.0
checksum: e59676cfc84ae64c59200d066b9c9a736ef8c54bac909ea56e3578332f54aff4da64ce9ce9e595e25529cb3f4063a1902adf3bc08313ae1bf808563c8c6e348a
languageName: node
linkType: hard
"yargs@npm:^14.2.2":
version: 14.2.3
resolution: "yargs@npm:14.2.3"