fix(merge): post-merge cleanup after upstream/master backport
Build: Dev / build (push) Failing after 3m8s
Build: Dev / update-infra (push) Has been skipped

- restore server/src/services/github-fetch.ts (re-added by upstream; dev's
  history had deleted it via 80f7d827)
- drop stale companySkillUpdateAuthSchema export from shared/index.ts
  (upstream removed the validator we took with --theirs)
- regenerate pnpm-lock.yaml for the merged workspace

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-05-31 08:04:06 -04:00
parent daa1324e5f
commit c07ba9ea3b
3 changed files with 27 additions and 1 deletions
-1
View File
@@ -1087,7 +1087,6 @@ export {
companySkillAuditFindingSchema,
companySkillAuditResultSchema,
companySkillImportSchema,
companySkillUpdateAuthSchema,
companySkillProjectScanRequestSchema,
companySkillProjectScanSkippedSchema,
companySkillProjectScanConflictSchema,
+2
View File
@@ -622,6 +622,8 @@ importers:
specifier: ^5.7.3
version: 5.9.3
packages/skills-catalog: {}
server:
dependencies:
'@aws-sdk/client-s3':
+25
View File
@@ -0,0 +1,25 @@
import { unprocessable } from "../errors.js";
function isGitHubDotCom(hostname: string) {
const h = hostname.toLowerCase();
return h === "github.com" || h === "www.github.com";
}
export function gitHubApiBase(hostname: string) {
return isGitHubDotCom(hostname) ? "https://api.github.com" : `https://${hostname}/api/v3`;
}
export function resolveRawGitHubUrl(hostname: string, owner: string, repo: string, ref: string, filePath: string) {
const p = filePath.replace(/^\/+/, "");
return isGitHubDotCom(hostname)
? `https://raw.githubusercontent.com/${owner}/${repo}/${ref}/${p}`
: `https://${hostname}/raw/${owner}/${repo}/${ref}/${p}`;
}
export async function ghFetch(url: string, init?: RequestInit): Promise<Response> {
try {
return await fetch(url, init);
} catch {
throw unprocessable(`Could not connect to ${new URL(url).hostname} — ensure the URL points to a GitHub or GitHub Enterprise instance`);
}
}