Skip to content

Commit

Permalink
Merge pull request #72 from propeldata/refactor/fix-build-issues
Browse files Browse the repository at this point in the history
Fix build issues
  • Loading branch information
markandrus committed Jun 15, 2023
2 parents a57d565 + ece43f6 commit 5670ded
Show file tree
Hide file tree
Showing 6 changed files with 2,622 additions and 2,455 deletions.
1 change: 0 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,4 @@ Before merging to main:
## Storybook

- Added Y story for Time Series.

```
21 changes: 11 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,17 @@ Every merge to main creates a new release candidate. For example, if we are curr
To create a proper release, first

1. **Draft a new Release in GitHub.** You can use [this link](https://github.com/propeldata/ui-kit/releases/new).
1. Do not choose a tag yet.
2. Set the title to the version of the UI Kit that will be released (for example, "1.2.3").
3. Get the list of all pull requests merged since the last release. You can do this by comparing to the last release in GitHub. For example, if the last release was 1.2.2, the following URL will show all the pull requests merged since 1.2.2:

```
https://github.com/propeldata/ui-kit/compare/%40propeldata/ui-kit%401.2.3...main
```

4. Combine the release notes from each of the pull requests.
5. Type them into the GitHub Release and click "Save draft".

1. Do not choose a tag yet.
2. Set the title to the version of the UI Kit that will be released (for example, "1.2.3").
3. Get the list of all pull requests merged since the last release. You can do this by comparing to the last release in GitHub. For example, if the last release was 1.2.2, the following URL will show all the pull requests merged since 1.2.2:

```
https://github.com/propeldata/ui-kit/compare/%40propeldata/ui-kit%401.2.3...main
```

4. Combine the release notes from each of the pull requests.
5. Type them into the GitHub Release and click "Save draft".

2. **Manually trigger the "publish-release" workflow.** Go to the "Actions" tab, click on the "publish-release" workflow, and then click "Run workflow". This will release 1.2.3, publish it to NPM, and create its git tag.

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"devDependencies": {
"@babel/core": "^7.20.5",
"@emotion/css": "^11.10.6",
"@parcel/packager-ts": "^2.8.3",
"@parcel/transformer-typescript-types": "2.8.3",
"@parcel/packager-ts": "^2.8.2",
"@parcel/transformer-typescript-types": "^2.8.2",
"@propeldata/release": "workspace:^",
"@types/css-modules": "^1.0.2",
"@types/eslint": "^7.28.0",
Expand Down
1 change: 1 addition & 0 deletions packages/core/graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"dependencies": {
"dotenv": "^16.0.3",
"graphql": "^16.6.0",
"graphql-request": "^6.0.0",
"react-query": "^3.39.2"
},
"peerDependencies": {
Expand Down
4 changes: 4 additions & 0 deletions packages/core/plugins/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
"group": "@propeldata/ui-kit"
},
"devDependencies": {
"chart.js": "^4.2.1",
"parcel": "^2.8.2",
"typescript": "^4.9.4"
},
"peerDependencies": {
"chart.js": "^4.2.1"
}
}
Loading

0 comments on commit 5670ded

Please sign in to comment.