@tiddlywiki/mws 0.0.21 → 0.1.1

package/editions/mws-docs/tiddlers/x-mws-tiddler.md.meta

@@ -0,0 +1,5 @@
+created: 20250519213345090
+modified: 20250613004224256
+tags: Reference
+title: x-mws-tiddler
+type: text/markdown

package/mws.run.mjs

@@ -0,0 +1,30 @@
+#!/usr/bin/env node
+//@ts-check
+import { existsSync, readFileSync, } from "fs";
+
+const cwd = process.cwd();
+/** @type {import("./package.json") | null} */
+const pkg = existsSync(`${cwd}/package.json`)
+  ? tryParseJSON(readFileSync(`${cwd}/package.json`, "utf8"))
+  : null;
+
+if(pkg?.name === "@tiddlywiki/mws" && existsSync(`${cwd}/mws.dev.mjs`)) {
+  console.error("This appears to be a development version of MWS.");
+  process.exit(1);
+}
+
+if(!pkg?.dependencies?.["@tiddlywiki/mws"] || pkg.name !== "@tiddlywiki/mws-instance" || !pkg.private) {
+  console.error("This does not appear to be a valid MWS data folder.");
+  console.error("Please run this command in the root of your MWS data folder.");
+  process.exit(1);
+}
+
+import(`${cwd}/node_modules/@tiddlywiki/mws/dist/mws.js`).then(mws => mws.default()).catch(console.error);
+
+function tryParseJSON(file) {
+  try {
+    return JSON.parse(file);
+  } catch(e) {
+    return undefined;
+  }
+}

package/package.json

@@ -2,21 +2,38 @@
   "name": "@tiddlywiki/mws",
   "description": "TiddlyWiki Multiple Wiki Server",
   "private": false,
-  "version": "0.0.21",
+  "version": "0.1.1",
+  "bin": {
+    "mws": "./mws.run.mjs"
+  },
   "type": "module",
+  "repository": {
+    "url": "https://github.com/TiddlyWiki/MultiWikiServer"
+  },
+  "license": "BSD-3-Clause",
+  "author": "TiddlyWiki Community",
   "exports": {
-    "types": "./src/server.ts",
-    "require": "./dist/server.cjs",
-    "import": "./dist/server.js"
+    ".": {
+      "types": "./dist/mws.d.ts",
+      "import": "./dist/mws.js"
+    }
   },
+  "workspaces": [
+    "packages/events",
+    "packages/commander",
+    "packages/server",
+    "packages/mws",
+    "packages/react-admin",
+    "packages/tiddlywiki-types"
+  ],
   "files": [
     "dist",
-    "prisma",
-    "react-user-mgmt",
-    "tiddlywiki-types",
     "editions/mws-docs",
-    "plugins/client",
-    "scripts.mjs"
+    "plugins",
+    "prisma",
+    "public",
+    "scripts.mjs",
+    "mws.run.mjs"
   ],
   "engines": {
     "node": ">=18"
@@ -24,42 +41,36 @@
   "scripts": {
     "docs": "node scripts.mjs docs",
     "start": "node scripts.mjs start",
-    "certs": "(cd runtime-config && bash localhost_certs.sh)",
-    "tsc": "tsc -p tsconfig.json --skipLibCheck",
-    "build": "npm run tsc && tsup && node mws.dev.mjs --client-build",
+    "certs": "(cd dev && bash localhost_certs.sh)",
+    "tsc": "TSCMWS=1 npx tsup",
+    "build": "tsup && npm run build:admin",
+    "build:admin": "node scripts.mjs client-build",
+    "build:client": "cd plugins/client && tsc",
     "install-android": "GYP_DEFINES=\"android_ndk_path=''\" npm install",
-    "postinstall": "node scripts.mjs prisma:generate",
+    "prisma:format": "prettier --write prisma/client/*.js prisma/client/*/*.js",
+    "prisma:generate": "node scripts.mjs prisma:generate",
+    "dev:init-store": "rm -rf dev/wiki/store && DEBUG= npm start init-store",
     "env": "env",
-    "test:pack": "(git clean -dfx tests && npm pack --pack-destination tests && cd tests && npm install && npm install ./tiddlywiki-mws-$npm_package_version.tgz --no-save && npm test)",
-    "test": "(git clean -dfx tests && cd tests && npm install .. --no-save && npm test)",
-    "fulltest": "mv node_modules node_modules_old; npm run test:pack; mv node_modules_old node_modules",
-    "prepublishOnly": "npm run build"
+    "test": "node scripts.mjs test",
+    "prisma:migrate": "DATABASE_URL=file:test.sqlite npx prisma migrate dev --create-only --skip-generate --schema prisma/schema.prisma"
   },
   "dependencies": {
-    "@prisma/adapter-better-sqlite3": "6.7.0-dev.48",
-    "@prisma/client": "6.6.0",
+    "@prisma/adapter-better-sqlite3": "6.10.1",
     "@serenity-kit/opaque": "^0.8.4",
-    "@types/mime-types": "^2.1.4",
-    "@types/node": "^22.13.1",
-    "@types/send": "^0.17.4",
-    "@types/sjcl": "^1.0.34",
-    "@types/tiddlywiki": "file:tiddlywiki-types",
-    "prisma": "6.6.0",
+    "prisma-client": "file:prisma/client",
     "source-map-support": "^0.5.21",
-    "zod": "^3.24.2"
+    "tiddlywiki": "^5.3.2"
   },
   "devDependencies": {
-    "commander": "^13.1.0",
-    "esbuild": "0.25.2",
-    "mime-types": "^2.1.35",
-    "send": "^1.1.0",
-    "sjcl": "^1.0.8",
-    "tiddlywiki": "^5.1.22",
-    "tsup": "^8.4.0",
-    "typescript": "^5.7.3",
-    "uuid": "^11.1.0"
+    "@prisma/client": "6.10.1",
+    "@types/node": "^24.0.0",
+    "prettier": "^3.6.1",
+    "prisma": "6.10.1",
+    "prisma-json-types-generator": "3.5.0",
+    "tsup": "^8.5.0",
+    "typescript": "^5.8.3"
   },
   "peerDependencies": {
-    "tiddlywiki": "^5.1.22"
+    "tiddlywiki": "^5.3.2"
   }
 }

package/plugins/client/package-lock.json

@@ -5,99 +5,62 @@
   "requires": true,
   "packages": {
     "": {
-      "version": "1.0.0",
+      "version": "1.0.0"
+    },
+    "../..": {
+      "name": "@tiddlywiki/mws",
+      "version": "0.0.0",
+      "extraneous": true,
+      "hasInstallScript": true,
       "dependencies": {
-        "typescript": "^5.8.3"
+        "@prisma/client": "^6.6.0"
       },
       "devDependencies": {
-        "tw5-typed": "*"
-      }
-    },
-    "node_modules/@types/codemirror": {
-      "version": "5.60.15",
-      "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.15.tgz",
-      "integrity": "sha512-dTOvwEQ+ouKJ/rE9LT1Ue2hmP6H1mZv5+CCnNWu2qtiOe2LQa9lCprEY20HxiDmV/Bxh+dXjywmy5aKvoGjULA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/tern": "*"
-      }
-    },
-    "node_modules/@types/echarts": {
-      "version": "4.9.22",
-      "resolved": "https://registry.npmjs.org/@types/echarts/-/echarts-4.9.22.tgz",
-      "integrity": "sha512-7Fo6XdWpoi8jxkwP7BARUOM7riq8bMhmsCtSG8gzUcJmFhLo387tihoBYS/y5j7jl3PENT5RxeWZdN9RiwO7HQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/zrender": "*"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
-      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/node": {
-      "version": "20.17.30",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.30.tgz",
-      "integrity": "sha512-7zf4YyHA+jvBNfVrk2Gtvs6x7E8V+YDW05bNfG2XkWDJfYRXrTiP/DsB2zSYTaHX0bGIujTBQdMVAhb+j7mwpg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.19.2"
+        "prisma": "6.6.0",
+        "prisma-json-types-generator": "~3.3.1",
+        "tsup": "^8.5.0",
+        "typescript": "^5.8.3"
+      },
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@types/tern": {
-      "version": "0.23.9",
-      "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
-      "integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
-      "dev": true,
-      "license": "MIT",
+    "../../packages/mws": {
+      "name": "@tiddlywiki/mws",
+      "extraneous": true,
       "dependencies": {
-        "@types/estree": "*"
+        "@prisma/adapter-better-sqlite3": "6.7.0-dev.48",
+        "@prisma/client": "6.6.0",
+        "@serenity-kit/opaque": "^0.8.4",
+        "prisma": "6.6.0",
+        "prisma-json-types-generator": "~3.3.1"
+      },
+      "devDependencies": {
+        "@types/better-sqlite3": "^7.6.13",
+        "@types/debug": "^4.1.12",
+        "@types/tiddlywiki": "file:../tiddlywiki-types",
+        "debug": "^4.4.1",
+        "esbuild": "0.25.2",
+        "source-map-support": "^0.5.21",
+        "supports-color": "^10.0.0",
+        "tiddlywiki": "^5.1.22",
+        "try": "^1.0.0-beta.5",
+        "uuid": "^11.1.0"
+      },
+      "peerDependencies": {
+        "tiddlywiki": "^5.1.22"
       }
     },
-    "node_modules/@types/zrender": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@types/zrender/-/zrender-4.0.6.tgz",
-      "integrity": "sha512-1jZ9bJn2BsfmYFPBHtl5o3uV+ILejAtGrDcYSpT4qaVKEI/0YY+arw3XHU04Ebd8Nca3SQ7uNcLaqiL+tTFVMg==",
-      "dev": true,
-      "license": "MIT"
+    "../../packages/tiddlywiki-types": {
+      "name": "@types/tiddlywiki",
+      "extraneous": true
     },
-    "node_modules/tw5-typed": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tw5-typed/-/tw5-typed-0.6.0.tgz",
-      "integrity": "sha512-Mp3yxP0v6+Ja7doPC4ZbXpDcc+Y/WPsEiOvePdvR8PoyAHsOAWuNotnwgsdbPJfNLdHWo9vXBBFvz6T4sa8dfg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/codemirror": "^5.60.15",
-        "@types/echarts": "^4.9.22",
-        "@types/node": "^20.11.24"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "5.8.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
-      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
+    "../../tiddlywiki-types": {
+      "name": "@types/tiddlywiki",
+      "extraneous": true
     },
-    "node_modules/undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
-      "dev": true,
-      "license": "MIT"
+    "tiddlywiki-types": {
+      "extraneous": true
     }
   }
 }

package/plugins/client/package.json

@@ -1,11 +1,6 @@
 {
   "title": "$:/plugins/tiddlywiki/multiwikiclient",
-  "version": "1.0.0",
   "scripts": {
     "tsc": "tsc"
-  },
-  "devDependencies": {
-    "tw5-typed": "*",
-    "typescript": "^5.8.3"
   }
-}
+}

package/plugins/client/plugin.info

@@ -1,7 +1,7 @@
 {
-	"title": "$:/plugins/tiddlywiki/multiwikiclient",
+	"title": "$:/plugins/mws/client",
 	"name": "MultiWikiClient",
-	"description": "Synchronise changes from the browser to TiddlyWiki ~MultiWikiServer",
+	"description": "Synchronise changes from the browser to TiddlyWiki ~MultiWikiServer     ",
 	"list": "readme",
 	"plugin-priority": 12,
 	"stability": "STABILITY_1_EXPERIMENTAL",