Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade storybook #184

Merged
merged 19 commits into from
Nov 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .changeset/quick-boxes-jog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@chart-io/d3": minor
"@chart-io/detection": minor
"@chart-io/react": minor
"@chart-io/types": minor
---

Upgraded Storybook
51 changes: 25 additions & 26 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,21 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'ci skip')"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
- uses: pnpm/action-setup@v2
with:
run_install: false
- name: Get pnpm store directory
id: pnpm-cache
- name: Get pnpm store cache directory
shell: bash
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"

echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
path: ${{ env.STORE_PATH }}
key: ${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
Expand All @@ -43,22 +42,22 @@ jobs:
# runs-on: ubuntu-latest
# if: "!contains(github.event.head_commit.message, 'ci skip')"
# steps:
# - uses: actions/checkout@v2
# - uses: actions/checkout@v3
# - uses: actions/setup-node@v3
# with:
# node-version: 16
# - uses: pnpm/action-setup@v2
# with:
# run_install: false
# - name: Get pnpm store directory
# id: pnpm-cache
# - name: Get pnpm store cache directory
# shell: bash
# run: |
# echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
# echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
# - uses: actions/cache@v3
# name: Setup pnpm cache
# with:
# path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
# key: ${{ hashFiles('**/pnpm-lock.yaml') }}
# path: ${{ env.STORE_PATH }}
# key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
# restore-keys: |
# ${{ runner.os }}-pnpm-store-
# - name: pnpm Install
Expand All @@ -70,21 +69,21 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'ci skip')"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
- uses: pnpm/action-setup@v2
with:
run_install: false
- name: Get pnpm store directory
id: pnpm-cache
- name: Get pnpm store cache directory
shell: bash
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
path: ${{ env.STORE_PATH }}
key: ${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
Expand All @@ -98,23 +97,23 @@ jobs:
if: "!contains(github.event.head_commit.message, 'ci skip') && github.event.pull_request.draft == false"
needs: [lint, unit]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
- uses: pnpm/action-setup@v2
with:
run_install: false
- name: Get pnpm store directory
id: pnpm-cache
- name: Get pnpm store cache directory
shell: bash
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
path: ${{ env.STORE_PATH }}
key: ${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
Expand All @@ -134,7 +133,7 @@ jobs:
if: "!contains(github.event.head_commit.message, 'ci skip') && github.event.pull_request.draft == false"
needs: [chromatic]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Check if auto merge possible
id: check
run: |
Expand Down
54 changes: 27 additions & 27 deletions .github/workflows/push-to-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'ci skip')"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
- uses: pnpm/action-setup@v2
with:
run_install: false
- name: Get pnpm store directory
id: pnpm-cache
- name: Get pnpm store cache directory
shell: bash
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
path: ${{ env.STORE_PATH }}
key: ${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: pnpm Install
Expand All @@ -42,24 +42,24 @@ jobs:
outputs:
published: ${{ steps.published.outputs.published }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
token: ${{ secrets.DEPLOY_TOKEN }}
- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
- uses: pnpm/action-setup@v2
with:
run_install: false
- name: Get pnpm store directory
id: pnpm-cache
- name: Get pnpm store cache directory
shell: bash
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
path: ${{ env.STORE_PATH }}
key: ${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: pnpm Install
Expand All @@ -85,22 +85,22 @@ jobs:
if: needs.changesets_version.outputs.published == 'true'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
- uses: pnpm/action-setup@v2
with:
run_install: false
- name: Get pnpm store directory
id: pnpm-cache
- name: Get pnpm store cache directory
shell: bash
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
path: ${{ env.STORE_PATH }}
key: ${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: pnpm Install
Expand All @@ -115,24 +115,24 @@ jobs:
if: needs.changesets_version.outputs.published == 'true'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
token: ${{ secrets.DEPLOY_TOKEN }}
- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
- uses: pnpm/action-setup@v2
with:
run_install: false
- name: Get pnpm store directory
id: pnpm-cache
- name: Get pnpm store cache directory
shell: bash
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.18.2
v20.2.0
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# @chart-io/react-d3
# @chart-io/react

@chart-io/react-d3 provides a set of reusable chart components to make data visualization easy. All the components are built using a combination of [React](https://reactjs.org/) and [D3](https://d3js.org/).
@chart-io/react provides a set of reusable chart components to make data visualization easy. All the components are built using a combination of [React](https://reactjs.org/) and [D3](https://d3js.org/).

It aims to provide high-level components that require minial configuration to provide great looking charts, while also providing access to the low level components giving you the flexibility to customize them as you see fit.

> :warning: @chart-io/react-d3 is currently in pre-release. While you're welcome to give it a try some interfaces may change.
> :warning: @chart-io/react is currently in pre-release. While you're welcome to give it a try some interfaces may change.

# Install

#### npm

`npm install --save @chart-io/react-d3`
`npm install --save @chart-io/react`

#### yarn

`yarn add @chart-io/react-d3`
`yarn add @chart-io/react`

# Getting Started

Expand Down Expand Up @@ -58,6 +58,6 @@ Start the storybook server

## FAQ

#### Is @chart-io/react-d3 free to use?
#### Is @chart-io/react free to use?

@chart-io/react-d3 is free to use and the aim is that it will always be free in open source/non-commercial projects. There may be costs for commercial use in the future, purely to help support the development and improvement of @chart-io/react-d3.
@chart-io/react is free to use and the aim is that it will always be free in open source/non-commercial projects. There may be costs for commercial use in the future, purely to help support the development and improvement of @chart-io/react.
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
{
"name": "monorepo-root",
"version": "1.0.0",
"packageManager": "pnpm@7.12.1",
"packageManager": "pnpm@8.10.2",
"type": "module",
"author": "\"Ian Wright\" <\"ipwright83+dev@gmail.com\">",
"scripts": {
"build": "turbo run build",
"build:package": "node scripts/choice build",
"build:watch": "turbo run build --scope=@chart-io/* --no-deps -- -- -w",
"dev": "turbo run build --scope=@chart-io/* --no-deps && turbo run dev --no-cache --parallel --continue",
"changeset": "changeset",
"clean": "rm -rf node_modules && pnpm -r clean",
"dev": "turbo run build --scope=@chart-io/* --no-deps && turbo run dev --no-cache --parallel --continue",
"graph": "turbo run build --graph=graph.html",
"lint": "turbo run lint",
"publish": "changeset publish",
Expand All @@ -19,9 +18,13 @@
"storybook": "pnpm --filter '@chart-io/react' storybook",
"storybook:build": "pnpm --filter '@chart-io/react' build-storybook",
"storybook:deploy": "pnpm --filter '@chart-io/*' deploy-storybook",
"storybook:package": "node scripts/choice storybook",
"storybook:test": "pnpm --filter '@chart-io/*' test-storybook",
"storybook:report": "node scripts/choice coverage-storybook",
"types": "turbo run types",
"test": "turbo run test --concurrency=1",
"test:coverage": "turbo run test --concurrency=1 -- --coverage",
"test:report": "node scripts/choice test-coverage",
"test:package": "node scripts/choice test --coverage",
"test:watch": "node scripts/choice test --watchAll=true",
"version": "changeset version"
Expand Down
4 changes: 2 additions & 2 deletions packages/d3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"name": "@chart-io/d3",
"version": "0.10.0",
"private": true,
"packageManager": "pnpm@7.5.2",
"packageManager": "pnpm@8.10.2",
"description": "Provides a custom d3 bundle",
"repository": "git@github.com:IPWright83/chart-io.git",
"author": "Ian Wright - IPWright83",
"main": "index.ts",
"types": "index.ts",
"scripts": {
"clean": "rm -rf node_modules"
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist && rm -rf coverage"
},
"np": {
"publish": false,
Expand Down
4 changes: 2 additions & 2 deletions packages/detection/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@chart-io/detection",
"version": "0.8.0",
"private": true,
"packageManager": "pnpm@7.26.2",
"packageManager": "pnpm@8.10.2",
"description": "Provides data type detection utilities for @chart-io",
"repository": "git@github.com:IPWright83/chart-io.git",
"author": "\"Ian Wright\" <\"ipwright83+dev@gmail.com\">",
Expand All @@ -14,7 +14,7 @@
"build": "tsc --noEmit",
"test": "jest --config jest.config.js",
"test:coverage": "jest --config jest.config.js --coverage",
"clean": "rm -rf node_modules",
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist && rm -rf coverage",
"lint": "eslint src",
"types": "tsc --noEmit",
"publish": ""
Expand Down
Loading
Loading