Merge branch 'main' into ts-search-skeleton

.nvmrc

@@ -1 +1 @@
-18.14
+18.15

config/jest-config-carbon/index.js

@@ -20,7 +20,6 @@ module.exports = {
   reporters: ['default'],
   setupFiles: [require.resolve('./setup/setup.js')],
   setupFilesAfterEnv: [require.resolve('./setup/setupAfterEnv.js')],
-  snapshotSerializers: ['enzyme-to-json/serializer'],
   testMatch: [
     '<rootDir>/**/__tests__/**/*.js?(x)',
     '<rootDir>/**/*.(spec|test).js?(x)',

config/jest-config-carbon/package.json

@@ -2,7 +2,7 @@
   "name": "jest-config-carbon",
   "private": true,
   "description": "Jest configuration and preset for Carbon",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {
@@ -27,13 +27,10 @@
     "@babel/preset-env": "^7.18.2",
     "@babel/preset-react": "^7.17.12",
     "@babel/runtime": "^7.18.3",
-    "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
     "accessibility-checker": "^3.1.32",
     "axe-core": "^4.3.5",
     "babel-jest": "^28.1.0",
     "chalk": "^4.1.1",
-    "enzyme": "^3.11.0",
-    "enzyme-to-json": "^3.6.2",
     "jest-circus": "^28.1.0",
     "jest-environment-jsdom": "^28.1.0",
     "jest-watch-typeahead": "^1.1.0",

config/jest-config-carbon/setup/setup.js

@@ -17,11 +17,6 @@ global.requestAnimationFrame = function requestAnimationFrame(callback) {
   callback();
 };
 
-const enzyme = jest.requireActual('enzyme');
-const Adapter = jest.requireActual('@wojtekmaj/enzyme-adapter-react-17');
-
-enzyme.configure({ adapter: new Adapter() });
-
 if (global.HTMLElement) {
   // This is a quirk that we need to bring in due to how our `tabbable` dependency
   // determines what nodes are focusable. Without this override, it's unable to

docs/release.md

@@ -133,7 +133,7 @@ following:
       to automatically generate the prerelease versions for packages
   - [ ] Specify `minor` as the release type
   - [ ] Provide the tag for the release. For example, if the previous release
-        was `v11.1.0-rc.0` this tag would be `v11.2.0`. To find the previous
+        was `v11.1.0-rc.0` this tag would be `v11.1.0`. To find the previous
         release, view the
         [tag list](https://github.com/carbon-design-system/carbon/tags).
 - [ ] Review and approve the Pull Request generated from this action

e2e/components/ComboButton/ComboButton-test.e2e.js

@@ -0,0 +1,37 @@
+/**
+ * Copyright IBM Corp. 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+const { expect, test } = require('@playwright/test');
+const { themes } = require('../../test-utils/env');
+const { snapshotStory, visitStory } = require('../../test-utils/storybook');
+
+test.describe('ComboButton', () => {
+  themes.forEach((theme) => {
+    test.describe(theme, () => {
+      test('combo-button @vrt', async ({ page }) => {
+        await snapshotStory(page, {
+          component: 'ComboButton',
+          id: 'experimental-unstable-combobutton--default',
+          theme,
+        });
+      });
+    });
+  });
+
+  test('accessibility-checker @avt', async ({ page }) => {
+    await visitStory(page, {
+      component: 'ComboButton',
+      id: 'experimental-unstable-combobutton--default',
+      globals: {
+        theme: 'white',
+      },
+    });
+    await expect(page).toHaveNoACViolations('ComboButton');
+  });
+});

e2e/components/MenuButton/MenuButton-test.e2e.js

@@ -0,0 +1,37 @@
+/**
+ * Copyright IBM Corp. 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+const { expect, test } = require('@playwright/test');
+const { themes } = require('../../test-utils/env');
+const { snapshotStory, visitStory } = require('../../test-utils/storybook');
+
+test.describe('MenuButton', () => {
+  themes.forEach((theme) => {
+    test.describe(theme, () => {
+      test('menu-button @vrt', async ({ page }) => {
+        await snapshotStory(page, {
+          component: 'MenuButton',
+          id: 'experimental-unstable-menubutton--default',
+          theme,
+        });
+      });
+    });
+  });
+
+  test('accessibility-checker @avt', async ({ page }) => {
+    await visitStory(page, {
+      component: 'MenuButton',
+      id: 'experimental-unstable-menubutton--default',
+      globals: {
+        theme: 'white',
+      },
+    });
+    await expect(page).toHaveNoACViolations('MenuButton');
+  });
+});

examples/class-prefix/package.json

@@ -1,14 +1,14 @@
 {
   "name": "class-prefix",
   "private": true,
-  "version": "0.21.0",
+  "version": "0.22.0",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@carbon/react": "^1.24.0",
+    "@carbon/react": "^1.25.0",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"
   },

examples/codesandbox-styles/package.json

@@ -1,15 +1,15 @@
 {
   "name": "codesandbox-styles",
   "private": true,
-  "version": "0.27.0",
+  "version": "0.28.0",
   "scripts": {
     "develop": "vite"
   },
   "devDependencies": {
     "vite": "^2.8.0"
   },
   "dependencies": {
-    "@carbon/styles": "^1.24.0",
+    "@carbon/styles": "^1.25.0",
     "sass": "^1.51.0"
   }
 }

examples/codesandbox-with-sass-compilation/package.json

@@ -1,9 +1,9 @@
 {
   "name": "codesandbox-with-sass-compilation",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "private": true,
   "dependencies": {
-    "@carbon/react": "^1.24.0",
+    "@carbon/react": "^1.25.0",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"
   },

examples/codesandbox/package.json

@@ -1,9 +1,9 @@
 {
   "name": "codesandbox",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "private": true,
   "dependencies": {
-    "@carbon/react": "^1.24.0",
+    "@carbon/react": "^1.25.0",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"
   },

examples/custom-theme/package.json

@@ -1,14 +1,14 @@
 {
   "name": "custom-theme",
   "private": true,
-  "version": "0.22.0",
+  "version": "0.23.0",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@carbon/react": "^1.24.0",
+    "@carbon/react": "^1.25.0",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"
   },

examples/id-prefix/package.json

@@ -1,14 +1,14 @@
 {
   "name": "id-prefix",
   "private": true,
-  "version": "0.21.0",
+  "version": "0.22.0",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@carbon/react": "^1.24.0",
+    "@carbon/react": "^1.25.0",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"
   },

examples/incremental-migration/package.json

@@ -1,7 +1,7 @@
 {
   "name": "incremental-migration",
   "private": true,
-  "version": "0.24.0",
+  "version": "0.25.0",
   "scripts": {
     "build": "next build",
     "dev": "next dev",
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@carbon/icons-react": "^10.49.0",
-    "@carbon/react": "^1.24.0",
+    "@carbon/react": "^1.25.0",
     "carbon-components": "^10.57.0",
     "carbon-components-react": "^7.57.0",
     "carbon-icons": "^7.0.7",

examples/light-dark-mode/package.json

@@ -1,15 +1,15 @@
 {
   "name": "examples-light-dark",
   "private": true,
-  "version": "0.22.0",
+  "version": "0.23.0",
   "scripts": {
     "build": "next build",
     "dev": "next dev",
     "lint": "next lint",
     "start": "next start"
   },
   "dependencies": {
-    "@carbon/react": "^1.24.0",
+    "@carbon/react": "^1.25.0",
     "next": "12.1.4",
     "react": "18.0.0",
     "react-dom": "18.0.0"

examples/nextjs/package.json

@@ -1,15 +1,15 @@
 {
   "name": "examples-nextjs",
   "private": true,
-  "version": "0.24.0",
+  "version": "0.25.0",
   "scripts": {
     "build": "next build",
     "dev": "next dev",
     "lint": "next lint",
     "start": "next start"
   },
   "dependencies": {
-    "@carbon/react": "^1.24.0",
+    "@carbon/react": "^1.25.0",
     "next": "12.1.4",
     "react": "18.0.0",
     "react-dom": "18.0.0"

examples/vite/package.json

@@ -1,14 +1,14 @@
 {
   "name": "vite",
   "private": true,
-  "version": "0.22.0",
+  "version": "0.23.0",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@carbon/react": "^1.24.0",
+    "@carbon/react": "^1.25.0",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"
   },

examples/vite/src/index.scss

@@ -1,11 +1,3 @@
-@use '@carbon/react/scss/compat/themes' as compat;
-@use '@carbon/react/scss/themes';
-@use '@carbon/react/scss/theme' with (
-  $fallback: compat.$g100,
-  $theme: themes.$g100
+@use '@carbon/react' with (
+  $font-path: '@ibm/plex'
 );
-@use '@carbon/react';
-
-:root {
-  @include theme.theme();
-}

packages/carbon-components-react/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carbon-components-react",
   "description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
-  "version": "8.24.0",
+  "version": "8.25.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -39,8 +39,8 @@
     "sass": "^1.33.0"
   },
   "dependencies": {
-    "@carbon/react": "^1.24.0",
-    "@carbon/styles": "^1.24.0",
+    "@carbon/react": "^1.25.0",
+    "@carbon/styles": "^1.25.0",
     "@carbon/telemetry": "0.1.0"
   },
   "devDependencies": {

packages/carbon-components/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carbon-components",
   "description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
-  "version": "11.24.0",
+  "version": "11.25.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -40,7 +40,7 @@
     "sass": "^1.33.0"
   },
   "dependencies": {
-    "@carbon/styles": "^1.24.0",
+    "@carbon/styles": "^1.25.0",
     "@carbon/telemetry": "0.1.0"
   },
   "devDependencies": {

packages/react/.storybook/preview.js

@@ -8,7 +8,6 @@
 import './styles.scss';
 import '../src/feature-flags';
 
-import { configureActions } from '@storybook/addon-actions';
 import { white, g10, g90, g100 } from '@carbon/themes';
 import React from 'react';
 import { breakpoints } from '@carbon/layout';
@@ -203,11 +202,6 @@ export const parameters = {
   },
 };
 
-configureActions({
-  depth: 3,
-  limit: 10,
-});
-
 export const decorators = [
   (Story, context) => {
     const { locale, theme } = context.globals;