Skip to content

Commit 0fe3524

Browse files
Merge release/2.0.0-rc into main branch (#931)
* add Spacing stories to foundations (#914) * Improve Drawer breakpoints on tablets (#921) * Storybook 7 upgrade (#911) * move btn-focus-outline--dark-bg to buttons styles (#917) * add TableFoot, update TableCell hover, and allow stickyRowBottom (#916) * bump node version max to 19 (#926) * remove unused react-scripts (#928)
1 parent 75eda19 commit 0fe3524

File tree

77 files changed

+24406
-25787
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+24406
-25787
lines changed

.babelrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
"plugins": [
77
"@babel/plugin-transform-runtime",
88
"@babel/plugin-proposal-object-rest-spread",
9+
["@babel/plugin-proposal-private-property-in-object", { "loose": true }],
10+
["@babel/plugin-proposal-private-methods", { "loose": true }],
911
["module-resolver", {
1012
"alias": {
1113
"src": "./src",
@@ -18,6 +20,9 @@
1820
"plugins": [
1921
[
2022
"@babel/plugin-proposal-class-properties",
23+
{
24+
"loose": true
25+
}
2126
],
2227
[
2328
"transform-react-remove-prop-types",
@@ -31,6 +36,9 @@
3136
"plugins": [
3237
[
3338
"@babel/plugin-proposal-class-properties",
39+
{
40+
"loose": true
41+
}
3442
]
3543
]
3644
}

.github/workflows/chromatic.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
- uses: actions/checkout@v2
2020
with:
2121
fetch-depth: 0 # 👈 Required to retrieve git history
22-
- uses: actions/setup-node@v1
22+
- uses: actions/setup-node@v3
2323
with:
24-
node-version: '14.17.4'
24+
node-version-file: '.node-version'
2525
- run: npm config set "@fortawesome:registry" https://npm.fontawesome.com/ &&
2626
npm config set "//npm.fontawesome.com/:_authToken" $FONTAWESOME_NPM_AUTH_TOKEN
2727
- run: yarn

.github/workflows/create-new-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
1111
steps:
1212
- uses: actions/checkout@v2
13-
- uses: actions/setup-node@v1
13+
- uses: actions/setup-node@v3
1414
with:
15-
node-version: '14.17.4'
15+
node-version-file: '.node-version'
1616
- run: npm config set "@fortawesome:registry" https://npm.fontawesome.com/ &&
1717
npm config set "//npm.fontawesome.com/:_authToken" $FONTAWESOME_NPM_AUTH_TOKEN
1818
- run: yarn install

.github/workflows/gh-pages-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
- name: Checkout branch
1414
uses: actions/checkout@v2
1515
- name: Setup node
16-
uses: actions/setup-node@v1
16+
uses: actions/setup-node@v3
1717
with:
18-
node-version: '14.17.4'
18+
node-version-file: '.node-version'
1919

2020
- name: Configure npm
2121
run: npm config set "@fortawesome:registry" https://npm.fontawesome.com/ &&

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
1010
steps:
1111
- uses: actions/checkout@v2
12-
- uses: actions/setup-node@v1
12+
- uses: actions/setup-node@v3
1313
with:
14-
node-version: '14.17.4'
14+
node-version-file: '.node-version'
1515
- run: npm config set "@fortawesome:registry" https://npm.fontawesome.com/ &&
1616
npm config set "//npm.fontawesome.com/:_authToken" $FONTAWESOME_NPM_AUTH_TOKEN
1717
- run: yarn

.github/workflows/prepare-hotfix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
- uses: actions/checkout@v2
1616
with:
1717
fetch-depth: 0
18-
- uses: actions/setup-node@v1
18+
- uses: actions/setup-node@v3
1919
with:
20-
node-version: '14.17.4'
20+
node-version-file: '.node-version'
2121

2222
- name: Create hotfix branch
2323
run: git checkout -b hotfix/${{ github.event.inputs.version }}

.github/workflows/prepare-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
- uses: actions/checkout@v2
1616
with:
1717
fetch-depth: 0
18-
- uses: actions/setup-node@v1
18+
- uses: actions/setup-node@v3
1919
with:
20-
node-version: '14.17.4'
20+
node-version-file: '.node-version'
2121

2222
- name: Create release branch
2323
run: git checkout -b release/${{ github.event.inputs.version }}

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
1010
steps:
1111
- uses: actions/checkout@v2
12-
- uses: actions/setup-node@v1
12+
- uses: actions/setup-node@v3
1313
with:
14-
node-version: '14.17.4'
14+
node-version-file: '.node-version'
1515
- run: npm config set "@fortawesome:registry" https://npm.fontawesome.com/ &&
1616
npm config set "//npm.fontawesome.com/:_authToken" $FONTAWESOME_NPM_AUTH_TOKEN
1717
- run: yarn

.node-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
16.20.0

.storybook/main.js

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,40 @@
1-
module.exports = {
1+
const config = {
22
addons: [
33
{
44
name: '@storybook/addon-docs',
5-
options: { mdxBabelOptions: { babelrc: true, configFile: true } },
5+
options: {
6+
jsxOptions: {
7+
babelrc: true,
8+
configFile: true
9+
}
10+
}
611
},
712
'@storybook/addon-a11y',
8-
'@storybook/addon-actions/register',
9-
'@storybook/addon-knobs/register',
10-
'@storybook/addon-links/register',
11-
'@storybook/addon-storysource/register'
13+
'@storybook/addon-actions',
14+
'@storybook/addon-controls',
15+
'@storybook/addon-links',
16+
'@storybook/addon-knobs',
17+
'@storybook/addon-storysource',
18+
'@storybook/addon-mdx-gfm'
1219
],
20+
docs: {
21+
autodocs: true,
22+
defaultName: 'Docs',
23+
},
1324
stories: [
1425
'../stories/Intro.stories.mdx',
1526
'../src/**/*.stories.@(js|mdx)',
1627
'../src/**/*.stories.js[x]',
1728
'../stories/**/*.stories.mdx',
1829
'../stories/**/*.stories.js[x]'
19-
]
30+
],
31+
features: {
32+
storyStoreV7: false,
33+
},
34+
framework: {
35+
name: '@storybook/react-webpack5',
36+
options: { fastRefresh: true },
37+
},
2038
};
39+
40+
export default config;

0 commit comments

Comments
 (0)