Skip to content

Commit

Permalink
Merge pull request #2932 from carbon-design-system/2929-upgrade-carbon
Browse files Browse the repository at this point in the history
2929 upgrade carbon
  • Loading branch information
kodiakhq[bot] authored Nov 11, 2021
2 parents 52dbcbf + 901434c commit 143971a
Show file tree
Hide file tree
Showing 100 changed files with 4,828 additions and 6,495 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/test-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,15 @@ jobs:
run: |
cd packages/react
yarn build
mkdir -p dist
cp -rf package.json umd scss lib es css ./dist
- name: Archive build artifacts
if: ${{ success() }} && steps.changes.outputs.react == 'true'
uses: actions/upload-artifact@v2
with:
name: dist
path: packages/react
path: packages/react/dist

create-test-app:
name: Create test app and build
Expand Down Expand Up @@ -85,6 +87,7 @@ jobs:
if: steps.changes.outputs.react == 'true'
run: |
cd dist
yarn install --frozen-lockfile --production
yarn link
cd ../test-app
yarn link carbon-addons-iot-react
Expand Down
127 changes: 127 additions & 0 deletions packages/react/.storybook/__snapshots__/Welcome.story.storyshot
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 0 - Overview/Get
</svg>
<div
className="bx--accordion__title"
dir="auto"
>
Exports table
</div>
Expand Down Expand Up @@ -966,6 +967,23 @@ exports[`Storybook Snapshot tests and console checks Storyshots 0 - Overview/Get
FileUploaderItem
</div>
</div>
<div
className="bx--structured-list-row"
role="row"
>
<div
className="bx--structured-list-td"
role="cell"
>
FilterableMultiSelect
</div>
<div
className="bx--structured-list-td"
role="cell"
>
FilterableMultiSelect
</div>
</div>
<div
className="bx--structured-list-row"
role="row"
Expand Down Expand Up @@ -1238,6 +1256,21 @@ exports[`Storybook Snapshot tests and console checks Storyshots 0 - Overview/Get
MultiSelect
</div>
</div>
<div
className="bx--structured-list-row"
role="row"
>
<div
className="bx--structured-list-td"
role="cell"
>
ActionableNotification
</div>
<div
className="bx--structured-list-td"
role="cell"
/>
</div>
<div
className="bx--structured-list-row"
role="row"
Expand Down Expand Up @@ -1425,6 +1458,40 @@ exports[`Storybook Snapshot tests and console checks Storyshots 0 - Overview/Get
PaginationNav
</div>
</div>
<div
className="bx--structured-list-row"
role="row"
>
<div
className="bx--structured-list-td"
role="cell"
>
ControlledPasswordInput
</div>
<div
className="bx--structured-list-td"
role="cell"
>
ControlledPasswordInput
</div>
</div>
<div
className="bx--structured-list-row"
role="row"
>
<div
className="bx--structured-list-td"
role="cell"
>
PasswordInput
</div>
<div
className="bx--structured-list-td"
role="cell"
>
PasswordInput
</div>
</div>
<div
className="bx--structured-list-row"
role="row"
Expand Down Expand Up @@ -3452,6 +3519,66 @@ exports[`Storybook Snapshot tests and console checks Storyshots 0 - Overview/Get
role="cell"
/>
</div>
<div
className="bx--structured-list-row"
role="row"
>
<div
className="bx--structured-list-td"
role="cell"
>
unstable_usePrefix
</div>
<div
className="bx--structured-list-td"
role="cell"
/>
</div>
<div
className="bx--structured-list-row"
role="row"
>
<div
className="bx--structured-list-td"
role="cell"
>
unstable_HStack
</div>
<div
className="bx--structured-list-td"
role="cell"
/>
</div>
<div
className="bx--structured-list-row"
role="row"
>
<div
className="bx--structured-list-td"
role="cell"
>
unstable_Stack
</div>
<div
className="bx--structured-list-td"
role="cell"
/>
</div>
<div
className="bx--structured-list-row"
role="row"
>
<div
className="bx--structured-list-td"
role="cell"
>
unstable_VStack
</div>
<div
className="bx--structured-list-td"
role="cell"
/>
</div>
<div
className="bx--structured-list-row"
role="row"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/react/cypress/integration/codesandbox.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ describe('CodeSandbox', () => {
it(
'should build and load',
{
defaultCommandTimeout: 60000,
defaultCommandTimeout: 120000,
},
() => {
// load sandbox
Expand Down
18 changes: 9 additions & 9 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,16 +169,16 @@
"@babel/runtime": "^7.10.2",
"@carbon/charts": "0.50.4",
"@carbon/charts-react": "0.50.4",
"@carbon/colors": "10.28.0",
"@carbon/icons-react": "10.35.0",
"@carbon/layout": "10.27.0",
"@carbon/motion": "10.20.0",
"@carbon/pictograms-react": "11.13.0",
"@carbon/colors": "10.34.0",
"@carbon/icons-react": "10.42.0",
"@carbon/layout": "10.34.0",
"@carbon/motion": "10.26.0",
"@carbon/pictograms-react": "11.20.0",
"@carbon/telemetry": "^0.0.0-alpha.6",
"@carbon/themes": "10.38.0",
"@carbon/themes": "10.46.0",
"@monaco-editor/react": "^3.6.2",
"carbon-components": "10.39.0",
"carbon-components-react": "7.39.0",
"carbon-components": "10.47.1",
"carbon-components-react": "7.47.2",
"carbon-icons": "^7.0.7",
"classnames": "^2.2.5",
"core-js": "3.6.5",
Expand Down Expand Up @@ -331,7 +331,7 @@
"rollup-plugin-filesize": "^9.1.1",
"rollup-plugin-postcss": "^4.0.0",
"rollup-plugin-uglify": "^6.0.4",
"sass": "^1.34.0",
"sass": "^1.42.1",
"storybook-addon-rtl": "^0.2.2",
"style-loader": "^0.23.1",
"stylelint": "^10.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/A
</svg>
<div
className="bx--accordion__title"
dir="auto"
>
A section without deferred content rendering
</div>
Expand Down Expand Up @@ -88,6 +89,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/A
</svg>
<div
className="bx--accordion__title"
dir="auto"
>
A section with deferred content rendering
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/AddCard/AddCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const AddCard = ({ onClick, title, className, testId }) => (
<ClickableTile
data-testid={testId}
className={classnames(`${iotPrefix}-add-card`, className)}
handleClick={onClick}
onClick={onClick}
>
<p className={`${iotPrefix}-addcard-title`}>{title}</p>
<Add20 fill={g10.icon01} description={title} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,13 +256,13 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/B
className="bx--loading__background"
cx="50%"
cy="50%"
r="42"
r="44"
/>
<circle
className="bx--loading__stroke"
cx="50%"
cy="50%"
r="42"
r="44"
/>
</svg>
</div>
Expand Down Expand Up @@ -312,13 +312,13 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/B
className="bx--loading__background"
cx="50%"
cy="50%"
r="42"
r="44"
/>
<circle
className="bx--loading__stroke"
cx="50%"
cy="50%"
r="42"
r="44"
/>
</svg>
</div>
Expand Down
Loading

0 comments on commit 143971a

Please sign in to comment.