From cb08ddf5a741ed864cef313630fb8c5f1e90e17a Mon Sep 17 00:00:00 2001 From: bluwy Date: Mon, 14 Sep 2026 13:42:58 +0800 Subject: [PATCH] Use yaml instead of js-yaml --- get-changed-packages.ts | 4 ++-- package.json | 5 ++--- pnpm-lock.yaml | 23 ++++------------------- 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/get-changed-packages.ts b/get-changed-packages.ts index 4665cd7..edee2ca 100644 --- a/get-changed-packages.ts +++ b/get-changed-packages.ts @@ -10,10 +10,10 @@ import type { WrittenConfig, PackageJSON as ChangesetPackageJSON, } from "@changesets/types"; -import jsYaml from "js-yaml"; import micromatch from "micromatch"; import type { ProbotOctokit } from "probot"; import subset from "semver/ranges/subset.js"; +import * as yaml from "yaml"; import { isChangeset } from "./is-changeset.ts"; interface PackageJSON extends ChangesetPackageJSON { @@ -221,7 +221,7 @@ export const getChangedPackages = async ({ if (isPnpm) { const pnpmWorkspaceContent = await fetchTextFile("pnpm-workspace.yaml"); - const pnpmWorkspace = jsYaml.safeLoad(pnpmWorkspaceContent) as PnpmWorkspace; + const pnpmWorkspace = yaml.parse(pnpmWorkspaceContent) as PnpmWorkspace; if (pnpmWorkspace.packages) { tool = { diff --git a/package.json b/package.json index 108bebe..b25a58f 100644 --- a/package.json +++ b/package.json @@ -24,17 +24,16 @@ "@changesets/types": "^7.0.0", "@octokit/webhooks": "^9.8.4", "@sentry/node": "^6.0.0", - "@types/js-yaml": "^3.12.2", "@types/markdown-table": "^2.0.0", "@types/micromatch": "^4.0.1", "@types/node": "^25.5.0", "human-id": "^4.1.3", - "js-yaml": "^3.14.0", "markdown-table": "^2.0.0", "micromatch": "^4.0.2", "probot": "^12.2.4", "semver": "^7.8.5", - "typescript": "^6.0.2" + "typescript": "^6.0.2", + "yaml": "^2.9.0" }, "devDependencies": { "@types/semver": "^7.8.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e330aa0..20a2f3e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27,9 +27,6 @@ importers: '@sentry/node': specifier: ^6.0.0 version: 6.19.7 - '@types/js-yaml': - specifier: ^3.12.2 - version: 3.12.10 '@types/markdown-table': specifier: ^2.0.0 version: 2.0.0 @@ -42,9 +39,6 @@ importers: human-id: specifier: ^4.1.3 version: 4.1.3 - js-yaml: - specifier: ^3.14.0 - version: 3.14.2 markdown-table: specifier: ^2.0.0 version: 2.0.0 @@ -60,6 +54,9 @@ importers: typescript: specifier: ^6.0.2 version: 6.0.3 + yaml: + specifier: ^2.9.0 + version: 2.9.0 devDependencies: '@types/semver': specifier: ^7.8.0 @@ -1023,9 +1020,6 @@ packages: '@types/ioredis@4.28.10': resolution: {integrity: sha512-69LyhUgrXdgcNDv7ogs1qXZomnfOEnSmrmMFqKgt1XMJxmoOSG/u3wYy13yACIfKuMJ8IhKgHafDO3sx19zVQQ==} - '@types/js-yaml@3.12.10': - resolution: {integrity: sha512-/Mtaq/wf+HxXpvhzFYzrzCqNRcA958sW++7JOFC8nPrZcvfi/TrzOaaGbvt27ltJB2NQbHVAg5a1wUCsyMH7NA==} - '@types/js-yaml@4.0.9': resolution: {integrity: sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==} @@ -2426,11 +2420,6 @@ packages: yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - yaml@2.8.4: - resolution: {integrity: sha512-ml/JPOj9fOQK8RNnWojA67GbZ0ApXAUlN2UQclwv2eVgTgn7O9gg9o7paZWKMp4g0H3nTLtS9LVzhkpOFIKzog==} - engines: {node: '>= 14.6'} - hasBin: true - yaml@2.9.0: resolution: {integrity: sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==} engines: {node: '>= 14.6'} @@ -3216,8 +3205,6 @@ snapshots: dependencies: '@types/node': 25.6.2 - '@types/js-yaml@3.12.10': {} - '@types/js-yaml@4.0.9': {} '@types/jsonwebtoken@9.0.10': @@ -3841,7 +3828,7 @@ snapshots: strip-json-comments: 5.0.3 tinyglobby: 0.2.16 unbash: 3.0.0 - yaml: 2.8.4 + yaml: 2.9.0 zod: 4.4.3 transitivePeerDependencies: - '@emnapi/core' @@ -4668,8 +4655,6 @@ snapshots: yallist@4.0.0: {} - yaml@2.8.4: {} - yaml@2.9.0: {} yargs-parser@21.1.1: {}