Merge branch 'main' into 6361--deprecate-tests

carbon-design-system · Jan 14, 2025 · dfc4211 · dfc4211
2 parents 3112e09 + 4e11b90
commit dfc4211
Show file tree

Hide file tree

Showing 33 changed files with 457 additions and 105 deletions.
diff --git a/config/babel-preset-ibm-cloud-cognitive/CHANGELOG.md b/config/babel-preset-ibm-cloud-cognitive/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.15.1](https://github.com/carbon-design-system/ibm-products/compare/babel-preset-ibm-cloud-cognitive@[email protected]) (2025-01-10)
+
+**Note:** Version bump only for package babel-preset-ibm-cloud-cognitive
+
+
+
+
+
+## [0.15.1-rc.0](https://github.com/carbon-design-system/ibm-products/compare/babel-preset-ibm-cloud-cognitive@[email protected]) (2025-01-09)
+
+**Note:** Version bump only for package babel-preset-ibm-cloud-cognitive
+
+
+
+
+
 # [0.15.0](https://github.com/carbon-design-system/ibm-products/compare/babel-preset-ibm-cloud-cognitive@[email protected]) (2025-01-08)
 
 **Note:** Version bump only for package babel-preset-ibm-cloud-cognitive

diff --git a/config/babel-preset-ibm-cloud-cognitive/package.json b/config/babel-preset-ibm-cloud-cognitive/package.json
@@ -1,7 +1,7 @@
 {
   "name": "babel-preset-ibm-cloud-cognitive",
   "private": true,
-  "version": "0.15.0",
+  "version": "0.15.1",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {

diff --git a/config/jest-config-ibm-cloud-cognitive/CHANGELOG.md b/config/jest-config-ibm-cloud-cognitive/CHANGELOG.md
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.16.1](https://github.com/carbon-design-system/ibm-products/compare/jest-config-ibm-cloud-cognitive@[email protected]) (2025-01-10)
+
+**Note:** Version bump only for package jest-config-ibm-cloud-cognitive
+
+
+
+
+
+## [1.16.1-rc.0](https://github.com/carbon-design-system/ibm-products/compare/jest-config-ibm-cloud-cognitive@[email protected]) (2025-01-09)
+
+
+### Bug Fixes
+
+* update accessibility-checker version ([#6525](https://github.com/carbon-design-system/ibm-products/issues/6525)) ([d8c7051](https://github.com/carbon-design-system/ibm-products/commit/d8c70518087e7e41fdf1aa45cbbf692389058d56))
+
+
+
+
+
 # [1.16.0](https://github.com/carbon-design-system/ibm-products/compare/jest-config-ibm-cloud-cognitive@[email protected]) (2025-01-08)
 
 **Note:** Version bump only for package jest-config-ibm-cloud-cognitive

diff --git a/config/jest-config-ibm-cloud-cognitive/index.js b/config/jest-config-ibm-cloud-cognitive/index.js
@@ -33,9 +33,9 @@ module.exports = {
   setupFiles: [require.resolve('./setup/setupFiles.js')],
   setupFilesAfterEnv: [require.resolve('./setup/setupFilesAfterEnv.js')],
   testMatch: [
-    '<rootDir>/**/__tests__/**/*.js?(x)',
-    '<rootDir>/**/*.(spec|test).js?(x)',
-    '<rootDir>/**/*-(spec|test).js?(x)',
+    '<rootDir>/**/__tests__/**/*.(js|jsx|ts|tsx)?(x)',
+    '<rootDir>/**/*.(spec|test).(js|jsx|ts|tsx)?(x)',
+    '<rootDir>/**/*-(spec|test).(js|jsx|ts|tsx)?(x)',
   ],
   transform: {
     '^.+\\.(mjs|cjs|js|jsx|ts|tsx)$': require.resolve(

diff --git a/config/jest-config-ibm-cloud-cognitive/package.json b/config/jest-config-ibm-cloud-cognitive/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jest-config-ibm-cloud-cognitive",
   "private": true,
-  "version": "1.16.0",
+  "version": "1.16.1",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {
@@ -39,7 +39,7 @@
     "accessibility-checker": "^3.1.78",
     "axe-core": "^4.8.3",
     "babel-jest": "^29.7.0",
-    "babel-preset-ibm-cloud-cognitive": "^0.15.0",
+    "babel-preset-ibm-cloud-cognitive": "^0.15.1",
     "chalk": "^4.1.2",
     "identity-obj-proxy": "^3.0.0",
     "jest-circus": "^29.7.0",

diff --git a/config/storybook-addon-carbon-theme/CHANGELOG.md b/config/storybook-addon-carbon-theme/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.6.1](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2025-01-10)
+
+**Note:** Version bump only for package @carbon/storybook-addon-theme
+
+
+
+
+
+## [2.6.1-rc.0](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2025-01-09)
+
+**Note:** Version bump only for package @carbon/storybook-addon-theme
+
+
+
+
+
 # [2.6.0](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2025-01-08)
 
 **Note:** Version bump only for package @carbon/storybook-addon-theme

diff --git a/config/storybook-addon-carbon-theme/package.json b/config/storybook-addon-carbon-theme/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/storybook-addon-theme",
   "description": "Carbon theme switcher for Storybook",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "license": "Apache-2.0",
   "main": "dist/react.js",
   "repository": {

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.33.1](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2025-01-10)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive-core
+
+
+
+
+
+## [2.33.1-rc.0](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2025-01-09)
+
+
+### Bug Fixes
+
+* update to Carbon 11 compatible versions to latest ([#6437](https://github.com/carbon-design-system/ibm-products/issues/6437)) ([48d5c34](https://github.com/carbon-design-system/ibm-products/commit/48d5c34dca79a4b00fc69391a513431fa21295ee))
+
+
+### Features
+
+* add utils section to storybook ([#6394](https://github.com/carbon-design-system/ibm-products/issues/6394)) ([711eb72](https://github.com/carbon-design-system/ibm-products/commit/711eb72ef00d1f1935fd0fcec9e0c0383dff53dc))
+
+
+
+
+
 # [2.33.0](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2025-01-08)
 
 **Note:** Version bump only for package @carbon/ibm-cloud-cognitive-core

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-cloud-cognitive-core",
   "private": true,
-  "version": "2.33.0",
+  "version": "2.33.1",
   "license": "Apache-2.0",
   "main": "scripts/build.js",
   "repository": {
@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "@carbon/grid": "^11.29.0",
-    "@carbon/ibm-products-styles": "^2.53.0",
+    "@carbon/ibm-products-styles": "^2.53.1",
     "@carbon/layout": "^11.28.0",
     "@carbon/motion": "^11.24.0",
     "@carbon/react": "^1.72.0",

diff --git a/packages/ibm-products-styles/CHANGELOG.md b/packages/ibm-products-styles/CHANGELOG.md
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.53.1](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2025-01-10)
+
+**Note:** Version bump only for package @carbon/ibm-products-styles
+
+
+
+
+
+## [2.53.1-rc.0](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2025-01-09)
+
+
+### Bug Fixes
+
+* **APIKeyModal:** improve screen reader announcement ([#6481](https://github.com/carbon-design-system/ibm-products/issues/6481)) ([bea9003](https://github.com/carbon-design-system/ibm-products/commit/bea9003e1c1dcf2f1c19ecaccd6a4096bc313d8d))
+* pageheader subtitle truncation visibility ([#6551](https://github.com/carbon-design-system/ibm-products/issues/6551)) ([26394dd](https://github.com/carbon-design-system/ibm-products/commit/26394dd2b740f19306e8fbbbd6c2195fc5a3bbed))
+* **pageHeader:** menu button overflow issue on small screens ([#6502](https://github.com/carbon-design-system/ibm-products/issues/6502)) ([0072e42](https://github.com/carbon-design-system/ibm-products/commit/0072e424fc1f25fbf58be67f7d4d792643f26c30))
+
+
+### Features
+
+* **BreadcrumbWithOverflow:** adopt overflowMenuV12 and floating ui ([#6411](https://github.com/carbon-design-system/ibm-products/issues/6411)) ([f716852](https://github.com/carbon-design-system/ibm-products/commit/f716852c979a0b9556e853fad7e7a7774b4c6579))
+* **sidepanel:** implement decorator prop ([#6511](https://github.com/carbon-design-system/ibm-products/issues/6511)) ([336a5b0](https://github.com/carbon-design-system/ibm-products/commit/336a5b0ad06051bd52080e5d7cd610feb56604c8))
+
+
+
+
+
 # [2.53.0](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2025-01-08)
 
 **Note:** Version bump only for package @carbon/ibm-products-styles

diff --git a/packages/ibm-products-styles/package.json b/packages/ibm-products-styles/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products-styles",
   "description": "Carbon for IBM Products styles",
-  "version": "2.53.0",
+  "version": "2.53.1",
   "license": "Apache-2.0",
   "installConfig": {
     "hoistingLimits": "none"
@@ -52,7 +52,7 @@
     "cross-env": "^7.0.3",
     "glob": "^10.3.10",
     "jest": "^29.7.0",
-    "jest-config-ibm-cloud-cognitive": "^1.16.0",
+    "jest-config-ibm-cloud-cognitive": "^1.16.1",
     "jest-environment-jsdom": "^29.7.0",
     "npm-check-updates": "^17.1.11",
     "npm-run-all": "^4.1.5",

diff --git a/...ges/ibm-products-styles/src/components/ConditionBuilder/styles/_conditionBuilderItem.scss b/...ges/ibm-products-styles/src/components/ConditionBuilder/styles/_conditionBuilderItem.scss
@@ -31,7 +31,7 @@ $block-class: #{c4p-settings.$pkg-prefix}--condition-builder;
   transition: all $duration-fast-02 motion(standard, productive);
 }
 
-.#{$block-class}__condition-wrapper * {
+.#{$block-class}__condition-wrapper {
   @include type-style('body-01');
 }
 

diff --git a/packages/ibm-products-web-components/CHANGELOG.md b/packages/ibm-products-web-components/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.6.1](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2025-01-10)
+
+**Note:** Version bump only for package @carbon/ibm-products-web-components
+
+
+
+
+
+## [0.6.1-rc.0](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2025-01-09)
+
+
+### Bug Fixes
+
+* **Side Panel Web components:** storybook controls issue ([#6500](https://github.com/carbon-design-system/ibm-products/issues/6500)) ([19a7536](https://github.com/carbon-design-system/ibm-products/commit/19a75363d0683ed6765e0d713c3f68878eaeaef2))
+* **Tearsheet in Web Components:** cancel button not working as expected ([#6458](https://github.com/carbon-design-system/ibm-products/issues/6458)) ([2461f81](https://github.com/carbon-design-system/ibm-products/commit/2461f8120431c125ceb826ccb5d139a82d49f39c))
+* **Tearsheet web components:** control changes doesn't reflect in stories ([#6413](https://github.com/carbon-design-system/ibm-products/issues/6413)) ([84f6d14](https://github.com/carbon-design-system/ibm-products/commit/84f6d140d0476868a13b18ea886515d856bb0835))
+* update to Carbon 11 compatible versions to latest ([#6437](https://github.com/carbon-design-system/ibm-products/issues/6437)) ([48d5c34](https://github.com/carbon-design-system/ibm-products/commit/48d5c34dca79a4b00fc69391a513431fa21295ee))
+
+
+
+
+
 # [0.6.0](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2025-01-08)
 
 **Note:** Version bump only for package @carbon/ibm-products-web-components

diff --git a/packages/ibm-products-web-components/package.json b/packages/ibm-products-web-components/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products-web-components",
   "description": "Carbon for IBM Products Web Components",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "license": "Apache-2.0",
   "main": "es/index.js",
   "module": "es/index.js",
@@ -49,12 +49,13 @@
     "wca": "web-component-analyzer analyze src --outFile custom-elements.json"
   },
   "dependencies": {
-    "@carbon/ibm-products-styles": "^2.53.0",
+    "@carbon/ibm-products-styles": "^2.53.1",
     "@carbon/styles": "1.71.0",
     "@carbon/web-components": "2.19.0",
     "lit": "^3.1.0"
   },
   "devDependencies": {
+    "@carbon/icon-helpers": "^10.54.0",
     "@carbon/icons": "^11.53.0",
     "@carbon/motion": "^11.24.0",
     "@mordech/vite-lit-loader": "^0.35.0",

diff --git a/packages/ibm-products-web-components/tasks/build.js b/packages/ibm-products-web-components/tasks/build.js
@@ -46,7 +46,8 @@ async function build() {
   ]);
 
   const iconInput = await globby([
-    'node_modules/@carbon/icons/lib/**/*.js',
+    '../node_modules/@carbon/icons/lib/**/*.js',
+    '../../node_modules/@carbon/icons/lib/**/*.js',
     '!**/index.js',
   ]);
 

diff --git a/packages/ibm-products-web-components/tools/svg-result-carbon-icon-loader.js b/packages/ibm-products-web-components/tools/svg-result-carbon-icon-loader.js
@@ -7,15 +7,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-const path = require('path');
-const createSVGResultFromCarbonIcon = require('./svg-result-carbon-icon');
+import createSVGResultFromCarbonIcon from './svg-result-carbon-icon';
 
 /**
  * A Vite loader to generate `lit-html`'s `SVGResult` from an icon descriptor from `@carbon/icons`.
  *
  * @returns {string} The massaged module content.
  */
-function svgResultCarbonIconLoader() {
+export default function svgResultCarbonIconLoader() {
   const descriptor = require(this.resourcePath); // eslint-disable-line global-require
   return `
     import { svg } from 'lit';
@@ -24,5 +23,3 @@ function svgResultCarbonIconLoader() {
     export default svgResultCarbonIcon;
   `;
 }
-
-module.exports = svgResultCarbonIconLoader;
diff --git a/packages/ibm-products-web-components/tools/svg-result-carbon-icon.js b/packages/ibm-products-web-components/tools/svg-result-carbon-icon.js
@@ -31,7 +31,7 @@ const toString = (descriptor) => {
  */
 const icon = (descriptor) => {
   descriptor.attrs = getAttributes(
-    Object.assign(descriptor.attrs, {
+    Object.assign(descriptor.attrs ?? {}, {
       '...': '${spread(attrs)}', // eslint-disable-line no-template-curly-in-string
     })
   );

diff --git a/packages/ibm-products-web-components/tools/vite-svg-result-carbon-icon-loader.ts b/packages/ibm-products-web-components/tools/vite-svg-result-carbon-icon-loader.ts
@@ -1,14 +1,13 @@
 /**
  * @license
  *
- * Copyright IBM Corp. 2019, 2023
+ * Copyright IBM Corp. 2019, 2025
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
-const path = require('path');
-const createSVGResultFromCarbonIcon = require('./svg-result-carbon-icon');
+import createSVGResultFromCarbonIcon from './svg-result-carbon-icon';
 
 /**
  * A Vite plugin to generate `lit-html`'s `SVGResult` from an icon descriptor from `@carbon/icons`.
@@ -50,12 +49,11 @@ export default function svgResultCarbonIconLoader() {
       if (!id.match(svgRegex)) {
         return outcome;
       }
-
       const descriptor = require(id);
       return `
           import { svg } from 'lit';
           import spread from '@carbon/web-components/es/globals/directives/spread.js';
-          const svgResultCarbonIcon = ${createSVGResultFromCarbonIcon.default(
+          const svgResultCarbonIcon = ${createSVGResultFromCarbonIcon(
             descriptor
           )};
           export default svgResultCarbonIcon;

diff --git a/packages/ibm-products-web-components/vite.config.ts b/packages/ibm-products-web-components/vite.config.ts
@@ -8,14 +8,8 @@
 import { defineConfig, configDefaults } from 'vitest/config';
 import { litStyleLoader, litTemplateLoader } from '@mordech/vite-lit-loader';
 
-// https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [
-    // @ts-ignore
-    litStyleLoader(),
-    // @ts-ignore
-    litTemplateLoader(),
-  ],
+  plugins: [litStyleLoader(), litTemplateLoader()],
   test: {
     environment: 'happy-dom',
     include: ['./src/**/*.{test,spec}.{js,ts}'],