Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 30 additions & 22 deletions packages/app/server/utils/markdown.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,22 @@ export function generateCommitPublishMessage(
workflowData,
compact,
);

if (packageManager === "yarn") {
shaUrl = `${shaUrl}.tgz`;
}

const descriptor = `${packageManager === "yarn" ? `${packageName}@` : ""}${shaUrl}`;

return `
\`\`\`
${bin ? binCommands[packageManager] : installCommands[packageManager]} ${descriptor}
\`\`\`
`;
return packageManager
.split(",")
.map((pm) => {
if (pm === "yarn") {
shaUrl = `${shaUrl}.tgz`;
}

const descriptor = `${pm === "yarn" ? `${packageName}@` : ""}${shaUrl}`;

return `
\`\`\`
${bin ? binCommands[pm as PackageManager] : installCommands[pm as PackageManager]} ${descriptor}
\`\`\`
`;
})
.join("\n");
})
.map((message, i) =>
isMoreThanFour
Expand Down Expand Up @@ -86,16 +90,20 @@ export function generatePullRequestPublishMessage(
workflowData,
compact,
);

if (packageManager === "yarn") {
refUrl = `${refUrl}.tgz`;
}

return `
\`\`\`
${bin ? binCommands[packageManager] : installCommands[packageManager]} ${refUrl}
\`\`\`
`;
return packageManager
.split(",")
.map((pm) => {
if (pm === "yarn") {
refUrl = `${refUrl}.tgz`;
}

return `
\`\`\`
${bin ? binCommands[pm as PackageManager] : installCommands[pm as PackageManager]} ${refUrl}
\`\`\`
`;
})
.join("\n");
})
.map((message, i) =>
isMoreThanFour
Expand Down
27 changes: 16 additions & 11 deletions packages/cli/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,25 @@ const main = defineCommand({
const isOnlyTemplates = !!args["only-templates"];
const isBinaryApplication = !!args.bin;
const comment: Comment = args.comment as Comment;
const selectedPackageManager = args.packageManager as
| "npm"
| "bun"
| "pnpm"
| "yarn";

if (
!["npm", "bun", "pnpm", "yarn"].includes(selectedPackageManager)
) {
const selectedPackageManager = (args.packageManager as string)
.split(",")
.filter((s) => s.trim()) as Array<"npm" | "bun" | "pnpm" | "yarn">;
const packageManagers = ["npm", "bun", "pnpm", "yarn"];

if (!selectedPackageManager.length) {
console.error(
`Unsupported package manager: ${selectedPackageManager}. Supported managers are npm, bun, pnpm, yarn.`,
`Unsupported package manager: ${args.packageManager}. Supported managers are npm, bun, pnpm, yarn.`,
);
process.exit(1);
}
for (let i = 0; i < packageManagers.length; i++) {
if (!packageManagers.includes(packageManagers[i])) {
console.error(
`Unsupported package manager: ${packageManagers[i]}. Supported managers are npm, bun, pnpm, yarn.`,
);
process.exit(1);
}
}

if (!process.env.TEST && process.env.GITHUB_ACTIONS !== "true") {
console.error(
Expand Down Expand Up @@ -511,7 +516,7 @@ const main = defineCommand({
"sb-shasums": JSON.stringify(shasums),
"sb-run-id": GITHUB_RUN_ID,
"sb-bin": `${isBinaryApplication}`,
"sb-package-manager": selectedPackageManager,
"sb-package-manager": selectedPackageManager[0],
"sb-only-templates": `${isOnlyTemplates}`,
},
body: formData,
Expand Down