Skip to content

Commit ab2db51

Browse files
Merge release/2.0.2 into main branch (#954)
* Move deploy to GitHub actions (#950) * add MoneyInput component (#951) * add IconButton (#953)
1 parent 1f6a360 commit ab2db51

File tree

17 files changed

+843
-137
lines changed

17 files changed

+843
-137
lines changed
Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,46 @@
11
name: Deploy to github pages
22
on:
3+
workflow_dispatch:
34
push:
45
branches:
56
- main
7+
8+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
9+
permissions:
10+
contents: read
11+
pages: write
12+
id-token: write
13+
614
jobs:
715
gh-pages-deploy:
816
name: Deploying to gh-pages
917
runs-on: ubuntu-latest
10-
env:
11-
FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
1218
steps:
1319
- name: Checkout branch
14-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
21+
1522
- name: Setup node
1623
uses: actions/setup-node@v3
1724
with:
1825
node-version-file: '.node-version'
26+
cache: 'yarn'
1927

2028
- name: Configure npm
2129
run: npm config set "@fortawesome:registry" https://npm.fontawesome.com/ &&
22-
npm config set "//npm.fontawesome.com/:_authToken" $FONTAWESOME_NPM_AUTH_TOKEN
30+
npm config set "//npm.fontawesome.com/:_authToken" ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
2331

2432
- name: Install dependencies
2533
run: yarn install
2634

27-
- name: Run deploy script
28-
run: yarn deploy-storybook -- --ci
29-
env:
30-
GH_TOKEN: ${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}
35+
- name: Build
36+
run: yarn build-storybook
37+
38+
- name: Upload
39+
uses: actions/[email protected]
40+
with:
41+
path: 'storybook-static'
42+
43+
- name: Deploy
44+
uses: actions/deploy-pages@v1
45+
with:
46+
token: ${{ github.token }}

.storybook/main.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const config = {
1111
},
1212
'@storybook/addon-a11y',
1313
'@storybook/addon-actions',
14+
'@storybook/addon-backgrounds',
1415
'@storybook/addon-controls',
1516
'@storybook/addon-links',
1617
'@storybook/addon-knobs',

.storybook/preview.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,28 @@
1+
import colors from '../src/Styles/colors/palette';
2+
13
const preview = {
24
parameters: {
5+
backgrounds: {
6+
default: '$ux-white',
7+
values: [
8+
{
9+
name: '$ux-white',
10+
value: colors.UX_WHITE,
11+
},
12+
{
13+
name: '$ux-cream',
14+
value: colors.UX_CREAM,
15+
},
16+
{
17+
name: '$ux-emerald-600',
18+
value: colors.UX_EMERALD_600,
19+
},
20+
{
21+
name: '$ux-neutral-800',
22+
value: colors.UX_NEUTRAL_800,
23+
}
24+
],
25+
},
326
options: {
427
storySort: {
528
order: ['Foundations', 'Components'],

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
22
"name": "@user-interviews/ui-design-system",
3-
"version": "2.0.1",
3+
"version": "2.0.2",
44
"dependencies": {
55
"react-bootstrap": "^2.5.0",
6+
"react-currency-input-field": "^3.6.10",
67
"react-loading-skeleton": "^3.1.0",
78
"react-router-dom": "^5.2.0",
89
"react-select": "^5.0.0",
@@ -15,7 +16,6 @@
1516
"build-storybook": "storybook build -s public",
1617
"build-storybook-docs": "storybook build -s public --docs",
1718
"chromatic": "npx chromatic",
18-
"deploy-storybook": "storybook-to-ghpages",
1919
"lint": "eslint . --ext .js,.jsx",
2020
"prepublishOnly": "yarn build",
2121
"rs:link": "bin/link-rs",
@@ -60,6 +60,7 @@
6060
"@babel/cli": "^7.8.4",
6161
"@babel/core": "^7.8.4",
6262
"@babel/plugin-proposal-object-rest-spread": "^7.8.3",
63+
"@babel/plugin-proposal-private-property-in-object": "^7.21.0",
6364
"@babel/plugin-transform-runtime": "^7.12.1",
6465
"@babel/preset-env": "^7.8.4",
6566
"@babel/runtime": "^7.12.5",
@@ -71,6 +72,7 @@
7172
"@popperjs/core": "^2.5.3",
7273
"@storybook/addon-a11y": "7.0.8",
7374
"@storybook/addon-actions": "7.0.8",
75+
"@storybook/addon-backgrounds": "7.0.8",
7476
"@storybook/addon-controls": "^7.0.8",
7577
"@storybook/addon-docs": "7.0.8",
7678
"@storybook/addon-jest": "7.0.8",
@@ -82,7 +84,6 @@
8284
"@storybook/addons": "7.0.8",
8385
"@storybook/react": "7.0.8",
8486
"@storybook/react-webpack5": "7.0.8",
85-
"@storybook/storybook-deployer": "^2.8.16",
8687
"@testing-library/jest-dom": "^5.15.0",
8788
"@testing-library/react": "^12.1.2",
8889
"@testing-library/react-hooks": "^3.2.1",

0 commit comments

Comments
 (0)