mirror of
https://github.com/TriliumNext/Notes.git
synced 2025-07-27 18:12:29 +08:00
Merge branch 'develop' into feature/MFA
This commit is contained in:
commit
ed58be1578
@ -9,7 +9,7 @@
|
|||||||
"pOsGYCXsbNQG"
|
"pOsGYCXsbNQG"
|
||||||
],
|
],
|
||||||
"title": "User Guide",
|
"title": "User Guide",
|
||||||
"notePosition": 130,
|
"notePosition": 1,
|
||||||
"prefix": null,
|
"prefix": null,
|
||||||
"isExpanded": false,
|
"isExpanded": false,
|
||||||
"type": "text",
|
"type": "text",
|
||||||
|
@ -143,13 +143,14 @@ async function exportData(format: "html" | "markdown", outputPath: string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
await cleanUpMeta();
|
await cleanUpMeta(outputPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function cleanUpMeta() {
|
async function cleanUpMeta(outputPath: string) {
|
||||||
const metaPath = path.join(markdownPath, "!!!meta.json");
|
const metaPath = path.join(outputPath, "!!!meta.json");
|
||||||
const meta = JSON.parse(await fs.readFile(metaPath, "utf-8")) as NoteMetaFile;
|
const meta = JSON.parse(await fs.readFile(metaPath, "utf-8")) as NoteMetaFile;
|
||||||
for (const file of meta.files) {
|
for (const file of meta.files) {
|
||||||
|
file.notePosition = 1;
|
||||||
traverse(file);
|
traverse(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
8
package-lock.json
generated
8
package-lock.json
generated
@ -144,7 +144,7 @@
|
|||||||
"@types/react": "18.3.20",
|
"@types/react": "18.3.20",
|
||||||
"@types/react-dom": "18.3.5",
|
"@types/react-dom": "18.3.5",
|
||||||
"@types/safe-compare": "1.1.2",
|
"@types/safe-compare": "1.1.2",
|
||||||
"@types/sanitize-html": "2.13.0",
|
"@types/sanitize-html": "2.15.0",
|
||||||
"@types/sax": "1.2.7",
|
"@types/sax": "1.2.7",
|
||||||
"@types/serve-favicon": "2.5.7",
|
"@types/serve-favicon": "2.5.7",
|
||||||
"@types/session-file-store": "1.2.5",
|
"@types/session-file-store": "1.2.5",
|
||||||
@ -5386,9 +5386,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@types/sanitize-html": {
|
"node_modules/@types/sanitize-html": {
|
||||||
"version": "2.13.0",
|
"version": "2.15.0",
|
||||||
"resolved": "https://registry.npmjs.org/@types/sanitize-html/-/sanitize-html-2.13.0.tgz",
|
"resolved": "https://registry.npmjs.org/@types/sanitize-html/-/sanitize-html-2.15.0.tgz",
|
||||||
"integrity": "sha512-X31WxbvW9TjIhZZNyNBZ/p5ax4ti7qsNDBDEnH4zAgmEh35YnFD1UiS6z9Cd34kKm0LslFW0KPmTQzu/oGtsqQ==",
|
"integrity": "sha512-71Z6PbYsVKfp4i6Jvr37s5ql6if1Q/iJQT80NbaSi7uGaG8CqBMXP0pk/EsURAOuGdk5IJCd/vnzKrR7S3Txsw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -200,7 +200,7 @@
|
|||||||
"@types/react": "18.3.20",
|
"@types/react": "18.3.20",
|
||||||
"@types/react-dom": "18.3.5",
|
"@types/react-dom": "18.3.5",
|
||||||
"@types/safe-compare": "1.1.2",
|
"@types/safe-compare": "1.1.2",
|
||||||
"@types/sanitize-html": "2.13.0",
|
"@types/sanitize-html": "2.15.0",
|
||||||
"@types/sax": "1.2.7",
|
"@types/sax": "1.2.7",
|
||||||
"@types/serve-favicon": "2.5.7",
|
"@types/serve-favicon": "2.5.7",
|
||||||
"@types/session-file-store": "1.2.5",
|
"@types/session-file-store": "1.2.5",
|
||||||
|
16242
src/public/app/doc_notes/en/User Guide/!!!meta.json
generated
16242
src/public/app/doc_notes/en/User Guide/!!!meta.json
generated
File diff suppressed because it is too large
Load Diff
@ -76,8 +76,8 @@
|
|||||||
the <code>#monthPattern</code> attribute, much like <code>#datePattern</code>.
|
the <code>#monthPattern</code> attribute, much like <code>#datePattern</code>.
|
||||||
The options are:</p>
|
The options are:</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li><code>{isoMonth}</code> results in an ISO 8061 formatted month (e.g.
|
<li><code>{isoMonth}</code> results in an ISO 8061 formatted month (e.g. "2025-03"
|
||||||
"2025-03" for March 2025)</li>
|
for March 2025)</li>
|
||||||
<li><code>{monthNumberPadded}</code> results in a number like <code>09</code> for
|
<li><code>{monthNumberPadded}</code> results in a number like <code>09</code> for
|
||||||
September, and <code>11</code> for November</li>
|
September, and <code>11</code> for November</li>
|
||||||
<li><code>{month}</code> results in the full month name (e.g. <code>September</code> or <code>October</code>)</li>
|
<li><code>{month}</code> results in the full month name (e.g. <code>September</code> or <code>October</code>)</li>
|
||||||
@ -100,4 +100,4 @@
|
|||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
Loading…
x
Reference in New Issue
Block a user