Compare commits
3 Commits
ce0c6b1ddf
...
a564f71617
| Author | SHA1 | Date | |
|---|---|---|---|
| a564f71617 | |||
| add15f1857 | |||
| 6e48832ea4 |
3
content/.obsidian/appearance.json
vendored
3
content/.obsidian/appearance.json
vendored
@ -2,5 +2,6 @@
|
|||||||
"accentColor": "",
|
"accentColor": "",
|
||||||
"cssTheme": "",
|
"cssTheme": "",
|
||||||
"translucency": true,
|
"translucency": true,
|
||||||
"baseFontSize": 14
|
"baseFontSize": 14,
|
||||||
|
"textFontFamily": "Meiryo UI"
|
||||||
}
|
}
|
||||||
6
content/.obsidian/community-plugins.json
vendored
6
content/.obsidian/community-plugins.json
vendored
@ -1,11 +1,9 @@
|
|||||||
[
|
[
|
||||||
"obsidian-zotero-desktop-connector",
|
|
||||||
"2hop-links-plus",
|
|
||||||
"obsidian-auto-link-title",
|
|
||||||
"obsidian-pandoc-reference-list",
|
"obsidian-pandoc-reference-list",
|
||||||
"templater-obsidian",
|
"templater-obsidian",
|
||||||
"better-word-count",
|
"better-word-count",
|
||||||
"obsidian-local-rest-api",
|
"obsidian-local-rest-api",
|
||||||
"obsidian-excalidraw-plugin",
|
"obsidian-excalidraw-plugin",
|
||||||
"obsidian-git"
|
"obsidian-git",
|
||||||
|
"obsidian-auto-link-title"
|
||||||
]
|
]
|
||||||
3487
content/.obsidian/plugins/obsidian-git/main.js
vendored
3487
content/.obsidian/plugins/obsidian-git/main.js
vendored
File diff suppressed because one or more lines are too long
@ -1,9 +1,10 @@
|
|||||||
{
|
{
|
||||||
|
"author": "Vinzent",
|
||||||
|
"authorUrl": "https://github.com/Vinzent03",
|
||||||
"id": "obsidian-git",
|
"id": "obsidian-git",
|
||||||
"name": "Git",
|
"name": "Git",
|
||||||
"description": "Backup your vault with Git.",
|
"description": "Integrate Git version control with automatic backup and other advanced features.",
|
||||||
"isDesktopOnly": false,
|
"isDesktopOnly": false,
|
||||||
"fundingUrl": "https://ko-fi.com/vinzent",
|
"fundingUrl": "https://ko-fi.com/vinzent",
|
||||||
"js": "main.js",
|
"version": "2.25.0"
|
||||||
"version": "2.24.3"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -77,6 +77,10 @@
|
|||||||
height: auto;
|
height: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.is-active .git-tools .buttons > * {
|
||||||
|
color: var(--nav-item-color-active);
|
||||||
|
}
|
||||||
|
|
||||||
.git-author {
|
.git-author {
|
||||||
color: var(--text-accent);
|
color: var(--text-accent);
|
||||||
}
|
}
|
||||||
@ -550,7 +554,7 @@
|
|||||||
white-space: pre; /* Keep spaces and do not collapse them. */
|
white-space: pre; /* Keep spaces and do not collapse them. */
|
||||||
}
|
}
|
||||||
|
|
||||||
@media(max-width:800px){
|
@media (max-width: 800px) {
|
||||||
/* hide git blame gutter not to superpose text */
|
/* hide git blame gutter not to superpose text */
|
||||||
.cm-gutterElement.obs-git-blame-gutter {
|
.cm-gutterElement.obs-git-blame-gutter {
|
||||||
display: none;
|
display: none;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
@ -1,684 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="display-and-sort" page-range-format="chicago">
|
|
||||||
<info>
|
|
||||||
<title>Chicago Manual of Style 17th edition (author-date)</title>
|
|
||||||
<id>http://www.zotero.org/styles/chicago-author-date</id>
|
|
||||||
<link href="http://www.zotero.org/styles/chicago-author-date" rel="self"/>
|
|
||||||
<link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
|
|
||||||
<author>
|
|
||||||
<name>Julian Onions</name>
|
|
||||||
<email>julian.onions@gmail.com</email>
|
|
||||||
</author>
|
|
||||||
<contributor>
|
|
||||||
<name>Sebastian Karcher</name>
|
|
||||||
</contributor>
|
|
||||||
<contributor>
|
|
||||||
<name>Richard Karnesky</name>
|
|
||||||
<email>karnesky+zotero@gmail.com</email>
|
|
||||||
<uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
|
|
||||||
</contributor>
|
|
||||||
<contributor>
|
|
||||||
<name>Andrew Dunning</name>
|
|
||||||
<uri>https://orcid.org/0000-0003-0464-5036</uri>
|
|
||||||
</contributor>
|
|
||||||
<contributor>
|
|
||||||
<name>Matthew Roth</name>
|
|
||||||
<email>matthew.g.roth@yale.edu</email>
|
|
||||||
<uri> https://orcid.org/0000-0001-7902-6331</uri>
|
|
||||||
</contributor>
|
|
||||||
<contributor>
|
|
||||||
<name>Brenton M. Wiernik</name>
|
|
||||||
</contributor>
|
|
||||||
<category citation-format="author-date"/>
|
|
||||||
<category field="generic-base"/>
|
|
||||||
<summary>The author-date variant of the Chicago style</summary>
|
|
||||||
<updated>2018-01-24T12:00:00+00:00</updated>
|
|
||||||
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
|
|
||||||
</info>
|
|
||||||
<locale xml:lang="en">
|
|
||||||
<terms>
|
|
||||||
<term name="editor" form="verb-short">ed.</term>
|
|
||||||
<term name="container-author" form="verb">by</term>
|
|
||||||
<term name="translator" form="verb-short">trans.</term>
|
|
||||||
<term name="editortranslator" form="verb">edited and translated by</term>
|
|
||||||
<term name="translator" form="short">trans.</term>
|
|
||||||
</terms>
|
|
||||||
</locale>
|
|
||||||
<locale xml:lang="pt-PT">
|
|
||||||
<terms>
|
|
||||||
<term name="accessed">acedido a</term>
|
|
||||||
</terms>
|
|
||||||
</locale>
|
|
||||||
<locale xml:lang="pt">
|
|
||||||
<terms>
|
|
||||||
<term name="editor" form="verb">editado por</term>
|
|
||||||
<term name="editor" form="verb-short">ed.</term>
|
|
||||||
<term name="container-author" form="verb">por</term>
|
|
||||||
<term name="translator" form="verb-short">traduzido por</term>
|
|
||||||
<term name="translator" form="short">trad.</term>
|
|
||||||
<term name="editortranslator" form="verb">editado e traduzido por</term>
|
|
||||||
<term name="and">e</term>
|
|
||||||
<term name="no date" form="long">s.d</term>
|
|
||||||
<term name="no date" form="short">s.d.</term>
|
|
||||||
<term name="in">em</term>
|
|
||||||
<term name="at">em</term>
|
|
||||||
<term name="by">por</term>
|
|
||||||
</terms>
|
|
||||||
</locale>
|
|
||||||
<macro name="secondary-contributors">
|
|
||||||
<choose>
|
|
||||||
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
|
|
||||||
<group delimiter=". ">
|
|
||||||
<names variable="editor translator" delimiter=". ">
|
|
||||||
<label form="verb" text-case="capitalize-first" suffix=" "/>
|
|
||||||
<name and="text" delimiter=", "/>
|
|
||||||
</names>
|
|
||||||
<names variable="director" delimiter=". ">
|
|
||||||
<label form="verb" text-case="capitalize-first" suffix=" "/>
|
|
||||||
<name and="text" delimiter=", "/>
|
|
||||||
</names>
|
|
||||||
</group>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
</macro>
|
|
||||||
<macro name="container-contributors">
|
|
||||||
<choose>
|
|
||||||
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
|
|
||||||
<group prefix=", " delimiter=", ">
|
|
||||||
<names variable="container-author" delimiter=", ">
|
|
||||||
<label form="verb" suffix=" "/>
|
|
||||||
<name and="text" delimiter=", "/>
|
|
||||||
</names>
|
|
||||||
<names variable="editor translator" delimiter=", ">
|
|
||||||
<label form="verb" suffix=" "/>
|
|
||||||
<name and="text" delimiter=", "/>
|
|
||||||
</names>
|
|
||||||
</group>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
</macro>
|
|
||||||
<macro name="editor">
|
|
||||||
<names variable="editor">
|
|
||||||
<name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
|
|
||||||
<label form="short" prefix=", "/>
|
|
||||||
</names>
|
|
||||||
</macro>
|
|
||||||
<macro name="translator">
|
|
||||||
<names variable="translator">
|
|
||||||
<name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
|
|
||||||
<label form="short" prefix=", "/>
|
|
||||||
</names>
|
|
||||||
</macro>
|
|
||||||
<macro name="recipient">
|
|
||||||
<choose>
|
|
||||||
<if type="personal_communication">
|
|
||||||
<choose>
|
|
||||||
<if variable="genre">
|
|
||||||
<text variable="genre" text-case="capitalize-first"/>
|
|
||||||
</if>
|
|
||||||
<else>
|
|
||||||
<text term="letter" text-case="capitalize-first"/>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
<names variable="recipient" delimiter=", ">
|
|
||||||
<label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
|
|
||||||
<name and="text" delimiter=", "/>
|
|
||||||
</names>
|
|
||||||
</macro>
|
|
||||||
<macro name="substitute-title">
|
|
||||||
<choose>
|
|
||||||
<if type="article-magazine article-newspaper review review-book" match="any">
|
|
||||||
<text macro="container-title"/>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
</macro>
|
|
||||||
<macro name="contributors">
|
|
||||||
<group delimiter=". ">
|
|
||||||
<names variable="author">
|
|
||||||
<name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
|
|
||||||
<label form="short" prefix=", "/>
|
|
||||||
<substitute>
|
|
||||||
<names variable="editor"/>
|
|
||||||
<names variable="translator"/>
|
|
||||||
<names variable="director"/>
|
|
||||||
<text macro="substitute-title"/>
|
|
||||||
<text macro="title"/>
|
|
||||||
</substitute>
|
|
||||||
</names>
|
|
||||||
<text macro="recipient"/>
|
|
||||||
</group>
|
|
||||||
</macro>
|
|
||||||
<macro name="contributors-short">
|
|
||||||
<names variable="author">
|
|
||||||
<name form="short" and="text" delimiter=", " initialize-with=". "/>
|
|
||||||
<substitute>
|
|
||||||
<names variable="editor"/>
|
|
||||||
<names variable="translator"/>
|
|
||||||
<names variable="director"/>
|
|
||||||
<text macro="substitute-title"/>
|
|
||||||
<text macro="title"/>
|
|
||||||
</substitute>
|
|
||||||
</names>
|
|
||||||
</macro>
|
|
||||||
<macro name="interviewer">
|
|
||||||
<names variable="interviewer" delimiter=", ">
|
|
||||||
<label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
|
|
||||||
<name and="text" delimiter=", "/>
|
|
||||||
</names>
|
|
||||||
</macro>
|
|
||||||
<macro name="archive">
|
|
||||||
<group delimiter=". ">
|
|
||||||
<text variable="archive_location" text-case="capitalize-first"/>
|
|
||||||
<text variable="archive"/>
|
|
||||||
<text variable="archive-place"/>
|
|
||||||
</group>
|
|
||||||
</macro>
|
|
||||||
<macro name="access">
|
|
||||||
<group delimiter=". ">
|
|
||||||
<choose>
|
|
||||||
<if type="graphic report" match="any">
|
|
||||||
<text macro="archive"/>
|
|
||||||
</if>
|
|
||||||
<else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
|
|
||||||
<text macro="archive"/>
|
|
||||||
</else-if>
|
|
||||||
</choose>
|
|
||||||
<choose>
|
|
||||||
<if type="webpage post-weblog" match="any">
|
|
||||||
<date variable="issued" form="text"/>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
<choose>
|
|
||||||
<if variable="issued" match="none">
|
|
||||||
<group delimiter=" ">
|
|
||||||
<text term="accessed" text-case="capitalize-first"/>
|
|
||||||
<date variable="accessed" form="text"/>
|
|
||||||
</group>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
<choose>
|
|
||||||
<if type="legal_case" match="none">
|
|
||||||
<choose>
|
|
||||||
<if variable="DOI">
|
|
||||||
<text variable="DOI" prefix="https://doi.org/"/>
|
|
||||||
</if>
|
|
||||||
<else>
|
|
||||||
<text variable="URL"/>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
</group>
|
|
||||||
</macro>
|
|
||||||
<macro name="title">
|
|
||||||
<choose>
|
|
||||||
<if variable="title" match="none">
|
|
||||||
<choose>
|
|
||||||
<if type="personal_communication speech thesis" match="none">
|
|
||||||
<text variable="genre" text-case="capitalize-first"/>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
</if>
|
|
||||||
<else-if type="bill book graphic legislation motion_picture song" match="any">
|
|
||||||
<text variable="title" text-case="title" font-style="italic"/>
|
|
||||||
<group prefix=" (" suffix=")" delimiter=" ">
|
|
||||||
<text term="version"/>
|
|
||||||
<text variable="version"/>
|
|
||||||
</group>
|
|
||||||
</else-if>
|
|
||||||
<else-if variable="reviewed-author">
|
|
||||||
<choose>
|
|
||||||
<if variable="reviewed-title">
|
|
||||||
<group delimiter=". ">
|
|
||||||
<text variable="title" text-case="title" quotes="true"/>
|
|
||||||
<group delimiter=", ">
|
|
||||||
<text variable="reviewed-title" text-case="title" font-style="italic" prefix="Review of "/>
|
|
||||||
<names variable="reviewed-author">
|
|
||||||
<label form="verb-short" text-case="lowercase" suffix=" "/>
|
|
||||||
<name and="text" delimiter=", "/>
|
|
||||||
</names>
|
|
||||||
</group>
|
|
||||||
</group>
|
|
||||||
</if>
|
|
||||||
<else>
|
|
||||||
<group delimiter=", ">
|
|
||||||
<text variable="title" text-case="title" font-style="italic" prefix="Review of "/>
|
|
||||||
<names variable="reviewed-author">
|
|
||||||
<label form="verb-short" text-case="lowercase" suffix=" "/>
|
|
||||||
<name and="text" delimiter=", "/>
|
|
||||||
</names>
|
|
||||||
</group>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
</else-if>
|
|
||||||
<else-if type="legal_case interview patent" match="any">
|
|
||||||
<text variable="title"/>
|
|
||||||
</else-if>
|
|
||||||
<else>
|
|
||||||
<text variable="title" text-case="title" quotes="true"/>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
</macro>
|
|
||||||
<macro name="edition">
|
|
||||||
<choose>
|
|
||||||
<if type="bill book graphic legal_case legislation motion_picture report song" match="any">
|
|
||||||
<choose>
|
|
||||||
<if is-numeric="edition">
|
|
||||||
<group delimiter=" " prefix=". ">
|
|
||||||
<number variable="edition" form="ordinal"/>
|
|
||||||
<text term="edition" form="short" strip-periods="true"/>
|
|
||||||
</group>
|
|
||||||
</if>
|
|
||||||
<else>
|
|
||||||
<text variable="edition" text-case="capitalize-first" prefix=". "/>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
</if>
|
|
||||||
<else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
|
|
||||||
<choose>
|
|
||||||
<if is-numeric="edition">
|
|
||||||
<group delimiter=" " prefix=", ">
|
|
||||||
<number variable="edition" form="ordinal"/>
|
|
||||||
<text term="edition" form="short"/>
|
|
||||||
</group>
|
|
||||||
</if>
|
|
||||||
<else>
|
|
||||||
<text variable="edition" prefix=", "/>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
</else-if>
|
|
||||||
</choose>
|
|
||||||
</macro>
|
|
||||||
<macro name="locators">
|
|
||||||
<choose>
|
|
||||||
<if type="article-journal">
|
|
||||||
<choose>
|
|
||||||
<if variable="volume">
|
|
||||||
<text variable="volume" prefix=" "/>
|
|
||||||
<group prefix=" (" suffix=")">
|
|
||||||
<choose>
|
|
||||||
<if variable="issue">
|
|
||||||
<text variable="issue"/>
|
|
||||||
</if>
|
|
||||||
<else>
|
|
||||||
<date variable="issued">
|
|
||||||
<date-part name="month"/>
|
|
||||||
</date>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
</group>
|
|
||||||
</if>
|
|
||||||
<else-if variable="issue">
|
|
||||||
<group delimiter=" " prefix=", ">
|
|
||||||
<text term="issue" form="short"/>
|
|
||||||
<text variable="issue"/>
|
|
||||||
<date variable="issued" prefix="(" suffix=")">
|
|
||||||
<date-part name="month"/>
|
|
||||||
</date>
|
|
||||||
</group>
|
|
||||||
</else-if>
|
|
||||||
<else>
|
|
||||||
<date variable="issued" prefix=", ">
|
|
||||||
<date-part name="month"/>
|
|
||||||
</date>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
</if>
|
|
||||||
<else-if type="legal_case">
|
|
||||||
<text variable="volume" prefix=", "/>
|
|
||||||
<text variable="container-title" prefix=" "/>
|
|
||||||
<text variable="page" prefix=" "/>
|
|
||||||
</else-if>
|
|
||||||
<else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
|
|
||||||
<group prefix=". " delimiter=". ">
|
|
||||||
<group>
|
|
||||||
<text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
|
|
||||||
<number variable="volume" form="numeric"/>
|
|
||||||
</group>
|
|
||||||
<group>
|
|
||||||
<number variable="number-of-volumes" form="numeric"/>
|
|
||||||
<text term="volume" form="short" prefix=" " plural="true"/>
|
|
||||||
</group>
|
|
||||||
</group>
|
|
||||||
</else-if>
|
|
||||||
<else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
|
|
||||||
<choose>
|
|
||||||
<if variable="page" match="none">
|
|
||||||
<group prefix=". ">
|
|
||||||
<text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
|
|
||||||
<number variable="volume" form="numeric"/>
|
|
||||||
</group>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
</else-if>
|
|
||||||
</choose>
|
|
||||||
</macro>
|
|
||||||
<macro name="locators-chapter">
|
|
||||||
<choose>
|
|
||||||
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
|
|
||||||
<choose>
|
|
||||||
<if variable="page">
|
|
||||||
<group prefix=", ">
|
|
||||||
<text variable="volume" suffix=":"/>
|
|
||||||
<text variable="page"/>
|
|
||||||
</group>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
</macro>
|
|
||||||
<macro name="locators-article">
|
|
||||||
<choose>
|
|
||||||
<if type="article-newspaper">
|
|
||||||
<group prefix=", " delimiter=", ">
|
|
||||||
<group delimiter=" ">
|
|
||||||
<text variable="edition"/>
|
|
||||||
<text term="edition"/>
|
|
||||||
</group>
|
|
||||||
<group>
|
|
||||||
<text term="section" form="short" suffix=" "/>
|
|
||||||
<text variable="section"/>
|
|
||||||
</group>
|
|
||||||
</group>
|
|
||||||
</if>
|
|
||||||
<else-if type="article-journal">
|
|
||||||
<choose>
|
|
||||||
<if variable="volume issue" match="any">
|
|
||||||
<text variable="page" prefix=": "/>
|
|
||||||
</if>
|
|
||||||
<else>
|
|
||||||
<text variable="page" prefix=", "/>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
</else-if>
|
|
||||||
</choose>
|
|
||||||
</macro>
|
|
||||||
<macro name="point-locators">
|
|
||||||
<choose>
|
|
||||||
<if variable="locator">
|
|
||||||
<choose>
|
|
||||||
<if locator="page" match="none">
|
|
||||||
<choose>
|
|
||||||
<if type="bill book graphic legal_case legislation motion_picture report song" match="any">
|
|
||||||
<choose>
|
|
||||||
<if variable="volume">
|
|
||||||
<group>
|
|
||||||
<text term="volume" form="short" suffix=" "/>
|
|
||||||
<number variable="volume" form="numeric"/>
|
|
||||||
<label variable="locator" form="short" prefix=", " suffix=" "/>
|
|
||||||
</group>
|
|
||||||
</if>
|
|
||||||
<else>
|
|
||||||
<label variable="locator" form="short" suffix=" "/>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
</if>
|
|
||||||
<else>
|
|
||||||
<label variable="locator" form="short" suffix=" "/>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
</if>
|
|
||||||
<else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
|
|
||||||
<number variable="volume" form="numeric" suffix=":"/>
|
|
||||||
</else-if>
|
|
||||||
</choose>
|
|
||||||
<text variable="locator"/>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
</macro>
|
|
||||||
<macro name="container-prefix">
|
|
||||||
<text term="in" text-case="capitalize-first"/>
|
|
||||||
</macro>
|
|
||||||
<macro name="container-title">
|
|
||||||
<choose>
|
|
||||||
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
|
|
||||||
<text macro="container-prefix" suffix=" "/>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
<choose>
|
|
||||||
<if type="webpage">
|
|
||||||
<text variable="container-title" text-case="title"/>
|
|
||||||
</if>
|
|
||||||
<else-if type="legal_case" match="none">
|
|
||||||
<group delimiter=" ">
|
|
||||||
<text variable="container-title" text-case="title" font-style="italic"/>
|
|
||||||
<choose>
|
|
||||||
<if type="post-weblog">
|
|
||||||
<text value="(blog)"/>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
</group>
|
|
||||||
</else-if>
|
|
||||||
</choose>
|
|
||||||
</macro>
|
|
||||||
<macro name="publisher">
|
|
||||||
<group delimiter=": ">
|
|
||||||
<text variable="publisher-place"/>
|
|
||||||
<text variable="publisher"/>
|
|
||||||
</group>
|
|
||||||
</macro>
|
|
||||||
<macro name="date">
|
|
||||||
<choose>
|
|
||||||
<if variable="issued">
|
|
||||||
<group delimiter=" ">
|
|
||||||
<date variable="original-date" form="text" date-parts="year" prefix="(" suffix=")"/>
|
|
||||||
<date variable="issued">
|
|
||||||
<date-part name="year"/>
|
|
||||||
</date>
|
|
||||||
</group>
|
|
||||||
<text variable="year-suffix"/>
|
|
||||||
</if>
|
|
||||||
<else-if variable="status">
|
|
||||||
<text variable="status" text-case="capitalize-first"/>
|
|
||||||
<text variable="year-suffix" prefix="-"/>
|
|
||||||
</else-if>
|
|
||||||
<else>
|
|
||||||
<text term="no date" form="short"/>
|
|
||||||
<text variable="year-suffix" prefix="-"/>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
</macro>
|
|
||||||
<macro name="date-in-text">
|
|
||||||
<choose>
|
|
||||||
<if variable="issued">
|
|
||||||
<group delimiter=" ">
|
|
||||||
<date variable="original-date" form="text" date-parts="year" prefix="[" suffix="]"/>
|
|
||||||
<date variable="issued">
|
|
||||||
<date-part name="year"/>
|
|
||||||
</date>
|
|
||||||
</group>
|
|
||||||
<text variable="year-suffix"/>
|
|
||||||
</if>
|
|
||||||
<else-if variable="status">
|
|
||||||
<text variable="status"/>
|
|
||||||
<text variable="year-suffix" prefix="-"/>
|
|
||||||
</else-if>
|
|
||||||
<else>
|
|
||||||
<text term="no date" form="short"/>
|
|
||||||
<text variable="year-suffix" prefix="-"/>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
</macro>
|
|
||||||
<macro name="day-month">
|
|
||||||
<date variable="issued">
|
|
||||||
<date-part name="month"/>
|
|
||||||
<date-part name="day" prefix=" "/>
|
|
||||||
</date>
|
|
||||||
</macro>
|
|
||||||
<macro name="collection-title">
|
|
||||||
<choose>
|
|
||||||
<if match="none" type="article-journal">
|
|
||||||
<choose>
|
|
||||||
<if match="none" is-numeric="collection-number">
|
|
||||||
<group delimiter=", ">
|
|
||||||
<text variable="collection-title" text-case="title"/>
|
|
||||||
<text variable="collection-number"/>
|
|
||||||
</group>
|
|
||||||
</if>
|
|
||||||
<else>
|
|
||||||
<group delimiter=" ">
|
|
||||||
<text variable="collection-title" text-case="title"/>
|
|
||||||
<text variable="collection-number"/>
|
|
||||||
</group>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
</macro>
|
|
||||||
<macro name="collection-title-journal">
|
|
||||||
<choose>
|
|
||||||
<if type="article-journal">
|
|
||||||
<group delimiter=" ">
|
|
||||||
<text variable="collection-title"/>
|
|
||||||
<text variable="collection-number"/>
|
|
||||||
</group>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
</macro>
|
|
||||||
<macro name="event">
|
|
||||||
<group delimiter=" ">
|
|
||||||
<choose>
|
|
||||||
<if variable="genre">
|
|
||||||
<text term="presented at"/>
|
|
||||||
</if>
|
|
||||||
<else>
|
|
||||||
<text term="presented at" text-case="capitalize-first"/>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
<text variable="event"/>
|
|
||||||
</group>
|
|
||||||
</macro>
|
|
||||||
<macro name="description">
|
|
||||||
<choose>
|
|
||||||
<if variable="interviewer" type="interview" match="any">
|
|
||||||
<group delimiter=". ">
|
|
||||||
<text macro="interviewer"/>
|
|
||||||
<text variable="medium" text-case="capitalize-first"/>
|
|
||||||
</group>
|
|
||||||
</if>
|
|
||||||
<else-if type="patent">
|
|
||||||
<group delimiter=" " prefix=". ">
|
|
||||||
<text variable="authority"/>
|
|
||||||
<text variable="number"/>
|
|
||||||
</group>
|
|
||||||
</else-if>
|
|
||||||
<else>
|
|
||||||
<text variable="medium" text-case="capitalize-first" prefix=". "/>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
<choose>
|
|
||||||
<if variable="title" match="none"/>
|
|
||||||
<else-if type="thesis personal_communication speech" match="any"/>
|
|
||||||
<else>
|
|
||||||
<group delimiter=" " prefix=". ">
|
|
||||||
<text variable="genre" text-case="capitalize-first"/>
|
|
||||||
<choose>
|
|
||||||
<if type="report">
|
|
||||||
<text variable="number"/>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
</group>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
</macro>
|
|
||||||
<macro name="issue">
|
|
||||||
<choose>
|
|
||||||
<if type="legal_case">
|
|
||||||
<text variable="authority" prefix=". "/>
|
|
||||||
</if>
|
|
||||||
<else-if type="speech">
|
|
||||||
<group prefix=". " delimiter=", ">
|
|
||||||
<group delimiter=" ">
|
|
||||||
<text variable="genre" text-case="capitalize-first"/>
|
|
||||||
<text macro="event"/>
|
|
||||||
</group>
|
|
||||||
<text variable="event-place"/>
|
|
||||||
<text macro="day-month"/>
|
|
||||||
</group>
|
|
||||||
</else-if>
|
|
||||||
<else-if type="article-newspaper article-magazine personal_communication" match="any">
|
|
||||||
<date variable="issued" form="text" prefix=", "/>
|
|
||||||
</else-if>
|
|
||||||
<else-if type="patent">
|
|
||||||
<group delimiter=", " prefix=", ">
|
|
||||||
<group delimiter=" ">
|
|
||||||
<!--Needs Localization-->
|
|
||||||
<text value="filed"/>
|
|
||||||
<date variable="submitted" form="text"/>
|
|
||||||
</group>
|
|
||||||
<group delimiter=" ">
|
|
||||||
<choose>
|
|
||||||
<if variable="issued submitted" match="all">
|
|
||||||
<text term="and"/>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
<!--Needs Localization-->
|
|
||||||
<text value="issued"/>
|
|
||||||
<date variable="issued" form="text"/>
|
|
||||||
</group>
|
|
||||||
</group>
|
|
||||||
</else-if>
|
|
||||||
<else-if type="article-journal" match="any"/>
|
|
||||||
<else>
|
|
||||||
<group prefix=". " delimiter=", ">
|
|
||||||
<choose>
|
|
||||||
<if type="thesis">
|
|
||||||
<text variable="genre" text-case="capitalize-first"/>
|
|
||||||
</if>
|
|
||||||
</choose>
|
|
||||||
<text macro="publisher"/>
|
|
||||||
</group>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
</macro>
|
|
||||||
<citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year" after-collapse-delimiter="; ">
|
|
||||||
<layout prefix="(" suffix=")" delimiter="; ">
|
|
||||||
<group delimiter=", ">
|
|
||||||
<choose>
|
|
||||||
<if variable="issued" match="any">
|
|
||||||
<group delimiter=" ">
|
|
||||||
<text macro="contributors-short"/>
|
|
||||||
<text macro="date-in-text"/>
|
|
||||||
</group>
|
|
||||||
</if>
|
|
||||||
<!---comma before forthcoming and n.d.-->
|
|
||||||
<else>
|
|
||||||
<group delimiter=", ">
|
|
||||||
<text macro="contributors-short"/>
|
|
||||||
<text macro="date-in-text"/>
|
|
||||||
</group>
|
|
||||||
</else>
|
|
||||||
</choose>
|
|
||||||
<text macro="point-locators"/>
|
|
||||||
</group>
|
|
||||||
</layout>
|
|
||||||
</citation>
|
|
||||||
<bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
|
|
||||||
<sort>
|
|
||||||
<key macro="contributors"/>
|
|
||||||
<key variable="issued"/>
|
|
||||||
<key variable="title"/>
|
|
||||||
</sort>
|
|
||||||
<layout suffix=".">
|
|
||||||
<group delimiter=". ">
|
|
||||||
<text macro="contributors"/>
|
|
||||||
<text macro="date"/>
|
|
||||||
<text macro="title"/>
|
|
||||||
</group>
|
|
||||||
<text macro="description"/>
|
|
||||||
<text macro="secondary-contributors" prefix=". "/>
|
|
||||||
<text macro="container-title" prefix=". "/>
|
|
||||||
<text macro="container-contributors"/>
|
|
||||||
<text macro="edition"/>
|
|
||||||
<text macro="locators-chapter"/>
|
|
||||||
<text macro="collection-title-journal" prefix=", " suffix=", "/>
|
|
||||||
<text macro="locators"/>
|
|
||||||
<text macro="collection-title" prefix=". "/>
|
|
||||||
<text macro="issue"/>
|
|
||||||
<text macro="locators-article"/>
|
|
||||||
<text macro="access" prefix=". "/>
|
|
||||||
</layout>
|
|
||||||
</bibliography>
|
|
||||||
</style>
|
|
||||||
@ -1 +1 @@
|
|||||||
Subproject commit fb5e7cbcd39738137f3e5a084be8c680bf04ce34
|
Subproject commit deb9628ce037a5e847eafd34cf97891dd92609b4
|
||||||
@ -1,103 +0,0 @@
|
|||||||
export const CommonArgv = {
|
|
||||||
directory: {
|
|
||||||
string: true,
|
|
||||||
alias: ["d"],
|
|
||||||
default: "content",
|
|
||||||
describe: "directory to look for content files",
|
|
||||||
},
|
|
||||||
verbose: {
|
|
||||||
boolean: true,
|
|
||||||
alias: ["v"],
|
|
||||||
default: false,
|
|
||||||
describe: "print out extra logging information",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
export const CreateArgv = {
|
|
||||||
...CommonArgv,
|
|
||||||
source: {
|
|
||||||
string: true,
|
|
||||||
alias: ["s"],
|
|
||||||
describe: "source directory to copy/create symlink from",
|
|
||||||
},
|
|
||||||
strategy: {
|
|
||||||
string: true,
|
|
||||||
alias: ["X"],
|
|
||||||
choices: ["new", "copy", "symlink"],
|
|
||||||
describe: "strategy for content folder setup",
|
|
||||||
},
|
|
||||||
links: {
|
|
||||||
string: true,
|
|
||||||
alias: ["l"],
|
|
||||||
choices: ["absolute", "shortest", "relative"],
|
|
||||||
describe: "strategy to resolve links",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
export const SyncArgv = {
|
|
||||||
...CommonArgv,
|
|
||||||
commit: {
|
|
||||||
boolean: true,
|
|
||||||
default: true,
|
|
||||||
describe: "create a git commit for your unsaved changes",
|
|
||||||
},
|
|
||||||
message: {
|
|
||||||
string: true,
|
|
||||||
alias: ["m"],
|
|
||||||
describe: "option to override the default Quartz commit message",
|
|
||||||
},
|
|
||||||
push: {
|
|
||||||
boolean: true,
|
|
||||||
default: true,
|
|
||||||
describe: "push updates to your Quartz fork",
|
|
||||||
},
|
|
||||||
pull: {
|
|
||||||
boolean: true,
|
|
||||||
default: true,
|
|
||||||
describe: "pull updates from your Quartz fork",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
export const BuildArgv = {
|
|
||||||
...CommonArgv,
|
|
||||||
output: {
|
|
||||||
string: true,
|
|
||||||
alias: ["o"],
|
|
||||||
default: "public",
|
|
||||||
describe: "output folder for files",
|
|
||||||
},
|
|
||||||
serve: {
|
|
||||||
boolean: true,
|
|
||||||
default: false,
|
|
||||||
describe: "run a local server to live-preview your Quartz",
|
|
||||||
},
|
|
||||||
baseDir: {
|
|
||||||
string: true,
|
|
||||||
default: "",
|
|
||||||
describe: "base path to serve your local server on",
|
|
||||||
},
|
|
||||||
port: {
|
|
||||||
number: true,
|
|
||||||
default: 8080,
|
|
||||||
describe: "port to serve Quartz on",
|
|
||||||
},
|
|
||||||
wsPort: {
|
|
||||||
number: true,
|
|
||||||
default: 3001,
|
|
||||||
describe: "port to use for WebSocket-based hot-reload notifications",
|
|
||||||
},
|
|
||||||
remoteDevHost: {
|
|
||||||
string: true,
|
|
||||||
default: "",
|
|
||||||
describe: "A URL override for the websocket connection if you are not developing on localhost",
|
|
||||||
},
|
|
||||||
bundleInfo: {
|
|
||||||
boolean: true,
|
|
||||||
default: false,
|
|
||||||
describe: "show detailed bundle information",
|
|
||||||
},
|
|
||||||
concurrency: {
|
|
||||||
number: true,
|
|
||||||
describe: "how many threads to use to parse notes",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
import path from "path"
|
|
||||||
import { readFileSync } from "fs"
|
|
||||||
|
|
||||||
/**
|
|
||||||
* All constants relating to helpers or handlers
|
|
||||||
*/
|
|
||||||
export const ORIGIN_NAME = "origin"
|
|
||||||
export const UPSTREAM_NAME = "upstream"
|
|
||||||
export const QUARTZ_SOURCE_BRANCH = "v4"
|
|
||||||
export const cwd = process.cwd()
|
|
||||||
export const cacheDir = path.join(cwd, ".quartz-cache")
|
|
||||||
export const cacheFile = "./quartz/.quartz-cache/transpiled-build.mjs"
|
|
||||||
export const fp = "./quartz/build.ts"
|
|
||||||
export const { version } = JSON.parse(readFileSync("./package.json").toString())
|
|
||||||
export const contentCacheFolder = path.join(cacheDir, "content-cache")
|
|
||||||
@ -1,544 +0,0 @@
|
|||||||
import { promises } from "fs"
|
|
||||||
import path from "path"
|
|
||||||
import esbuild from "esbuild"
|
|
||||||
import chalk from "chalk"
|
|
||||||
import { sassPlugin } from "esbuild-sass-plugin"
|
|
||||||
import fs from "fs"
|
|
||||||
import { intro, outro, select, text } from "@clack/prompts"
|
|
||||||
import { rimraf } from "rimraf"
|
|
||||||
import chokidar from "chokidar"
|
|
||||||
import prettyBytes from "pretty-bytes"
|
|
||||||
import { execSync, spawnSync } from "child_process"
|
|
||||||
import http from "http"
|
|
||||||
import serveHandler from "serve-handler"
|
|
||||||
import { WebSocketServer } from "ws"
|
|
||||||
import { randomUUID } from "crypto"
|
|
||||||
import { Mutex } from "async-mutex"
|
|
||||||
import { CreateArgv } from "./args.js"
|
|
||||||
import {
|
|
||||||
exitIfCancel,
|
|
||||||
escapePath,
|
|
||||||
gitPull,
|
|
||||||
popContentFolder,
|
|
||||||
stashContentFolder,
|
|
||||||
} from "./helpers.js"
|
|
||||||
import {
|
|
||||||
UPSTREAM_NAME,
|
|
||||||
QUARTZ_SOURCE_BRANCH,
|
|
||||||
ORIGIN_NAME,
|
|
||||||
version,
|
|
||||||
fp,
|
|
||||||
cacheFile,
|
|
||||||
cwd,
|
|
||||||
} from "./constants.js"
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handles `npx quartz create`
|
|
||||||
* @param {*} argv arguments for `create`
|
|
||||||
*/
|
|
||||||
export async function handleCreate(argv) {
|
|
||||||
console.log()
|
|
||||||
intro(chalk.bgGreen.black(` Quartz v${version} `))
|
|
||||||
const contentFolder = path.join(cwd, argv.directory)
|
|
||||||
let setupStrategy = argv.strategy?.toLowerCase()
|
|
||||||
let linkResolutionStrategy = argv.links?.toLowerCase()
|
|
||||||
const sourceDirectory = argv.source
|
|
||||||
|
|
||||||
// If all cmd arguments were provided, check if theyre valid
|
|
||||||
if (setupStrategy && linkResolutionStrategy) {
|
|
||||||
// If setup isn't, "new", source argument is required
|
|
||||||
if (setupStrategy !== "new") {
|
|
||||||
// Error handling
|
|
||||||
if (!sourceDirectory) {
|
|
||||||
outro(
|
|
||||||
chalk.red(
|
|
||||||
`Setup strategies (arg '${chalk.yellow(
|
|
||||||
`-${CreateArgv.strategy.alias[0]}`,
|
|
||||||
)}') other than '${chalk.yellow(
|
|
||||||
"new",
|
|
||||||
)}' require content folder argument ('${chalk.yellow(
|
|
||||||
`-${CreateArgv.source.alias[0]}`,
|
|
||||||
)}') to be set`,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
process.exit(1)
|
|
||||||
} else {
|
|
||||||
if (!fs.existsSync(sourceDirectory)) {
|
|
||||||
outro(
|
|
||||||
chalk.red(
|
|
||||||
`Input directory to copy/symlink 'content' from not found ('${chalk.yellow(
|
|
||||||
sourceDirectory,
|
|
||||||
)}', invalid argument "${chalk.yellow(`-${CreateArgv.source.alias[0]}`)})`,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
process.exit(1)
|
|
||||||
} else if (!fs.lstatSync(sourceDirectory).isDirectory()) {
|
|
||||||
outro(
|
|
||||||
chalk.red(
|
|
||||||
`Source directory to copy/symlink 'content' from is not a directory (found file at '${chalk.yellow(
|
|
||||||
sourceDirectory,
|
|
||||||
)}', invalid argument ${chalk.yellow(`-${CreateArgv.source.alias[0]}`)}")`,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
process.exit(1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use cli process if cmd args werent provided
|
|
||||||
if (!setupStrategy) {
|
|
||||||
setupStrategy = exitIfCancel(
|
|
||||||
await select({
|
|
||||||
message: `Choose how to initialize the content in \`${contentFolder}\``,
|
|
||||||
options: [
|
|
||||||
{ value: "new", label: "Empty Quartz" },
|
|
||||||
{ value: "copy", label: "Copy an existing folder", hint: "overwrites `content`" },
|
|
||||||
{
|
|
||||||
value: "symlink",
|
|
||||||
label: "Symlink an existing folder",
|
|
||||||
hint: "don't select this unless you know what you are doing!",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
async function rmContentFolder() {
|
|
||||||
const contentStat = await fs.promises.lstat(contentFolder)
|
|
||||||
if (contentStat.isSymbolicLink()) {
|
|
||||||
await fs.promises.unlink(contentFolder)
|
|
||||||
} else {
|
|
||||||
await rimraf(contentFolder)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const gitkeepPath = path.join(contentFolder, ".gitkeep")
|
|
||||||
if (fs.existsSync(gitkeepPath)) {
|
|
||||||
await fs.promises.unlink(gitkeepPath)
|
|
||||||
}
|
|
||||||
if (setupStrategy === "copy" || setupStrategy === "symlink") {
|
|
||||||
let originalFolder = sourceDirectory
|
|
||||||
|
|
||||||
// If input directory was not passed, use cli
|
|
||||||
if (!sourceDirectory) {
|
|
||||||
originalFolder = escapePath(
|
|
||||||
exitIfCancel(
|
|
||||||
await text({
|
|
||||||
message: "Enter the full path to existing content folder",
|
|
||||||
placeholder:
|
|
||||||
"On most terminal emulators, you can drag and drop a folder into the window and it will paste the full path",
|
|
||||||
validate(fp) {
|
|
||||||
const fullPath = escapePath(fp)
|
|
||||||
if (!fs.existsSync(fullPath)) {
|
|
||||||
return "The given path doesn't exist"
|
|
||||||
} else if (!fs.lstatSync(fullPath).isDirectory()) {
|
|
||||||
return "The given path is not a folder"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
await rmContentFolder()
|
|
||||||
if (setupStrategy === "copy") {
|
|
||||||
await fs.promises.cp(originalFolder, contentFolder, {
|
|
||||||
recursive: true,
|
|
||||||
preserveTimestamps: true,
|
|
||||||
})
|
|
||||||
} else if (setupStrategy === "symlink") {
|
|
||||||
await fs.promises.symlink(originalFolder, contentFolder, "dir")
|
|
||||||
}
|
|
||||||
} else if (setupStrategy === "new") {
|
|
||||||
await fs.promises.writeFile(
|
|
||||||
path.join(contentFolder, "index.md"),
|
|
||||||
`---
|
|
||||||
title: Welcome to Quartz
|
|
||||||
---
|
|
||||||
|
|
||||||
This is a blank Quartz installation.
|
|
||||||
See the [documentation](https://quartz.jzhao.xyz) for how to get started.
|
|
||||||
`,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use cli process if cmd args werent provided
|
|
||||||
if (!linkResolutionStrategy) {
|
|
||||||
// get a preferred link resolution strategy
|
|
||||||
linkResolutionStrategy = exitIfCancel(
|
|
||||||
await select({
|
|
||||||
message: `Choose how Quartz should resolve links in your content. This should match Obsidian's link format. You can change this later in \`quartz.config.ts\`.`,
|
|
||||||
options: [
|
|
||||||
{
|
|
||||||
value: "shortest",
|
|
||||||
label: "Treat links as shortest path",
|
|
||||||
hint: "(default)",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: "absolute",
|
|
||||||
label: "Treat links as absolute path",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: "relative",
|
|
||||||
label: "Treat links as relative paths",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// now, do config changes
|
|
||||||
const configFilePath = path.join(cwd, "quartz.config.ts")
|
|
||||||
let configContent = await fs.promises.readFile(configFilePath, { encoding: "utf-8" })
|
|
||||||
configContent = configContent.replace(
|
|
||||||
/markdownLinkResolution: '(.+)'/,
|
|
||||||
`markdownLinkResolution: '${linkResolutionStrategy}'`,
|
|
||||||
)
|
|
||||||
await fs.promises.writeFile(configFilePath, configContent)
|
|
||||||
|
|
||||||
// setup remote
|
|
||||||
execSync(
|
|
||||||
`git remote show upstream || git remote add upstream https://github.com/jackyzha0/quartz.git`,
|
|
||||||
{ stdio: "ignore" },
|
|
||||||
)
|
|
||||||
|
|
||||||
outro(`You're all set! Not sure what to do next? Try:
|
|
||||||
• Customizing Quartz a bit more by editing \`quartz.config.ts\`
|
|
||||||
• Running \`npx quartz build --serve\` to preview your Quartz locally
|
|
||||||
• Hosting your Quartz online (see: https://quartz.jzhao.xyz/hosting)
|
|
||||||
`)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handles `npx quartz build`
|
|
||||||
* @param {*} argv arguments for `build`
|
|
||||||
*/
|
|
||||||
export async function handleBuild(argv) {
|
|
||||||
console.log(chalk.bgGreen.black(`\n Quartz v${version} \n`))
|
|
||||||
const ctx = await esbuild.context({
|
|
||||||
entryPoints: [fp],
|
|
||||||
outfile: cacheFile,
|
|
||||||
bundle: true,
|
|
||||||
keepNames: true,
|
|
||||||
minifyWhitespace: true,
|
|
||||||
minifySyntax: true,
|
|
||||||
platform: "node",
|
|
||||||
format: "esm",
|
|
||||||
jsx: "automatic",
|
|
||||||
jsxImportSource: "preact",
|
|
||||||
packages: "external",
|
|
||||||
metafile: true,
|
|
||||||
sourcemap: true,
|
|
||||||
sourcesContent: false,
|
|
||||||
plugins: [
|
|
||||||
sassPlugin({
|
|
||||||
type: "css-text",
|
|
||||||
cssImports: true,
|
|
||||||
}),
|
|
||||||
{
|
|
||||||
name: "inline-script-loader",
|
|
||||||
setup(build) {
|
|
||||||
build.onLoad({ filter: /\.inline\.(ts|js)$/ }, async (args) => {
|
|
||||||
let text = await promises.readFile(args.path, "utf8")
|
|
||||||
|
|
||||||
// remove default exports that we manually inserted
|
|
||||||
text = text.replace("export default", "")
|
|
||||||
text = text.replace("export", "")
|
|
||||||
|
|
||||||
const sourcefile = path.relative(path.resolve("."), args.path)
|
|
||||||
const resolveDir = path.dirname(sourcefile)
|
|
||||||
const transpiled = await esbuild.build({
|
|
||||||
stdin: {
|
|
||||||
contents: text,
|
|
||||||
loader: "ts",
|
|
||||||
resolveDir,
|
|
||||||
sourcefile,
|
|
||||||
},
|
|
||||||
write: false,
|
|
||||||
bundle: true,
|
|
||||||
minify: true,
|
|
||||||
platform: "browser",
|
|
||||||
format: "esm",
|
|
||||||
})
|
|
||||||
const rawMod = transpiled.outputFiles[0].text
|
|
||||||
return {
|
|
||||||
contents: rawMod,
|
|
||||||
loader: "text",
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
})
|
|
||||||
|
|
||||||
const buildMutex = new Mutex()
|
|
||||||
let lastBuildMs = 0
|
|
||||||
let cleanupBuild = null
|
|
||||||
const build = async (clientRefresh) => {
|
|
||||||
const buildStart = new Date().getTime()
|
|
||||||
lastBuildMs = buildStart
|
|
||||||
const release = await buildMutex.acquire()
|
|
||||||
if (lastBuildMs > buildStart) {
|
|
||||||
release()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cleanupBuild) {
|
|
||||||
await cleanupBuild()
|
|
||||||
console.log(chalk.yellow("Detected a source code change, doing a hard rebuild..."))
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = await ctx.rebuild().catch((err) => {
|
|
||||||
console.error(`${chalk.red("Couldn't parse Quartz configuration:")} ${fp}`)
|
|
||||||
console.log(`Reason: ${chalk.grey(err)}`)
|
|
||||||
process.exit(1)
|
|
||||||
})
|
|
||||||
release()
|
|
||||||
|
|
||||||
if (argv.bundleInfo) {
|
|
||||||
const outputFileName = "quartz/.quartz-cache/transpiled-build.mjs"
|
|
||||||
const meta = result.metafile.outputs[outputFileName]
|
|
||||||
console.log(
|
|
||||||
`Successfully transpiled ${Object.keys(meta.inputs).length} files (${prettyBytes(
|
|
||||||
meta.bytes,
|
|
||||||
)})`,
|
|
||||||
)
|
|
||||||
console.log(await esbuild.analyzeMetafile(result.metafile, { color: true }))
|
|
||||||
}
|
|
||||||
|
|
||||||
// bypass module cache
|
|
||||||
// https://github.com/nodejs/modules/issues/307
|
|
||||||
const { default: buildQuartz } = await import(`../../${cacheFile}?update=${randomUUID()}`)
|
|
||||||
// ^ this import is relative, so base "cacheFile" path can't be used
|
|
||||||
|
|
||||||
cleanupBuild = await buildQuartz(argv, buildMutex, clientRefresh)
|
|
||||||
clientRefresh()
|
|
||||||
}
|
|
||||||
|
|
||||||
if (argv.serve) {
|
|
||||||
const connections = []
|
|
||||||
const clientRefresh = () => connections.forEach((conn) => conn.send("rebuild"))
|
|
||||||
|
|
||||||
if (argv.baseDir !== "" && !argv.baseDir.startsWith("/")) {
|
|
||||||
argv.baseDir = "/" + argv.baseDir
|
|
||||||
}
|
|
||||||
|
|
||||||
await build(clientRefresh)
|
|
||||||
const server = http.createServer(async (req, res) => {
|
|
||||||
if (argv.baseDir && !req.url?.startsWith(argv.baseDir)) {
|
|
||||||
console.log(
|
|
||||||
chalk.red(
|
|
||||||
`[404] ${req.url} (warning: link outside of site, this is likely a Quartz bug)`,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
res.writeHead(404)
|
|
||||||
res.end()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// strip baseDir prefix
|
|
||||||
req.url = req.url?.slice(argv.baseDir.length)
|
|
||||||
|
|
||||||
const serve = async () => {
|
|
||||||
const release = await buildMutex.acquire()
|
|
||||||
await serveHandler(req, res, {
|
|
||||||
public: argv.output,
|
|
||||||
directoryListing: false,
|
|
||||||
headers: [
|
|
||||||
{
|
|
||||||
source: "**/*.*",
|
|
||||||
headers: [{ key: "Content-Disposition", value: "inline" }],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
})
|
|
||||||
const status = res.statusCode
|
|
||||||
const statusString =
|
|
||||||
status >= 200 && status < 300 ? chalk.green(`[${status}]`) : chalk.red(`[${status}]`)
|
|
||||||
console.log(statusString + chalk.grey(` ${argv.baseDir}${req.url}`))
|
|
||||||
release()
|
|
||||||
}
|
|
||||||
|
|
||||||
const redirect = (newFp) => {
|
|
||||||
newFp = argv.baseDir + newFp
|
|
||||||
res.writeHead(302, {
|
|
||||||
Location: newFp,
|
|
||||||
})
|
|
||||||
console.log(chalk.yellow("[302]") + chalk.grey(` ${argv.baseDir}${req.url} -> ${newFp}`))
|
|
||||||
res.end()
|
|
||||||
}
|
|
||||||
|
|
||||||
let fp = req.url?.split("?")[0] ?? "/"
|
|
||||||
|
|
||||||
// handle redirects
|
|
||||||
if (fp.endsWith("/")) {
|
|
||||||
// /trailing/
|
|
||||||
// does /trailing/index.html exist? if so, serve it
|
|
||||||
const indexFp = path.posix.join(fp, "index.html")
|
|
||||||
if (fs.existsSync(path.posix.join(argv.output, indexFp))) {
|
|
||||||
req.url = fp
|
|
||||||
return serve()
|
|
||||||
}
|
|
||||||
|
|
||||||
// does /trailing.html exist? if so, redirect to /trailing
|
|
||||||
let base = fp.slice(0, -1)
|
|
||||||
if (path.extname(base) === "") {
|
|
||||||
base += ".html"
|
|
||||||
}
|
|
||||||
if (fs.existsSync(path.posix.join(argv.output, base))) {
|
|
||||||
return redirect(fp.slice(0, -1))
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// /regular
|
|
||||||
// does /regular.html exist? if so, serve it
|
|
||||||
let base = fp
|
|
||||||
if (path.extname(base) === "") {
|
|
||||||
base += ".html"
|
|
||||||
}
|
|
||||||
if (fs.existsSync(path.posix.join(argv.output, base))) {
|
|
||||||
req.url = fp
|
|
||||||
return serve()
|
|
||||||
}
|
|
||||||
|
|
||||||
// does /regular/index.html exist? if so, redirect to /regular/
|
|
||||||
let indexFp = path.posix.join(fp, "index.html")
|
|
||||||
if (fs.existsSync(path.posix.join(argv.output, indexFp))) {
|
|
||||||
return redirect(fp + "/")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return serve()
|
|
||||||
})
|
|
||||||
server.listen(argv.port)
|
|
||||||
const wss = new WebSocketServer({ port: argv.wsPort })
|
|
||||||
wss.on("connection", (ws) => connections.push(ws))
|
|
||||||
console.log(
|
|
||||||
chalk.cyan(
|
|
||||||
`Started a Quartz server listening at http://localhost:${argv.port}${argv.baseDir}`,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
console.log("hint: exit with ctrl+c")
|
|
||||||
chokidar
|
|
||||||
.watch(["**/*.ts", "**/*.tsx", "**/*.scss", "package.json"], {
|
|
||||||
ignoreInitial: true,
|
|
||||||
})
|
|
||||||
.on("all", async () => {
|
|
||||||
build(clientRefresh)
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
await build(() => {})
|
|
||||||
ctx.dispose()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handles `npx quartz update`
|
|
||||||
* @param {*} argv arguments for `update`
|
|
||||||
*/
|
|
||||||
export async function handleUpdate(argv) {
|
|
||||||
const contentFolder = path.join(cwd, argv.directory)
|
|
||||||
console.log(chalk.bgGreen.black(`\n Quartz v${version} \n`))
|
|
||||||
console.log("Backing up your content")
|
|
||||||
execSync(
|
|
||||||
`git remote show upstream || git remote add upstream https://github.com/jackyzha0/quartz.git`,
|
|
||||||
)
|
|
||||||
await stashContentFolder(contentFolder)
|
|
||||||
console.log(
|
|
||||||
"Pulling updates... you may need to resolve some `git` conflicts if you've made changes to components or plugins.",
|
|
||||||
)
|
|
||||||
|
|
||||||
try {
|
|
||||||
gitPull(UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH)
|
|
||||||
} catch {
|
|
||||||
console.log(chalk.red("An error occurred above while pulling updates."))
|
|
||||||
await popContentFolder(contentFolder)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
await popContentFolder(contentFolder)
|
|
||||||
console.log("Ensuring dependencies are up to date")
|
|
||||||
const res = spawnSync("npm", ["i"], { stdio: "inherit" })
|
|
||||||
if (res.status === 0) {
|
|
||||||
console.log(chalk.green("Done!"))
|
|
||||||
} else {
|
|
||||||
console.log(chalk.red("An error occurred above while installing dependencies."))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handles `npx quartz restore`
|
|
||||||
* @param {*} argv arguments for `restore`
|
|
||||||
*/
|
|
||||||
export async function handleRestore(argv) {
|
|
||||||
const contentFolder = path.join(cwd, argv.directory)
|
|
||||||
await popContentFolder(contentFolder)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handles `npx quartz sync`
|
|
||||||
* @param {*} argv arguments for `sync`
|
|
||||||
*/
|
|
||||||
export async function handleSync(argv) {
|
|
||||||
const contentFolder = path.join(cwd, argv.directory)
|
|
||||||
console.log(chalk.bgGreen.black(`\n Quartz v${version} \n`))
|
|
||||||
console.log("Backing up your content")
|
|
||||||
|
|
||||||
if (argv.commit) {
|
|
||||||
const contentStat = await fs.promises.lstat(contentFolder)
|
|
||||||
if (contentStat.isSymbolicLink()) {
|
|
||||||
const linkTarg = await fs.promises.readlink(contentFolder)
|
|
||||||
console.log(chalk.yellow("Detected symlink, trying to dereference before committing"))
|
|
||||||
|
|
||||||
// stash symlink file
|
|
||||||
await stashContentFolder(contentFolder)
|
|
||||||
|
|
||||||
// follow symlink and copy content
|
|
||||||
await fs.promises.cp(linkTarg, contentFolder, {
|
|
||||||
recursive: true,
|
|
||||||
preserveTimestamps: true,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
const currentTimestamp = new Date().toLocaleString("en-US", {
|
|
||||||
dateStyle: "medium",
|
|
||||||
timeStyle: "short",
|
|
||||||
})
|
|
||||||
const commitMessage = argv.message ?? `Quartz sync: ${currentTimestamp}`
|
|
||||||
spawnSync("git", ["add", "."], { stdio: "inherit" })
|
|
||||||
spawnSync("git", ["commit", "-m", commitMessage], { stdio: "inherit" })
|
|
||||||
|
|
||||||
if (contentStat.isSymbolicLink()) {
|
|
||||||
// put symlink back
|
|
||||||
await popContentFolder(contentFolder)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await stashContentFolder(contentFolder)
|
|
||||||
|
|
||||||
if (argv.pull) {
|
|
||||||
console.log(
|
|
||||||
"Pulling updates from your repository. You may need to resolve some `git` conflicts if you've made changes to components or plugins.",
|
|
||||||
)
|
|
||||||
try {
|
|
||||||
gitPull(ORIGIN_NAME, QUARTZ_SOURCE_BRANCH)
|
|
||||||
} catch {
|
|
||||||
console.log(chalk.red("An error occurred above while pulling updates."))
|
|
||||||
await popContentFolder(contentFolder)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await popContentFolder(contentFolder)
|
|
||||||
if (argv.push) {
|
|
||||||
console.log("Pushing your changes")
|
|
||||||
const res = spawnSync("git", ["push", "-uf", ORIGIN_NAME, QUARTZ_SOURCE_BRANCH], {
|
|
||||||
stdio: "inherit",
|
|
||||||
})
|
|
||||||
if (res.status !== 0) {
|
|
||||||
console.log(chalk.red(`An error occurred above while pushing to remote ${ORIGIN_NAME}.`))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log(chalk.green("Done!"))
|
|
||||||
}
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
import { isCancel, outro } from "@clack/prompts"
|
|
||||||
import chalk from "chalk"
|
|
||||||
import { contentCacheFolder } from "./constants.js"
|
|
||||||
import { spawnSync } from "child_process"
|
|
||||||
import fs from "fs"
|
|
||||||
|
|
||||||
export function escapePath(fp) {
|
|
||||||
return fp
|
|
||||||
.replace(/\\ /g, " ") // unescape spaces
|
|
||||||
.replace(/^".*"$/, "$1")
|
|
||||||
.replace(/^'.*"$/, "$1")
|
|
||||||
.trim()
|
|
||||||
}
|
|
||||||
|
|
||||||
export function exitIfCancel(val) {
|
|
||||||
if (isCancel(val)) {
|
|
||||||
outro(chalk.red("Exiting"))
|
|
||||||
process.exit(0)
|
|
||||||
} else {
|
|
||||||
return val
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function stashContentFolder(contentFolder) {
|
|
||||||
await fs.promises.rm(contentCacheFolder, { force: true, recursive: true })
|
|
||||||
await fs.promises.cp(contentFolder, contentCacheFolder, {
|
|
||||||
force: true,
|
|
||||||
recursive: true,
|
|
||||||
verbatimSymlinks: true,
|
|
||||||
preserveTimestamps: true,
|
|
||||||
})
|
|
||||||
await fs.promises.rm(contentFolder, { force: true, recursive: true })
|
|
||||||
}
|
|
||||||
|
|
||||||
export function gitPull(origin, branch) {
|
|
||||||
const flags = ["--no-rebase", "--autostash", "-s", "recursive", "-X", "ours", "--no-edit"]
|
|
||||||
const out = spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" })
|
|
||||||
if (out.stderr) {
|
|
||||||
throw new Error(chalk.red(`Error while pulling updates: ${out.stderr}`))
|
|
||||||
} else if (out.status !== 0) {
|
|
||||||
throw new Error(chalk.red("Error while pulling updates"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function popContentFolder(contentFolder) {
|
|
||||||
await fs.promises.rm(contentFolder, { force: true, recursive: true })
|
|
||||||
await fs.promises.cp(contentCacheFolder, contentFolder, {
|
|
||||||
force: true,
|
|
||||||
recursive: true,
|
|
||||||
verbatimSymlinks: true,
|
|
||||||
preserveTimestamps: true,
|
|
||||||
})
|
|
||||||
await fs.promises.rm(contentCacheFolder, { force: true, recursive: true })
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user