package versions, dependency updates, a couple bug fixes

Author: Arlen22

create-package/files/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiddlywiki/mws-instance",
   "private": true,
-  "version": "0.1.0",
+  "version": "0.2.0",
   "scripts": {
     "start": "mws listen --listener"
   }

create-package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiddlywiki/create-mws",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "bin": "create.js",
   "files":[
     "create.js",

mws.run.mjs

@@ -7,15 +7,28 @@ const cwd = process.cwd();
 /** @type {import("./package.json") | null} */
 const pkg = existsSync(`${cwd}/package.json`) && tryParseJSON(readFileSync(`${cwd}/package.json`, "utf8")) || null;
 
-if(pkg && pkg.name === "@tiddlywiki/mws" && existsSync(`${cwd}/mws.dev.mjs`)) {
+if (pkg && 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 && pkg.name === "@tiddlywiki/mws-instance" && pkg.private) {
+if (pkg && pkg.name === "@tiddlywiki/mws-instance" && pkg.private) {
+  if (pkg.version !== "0.2.0") {
+    console.log([
+      "=======================================================================================",
+      "The data folder you are trying to open appears to be from a different version of MWS.",
+      "",
+      "Folder: " + process.cwd(),
+      "Version: " + pkg.version,
+      "",
+      "To prevent data loss the program will now exit.",
+      "=======================================================================================",
+    ].join("\n"));
+    process.exit(1);
+  }
   // need absolute path because of cwd
   import(`file://${cwd}/node_modules/@tiddlywiki/mws/dist/mws.js`)
-    .then(mws => mws.default())
+    .then(mws => mws.default(pkg.version))
     .catch(console.error);
 } else {
   console.error("This does not appear to be a valid MWS data folder.");
@@ -31,7 +44,7 @@ if(pkg && pkg.name === "@tiddlywiki/mws-instance" && pkg.private) {
 function tryParseJSON(file) {
   try {
     return JSON.parse(file);
-  } catch(e) {
+  } catch (e) {
     return undefined;
   }
 }

package-lock.json

@@ -46,25 +46,20 @@
     "build:admin": "node scripts/scripts.mjs client-build",
     "build:client": "cd plugins/client && tsc",
     "build:types": "PLUGINDTS=1 npx tsup",
+    "prisma:gen": "cd tools && npm run prisma:gen",
+    "prisma:mig": "cd tools && npm run prisma:mig",
     "dev-quick-reset": "node scripts/scripts.mjs dev-quick-reset",
     "env": "env",
-    "test": "node scripts/scripts.mjs test",
-    "prisma:gen": "cd tools && npm run prisma:gen",
-    "prisma:mig": "cd tools && npm run prisma:mig"
+    "test": "node scripts/scripts.mjs test"
   },
   "dependencies": {
     "@prisma/adapter-better-sqlite3": "7.8.0",
     "@prisma/client": "7.8.0",
-    "@serenity-kit/opaque": "^0.8.4",
-    "source-map-support": "^0.5.21",
-    "tiddlywiki": "^5.3.2"
+    "@serenity-kit/opaque": "1.1.0",
+    "source-map-support": "0.5.21"
   },
   "devDependencies": {
     "@types/node": "^24.6.0",
-    "@types/pg": "^8.20.0",
-    "@types/source-map-support": "^0.5.10"
-  },
-  "peerDependencies": {
-    "tiddlywiki": "^5.3.2"
+    "@types/source-map-support": "0.5.10"
   }
-}
+}

package.json

@@ -35,6 +35,7 @@ export class FomController<T extends AdminRecord> {
       operationMessages: this.operationMessages,
       pendingRows: this.pendingRows,
       transientPermissionRows: this.transientPermissionRows,
+      storageError: "",
     };
   }
 

packages/admin-vanilla/src/FomController.tsx

@@ -302,11 +302,10 @@ function renderSearchMultiselectFieldEditor(ctx: FieldEditorContext<any>) {
   const editableLines = value;
   const pendingRowCount = fieldState.pendingRows[field.key] ?? 0;
   const lookupOptions = getLookupOptions(field.key, itemsByTab);
-  const itemLabel = field.key === "plugins"
-    ? "plugin"
-    : field.key === "userRoles"
-      ? "role id"
-      : "bag";
+  const itemLabel =
+    field.key === "plugins" ? "plugin" :
+      field.key === "userRoles" ? "role id" :
+        "bag";
   const templateRecord = is<WikiAdminRecord>(fieldState.draft, fieldState.tabId === "wikis")
     ? findTemplateRecordForWikiRecord(fieldState.draft, itemsByTab) : undefined;
   const templateReadonlyBagLines = field.key === "readonlyBags" && templateRecord ? templateRecord.readonlyBags : [];

packages/admin-vanilla/src/definition/renders.tsx

@@ -17,7 +17,6 @@
     "zod-to-ts": "^1.2.0"
   },
   "peerDependencies": {
-    "tiddlywiki": "^5.1.22",
     "@remix-run/headers": "*",
     "hono": "*"
   }

packages/mws/package.json

@@ -5,6 +5,7 @@ import { LoadWikiFolderCommand } from "./load-wiki-folder";
 import { RoleImportWriter, TemplateImportWriter, UserImportWriter } from "../new-managers";
 import { IdString } from "@mws/admin-vanilla/src/definition/tabs";
 import { serverEvents } from "@tiddlywiki/events";
+import { getTW5Path } from "../plugin-cache";
 
 serverEvents.on("cli.register", (commands) => {
 	commands[info.name] = { info, Command: InitStoreCommand };
@@ -78,7 +79,7 @@ export class InitStoreCommand extends BaseCommand {
 		console.log("Default user created with username 'admin' and password '1234'. Please change this password after logging in.");
 
 		// should give us the path to boot.js
-		const tweditions = resolve(dist_require_resolve("tiddlywiki"), "../../editions");
+		const tweditions = resolve(await getTW5Path(this.config.wikiPath), "editions");
 
 		const runner = async (path: string, bagName: string, bagDesc: string, recName: string, recDesc: string) => {
 			const command = new LoadWikiFolderCommand([path!], {

packages/mws/src/new-commands/init-store.ts

@@ -26,7 +26,7 @@ interface TW5RegistryInfo {
   "dist-tags": { latest: string; };
 }
 
-async function getTW5Path(wikiPath: string) {
+export async function getTW5Path(wikiPath: string) {
   if (!fs.existsSync(path.resolve(wikiPath, "tw5"))) {
     throw new Error("You need to run update-tiddlywiki first");
   }