GitHub/quartz
1
0
Fork 2
mirror of https://github.com/jackyzha0/quartz.git synced 2026-03-21 21:45:42 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat(cli): allow non-default branch plugins

Browse Source
This commit is contained in:
saberzero1 2026-03-12 00:35:20 +01:00
parent ec9efa01c0
commit 524d6dab06
No known key found for this signature in database
4 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
quartz/cli/plugin-data.js
View File

@ -116,13 +116,15 @@ export function parseGitSource(source) {
return { name: repo, url: `https://github.com/${owner}/${repo}.git`, ref }
}
if (source.startsWith("git+")) {
const url = source.replace("git+", "")
const raw = source.replace("git+", "")
const [url, ref] = raw.split("#")
const name = path.basename(url, ".git")
return { name, url }
return { name, url, ref }
}
if (source.startsWith("https://")) {
const name = path.basename(source, ".git")
return { name, url: source }
const [url, ref] = source.split("#")
const name = path.basename(url, ".git")
return { name, url, ref }
}
throw new Error(`Cannot parse plugin source: ${source}`)
}

26
quartz/cli/plugin-git-handlers.js
View File

@ -199,7 +199,8 @@ export async function handlePluginInstall() {
}
if (currentCommit !== entry.commit) {
console.log(styleText("cyan", ` → ${name}: updating to ${entry.commit.slice(0, 7)}...`))
execSync("git fetch --depth 1 origin", { cwd: pluginDir, stdio: "ignore" })
const fetchRef = entry.ref ? ` ${entry.ref}` : ""
execSync(`git fetch --depth 1 origin${fetchRef}`, { cwd: pluginDir, stdio: "ignore" })
execSync(`git reset --hard ${entry.commit}`, { cwd: pluginDir, stdio: "ignore" })
}
pluginsToBuild.push({ name, pluginDir })
@ -211,7 +212,10 @@ export async function handlePluginInstall() {
} else {
try {
console.log(styleText("cyan", ` → ${name}: cloning...`))
execSync(`git clone --depth 1 ${entry.resolved} ${pluginDir}`, { stdio: "ignore" })
const branchArg = entry.ref ? ` --branch ${entry.ref}` : ""
execSync(`git clone --depth 1${branchArg} ${entry.resolved} ${pluginDir}`, {
stdio: "ignore",
})
if (entry.commit !== "unknown") {
execSync(`git fetch --depth 1 origin ${entry.commit}`, {
cwd: pluginDir,
@ -287,6 +291,7 @@ export async function handlePluginAdd(sources) {
source,
resolved: url,
commit,
...(ref && { ref }),
installedAt: new Date().toISOString(),
}
@ -500,7 +505,8 @@ export async function handlePluginCheck() {
const results = []
for (const [name, entry] of Object.entries(lockfile.plugins)) {
try {
const latestCommit = execSync(`git ls-remote ${entry.resolved} HEAD`, {
const lsRemoteRef = entry.ref ? `refs/heads/${entry.ref}` : "HEAD"
const latestCommit = execSync(`git ls-remote ${entry.resolved} ${lsRemoteRef}`, {
encoding: "utf-8",
})
.split("\t")[0]
@ -567,8 +573,13 @@ export async function handlePluginUpdate(names) {
try {
console.log(styleText("cyan", `→ Updating ${name}...`))
execSync("git fetch --depth 1 origin", { cwd: pluginDir, stdio: "ignore" })
execSync("git reset --hard origin/HEAD", { cwd: pluginDir, stdio: "ignore" })
const fetchRef = entry.ref || ""
const resetTarget = entry.ref ? `origin/${entry.ref}` : "origin/HEAD"
execSync(`git fetch --depth 1 origin${fetchRef ? " " + fetchRef : ""}`, {
cwd: pluginDir,
stdio: "ignore",
})
execSync(`git reset --hard ${resetTarget}`, { cwd: pluginDir, stdio: "ignore" })
const newCommit = getGitCommit(pluginDir)
if (newCommit !== entry.commit) {
@ -669,7 +680,8 @@ export async function handlePluginRestore() {
console.log(
styleText("cyan", `→ ${name}: cloning ${entry.resolved}@${entry.commit.slice(0, 7)}...`),
)
execSync(`git clone ${entry.resolved} ${pluginDir}`, { stdio: "ignore" })
const branchArg = entry.ref ? ` --branch ${entry.ref}` : ""
execSync(`git clone${branchArg} ${entry.resolved} ${pluginDir}`, { stdio: "ignore" })
execSync(`git checkout ${entry.commit}`, { cwd: pluginDir, stdio: "ignore" })
console.log(styleText("green", `✓ ${name} restored`))
restoredPlugins.push({ name, pluginDir })
@ -816,6 +828,7 @@ export async function handlePluginResolve({ dryRun = false } = {}) {
source: entry.source,
resolved: url,
commit,
...(ref && { ref }),
installedAt: new Date().toISOString(),
}
installed.push({ name, pluginDir })
@ -835,6 +848,7 @@ export async function handlePluginResolve({ dryRun = false } = {}) {
source: entry.source,
resolved: url,
commit,
...(ref && { ref }),
installedAt: new Date().toISOString(),
}

10
quartz/plugins/loader/gitLoader.ts
View File

@ -61,15 +61,17 @@ export function parsePluginSource(source: string): GitPluginSpec {
// Handle git+https:// protocol
if (source.startsWith("git+")) {
const url = source.replace("git+", "")
const raw = source.replace("git+", "")
const [url, ref] = raw.split("#")
const name = extractRepoName(url)
return { name, repo: url, ref: "main" }
return { name, repo: url, ref: ref || "main" }
}
// Handle direct HTTPS URL (GitHub, GitLab, etc.)
if (source.startsWith("https://")) {
const name = extractRepoName(source)
return { name, repo: source, ref: "main" }
const [url, ref] = source.split("#")
const name = extractRepoName(url)
return { name, repo: url, ref: ref || "main" }
}
// Assume it's a plain repo name and try github

2
quartz/plugins/quartz-plugins.schema.json
View File

@ -192,7 +192,7 @@
"properties": {
"source": {
"type": "string",
"description": "Plugin source path or identifier"
"description": "Plugin source path or identifier. Supports github:user/repo, git+https://, and https:// URLs. Append #ref to pin to a specific branch or tag (e.g., github:user/repo#my-branch)."
},
"enabled": {
"type": "boolean",