diff --git a/.changeset/config.json b/.changeset/config.json index 4fbd93212..396072af7 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -1,6 +1,9 @@ { "$schema": "https://unpkg.com/@changesets/config@2.3.1/schema.json", - "changelog": "@changesets/cli/changelog", + "changelog": [ + "@svitejs/changesets-changelog-github-compact", + { "repo": "hms-dbmi/viv" } + ], "fixed": [["@hms-dbmi/viv", "@vivjs/*"]], "commit": false, "access": "public", diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2850c01d3..78e802335 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,15 +19,14 @@ jobs: version: 7 run_install: true - - run: pnpm build - - name: Create Release Pull Request or Publish to npm id: changesets uses: changesets/action@v1 with: title: Create Release - version: node scripts/version.mjs - publish: pnpm changeset publish + version: pnpm run version + publish: pnpm run publish + createGithubReleases: false env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/package.json b/package.json index f4ef3a30d..3bd688b7c 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,9 @@ "test": "pnpm -r --parallel test", "check-format": "prettier --check --ignore-path .gitignore tsconfig.json sites/avivator packages/", "lint": "npm run check-format && eslint \"packages/*/src/**/*\" \"sites/avivator/src/**/*\"", - "format": "npm run check-format -- --write" + "format": "npm run check-format -- --write", + "version": "node ./scripts/version.mjs", + "publish": "pnpm build && pnpm changeset publish" }, "dependencies": { "@deck.gl/core": "~8.8.27", @@ -41,6 +43,7 @@ "@pnpm/meta-updater": "^0.0.6", "@pnpm/types": "^8.4.0", "@probe.gl/test-utils": "^3.5.0", + "@svitejs/changesets-changelog-github-compact": "^1.1.0", "@typescript-eslint/eslint-plugin": "^6.10.0", "@typescript-eslint/parser": "^6.10.0", "esbuild": "^0.19.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 49d7779a0..c0dd911fb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -63,6 +63,9 @@ importers: '@probe.gl/test-utils': specifier: ^3.5.0 version: 3.5.2 + '@svitejs/changesets-changelog-github-compact': + specifier: ^1.1.0 + version: 1.1.0 '@typescript-eslint/eslint-plugin': specifier: ^6.10.0 version: 6.10.0(@typescript-eslint/parser@6.10.0)(eslint@8.53.0)(typescript@5.2.2) @@ -882,6 +885,15 @@ packages: semver: 7.5.4 dev: true + /@changesets/get-github-info@0.5.2: + resolution: {integrity: sha512-JppheLu7S114aEs157fOZDjFqUDpm7eHdq5E8SSR0gUBTEK0cNSHsrSR5a66xs0z3RWuo46QvA3vawp8BxDHvg==} + dependencies: + dataloader: 1.4.0 + node-fetch: 2.6.7 + transitivePeerDependencies: + - encoding + dev: true + /@changesets/get-release-plan@3.0.17: resolution: {integrity: sha512-6IwKTubNEgoOZwDontYc2x2cWXfr6IKxP3IhKeK+WjyD6y3M4Gl/jdQvBw+m/5zWILSOCAaGLu2ZF6Q+WiPniw==} dependencies: @@ -2655,6 +2667,16 @@ packages: engines: {node: '>=6'} dev: true + /@svitejs/changesets-changelog-github-compact@1.1.0: + resolution: {integrity: sha512-qhUGGDHcpbY2zpjW3SwqchuW8J/5EzlPFud7xNntHKA7f3a/mx5+g+ruJKFHSAiVZYo30PALt+AyhmPUNKH/Og==} + engines: {node: ^14.13.1 || ^16.0.0 || >=18} + dependencies: + '@changesets/get-github-info': 0.5.2 + dotenv: 16.3.1 + transitivePeerDependencies: + - encoding + dev: true + /@szmarczak/http-timer@1.1.2: resolution: {integrity: sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==} engines: {node: '>=6'} @@ -4301,6 +4323,10 @@ packages: resolution: {integrity: sha512-ND9qDTLc6diwj+Xe5cdAgVTbLVdXbtxTJRXRhli8Mowuaan+0EJOtdqJ0QCHNSSPyoXGx9HX2/VMnKeC34AChA==} dev: true + /dataloader@1.4.0: + resolution: {integrity: sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==} + dev: true + /dateformat@3.0.3: resolution: {integrity: sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==} dev: true @@ -4642,6 +4668,11 @@ packages: is-obj: 2.0.0 dev: true + /dotenv@16.3.1: + resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==} + engines: {node: '>=12'} + dev: true + /dotgitignore@2.1.0: resolution: {integrity: sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA==} engines: {node: '>=6'} diff --git a/scripts/version.mjs b/scripts/version.mjs index f44b780e1..806700c9b 100644 --- a/scripts/version.mjs +++ b/scripts/version.mjs @@ -89,16 +89,19 @@ function clearChangelogs(pkgDir) { * Deletes all the other changelogs. */ function postChangesetsVersion() { + const mainPkg = path.resolve(__dirname, '..', 'packages', 'main'); // remove dependency updates from main changelog - const mainChangelogPath = path.resolve(__dirname, '..', 'packages', 'main', 'CHANGELOG.md'); + const mainChangelogPath = path.resolve(mainPkg, 'CHANGELOG.md'); const contents = fs.readFileSync(mainChangelogPath, { encoding: 'utf-8' }); - const lines = contents.split('\n'); - const newChangelog = lines - .filter(line => !line.startsWith(' - @vivjs/')) // remove dependency updates + const newChangelog = contents + .split('\n') + .filter(line => !line.startsWith('- Updated dependencies')) + .filter(line => !line.startsWith(' - @vivjs/')) .join('\n'); fs.writeFileSync(mainChangelogPath, newChangelog); - clearChangelogs(path.resolve(__dirname, '..', 'packages')); - clearChangelogs(path.resolve(__dirname, '..', 'sites')); + + // clearChangelogs(path.resolve(__dirname, '..', 'packages')); + // clearChangelogs(path.resolve(__dirname, '..', 'sites')); } preChangesetsVersion();