diff --git a/apps/blog/source.config.ts b/apps/blog/source.config.ts index b73fa829f8..9aa44e0bd4 100644 --- a/apps/blog/source.config.ts +++ b/apps/blog/source.config.ts @@ -59,11 +59,14 @@ export default defineConfig({ remarkCodeTabOptions: { parseMdx: true }, remarkNpmOptions: { persist: { id: "package-manager" }, - // Custom package managers to add --bun flag for bunx commands packageManagers: [ { - command: (cmd: string) => convert(cmd.replace(/^npm init -y$/, "npm init"), "npm"), - name: "npm", + command: (cmd: string) => { + const converted = convert(cmd.replace(/^npm init -y$/, "npm init"), "bun"); + if (!converted) return undefined; + return converted.replace(/^bun x /, "bunx --bun "); + }, + name: "bun", }, { command: (cmd: string) => convert(cmd.replace(/^npm init -y$/, "npm init"), "pnpm"), @@ -74,12 +77,8 @@ export default defineConfig({ name: "yarn", }, { - command: (cmd: string) => { - const converted = convert(cmd.replace(/^npm init -y$/, "npm init"), "bun"); - if (!converted) return undefined; - return converted.replace(/^bun x /, "bunx --bun "); - }, - name: "bun", + command: (cmd: string) => convert(cmd.replace(/^npm init -y$/, "npm init"), "npm"), + name: "npm", }, ], }, diff --git a/apps/docs/source.config.ts b/apps/docs/source.config.ts index 44e525d2c5..9c5c40f93c 100644 --- a/apps/docs/source.config.ts +++ b/apps/docs/source.config.ts @@ -91,9 +91,6 @@ export default defineConfig({ id: "package-manager", }, packageManagers: [ - { command: (cmd: string) => convertLine(cmd, "npm"), name: "npm" }, - { command: (cmd: string) => convertLine(cmd, "pnpm"), name: "pnpm" }, - { command: (cmd: string) => convertLine(cmd, "yarn"), name: "yarn" }, { command: (cmd: string) => { const converted = convertLine(cmd, "bun"); @@ -102,6 +99,9 @@ export default defineConfig({ }, name: "bun", }, + { command: (cmd: string) => convertLine(cmd, "pnpm"), name: "pnpm" }, + { command: (cmd: string) => convertLine(cmd, "yarn"), name: "yarn" }, + { command: (cmd: string) => convertLine(cmd, "npm"), name: "npm" }, ], }, }, diff --git a/apps/eclipse/source.config.ts b/apps/eclipse/source.config.ts index 558a9bab4e..a479e928cf 100644 --- a/apps/eclipse/source.config.ts +++ b/apps/eclipse/source.config.ts @@ -31,11 +31,14 @@ export default defineConfig({ persist: { id: "package-manager", }, - // Custom package managers to add --bun flag for bunx commands packageManagers: [ { - command: (cmd: string) => convert(cmd.replace(/^npm init -y$/, "npm init"), "npm"), - name: "npm", + command: (cmd: string) => { + const converted = convert(cmd.replace(/^npm init -y$/, "npm init"), "bun"); + if (!converted) return undefined; + return converted.replace(/^bun x /, "bunx --bun "); + }, + name: "bun", }, { command: (cmd: string) => convert(cmd.replace(/^npm init -y$/, "npm init"), "pnpm"), @@ -46,12 +49,8 @@ export default defineConfig({ name: "yarn", }, { - command: (cmd: string) => { - const converted = convert(cmd.replace(/^npm init -y$/, "npm init"), "bun"); - if (!converted) return undefined; - return converted.replace(/^bun x /, "bunx --bun "); - }, - name: "bun", + command: (cmd: string) => convert(cmd.replace(/^npm init -y$/, "npm init"), "npm"), + name: "npm", }, ], }, diff --git a/apps/site/source.config.ts b/apps/site/source.config.ts index 7ec7371f80..3aa9c5ed0a 100644 --- a/apps/site/source.config.ts +++ b/apps/site/source.config.ts @@ -3,6 +3,7 @@ import { remarkDirectiveAdmonition, remarkImage, remarkMdxFiles } from "fumadocs import { defineCollections, defineConfig, frontmatterSchema } from "fumadocs-mdx/config"; import lastModified from "fumadocs-mdx/plugins/last-modified"; import { z } from "zod"; +import convert from "npm-to-yarn"; export const releaseNotes = defineCollections({ type: "doc", @@ -31,5 +32,30 @@ export default defineConfig({ remarkMdxFiles, ], remarkCodeTabOptions: { parseMdx: true }, + remarkNpmOptions: { + persist: { id: "package-manager" }, + packageManagers: [ + { + command: (cmd: string) => { + const converted = convert(cmd.replace(/^npm init -y$/, "npm init"), "bun"); + if (!converted) return undefined; + return converted.replace(/^bun x /, "bunx --bun "); + }, + name: "bun", + }, + { + command: (cmd: string) => convert(cmd.replace(/^npm init -y$/, "npm init"), "pnpm"), + name: "pnpm", + }, + { + command: (cmd: string) => convert(cmd.replace(/^npm init -y$/, "npm init"), "yarn"), + name: "yarn", + }, + { + command: (cmd: string) => convert(cmd.replace(/^npm init -y$/, "npm init"), "npm"), + name: "npm", + }, + ], + }, }, });