Skip to content

Commit 552529e

Browse files
authored
Merge branch 'jackyzha0:v4' into v4
2 parents 19af37d + ec00a40 commit 552529e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1762
-792
lines changed

.github/workflows/build-preview.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ jobs:
1111
runs-on: ubuntu-latest
1212
name: Build Preview
1313
steps:
14-
- uses: actions/checkout@v5
14+
- uses: actions/checkout@v6
1515
with:
1616
fetch-depth: 0
1717

1818
- name: Setup Node
19-
uses: actions/setup-node@v4
19+
uses: actions/setup-node@v6
2020
with:
2121
node-version: 22
2222

2323
- name: Cache dependencies
24-
uses: actions/cache@v4
24+
uses: actions/cache@v5
2525
with:
2626
path: ~/.npm
2727
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -37,7 +37,7 @@ jobs:
3737
run: npx quartz build -d docs -v
3838

3939
- name: Upload build artifact
40-
uses: actions/upload-artifact@v4
40+
uses: actions/upload-artifact@v6
4141
with:
4242
name: preview-build
4343
path: public

.github/workflows/ci.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ jobs:
1919
permissions:
2020
contents: write
2121
steps:
22-
- uses: actions/checkout@v5
22+
- uses: actions/checkout@v6
2323
with:
2424
fetch-depth: 0
2525

2626
- name: Setup Node
27-
uses: actions/setup-node@v4
27+
uses: actions/setup-node@v6
2828
with:
2929
node-version: 22
3030

3131
- name: Cache dependencies
32-
uses: actions/cache@v4
32+
uses: actions/cache@v5
3333
with:
3434
path: ~/.npm
3535
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -53,11 +53,11 @@ jobs:
5353
permissions:
5454
contents: write
5555
steps:
56-
- uses: actions/checkout@v5
56+
- uses: actions/checkout@v6
5757
with:
5858
fetch-depth: 0
5959
- name: Setup Node
60-
uses: actions/setup-node@v4
60+
uses: actions/setup-node@v6
6161
with:
6262
node-version: 22
6363
- name: Get package version

.github/workflows/deploy-preview.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
name: Deploy Preview to Cloudflare Pages
1919
steps:
2020
- name: Download build artifact
21-
uses: actions/download-artifact@v5
21+
uses: actions/download-artifact@v7
2222
id: preview-build-artifact
2323
with:
2424
name: preview-build

.github/workflows/docker-build-push.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
echo "OWNER_LOWERCASE=${OWNER,,}" >> ${GITHUB_ENV}
2222
env:
2323
OWNER: "${{ github.repository_owner }}"
24-
- uses: actions/checkout@v5
24+
- uses: actions/checkout@v6
2525
with:
2626
fetch-depth: 1
2727
- name: Inject slug/short variables
28-
uses: rlespinasse/github-slug-action@v5.2.0
28+
uses: rlespinasse/github-slug-action@v5.4.0
2929
- name: Set up QEMU
3030
uses: docker/setup-qemu-action@v3
3131
- name: Set up Docker Buildx
@@ -37,7 +37,7 @@ jobs:
3737
network=host
3838
- name: Install cosign
3939
if: github.event_name != 'pull_request'
40-
uses: sigstore/cosign-installer@v3.9.2
40+
uses: sigstore/cosign-installer@v4.0.0
4141
- name: Login to GitHub Container Registry
4242
uses: docker/login-action@v3
4343
if: github.event_name != 'pull_request'

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
> [One] who works with the door open gets all kinds of interruptions, but [they] also occasionally gets clues as to what the world is and what might be important.” — Richard Hamming
44
55
Quartz is a set of tools that helps you publish your [digital garden](https://jzhao.xyz/posts/networked-thought) and notes as a website for free.
6-
Quartz v4 features a from-the-ground rewrite focusing on end-user extensibility and ease-of-use.
76

87
🔗 Read the documentation and get started: https://quartz.jzhao.xyz/
98

docs/configuration.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ This part of the configuration concerns anything that can affect the whole site.
3636
- `{provider: 'clarity', projectId: '<your-clarity-id-code' }`: use [Microsoft clarity](https://clarity.microsoft.com/). The project id can be found on top of the overview page.
3737
- `{ provider: 'matomo', siteId: '<your-matomo-id-code', host: 'matomo.example.com' }`: use [Matomo](https://matomo.org/), without protocol.
3838
- `{ provider: 'vercel' }`: use [Vercel Web Analytics](https://vercel.com/docs/concepts/analytics).
39+
- `{ provider: 'rybbit', siteId: 'my-rybbit-id' }` (managed) or `{ provider: 'rybbit', siteId: 'my-rybbit-id', host: 'my-rybbit-domain.com' }` (self-hosted) use [Rybbit](https://rybbit.com);
3940
- `locale`: used for [[i18n]] and date formatting
4041
- `baseUrl`: this is used for sitemaps and RSS feeds that require an absolute URL to know where the canonical 'home' of your site lives. This is normally the deployed URL of your site (e.g. `quartz.jzhao.xyz` for this site). Do not include the protocol (i.e. `https://`) or any leading or trailing slashes.
4142
- This should also include the subpath if you are [[hosting]] on GitHub pages without a custom domain. For example, if my repository is `jackyzha0/quartz`, GitHub pages would deploy to `https://jackyzha0.github.io/quartz` and the `baseUrl` would be `jackyzha0.github.io/quartz`.

docs/features/Docker Support.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@ You can run the below one-liner to run Quartz in Docker.
55
```sh
66
docker run --rm -itp 8080:8080 -p 3001:3001 -v ./content:/usr/src/app/content $(docker build -q .)
77
```
8+
9+
> [!warning] Not to be used for production
10+
> Serve mode is intended for local previews only.
11+
> For production workloads, see the page on [[hosting]].

docs/features/explorer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ You can access the tags of a file by `node.data.tags`.
162162
Component.Explorer({
163163
filterFn: (node) => {
164164
// exclude files with the tag "explorerexclude"
165-
return node.data.tags?.includes("explorerexclude") !== true
165+
return node.data?.tags?.includes("explorerexclude") !== true
166166
},
167167
})
168168
```

docs/features/popover previews.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ By default, Quartz only fetches previews for pages inside your vault due to [COR
88

99
When [[creating components|creating your own components]], you can include this `popover-hint` class to also include it in the popover.
1010

11-
Similar to Obsidian, [[quartz layout.png|images referenced using wikilinks]] can also be viewed as popups.
11+
Similar to Obsidian, [[quartz-layout-desktop.png|images referenced using wikilinks]] can also be viewed as popups.
1212

1313
## Configuration
1414

docs/hosting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ However, if you'd like to publish your site to the world, you need a way to host
1515
## Cloudflare Pages
1616

1717
1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
18-
2. In Account Home, select **Workers & Pages** > **Create application** > **Pages** > **Connect to Git**.
18+
2. In Account Home, select **Compute (Workers)** > **Workers & Pages** > **Create application** > **Pages** > **Connect to Git**.
1919
3. Select the new GitHub repository that you created and, in the **Set up builds and deployments** section, provide the following information:
2020

2121
| Configuration option | Value |

0 commit comments

Comments
 (0)