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.

Sign up for GitHub

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

Jump to bottom

2929 upgrade carbon #2932

Merged
merged 47 commits into from
Nov 11, 2021
Merged

2929 upgrade carbon #2932

Show file tree
Hide file tree
Changes from 45 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
086c5a3
chore(repo): upgrade carbon to 10.40/7.40
kevinsperrine Oct 6, 2021
35f6caf
chore(repo): upgrade carbon to 10.41/7.41
kevinsperrine Oct 6, 2021
cea83c0
chore(repo): upgrade to carbon 10.42/7.42
kevinsperrine Oct 6, 2021
14c1a02
chore(repo): upgrade to carbon 10.43/7.43
kevinsperrine Oct 6, 2021
c5815b6
chore(repo): upgrade carbon to 10.44/7.44
kevinsperrine Oct 6, 2021
a462b92
fix(table): add Pagination size prop and pass to pagination
kevinsperrine Oct 6, 2021
8316efd
chore(repo): upgrade carbon to 10.45/7.45
kevinsperrine Oct 6, 2021
758cd9a
chore(repo): upgrade sass
kevinsperrine Oct 12, 2021
d0fb50f
Merge branch 'next' into 2929-upgrade-carbon
kevinsperrine Oct 22, 2021
cbd7e52
chore(repo): upgrade to carbon 7.46/10.46
kevinsperrine Oct 22, 2021
d50ad49
Merge branch 'next' into 2929-upgrade-carbon
kevinsperrine Oct 29, 2021
874b506
chore(repo): upgrade to carbon 10.47/7.47
kevinsperrine Oct 29, 2021
95904f6
chore(table): update snapshot
kevinsperrine Oct 29, 2021
71dbe5d
Merge branch 'next' into 2929-upgrade-carbon
kevinsperrine Nov 3, 2021
6f35f28
chore(repo): increase codesandbox timeout
kevinsperrine Nov 3, 2021
19f744b
chore(repo): upgrade carbon to 10.47.1/7.47.2
kevinsperrine Nov 8, 2021
8922b4b
Merge branch 'next' into 2929-upgrade-carbon
kevinsperrine Nov 8, 2021
ae22601
chore(list): remove stopPropagation check and add prefix for `bx`
kevinsperrine Nov 8, 2021
e9633b8
chore(multselect-filterable): update to FilterableMultiSelect instead
kevinsperrine Nov 8, 2021
50bd6a1
chore(repo): export PasswordInput ControlledPasswordInput, clear output
kevinsperrine Nov 8, 2021
4425a96
chore(repo): iconDescription is not needed, removing default values
kevinsperrine Nov 8, 2021
68dd152
chore(repo): hide output about deprecated wrapperClassName in tests
kevinsperrine Nov 8, 2021
b4ecc06
fix(modal): update close button label
kevinsperrine Nov 8, 2021
c9a65da
feat(simple-pagination): add sizes and set lg to default
kevinsperrine Nov 8, 2021
0a247dd
fix(suite-header): proptype for close button label
kevinsperrine Nov 8, 2021
67fca7d
chore(repo): update snapshot
kevinsperrine Nov 8, 2021
1a79dcd
chore(repo): update timepicker props, suiteheader test
kevinsperrine Nov 9, 2021
de3df08
Merge branch 'next' into 2929-upgrade-carbon
kevinsperrine Nov 9, 2021
1580cfa
Merge branch 'next' into 2929-upgrade-carbon
kevinsperrine Nov 9, 2021
ff79c4a
chore(repo): update snapshots
kevinsperrine Nov 9, 2021
09fb2fb
fix(simple-pagination): apply size prop correctly
kevinsperrine Nov 9, 2021
c213a3f
Merge branch 'next' into 2929-upgrade-carbon
kevinsperrine Nov 9, 2021
8aa6b66
fix(page-title-bar): style fixes
kevinsperrine Nov 9, 2021
bef4a1c
Merge branch 'next' into 2929-upgrade-carbon
kevinsperrine Nov 9, 2021
921c03e
Merge branch '3012-page-title-bar-top-margin' into 2929-upgrade-carbon
kevinsperrine Nov 9, 2021
fef4831
fix(page-title-bar): adjust tests back after css fixes
kevinsperrine Nov 9, 2021
42f7486
fix(repo): force re-install to pickup new versions after linking
kevinsperrine Nov 10, 2021
f80eab4
fix(repo): attempt getting link to pickup correct sub packages
kevinsperrine Nov 10, 2021
f657f03
fix(repo): don't link in test-app..just a hunch
kevinsperrine Nov 10, 2021
ea596b8
fix(repo): another attempt at linking correct files
kevinsperrine Nov 10, 2021
93aa72b
Merge branch 'next' into 2929-upgrade-carbon
kevinsperrine Nov 10, 2021
74403d5
fix(menu-button): make adjustments for portal
kevinsperrine Nov 10, 2021
70d37a8
Merge branch 'next' into 2929-upgrade-carbon
kevinsperrine Nov 11, 2021
553ab9d
fix(menu-button): fix rtl positioning
kevinsperrine Nov 11, 2021
5d7cff3
fix(dropdown): add custom dropdown hook to fix titles
kevinsperrine Nov 11, 2021
b9757e3
Merge branch 'next' into 2929-upgrade-carbon
kevinsperrine Nov 11, 2021
901434c
fix(repo): update table vrt images
kevinsperrine Nov 11, 2021
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
5 changes: 4 additions & 1 deletion .github/workflows/test-app.yml
View file
Open in desktop
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
View file
Open in desktop
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
Binary file modified .../baseline/components/CardCodeEditor/CardCodeEditor.test.e2ex-CardCodeEditor.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ess-visual-screenshots/baseline/components/Table/Table.test.e2ex-snapshot-1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ess-visual-screenshots/baseline/components/Table/Table.test.e2ex-snapshot-3.png
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions packages/react/src/components/Accordion/__snapshots__/AccordionItemDefer.story.storyshot
View file
Open in desktop
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
View file
Open in desktop
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}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

handleClick is deprecated in favor of onClick in ClickableTiles. handleClick still works. It just throws a warning. Changing in our code, but consumers will still see the warning.

onClick={onClick}
>
<p className={`${iotPrefix}-addcard-title`}>{title}</p>
<Add20 fill={g10.icon01} description={title} />
Expand Down
8 changes: 4 additions & 4 deletions packages/react/src/components/Button/__snapshots__/Button.story.storyshot
View file
Open in desktop
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