From 996ad39bba4ddba658cd4b757505031d40e21fcc Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Tue, 12 Mar 2024 17:35:09 +0000 Subject: [PATCH] start using github-changelog --- package.json | 2 +- pnpm-lock.yaml | 252 +++++++++++++++++++++--------------------- pnpm-workspace.yaml | 2 - src/gather-changes.ts | 4 +- 4 files changed, 132 insertions(+), 128 deletions(-) delete mode 100644 pnpm-workspace.yaml diff --git a/package.json b/package.json index 8a9270a..b302479 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "test": "vitest" }, "dependencies": { - "@ef4/lerna-changelog": "^2.2.1", "@manypkg/get-packages": "^2.2.0", "@npmcli/package-json": "^5.0.0", "@octokit/rest": "^19.0.8", @@ -31,6 +30,7 @@ "cli-highlight": "^2.1.11", "execa": "^4.0.3", "fs-extra": "^10.0.0", + "github-changelog": "^1.0.0", "js-yaml": "^4.1.0", "latest-version": "^5.0.0", "parse-github-repo-url": "^1.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 04493e6..8a5dd8f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,98 +4,96 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false -importers: - - .: - dependencies: - '@ef4/lerna-changelog': - specifier: ^2.2.1 - version: 2.2.1 - '@manypkg/get-packages': - specifier: ^2.2.0 - version: 2.2.0 - '@npmcli/package-json': - specifier: ^5.0.0 - version: 5.0.0 - '@octokit/rest': - specifier: ^19.0.8 - version: 19.0.13 - '@types/fs-extra': - specifier: ^9.0.12 - version: 9.0.13 - '@types/js-yaml': - specifier: ^4.0.5 - version: 4.0.9 - '@types/semver': - specifier: ^7.3.6 - version: 7.5.5 - '@types/yargs': - specifier: ^17.0.3 - version: 17.0.31 - assert-never: - specifier: ^1.2.1 - version: 1.2.1 - chalk: - specifier: ^4.1.1 - version: 4.1.2 - cli-highlight: - specifier: ^2.1.11 - version: 2.1.11 - execa: - specifier: ^4.0.3 - version: 4.1.0 - fs-extra: - specifier: ^10.0.0 - version: 10.1.0 - js-yaml: - specifier: ^4.1.0 - version: 4.1.0 - latest-version: - specifier: ^5.0.0 - version: 5.1.0 - parse-github-repo-url: - specifier: ^1.4.1 - version: 1.4.1 - semver: - specifier: ^7.3.5 - version: 7.5.4 - yargs: - specifier: ^17.0.1 - version: 17.7.2 - devDependencies: - '@types/npmcli__package-json': - specifier: ^4.0.3 - version: 4.0.3 - '@types/parse-github-repo-url': - specifier: ^1.4.2 - version: 1.4.2 - '@typescript-eslint/eslint-plugin': - specifier: ^6.13.2 - version: 6.13.2(@typescript-eslint/parser@6.13.2)(eslint@8.55.0)(typescript@5.2.2) - '@typescript-eslint/parser': - specifier: ^6.13.2 - version: 6.13.2(eslint@8.55.0)(typescript@5.2.2) - eslint: - specifier: ^8.55.0 - version: 8.55.0 - eslint-config-prettier: - specifier: ^9.1.0 - version: 9.1.0(eslint@8.55.0) - eslint-plugin-n: - specifier: ^16.3.1 - version: 16.3.1(eslint@8.55.0) - eslint-plugin-prettier: - specifier: ^5.0.1 - version: 5.0.1(eslint-config-prettier@9.1.0)(eslint@8.55.0)(prettier@3.1.0) - prettier: - specifier: ^3.1.0 - version: 3.1.0 - typescript: - specifier: ^5.2.2 - version: 5.2.2 - vitest: - specifier: ^1.0.1 - version: 1.0.1 +dependencies: + '@manypkg/get-packages': + specifier: ^2.2.0 + version: 2.2.0 + '@npmcli/package-json': + specifier: ^5.0.0 + version: 5.0.0 + '@octokit/rest': + specifier: ^19.0.8 + version: 19.0.13 + '@types/fs-extra': + specifier: ^9.0.12 + version: 9.0.13 + '@types/js-yaml': + specifier: ^4.0.5 + version: 4.0.9 + '@types/semver': + specifier: ^7.3.6 + version: 7.5.5 + '@types/yargs': + specifier: ^17.0.3 + version: 17.0.31 + assert-never: + specifier: ^1.2.1 + version: 1.2.1 + chalk: + specifier: ^4.1.1 + version: 4.1.2 + cli-highlight: + specifier: ^2.1.11 + version: 2.1.11 + execa: + specifier: ^4.0.3 + version: 4.1.0 + fs-extra: + specifier: ^10.0.0 + version: 10.1.0 + github-changelog: + specifier: ^1.0.0 + version: 1.0.0 + js-yaml: + specifier: ^4.1.0 + version: 4.1.0 + latest-version: + specifier: ^5.0.0 + version: 5.1.0 + parse-github-repo-url: + specifier: ^1.4.1 + version: 1.4.1 + semver: + specifier: ^7.3.5 + version: 7.5.4 + yargs: + specifier: ^17.0.1 + version: 17.7.2 + +devDependencies: + '@types/npmcli__package-json': + specifier: ^4.0.3 + version: 4.0.3 + '@types/parse-github-repo-url': + specifier: ^1.4.2 + version: 1.4.2 + '@typescript-eslint/eslint-plugin': + specifier: ^6.13.2 + version: 6.13.2(@typescript-eslint/parser@6.13.2)(eslint@8.55.0)(typescript@5.2.2) + '@typescript-eslint/parser': + specifier: ^6.13.2 + version: 6.13.2(eslint@8.55.0)(typescript@5.2.2) + eslint: + specifier: ^8.55.0 + version: 8.55.0 + eslint-config-prettier: + specifier: ^9.1.0 + version: 9.1.0(eslint@8.55.0) + eslint-plugin-n: + specifier: ^16.3.1 + version: 16.3.1(eslint@8.55.0) + eslint-plugin-prettier: + specifier: ^5.0.1 + version: 5.0.1(eslint-config-prettier@9.1.0)(eslint@8.55.0)(prettier@3.1.0) + prettier: + specifier: ^3.1.0 + version: 3.1.0 + typescript: + specifier: ^5.2.2 + version: 5.2.2 + vitest: + specifier: ^1.0.1 + version: 1.0.1 packages: @@ -104,25 +102,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /@ef4/lerna-changelog@2.2.1: - resolution: {integrity: sha512-x0SkFpfvNj6l4LV6UnvnWIohmt8bC+i/P3ybmPc8X92KVMP6X/rkPeOxa2hI8BfDEHJMNXLJrDgQrJawI57aGQ==} - engines: {node: 12.* || 14.* || >= 16} - hasBin: true - dependencies: - '@manypkg/get-packages': 2.2.0 - chalk: 4.1.2 - cli-highlight: 2.1.11 - execa: 5.1.1 - hosted-git-info: 4.1.0 - make-fetch-happen: 9.1.0 - p-map: 3.0.0 - progress: 2.0.3 - yargs: 17.7.2 - transitivePeerDependencies: - - bluebird - - supports-color - dev: false - /@esbuild/android-arm64@0.19.8: resolution: {integrity: sha512-B8JbS61bEunhfx8kasogFENgQfr/dIp+ggYXwTqdbMAgGDhRa3AaPpQMuQU0rNxDLECj6FhDzk1cF9WHMVwrtA==} engines: {node: '>=12'} @@ -1830,6 +1809,25 @@ packages: resolve-pkg-maps: 1.0.0 dev: true + /github-changelog@1.0.0: + resolution: {integrity: sha512-8roCgUIEH6DDKHuywYKTk/TOSS7UxlmEbgQMevpSjF3Umf5067W2ihkmbuZmvH3m0MsM1DUiPJ27yzYbo4Fkaw==} + engines: {node: 12.* || 14.* || >= 16} + hasBin: true + dependencies: + '@manypkg/get-packages': 2.2.0 + chalk: 4.1.2 + cli-highlight: 2.1.11 + execa: 5.1.1 + hosted-git-info: 4.1.0 + make-fetch-happen: 9.1.0 + p-map: 3.0.0 + progress: 2.0.3 + yargs: 17.7.2 + transitivePeerDependencies: + - bluebird + - supports-color + dev: false + /glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} @@ -1985,7 +1983,7 @@ packages: /humanize-ms@1.2.1: resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==} dependencies: - ms: 2.1.3 + ms: 2.1.2 dev: false /iconv-lite@0.6.3: @@ -2035,8 +2033,12 @@ packages: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} dev: false - /ip@2.0.0: - resolution: {integrity: sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==} + /ip-address@9.0.5: + resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==} + engines: {node: '>= 12'} + dependencies: + jsbn: 1.1.0 + sprintf-js: 1.1.3 dev: false /is-builtin-module@3.2.1: @@ -2155,6 +2157,10 @@ packages: dependencies: argparse: 2.0.1 + /jsbn@1.1.0: + resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==} + dev: false + /json-buffer@3.0.0: resolution: {integrity: sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==} dev: false @@ -2432,10 +2438,6 @@ packages: /ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} - /ms@2.1.3: - resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - dev: false - /mz@2.7.0: resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} dependencies: @@ -2983,16 +2985,16 @@ packages: dependencies: agent-base: 6.0.2 debug: 4.3.4 - socks: 2.7.1 + socks: 2.8.1 transitivePeerDependencies: - supports-color dev: false - /socks@2.7.1: - resolution: {integrity: sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==} - engines: {node: '>= 10.13.0', npm: '>= 3.0.0'} + /socks@2.8.1: + resolution: {integrity: sha512-B6w7tkwNid7ToxjZ08rQMT8M9BJAf8DKx8Ft4NivzH0zBUfd6jldGcisJn/RLgxcX3FPNDdNQCUEMMT79b+oCQ==} + engines: {node: '>= 10.0.0', npm: '>= 3.0.0'} dependencies: - ip: 2.0.0 + ip-address: 9.0.5 smart-buffer: 4.2.0 dev: false @@ -3027,6 +3029,10 @@ packages: resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} dev: false + /sprintf-js@1.1.3: + resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==} + dev: false + /ssri@8.0.1: resolution: {integrity: sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==} engines: {node: '>= 8'} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml deleted file mode 100644 index 4de91a3..0000000 --- a/pnpm-workspace.yaml +++ /dev/null @@ -1,2 +0,0 @@ -packages: - - '.' diff --git a/src/gather-changes.ts b/src/gather-changes.ts index 92d846f..710e070 100644 --- a/src/gather-changes.ts +++ b/src/gather-changes.ts @@ -5,10 +5,10 @@ import { createRequire } from 'node:module'; const require = createRequire(import.meta.url); export async function gatherChanges() { - const lernaChangelogPath = require.resolve('@ef4/lerna-changelog'); + const githubChangelogPath = require.resolve('github-changelog'); const result = await execa('node', [ - resolve(dirname(lernaChangelogPath), 'bin', 'cli.js'), + resolve(dirname(githubChangelogPath), 'bin', 'cli.js'), '--next-version', 'Release', ]);