From dc336c089ff7ac1c8f368a92ab3bb7d116187f6a Mon Sep 17 00:00:00 2001 From: pmario Date: Wed, 16 Oct 2024 13:41:19 +0200 Subject: [PATCH 1/6] add watch, wiki, edition, lazy, server, server-external-js, library and help commands --- package.json | 106 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 67 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index dc2b7c496fa..31357772f3f 100644 --- a/package.json +++ b/package.json @@ -1,41 +1,69 @@ { - "name": "tiddlywiki", - "preferGlobal": "true", - "version": "5.3.6-prerelease", - "author": "Jeremy Ruston ", - "description": "a non-linear personal web notebook", - "contributors": [ - { - "name": "Jeremy Ruston", - "email": "jeremy@jermolene.com" - } - ], - "bin": { - "tiddlywiki": "./tiddlywiki.js" - }, - "main": "./boot/boot.js", - "repository": { - "type": "git", - "url": "https://github.com/TiddlyWiki/TiddlyWiki5.git" - }, - "keywords": [ - "tiddlywiki", - "tiddlywiki5", - "wiki" - ], - "devDependencies": { - "eslint": "^9.12.0", - "@eslint/js": "^9.12.0" - }, - "bundleDependencies": [], - "license": "BSD", - "engines": { - "node": ">=0.8.2" - }, - "scripts": { - "dev": "node ./tiddlywiki.js ./editions/tw5.com-server --listen", - "test": "node ./tiddlywiki.js ./editions/test --verbose --version --build index", - "lint:fix": "eslint . --fix", - "lint": "eslint ." - } + "name": "tiddlywiki", + "preferGlobal": "true", + "version": "5.3.6-prerelease", + "author": "Jeremy Ruston ", + "description": "a non-linear personal web notebook", + "contributors": [ + { + "name": "Jeremy Ruston", + "email": "jeremy@jermolene.com" + } + ], + "bin": { + "tiddlywiki": "./tiddlywiki.js" + }, + "main": "./boot/boot.js", + "repository": { + "type": "git", + "url": "https://github.com/TiddlyWiki/TiddlyWiki5.git" + }, + "keywords": [ + "tiddlywiki", + "tiddlywiki5", + "wiki" + ], + "devDependencies": { + "eslint": "^9.12.0", + "@eslint/js": "^9.12.0" + }, + "bundleDependencies": [], + "license": "BSD", + "engines": { + "node": ">=20.17.0" + }, + "scripts": { + "start": "node ./tiddlywiki.js ./editions/tw5.com-server --listen", + "test": "node ./tiddlywiki.js ./editions/test --verbose --version --build index", + + "watch:info": "echo \"npm run watch\" needs Node.js V20.x to work", + "watch": "node --watch-path=./core --watch-preserve-output ./tiddlywiki.js ./editions/tw5.com-server --listen", + + "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", + + "edition:info": "echo \"use: npm run edition --edition=tw5.com [de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", + "edition": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --listen", + + "lazy:info": "echo \"use: npm run lazy --edition=tw5.com [de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", + "lazy": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --listen root-tiddler=$:/core/save/lazy-all", + + "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", + + "help": "node ./tiddlywiki.js --help", + + "lint": "eslint .", + "lint:fix": "eslint . --fix", + + "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\"", + + "preedition": "npm run edition:info -s", + "pre:lazy": "npm run edition:lazy:info -s", + "prelibrary": "npm run library:info -s" + } } From 9815a3392be51be7e1ba639654a068996d43b172 Mon Sep 17 00:00:00 2001 From: pmario Date: Wed, 16 Oct 2024 13:43:50 +0200 Subject: [PATCH 2/6] move :info's up to the top of the list --- package.json | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 31357772f3f..c76479563af 100644 --- a/package.json +++ b/package.json @@ -37,23 +37,18 @@ "test": "node ./tiddlywiki.js ./editions/test --verbose --version --build index", "watch:info": "echo \"npm run watch\" needs Node.js V20.x to work", - "watch": "node --watch-path=./core --watch-preserve-output ./tiddlywiki.js ./editions/tw5.com-server --listen", - "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", - "edition:info": "echo \"use: npm run edition --edition=tw5.com [de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", - "edition": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --listen", - "lazy:info": "echo \"use: npm run lazy --edition=tw5.com [de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", - "lazy": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --listen root-tiddler=$:/core/save/lazy-all", + "library:info": "echo \"use: npm run library\" && echo \"IMPORTANT: It starts on port:8888\"", + "watch": "node --watch-path=./core --watch-preserve-output ./tiddlywiki.js ./editions/tw5.com-server --listen", + "wiki": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/%npm_config_edition% --listen", + "edition": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --listen", + "lazy": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --listen root-tiddler=$:/core/save/lazy-all", "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", - "help": "node ./tiddlywiki.js --help", "lint": "eslint .", From 88cd38d89d9f6a2f58fcc0262aba2cac3c57c20f Mon Sep 17 00:00:00 2001 From: pmario Date: Wed, 16 Oct 2024 13:54:37 +0200 Subject: [PATCH 3/6] make command positions consistent --- package.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c76479563af..6c5446610e4 100644 --- a/package.json +++ b/package.json @@ -36,19 +36,20 @@ "start": "node ./tiddlywiki.js ./editions/tw5.com-server --listen", "test": "node ./tiddlywiki.js ./editions/test --verbose --version --build index", - "watch:info": "echo \"npm run watch\" needs Node.js V20.x to work", - "wiki:info": "echo \"use: npm run wiki --edition= [empty, prerelease, dev, tour, tw.org, upgrade, full]\"", "edition:info": "echo \"use: npm run edition --edition=tw5.com [de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", + "wiki:info": "echo \"use: npm run wiki --edition= [empty, prerelease, dev, tour, tw.org, upgrade, full]\"", "lazy:info": "echo \"use: npm run lazy --edition=tw5.com [de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", "library:info": "echo \"use: npm run library\" && echo \"IMPORTANT: It starts on port:8888\"", + "watch:info": "echo \"npm run watch\" needs Node.js V20.x to work", - "watch": "node --watch-path=./core --watch-preserve-output ./tiddlywiki.js ./editions/tw5.com-server --listen", - "wiki": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/%npm_config_edition% --listen", "edition": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --listen", + "wiki": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/%npm_config_edition% --listen", "lazy": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --listen root-tiddler=$:/core/save/lazy-all", + "library": "node ./tiddlywiki.js ./editions/pluginlibrary --build test-server", + "watch": "node --watch-path=./core --watch-preserve-output ./tiddlywiki.js ./editions/tw5.com-server --listen", + "server": "node ./tiddlywiki.js ./editions/server --listen", "server-external-js": "node ./tiddlywiki.js ./editions/server-external-js --listen", - "library": "node ./tiddlywiki.js ./editions/pluginlibrary --build test-server", "help": "node ./tiddlywiki.js --help", "lint": "eslint .", From 58b60e560bc854ca1346d0a31035ccf1086deb50 Mon Sep 17 00:00:00 2001 From: pmario Date: Wed, 16 Oct 2024 19:49:46 +0200 Subject: [PATCH 4/6] update edtion:info --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6c5446610e4..571cc39893b 100644 --- a/package.json +++ b/package.json @@ -36,13 +36,13 @@ "start": "node ./tiddlywiki.js ./editions/tw5.com-server --listen", "test": "node ./tiddlywiki.js ./editions/test --verbose --version --build index", - "edition:info": "echo \"use: npm run edition --edition=tw5.com [de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", + "edition:info": "echo \"use: npm run edition --edition= [tw5.com, de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", "wiki:info": "echo \"use: npm run wiki --edition= [empty, prerelease, dev, tour, tw.org, upgrade, full]\"", "lazy:info": "echo \"use: npm run lazy --edition=tw5.com [de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", "library:info": "echo \"use: npm run library\" && echo \"IMPORTANT: It starts on port:8888\"", "watch:info": "echo \"npm run watch\" needs Node.js V20.x to work", - "edition": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --listen", + "edition": "export npm_config_edition=tw5.com || set npm_config_edition=tw5.com && node ./tiddlywiki.js ./editions/%npm_config_edition%-server --listen", "wiki": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/%npm_config_edition% --listen", "lazy": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --listen root-tiddler=$:/core/save/lazy-all", "library": "node ./tiddlywiki.js ./editions/pluginlibrary --build test-server", From 3b7b30dec8dd6946ca383a24f723e14d74e0c008 Mon Sep 17 00:00:00 2001 From: pmario Date: Thu, 17 Oct 2024 19:35:18 +0200 Subject: [PATCH 5/6] rename edtion to server --- package.json | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 571cc39893b..b278492ab7d 100644 --- a/package.json +++ b/package.json @@ -36,20 +36,27 @@ "start": "node ./tiddlywiki.js ./editions/tw5.com-server --listen", "test": "node ./tiddlywiki.js ./editions/test --verbose --version --build index", - "edition:info": "echo \"use: npm run edition --edition= [tw5.com, de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", - "wiki:info": "echo \"use: npm run wiki --edition= [empty, prerelease, dev, tour, tw.org, upgrade, full]\"", - "lazy:info": "echo \"use: npm run lazy --edition=tw5.com [de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", + "server:info": "echo \"use: npm run server --edition= [tw5.com, de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", + "wiki:info": "echo \"use: npm run wiki --edition= [empty, prerelease, dev, tour, tw.org, upgrade, full]\"", + "lazy:info": "echo \"use: npm run lazy --edition= [tw5.com, de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", "library:info": "echo \"use: npm run library\" && echo \"IMPORTANT: It starts on port:8888\"", + "watch:info": "echo \"npm run watch\" needs Node.js V20.x to work", + "build:info": "echo \"use: npm run build --edition= [tw5.com, de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", - "edition": "export npm_config_edition=tw5.com || set npm_config_edition=tw5.com && node ./tiddlywiki.js ./editions/%npm_config_edition%-server --listen", + "server": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --listen", "wiki": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/%npm_config_edition% --listen", "lazy": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --listen root-tiddler=$:/core/save/lazy-all", + "library": "node ./tiddlywiki.js ./editions/pluginlibrary --build test-server", "watch": "node --watch-path=./core --watch-preserve-output ./tiddlywiki.js ./editions/tw5.com-server --listen", - "server": "node ./tiddlywiki.js ./editions/server --listen", + "server-empty": "node ./tiddlywiki.js ./editions/server --listen", "server-external-js": "node ./tiddlywiki.js ./editions/server-external-js --listen", + + "build": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --build index", + "build:all": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --build", + "help": "node ./tiddlywiki.js --help", "lint": "eslint .", @@ -58,8 +65,9 @@ "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\"", - "preedition": "npm run edition:info -s", - "pre:lazy": "npm run edition:lazy:info -s", - "prelibrary": "npm run library:info -s" + "preserver": "npm run server:info -s", + "prelazy": "npm run lazy:info -s", + "prelibrary": "npm run library:info -s", + "prebuild": "npm run build:info -s" } } From 948c9a8219a807620f617f77006a2081e3e2b66f Mon Sep 17 00:00:00 2001 From: pmario Date: Sun, 20 Oct 2024 16:41:48 +0200 Subject: [PATCH 6/6] simplify package.json scripts --- package.json | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index b278492ab7d..4d3093b98ec 100644 --- a/package.json +++ b/package.json @@ -36,38 +36,21 @@ "start": "node ./tiddlywiki.js ./editions/tw5.com-server --listen", "test": "node ./tiddlywiki.js ./editions/test --verbose --version --build index", - "server:info": "echo \"use: npm run server --edition= [tw5.com, de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", - "wiki:info": "echo \"use: npm run wiki --edition= [empty, prerelease, dev, tour, tw.org, upgrade, full]\"", - "lazy:info": "echo \"use: npm run lazy --edition= [tw5.com, de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", - "library:info": "echo \"use: npm run library\" && echo \"IMPORTANT: It starts on port:8888\"", - - "watch:info": "echo \"npm run watch\" needs Node.js V20.x to work", - "build:info": "echo \"use: npm run build --edition= [tw5.com, de-AT, es-ES, fr-FR, ko-KR, xlsx-utils]\"", + "lazy": "node ./tiddlywiki.js ./editions/tw5.com-server --listen root-tiddler=$:/core/save/lazy-all", + "watch": "node --watch-path=./core --watch-preserve-output ./tiddlywiki.js ./editions/tw5.com-server --listen", - "server": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --listen", - "wiki": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/%npm_config_edition% --listen", - "lazy": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --listen root-tiddler=$:/core/save/lazy-all", + "dev": "node ./tiddlywiki.js +plugins/tiddlywiki/filesystem +plugins/tiddlywiki/tiddlyweb ./editions/dev --listen", + "library:info": "echo The Warning below: \"Plugin(s) required for client-server operation are missing\" is INTENTIONAL, so no files will be saved back.", "library": "node ./tiddlywiki.js ./editions/pluginlibrary --build test-server", - "watch": "node --watch-path=./core --watch-preserve-output ./tiddlywiki.js ./editions/tw5.com-server --listen", - "server-empty": "node ./tiddlywiki.js ./editions/server --listen", - "server-external-js": "node ./tiddlywiki.js ./editions/server-external-js --listen", - - "build": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --build index", - "build:all": "node ./tiddlywiki.js ./editions/%npm_config_edition%-server --build", + "build": "node ./tiddlywiki.js ./editions/tw5.com --build", "help": "node ./tiddlywiki.js --help", "lint": "eslint .", "lint:fix": "eslint . --fix", - "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\"", - - "preserver": "npm run server:info -s", - "prelazy": "npm run lazy:info -s", - "prelibrary": "npm run library:info -s", - "prebuild": "npm run build:info -s" + "prelibrary": "npm run library:info -s" } }