diff --git a/_regroup/package.json b/_regroup/package.json index 2157ad9df..444597799 100644 --- a/_regroup/package.json +++ b/_regroup/package.json @@ -36,7 +36,7 @@ }, "devDependencies": { "@playwright/test": "1.52.0", - "@stylistic/eslint-plugin": "4.4.0", + "@stylistic/eslint-plugin": "4.4.1", "@types/express": "5.0.1", "@types/node": "22.15.29", "@types/yargs": "17.0.33", diff --git a/apps/client/package.json b/apps/client/package.json index 752eca730..94f1a0ed3 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -64,7 +64,7 @@ "@types/leaflet-gpx": "1.3.7", "@types/mark.js": "8.11.12", "@types/react": "19.1.6", - "@types/react-dom": "19.1.5", + "@types/react-dom": "19.1.6", "copy-webpack-plugin": "13.0.0", "happy-dom": "17.6.3", "script-loader": "0.7.2", diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 7c9813963..33948c6b6 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -17,7 +17,7 @@ "@types/electron-squirrel-startup": "1.0.2", "@triliumnext/server": "workspace:*", "copy-webpack-plugin": "13.0.0", - "electron": "36.3.2", + "electron": "36.4.0", "@electron-forge/cli": "7.8.1", "@electron-forge/maker-deb": "7.8.1", "@electron-forge/maker-dmg": "7.8.1", diff --git a/apps/edit-docs/demo/!!!meta.json b/apps/edit-docs/demo/!!!meta.json index f50d0648e..178f5bd51 100644 --- a/apps/edit-docs/demo/!!!meta.json +++ b/apps/edit-docs/demo/!!!meta.json @@ -19,6 +19,52 @@ "attachments": [], "dirFileName": "root", "children": [ + { + "isClone": false, + "noteId": "uXI8DRRYXWKs", + "notePath": [ + "root", + "uXI8DRRYXWKs" + ], + "title": "Journal", + "notePosition": 10, + "prefix": null, + "isExpanded": true, + "type": "book", + "mime": "", + "attributes": [ + { + "type": "label", + "name": "calendarRoot", + "value": "", + "isInheritable": false, + "position": 10 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bx-calendar", + "isInheritable": false, + "position": 20 + }, + { + "type": "label", + "name": "viewType", + "value": "calendar", + "isInheritable": false, + "position": 30 + }, + { + "type": "label", + "name": "calendar:view", + "value": "dayGridMonth", + "isInheritable": false, + "position": 40 + } + ], + "dataFileName": "Journal.dat", + "attachments": [] + }, { "isClone": false, "noteId": "rvaX6hEaQlmk", @@ -388,55 +434,43 @@ }, { "isClone": false, - "noteId": "uXI8DRRYXWKs", + "noteId": "zoH8XiuiEJSV", "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs" + "zoH8XiuiEJSV" ], "title": "Journal", "notePosition": 30, "prefix": null, "isExpanded": false, - "type": "book", - "mime": "", + "type": "text", + "mime": "text/html", "attributes": [ { "type": "label", - "name": "calendarRoot", + "name": "sorted", "value": "", "isInheritable": false, "position": 10 }, + { + "type": "relation", + "name": "child:child:child:template", + "value": "kr6HIBBuXRwm", + "isInheritable": false, + "position": 20 + }, { "type": "label", "name": "iconClass", "value": "bx bx-calendar", "isInheritable": false, - "position": 20 - }, - { - "type": "label", - "name": "viewType", - "value": "calendar", - "isInheritable": false, "position": 30 - }, - { - "type": "label", - "name": "calendar:view", - "value": "dayGridMonth", - "isInheritable": false, - "position": 40 - }, - { - "type": "relation", - "name": "dateTemplate", - "value": "kr6HIBBuXRwm", - "isInheritable": false, - "position": 50 } ], + "format": "html", + "dataFileName": "Journal.html", "attachments": [], "dirFileName": "Journal", "children": [ @@ -446,13 +480,13 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET" ], "title": "2021", "notePosition": 10, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -488,7 +522,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "iYU0SglOv14g" ], @@ -531,7 +565,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "iYU0SglOv14g", "snHll0LeHI7G" @@ -569,7 +603,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "iYU0SglOv14g", "snHll0LeHI7G", @@ -592,7 +626,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "iYU0SglOv14g", "snHll0LeHI7G", @@ -615,7 +649,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "iYU0SglOv14g", "snHll0LeHI7G", @@ -642,7 +676,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk" ], @@ -685,7 +719,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "BL4b1a0UF8Lx" @@ -730,7 +764,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "BL4b1a0UF8Lx", @@ -753,7 +787,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "BL4b1a0UF8Lx", @@ -783,7 +817,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "BL4b1a0UF8Lx", @@ -821,7 +855,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "BL4b1a0UF8Lx", @@ -859,7 +893,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "BL4b1a0UF8Lx", @@ -897,7 +931,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "BL4b1a0UF8Lx", @@ -935,7 +969,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "BL4b1a0UF8Lx", @@ -973,7 +1007,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "BL4b1a0UF8Lx", @@ -1011,7 +1045,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "BL4b1a0UF8Lx", @@ -1049,7 +1083,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "BL4b1a0UF8Lx", @@ -1087,7 +1121,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "BL4b1a0UF8Lx", @@ -1125,7 +1159,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "BL4b1a0UF8Lx", @@ -1163,7 +1197,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "BL4b1a0UF8Lx", @@ -1201,7 +1235,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "BL4b1a0UF8Lx", @@ -1241,7 +1275,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "BL4b1a0UF8Lx", @@ -1302,7 +1336,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "E5ZFA3tndbcj" @@ -1347,7 +1381,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "E5ZFA3tndbcj", @@ -1408,7 +1442,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "YQxQ5rcWiFvQ" @@ -1452,7 +1486,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "Vf0GuwMAsitj" @@ -1497,7 +1531,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "Vf0GuwMAsitj", @@ -1520,7 +1554,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "Vf0GuwMAsitj", @@ -1545,7 +1579,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "ilB1T75UG19p" @@ -1590,7 +1624,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "ilB1T75UG19p", @@ -1613,7 +1647,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "ilB1T75UG19p", @@ -1637,7 +1671,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "ilB1T75UG19p", @@ -1665,7 +1699,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "Zjezi8WBQ1Mu" @@ -1709,7 +1743,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "gW1WbDNQRMUC" @@ -1754,7 +1788,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "gW1WbDNQRMUC", @@ -1836,7 +1870,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "gW1WbDNQRMUC", @@ -1911,7 +1945,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "SbaYih0D3uUk", "c5sYRApFBW5v" @@ -1950,7 +1984,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "AD8gDaZaJekk" ], @@ -1972,7 +2006,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "AD8gDaZaJekk", "c3NaitsUCQck" @@ -1995,7 +2029,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "AD8gDaZaJekk", "c3NaitsUCQck", @@ -2018,7 +2052,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "AD8gDaZaJekk", "c3NaitsUCQck", @@ -2041,7 +2075,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "AD8gDaZaJekk", "c3NaitsUCQck", @@ -2064,7 +2098,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "AD8gDaZaJekk", "c3NaitsUCQck", @@ -2087,7 +2121,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "b3kSYO90QeET", "AD8gDaZaJekk", "cO1ZpqA44IcF" @@ -2113,7 +2147,7 @@ "notePath": [ "root", "rvaX6hEaQlmk", - "uXI8DRRYXWKs", + "zoH8XiuiEJSV", "kr6HIBBuXRwm" ], "title": "Day template", @@ -2160,7 +2194,7 @@ "bZBkjm466gSM" ], "title": "Tech", - "notePosition": 50, + "notePosition": 40, "prefix": null, "isExpanded": false, "type": "text", @@ -2637,7 +2671,7 @@ "dvgVuMNvit5M" ], "title": "Note Types", - "notePosition": 70, + "notePosition": 60, "prefix": null, "isExpanded": false, "type": "text", @@ -3417,7 +3451,7 @@ "XpCKD6IODUj2" ], "title": "Books", - "notePosition": 140, + "notePosition": 130, "prefix": null, "isExpanded": false, "type": "text", @@ -3613,7 +3647,7 @@ "B2ao3EopB5yW" ], "title": "Work", - "notePosition": 160, + "notePosition": 150, "prefix": null, "isExpanded": false, "type": "text", @@ -3702,7 +3736,7 @@ "Zl2So0VN2bPq" ], "title": "Steel Blue", - "notePosition": 170, + "notePosition": 160, "prefix": null, "isExpanded": false, "type": "code", @@ -3813,7 +3847,7 @@ "KZVWidxicAfn" ], "title": "Scripting examples", - "notePosition": 360, + "notePosition": 350, "prefix": null, "isExpanded": false, "type": "text", diff --git a/apps/edit-docs/demo/index.html b/apps/edit-docs/demo/index.html index 7445ffa0b..638b4e3bf 100644 --- a/apps/edit-docs/demo/index.html +++ b/apps/edit-docs/demo/index.html @@ -6,6 +6,6 @@