From 74017ff79ccadad0ef72d416a249ad3664a9eb78 Mon Sep 17 00:00:00 2001 From: ibmdotcom-bot Date: Tue, 27 Apr 2021 21:35:11 +0000 Subject: [PATCH 1/3] chore(release): publish - @carbon/ibmdotcom-react@1.18.1 - @carbon/ibmdotcom-services-store@1.18.1 - @carbon/ibmdotcom-services@1.18.1 - @carbon/ibmdotcom-styles@1.18.1 - @carbon/ibmdotcom-utilities@1.18.1 - @carbon/ibmdotcom-web-components@1.3.1 --- packages/react/CHANGELOG.md | 8 ++++++++ packages/react/package.json | 8 ++++---- packages/services-store/CHANGELOG.md | 8 ++++++++ packages/services-store/package.json | 6 +++--- packages/services/CHANGELOG.md | 8 ++++++++ packages/services/package.json | 4 ++-- packages/styles/CHANGELOG.md | 8 ++++++++ packages/styles/package.json | 2 +- packages/utilities/CHANGELOG.md | 8 ++++++++ packages/utilities/package.json | 2 +- packages/web-components/CHANGELOG.md | 8 ++++++++ packages/web-components/package.json | 10 +++++----- 12 files changed, 64 insertions(+), 16 deletions(-) diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index 953ccb598a4..8d421c7e7ee 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.18.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-react@1.18.1-rc.1...@carbon/ibmdotcom-react@1.18.1) (2021-04-27) + +**Note:** Version bump only for package @carbon/ibmdotcom-react + + + + + ## [1.18.1-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-react@1.18.1-rc.0...@carbon/ibmdotcom-react@1.18.1-rc.1) (2021-04-26) **Note:** Version bump only for package @carbon/ibmdotcom-react diff --git a/packages/react/package.json b/packages/react/package.json index 240bd1460ee..221a3c1e79b 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/ibmdotcom-react", "description": "Carbon for IBM.com React Components", - "version": "1.18.1-rc.1", + "version": "1.18.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -58,9 +58,9 @@ }, "dependencies": { "@babel/runtime": "^7.5.5", - "@carbon/ibmdotcom-services": "1.18.1-rc.1", - "@carbon/ibmdotcom-styles": "1.18.1-rc.0", - "@carbon/ibmdotcom-utilities": "1.18.1-rc.0", + "@carbon/ibmdotcom-services": "1.18.1", + "@carbon/ibmdotcom-styles": "1.18.1", + "@carbon/ibmdotcom-utilities": "1.18.1", "@carbon/telemetry": "^0.0.0-alpha.6", "autosuggest-highlight": "^3.1.1", "carbon-components": "10.32.1", diff --git a/packages/services-store/CHANGELOG.md b/packages/services-store/CHANGELOG.md index 6c37b9dd9f7..9629980e43a 100644 --- a/packages/services-store/CHANGELOG.md +++ b/packages/services-store/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.18.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/tree/master/packages/services-store/compare/@carbon/ibmdotcom-services-store@1.18.1-rc.2...@carbon/ibmdotcom-services-store@1.18.1) (2021-04-27) + +**Note:** Version bump only for package @carbon/ibmdotcom-services-store + + + + + ## [1.18.1-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/tree/master/packages/services-store/compare/@carbon/ibmdotcom-services-store@1.18.1-rc.1...@carbon/ibmdotcom-services-store@1.18.1-rc.2) (2021-04-27) diff --git a/packages/services-store/package.json b/packages/services-store/package.json index b74a0308e2d..7c643a62030 100644 --- a/packages/services-store/package.json +++ b/packages/services-store/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/ibmdotcom-services-store", "private": true, - "version": "1.18.1-rc.2", + "version": "1.18.1", "description": "Redux store for Carbon for IBM.com Services", "license": "Apache-2.0", "main": "lib/store.js", @@ -39,8 +39,8 @@ "prettier": "^1.19.0" }, "dependencies": { - "@carbon/ibmdotcom-services": "1.18.1-rc.1", - "@carbon/ibmdotcom-utilities": "1.18.1-rc.0", + "@carbon/ibmdotcom-services": "1.18.1", + "@carbon/ibmdotcom-utilities": "1.18.1", "carbon-components": "10.32.1", "redux": "^4.0.0", "redux-logger": "^3.0.0", diff --git a/packages/services/CHANGELOG.md b/packages/services/CHANGELOG.md index 7255c0080e9..7e5f8f9e6a6 100644 --- a/packages/services/CHANGELOG.md +++ b/packages/services/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.18.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-services@1.18.1-rc.1...@carbon/ibmdotcom-services@1.18.1) (2021-04-27) + +**Note:** Version bump only for package @carbon/ibmdotcom-services + + + + + ## [1.18.1-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-services@1.18.1-rc.0...@carbon/ibmdotcom-services@1.18.1-rc.1) (2021-04-26) diff --git a/packages/services/package.json b/packages/services/package.json index 843d879c9c1..fe7684c3ff4 100644 --- a/packages/services/package.json +++ b/packages/services/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/ibmdotcom-services", "description": "Carbon for IBM.com Services", - "version": "1.18.1-rc.1", + "version": "1.18.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -44,7 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.5.0", - "@carbon/ibmdotcom-utilities": "1.18.1-rc.0", + "@carbon/ibmdotcom-utilities": "1.18.1", "@carbon/telemetry": "0.0.0-alpha.6", "axios": "^0.21.1", "window-or-global": "^1.0.1" diff --git a/packages/styles/CHANGELOG.md b/packages/styles/CHANGELOG.md index 97731f25fd3..33dd966bbbf 100644 --- a/packages/styles/CHANGELOG.md +++ b/packages/styles/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.18.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-styles@1.18.1-rc.0...@carbon/ibmdotcom-styles@1.18.1) (2021-04-27) + +**Note:** Version bump only for package @carbon/ibmdotcom-styles + + + + + ## [1.18.1-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-styles@1.18.0...@carbon/ibmdotcom-styles@1.18.1-rc.0) (2021-04-22) diff --git a/packages/styles/package.json b/packages/styles/package.json index 1c95b95213a..beec006a4b8 100644 --- a/packages/styles/package.json +++ b/packages/styles/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/ibmdotcom-styles", "description": "Carbon for IBM.com Styles", - "version": "1.18.1-rc.0", + "version": "1.18.1", "license": "Apache-2.0", "main": "dist/ibm-dotcom-styles.min.css", "module": "src/scss", diff --git a/packages/utilities/CHANGELOG.md b/packages/utilities/CHANGELOG.md index a96001057d4..7e8728ce896 100644 --- a/packages/utilities/CHANGELOG.md +++ b/packages/utilities/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.18.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-utilities@1.18.1-rc.0...@carbon/ibmdotcom-utilities@1.18.1) (2021-04-27) + +**Note:** Version bump only for package @carbon/ibmdotcom-utilities + + + + + ## [1.18.1-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-utilities@1.18.0...@carbon/ibmdotcom-utilities@1.18.1-rc.0) (2021-04-22) diff --git a/packages/utilities/package.json b/packages/utilities/package.json index 035a1200b8b..fcdb3f0e707 100644 --- a/packages/utilities/package.json +++ b/packages/utilities/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/ibmdotcom-utilities", "description": "Carbon for IBM.com Utilities", - "version": "1.18.1-rc.0", + "version": "1.18.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", diff --git a/packages/web-components/CHANGELOG.md b/packages/web-components/CHANGELOG.md index 8d86a3f4e68..19954f7bcdc 100644 --- a/packages/web-components/CHANGELOG.md +++ b/packages/web-components/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.3.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/tree/master/packages/web-components/compare/@carbon/ibmdotcom-web-components@1.3.1-rc.2...@carbon/ibmdotcom-web-components@1.3.1) (2021-04-27) + +**Note:** Version bump only for package @carbon/ibmdotcom-web-components + + + + + ## [1.3.1-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/tree/master/packages/web-components/compare/@carbon/ibmdotcom-web-components@1.3.1-rc.1...@carbon/ibmdotcom-web-components@1.3.1-rc.2) (2021-04-27) **Note:** Version bump only for package @carbon/ibmdotcom-web-components diff --git a/packages/web-components/package.json b/packages/web-components/package.json index fe108358097..a24e3e34b48 100644 --- a/packages/web-components/package.json +++ b/packages/web-components/package.json @@ -1,6 +1,6 @@ { "name": "@carbon/ibmdotcom-web-components", - "version": "1.3.1-rc.2", + "version": "1.3.1", "description": "Carbon for IBM.com Web Components", "license": "Apache-2.0", "exports": { @@ -76,9 +76,9 @@ "prettier": "^1.19.0" }, "dependencies": { - "@carbon/ibmdotcom-services": "1.18.1-rc.1", - "@carbon/ibmdotcom-styles": "1.18.1-rc.0", - "@carbon/ibmdotcom-utilities": "1.18.1-rc.0", + "@carbon/ibmdotcom-services": "1.18.1", + "@carbon/ibmdotcom-styles": "1.18.1", + "@carbon/ibmdotcom-utilities": "1.18.1", "@carbon/layout": "10.22.0", "@carbon/telemetry": "0.0.0-alpha.6", "carbon-components": "10.32.1", @@ -113,7 +113,7 @@ "@babel/preset-react": "^7.0.0", "@babel/template": "^7.8.0", "@babel/traverse": "^7.8.0", - "@carbon/ibmdotcom-services-store": "1.18.1-rc.2", + "@carbon/ibmdotcom-services-store": "1.18.1", "@carbon/icon-helpers": "10.15.0", "@carbon/icons": "10.29.0", "@open-wc/semantic-dom-diff": "^0.15.0", From 37a8410eb8a9d94d191f9dc264f698681650fa28 Mon Sep 17 00:00:00 2001 From: kennylam Date: Tue, 27 Apr 2021 18:39:37 -0400 Subject: [PATCH 2/3] fix(masthead): L1 platform not showing in hamburger menu (#5905) ### Related Ticket(s) #5896 ### Description Current `L1` platform implementations in React and web components are inconsistent, and in React simply do not work. This makes both implementations consistent in their naming and data structures. Also fixes some styling inconsistencies in the web components version. ### Changelog **Changed** - `title` for L1 is now `platform` (same as `L0`) - update Storybook stories for React and web components - update web components masthead styles **Removed** - `title` and `titleUrl` from web components `L1` --- .../__snapshots__/storyshots.test.js.snap | 2110 +++++++++-------- .../src/components/CardGroup/CardGroup.js | 1 - .../__stories__/DotcomShell.stories.js | 1 + .../react/src/components/Masthead/Masthead.js | 15 +- .../src/components/Masthead/MastheadL1.js | 4 +- .../components/Masthead/README.stories.mdx | 6 +- .../Masthead/__stories__/Masthead.stories.js | 7 +- .../data/Masthead.stories.knobs.js | 4 + .../masthead/_masthead-leftnav.scss | 4 +- .../__stories__/dotcom-shell.stories.ts | 31 +- .../masthead/__stories__/README.stories.mdx | 6 +- .../masthead/__stories__/masthead.stories.ts | 31 +- .../components/masthead/masthead-composite.ts | 2 +- .../src/components/masthead/masthead.scss | 9 +- 14 files changed, 1166 insertions(+), 1065 deletions(-) diff --git a/packages/react/src/__tests__/__snapshots__/storyshots.test.js.snap b/packages/react/src/__tests__/__snapshots__/storyshots.test.js.snap index 74159d477dd..9398d6f43c6 100644 --- a/packages/react/src/__tests__/__snapshots__/storyshots.test.js.snap +++ b/packages/react/src/__tests__/__snapshots__/storyshots.test.js.snap @@ -58390,12 +58390,15 @@ exports[`Storyshots Components|Dotcom shell With L1 1`] = ` "url": "https://www.ibm.com/support/home/?lnk=msu_usen", }, ], - "title": "Stock Charts", - "titleLink": "https://example.com/", }, "placeHolderText": "Search all of IBM", + "platform": Object { + "name": "Stock Charts", + "url": "https://www.example.com", + }, "selectedMenuItem": "Lorem ipsum dolor sit amet", }, + "platform": undefined, }, }, "subcomponents": undefined, @@ -59084,12 +59087,15 @@ exports[`Storyshots Components|Dotcom shell With L1 1`] = ` "url": "https://www.ibm.com/support/home/?lnk=msu_usen", }, ], - "title": "Stock Charts", - "titleLink": "https://example.com/", }, "placeHolderText": "Search all of IBM", + "platform": Object { + "name": "Stock Charts", + "url": "https://www.example.com", + }, "selectedMenuItem": "Lorem ipsum dolor sit amet", }, + "platform": undefined, }, }, "subcomponents": undefined, @@ -59730,10 +59736,12 @@ exports[`Storyshots Components|Dotcom shell With L1 1`] = ` "url": "https://www.ibm.com/support/home/?lnk=msu_usen", }, ], - "title": "Stock Charts", - "titleLink": "https://example.com/", }, "placeHolderText": "Search all of IBM", + "platform": Object { + "name": "Stock Charts", + "url": "https://www.example.com", + }, "selectedMenuItem": "Lorem ipsum dolor sit amet", } } @@ -60372,12 +60380,15 @@ exports[`Storyshots Components|Dotcom shell With L1 1`] = ` "url": "https://www.ibm.com/support/home/?lnk=msu_usen", }, ], - "title": "Stock Charts", - "titleLink": "https://example.com/", } } placeHolderText="Search all of IBM" - platform={null} + platform={ + Object { + "name": "Stock Charts", + "url": "https://www.example.com", + } + } searchOpenOnload={false} selectedMenuItem="Lorem ipsum dolor sit amet" > @@ -60418,15 +60429,15 @@ exports[`Storyshots Components|Dotcom shell With L1 1`] = `