Merge branch 'main' into new-icons-metadata-Jan-2023

carbon-design-system · Jan 25, 2023 · cb95506 · cb95506
2 parents f6f2a6d + 1d416ab
commit cb95506
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 33 deletions.
diff --git a/.github/workflows/deploy-react-storybook.yml b/.github/workflows/deploy-react-storybook.yml
@@ -1,4 +1,4 @@
-name: Deploy React storybook to IBM Cloud
+name: Deploy React storybook to GitHub Pages
 
 on:
   workflow_dispatch:
@@ -37,29 +37,10 @@ jobs:
         run: yarn install --immutable --immutable-cache
       - name: Build project
         run: yarn build
-      - name: Install ibmcloud CLI
-        run: curl -fsSL https://clis.cloud.ibm.com/install/osx | sh
-      - name: Login to IBM Cloud
-        env:
-          CLOUD_API_KEY: ${{ secrets.CLOUD_API_KEY}}
-        run: |
-          ibmcloud login \
-            -a 'https://cloud.ibm.com' \
-            --apikey "$CLOUD_API_KEY" \
-            -r 'us-south'
-          ibmcloud target -o 'carbon-design-system' -s 'production'
-      - name: Install IBM Cloud plugins
-        run: |
-          ibmcloud cf install
-          ibmcloud cf add-plugin-repo CF-Community https://plugins.cloudfoundry.org
-          ibmcloud cf install-plugin blue-green-deploy -f -r CF-Community
-      - name: Deploy React storybook
+      - name: Build React storybook
         run: |
           cd packages/react
           yarn build-storybook
-          ibmcloud cf blue-green-deploy carbon-storybook \
-            -f manifest.yml \
-            --delete-old-apps
       - name: Setup Pages
         uses: actions/configure-pages@v2
       - name: Upload artifact

diff --git a/docs/release.md b/docs/release.md
@@ -424,3 +424,10 @@ name to ensure unpkg resolves to the latest v10 version:
 
 `https://unpkg.com/carbon-components@10/css/carbon-components.min.css`
 `https://unpkg.com/carbon-components@10/scripts/carbon-components.min.js`
+
+### When running the v10 storybook deploy manually, the v11 storybook is being published to v7-react.carbondesignsystem.com
+
+The workflow needs to be ran from the `v10` branch. Select `v10` from the
+dropdown when you run it.
+
+<img width="342" alt="image" src="https://user-images.githubusercontent.com/3360588/214062284-94065d87-5949-43a7-844b-0d1eb25aba16.png">
diff --git a/packages/pictograms-react/examples/storybook/yarn.lock b/packages/pictograms-react/examples/storybook/yarn.lock
@@ -7425,9 +7425,9 @@ typedarray@^0.0.6:
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 ua-parser-js@^0.7.18:
-  version "0.7.20"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz#7527178b82f6a62a0f243d1f94fd30e3e3c21098"
-  integrity sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw==
+  version "0.7.33"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532"
+  integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==
 
 uglify-js@3.4.x:
   version "3.4.10"

diff --git a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
@@ -2796,6 +2796,7 @@ Map {
         "type": "oneOf",
       },
       "titleText": Object {
+        "isRequired": true,
         "type": "node",
       },
       "translateWithId": Object {

diff --git a/packages/react/manifest.yml b/packages/react/manifest.yml
diff --git a/packages/react/src/components/Dropdown/Dropdown.js b/packages/react/src/components/Dropdown/Dropdown.js
@@ -391,7 +391,7 @@ Dropdown.propTypes = {
    * Provide the title text that will be read by a screen reader when
    * visiting this control
    */
-  titleText: PropTypes.node,
+  titleText: PropTypes.node.isRequired,
 
   /**
    * Callback function for translating ListBoxMenuIcon SVG title