Skip to content

Commit

Permalink
chorer: switch to release-it, update rollup
Browse files Browse the repository at this point in the history
  • Loading branch information
domoritz committed Feb 13, 2023
1 parent 5bae86f commit 46a2fed
Show file tree
Hide file tree
Showing 7 changed files with 1,740 additions and 840 deletions.
34 changes: 0 additions & 34 deletions .github/workflows/publish.yml

This file was deleted.

16 changes: 16 additions & 0 deletions .release-it.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"git": {
"commitMessage": "chore: release v${version}"
},
"github": {
"release": true
},
"hooks": {
"after:bump": "yarn build"
},
"plugins": {
"@release-it/conventional-changelog": {
"infile": "CHANGELOG.md"
}
}
}
7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,4 @@ To view and test different themes, follow these steps:

## Publishing

Publishing is handled by a 2-branch [pre-release process](https://intuit.github.io/auto/docs/generated/shipit#next-branch-default), configured in `publish.yml`. All changes should be based off the default `next` branch, and are published automatically.

- PRs made into the default branch that [would trigger a version bump](https://intuit.github.io/auto/docs/generated/conventional-commits) are auto-deployed to the `next` pre-release tag on NPM. The result can be installed with `npm install vega-themes/@next`.
- When merging into `next`, please use the `squash and merge` strategy.
- To release a new stable version, open a PR from `next` into `stable` using this [compare link](https://github.com/vega/vega-themes/compare/stable...next).
- When merging from `next` into `stable`, please use the `create a merge commit` strategy.
To make a release, run `npm run release`.
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,28 +58,28 @@
"eslintbase": "beemo eslint .",
"format": "yarn eslintbase --fix",
"lint": "yarn eslintbase",
"release": "yarn build && auto shipit"
"release": "release-it"
},
"devDependencies": {
"@auto-it/conventional-commits": "^10.37.4",
"@auto-it/first-time-contributor": "^10.37.4",
"@release-it/conventional-changelog": "^5.1.1",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.0.1",
"auto": "^10.37.4",
"@rollup/plugin-terser": "^0.4.0",
"browser-sync": "^2.27.10",
"concurrently": "^7.3.0",
"gh-pages": "^5.0.0",
"rollup": "^2.77.3",
"release-it": "^15.6.0",
"rollup-plugin-bundle-size": "^1.0.3",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-ts": "^3.0.2",
"rollup": "^3.15.0",
"typescript": "^4.7.4",
"vega": "^5.19.1",
"vega-lite-dev-config": "^0.21.0",
"vega-lite": "^5.0.0",
"vega-lite-dev-config": "^0.21.0"
"vega": "^5.19.1"
},
"peerDependencies": {
"vega": "*",
"vega-lite": "*"
}
},
"dependencies": {}
}
6 changes: 3 additions & 3 deletions rollup.config.js → rollup.config.mjs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import json from '@rollup/plugin-json';
import resolve from '@rollup/plugin-node-resolve';
import ts from 'rollup-plugin-ts';
import terser from '@rollup/plugin-terser';
import bundleSize from 'rollup-plugin-bundle-size';
import { terser } from 'rollup-plugin-terser';
import ts from 'rollup-plugin-ts';

const pkg = require('./package.json');
import pkg from './package.json' assert { type: 'json' };

const plugins = (browserslist, declaration) => [
resolve(),
Expand Down
4 changes: 2 additions & 2 deletions src/theme-dark.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ const medColor = '#888';

const darkTheme: Config = {
background: '#333',

view: {
stroke: medColor,
},

title: {
color: lightColor,
subtitleColor: lightColor,
Expand Down
Loading

0 comments on commit 46a2fed

Please sign in to comment.