From 6014fdc722c288c32d0b1f4d3a53af48e53d24d0 Mon Sep 17 00:00:00 2001 From: pmario Date: Wed, 26 Jun 2024 11:10:40 +0200 Subject: [PATCH 01/10] add some new scripts to package.json, to make npm run command easier --- package.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package.json b/package.json index cb4eb8fc988..8123b9d0b94 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,15 @@ "node": ">=0.8.2" }, "scripts": { + "start": "node ./tiddlywiki.js ./editions/tw5.com-server --listen", "dev": "node ./tiddlywiki.js ./editions/tw5.com-server --listen", + "pre": "node ./tiddlywiki.js ./editions/prerelease --listen", + "empty": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/empty --listen", + "tour": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/tour --listen", + "tw.org": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/tw.org --listen", + "upgrade": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/upgrade --listen", + "full": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/full --listen", + "translators": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/translators --listen", "test": "node ./tiddlywiki.js ./editions/test --verbose --version --build index", "lint:fix": "eslint . --fix", "lint": "eslint ." From ccf3c9c951430c879511be77372fcdaa3cc1d268 Mon Sep 17 00:00:00 2001 From: pmario Date: Thu, 27 Jun 2024 12:54:09 +0200 Subject: [PATCH 02/10] improve script flexibility --- package.json | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 8123b9d0b94..b02b04885c0 100644 --- a/package.json +++ b/package.json @@ -33,15 +33,22 @@ }, "scripts": { "start": "node ./tiddlywiki.js ./editions/tw5.com-server --listen", - "dev": "node ./tiddlywiki.js ./editions/tw5.com-server --listen", - "pre": "node ./tiddlywiki.js ./editions/prerelease --listen", - "empty": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/empty --listen", - "tour": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/tour --listen", - "tw.org": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/tw.org --listen", - "upgrade": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/upgrade --listen", - "full": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/full --listen", - "translators": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/translators --listen", "test": "node ./tiddlywiki.js ./editions/test --verbose --version --build index", + + "wiki:info": "echo \"use: npm run wiki --edition= [empty, prerelease, dev, tour, tw.org, upgrade, full]\"", + "wiki": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/%npm_config_edition% --listen", + + "cs:info": "echo \"use: npm run cs --edition=tw5.com [de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", + "cs": "node ./editions/%npm_config_edition%-server --listen", + + "server": "node ./tiddlywiki.js ./editions/server --listen", + "server-external-js": "node ./tiddlywiki.js ./editions/server-external-js --listen", + + "prewiki": "npm run wiki:info -s", + "postwiki:info" : "echo \"or: [translators, aws, classicparserdemo, codemirrordemo, d3demo, dynaviewdemo, geospatialdemo, highlightdemo, innerwikidemo, introduction, ja-JP, katexdemo, markdowndemo, prerelease, resumebuilder, tw5.com-docs, text-slicer, twitter-archivist, zh-Hans, zh-Hant\"", + + "precs": "npm run cs:info -s", + "lint:fix": "eslint . --fix", "lint": "eslint ." } From 81020994e99ca248345b22899ce7d76bd82dc967 Mon Sep 17 00:00:00 2001 From: pmario Date: Thu, 27 Jun 2024 20:25:28 +0200 Subject: [PATCH 03/10] add share --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b02b04885c0..1d7bd0e11aa 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "server-external-js": "node ./tiddlywiki.js ./editions/server-external-js --listen", "prewiki": "npm run wiki:info -s", - "postwiki:info" : "echo \"or: [translators, aws, classicparserdemo, codemirrordemo, d3demo, dynaviewdemo, geospatialdemo, highlightdemo, innerwikidemo, introduction, ja-JP, katexdemo, markdowndemo, prerelease, resumebuilder, tw5.com-docs, text-slicer, twitter-archivist, zh-Hans, zh-Hant\"", + "postwiki:info" : "echo \"or: [translators, aws, classicparserdemo, codemirrordemo, d3demo, dynaviewdemo, geospatialdemo, highlightdemo, innerwikidemo, introduction, ja-JP, katexdemo, markdowndemo, prerelease, resumebuilder, share, tw5.com-docs, text-slicer, twitter-archivist, zh-Hans, zh-Hant\"", "precs": "npm run cs:info -s", From ca2ba69b4229aabce4e488b91f5b6ab6afea406e Mon Sep 17 00:00:00 2001 From: pmario Date: Tue, 20 Aug 2024 21:37:15 +0200 Subject: [PATCH 04/10] change cs to edtion, add library --- package.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 1d7bd0e11aa..79d01f32cd1 100644 --- a/package.json +++ b/package.json @@ -38,16 +38,20 @@ "wiki:info": "echo \"use: npm run wiki --edition= [empty, prerelease, dev, tour, tw.org, upgrade, full]\"", "wiki": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/%npm_config_edition% --listen", - "cs:info": "echo \"use: npm run cs --edition=tw5.com [de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", - "cs": "node ./editions/%npm_config_edition%-server --listen", + "edition:info": "echo \"use: npm run edition --edition=tw5.com [de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", + "edition": "node ./editions/%npm_config_edition%-server --listen", "server": "node ./tiddlywiki.js ./editions/server --listen", "server-external-js": "node ./tiddlywiki.js ./editions/server-external-js --listen", + "library:info": "echo \"use: npm run library\" && echo \"IMPORTANT: It starts on port:8888\"", + "library": "node ./tiddlywiki.js ./editions/pluginlibrary --build test-server", + "prewiki": "npm run wiki:info -s", "postwiki:info" : "echo \"or: [translators, aws, classicparserdemo, codemirrordemo, d3demo, dynaviewdemo, geospatialdemo, highlightdemo, innerwikidemo, introduction, ja-JP, katexdemo, markdowndemo, prerelease, resumebuilder, share, tw5.com-docs, text-slicer, twitter-archivist, zh-Hans, zh-Hant\"", - "precs": "npm run cs:info -s", + "preedition": "npm run edition:info -s", + "prelibrary": "npm run library:info -s", "lint:fix": "eslint . --fix", "lint": "eslint ." From 70490ee8cebe22f614eb404e955e8531ff071531 Mon Sep 17 00:00:00 2001 From: pmario Date: Tue, 20 Aug 2024 22:21:57 +0200 Subject: [PATCH 05/10] fix error if tiddlywiki.info file is missing --- core/modules/utils/edition-info.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/core/modules/utils/edition-info.js b/core/modules/utils/edition-info.js index f8a5cab06ae..6f1a5261c90 100644 --- a/core/modules/utils/edition-info.js +++ b/core/modules/utils/edition-info.js @@ -29,10 +29,14 @@ exports.getEditionInfo = function() { for(var entryIndex=0; entryIndex