chore(merge): resolve merge conflicts

ariellalgilmore · Sep 19, 2023 · a8f7267 · a8f7267
2 parents de094c0 + acffcb3
commit a8f7267
Show file tree

Hide file tree

Showing 46 changed files with 392 additions and 390 deletions.
diff --git a/docs/release-schedule.md b/docs/release-schedule.md
@@ -12,7 +12,7 @@ major versions of the Carbon for IBM.com library.
 
 > Dates are subject to change
 
-![schedule](https://www.ibm.com/standards/carbon/static/bcfed95efe679166dbec1cbae7ea33bb/4ea69/dotcom-lts.png)
+![schedule](https://www.ibm.com/standards/carbon/static/0ef80acd5f41a795ca27d8add6516414/4ea69/dotcom-lts.png)
 
 ## Release phases
 

diff --git a/packages/carbon-web-components/CHANGELOG.md b/packages/carbon-web-components/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.32.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-09-06)
+
+
+### Bug Fixes
+
+* **lerna:** build packages & codesandbox updates ([#10876](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10876)) ([fa5bee0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/fa5bee07eb65a0f730c7cb1094a5eb8d122ab593))
+* **pagination:** mark selected option in page-sizes-select component ([#10884](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10884)) ([ec3e4cf](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/ec3e4cfaa4f50282c037c789898b7d6a61d6d54c))
+
+
+
+
+
 # [1.31.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-22)
 
 **Note:** Version bump only for package @carbon/web-components

diff --git a/packages/carbon-web-components/examples/codesandbox/form/basic/webpack.config.js b/packages/carbon-web-components/examples/codesandbox/form/basic/webpack.config.js
@@ -10,6 +10,10 @@
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 module.exports = {
+  // disable the host check on sandbox
+  devServer: {
+    disableHostCheck: true
+  },
   plugins: [
     new HtmlWebpackPlugin({
       template: 'index.html',

diff --git a/packages/carbon-web-components/examples/codesandbox/form/redux-form/webpack.config.js b/packages/carbon-web-components/examples/codesandbox/form/redux-form/webpack.config.js
@@ -10,6 +10,10 @@
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 module.exports = {
+  // disable the host check on sandbox
+  devServer: {
+    disableHostCheck: true
+  },
   module: {
     rules: [
       {

diff --git a/packages/carbon-web-components/examples/codesandbox/ie/.gitignore b/packages/carbon-web-components/examples/codesandbox/ie/.gitignore
diff --git a/packages/carbon-web-components/examples/codesandbox/ie/package.json b/packages/carbon-web-components/examples/codesandbox/ie/package.json
diff --git a/packages/carbon-web-components/examples/codesandbox/ie/sandbox.config.json b/packages/carbon-web-components/examples/codesandbox/ie/sandbox.config.json
diff --git a/packages/carbon-web-components/examples/codesandbox/ie/src/index.html b/packages/carbon-web-components/examples/codesandbox/ie/src/index.html
diff --git a/packages/carbon-web-components/examples/codesandbox/ie/src/index.js b/packages/carbon-web-components/examples/codesandbox/ie/src/index.js
diff --git a/packages/carbon-web-components/examples/codesandbox/ie/webpack.config.js b/packages/carbon-web-components/examples/codesandbox/ie/webpack.config.js
diff --git a/packages/carbon-web-components/examples/codesandbox/next/package.json b/packages/carbon-web-components/examples/codesandbox/next/package.json
@@ -5,12 +5,12 @@
   "description": "Sample project for getting started with the Web Components from the Carbon Design System with Next.js.",
   "license": "Apache-2",
   "scripts": {
-    "start": "echo 'Running Next in Node 12.16.3+. If you have such Node version in your system just `next` here will work.' && ./node_modules/node/node_modules/.bin/node ./node_modules/.bin/next"
+    "start": "echo 'Running Next in Node 18.15.0+. If you have such Node version in your system just `next` here will work.' && NODE_OPTIONS=--openssl-legacy-provider ./node_modules/node/node_modules/.bin/node ./node_modules/.bin/next"
   },
   "dependencies": {
     "@carbon/web-components": "latest",
     "next": "^10.0.0",
-    "node": "^12.16.3",
+    "node": "^18.15.0",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"
   }

diff --git a/packages/carbon-web-components/examples/codesandbox/react-ssr/webpack.config.js b/packages/carbon-web-components/examples/codesandbox/react-ssr/webpack.config.js
@@ -8,6 +8,10 @@
  */
 
 module.exports = {
+  // disable the host check on sandbox
+  devServer: {
+    disableHostCheck: true
+  },
   module: {
     rules: [
       {

diff --git a/packages/carbon-web-components/examples/codesandbox/react/webpack.config.js b/packages/carbon-web-components/examples/codesandbox/react/webpack.config.js
@@ -10,6 +10,10 @@
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 module.exports = {
+  // disable the host check on sandbox
+  devServer: {
+    disableHostCheck: true
+  },
   module: {
     rules: [
       {

diff --git a/packages/carbon-web-components/examples/codesandbox/rtl/webpack.config.js b/packages/carbon-web-components/examples/codesandbox/rtl/webpack.config.js
@@ -19,6 +19,7 @@ const devServer = {
   open: true,
   contentBase: path.resolve(__dirname, 'src'),
   publicPath: '/dist',
+  disableHostCheck: true,
   setup(app, server) {
     app.get('/', (req, res) => {
       const { fileSystem, waitUntilValid } = server.middleware;

diff --git a/packages/carbon-web-components/examples/codesandbox/styling/custom-style/webpack.config.js b/packages/carbon-web-components/examples/codesandbox/styling/custom-style/webpack.config.js
@@ -10,6 +10,10 @@
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 module.exports = {
+  // disable the host check on sandbox
+  devServer: {
+    disableHostCheck: true
+  },
   plugins: [
     new HtmlWebpackPlugin({
       template: 'index.html',

diff --git a/packages/carbon-web-components/examples/codesandbox/vue/package.json b/packages/carbon-web-components/examples/codesandbox/vue/package.json
@@ -21,8 +21,7 @@
   },
   "browserslist": [
     "> 1%",
-    "last 2 versions",
-    "not ie <= 8"
+    "last 2 versions"
   ],
   "eslintConfig": {
     "parserOptions": {

diff --git a/packages/carbon-web-components/package.json b/packages/carbon-web-components/package.json
@@ -11,11 +11,12 @@
   "main": "es/index.js",
   "module": "es/index.js",
   "exports": {
-    "./es/components-react/": {
-      "node": "./lib/components-react-node/",
-      "default": "./es/components-react/"
+    "./es/components-react/*": {
+      "node": "./lib/components-react-node/*",
+      "default": "./es/components-react/*"
     },
     "./es/components/*": {
+      "node": "./lib/components/*",
       "default": "./es/components/*"
     },
     "./es/globals/": {

diff --git a/packages/carbon-web-components/src/components/combo-box/combo-box-story.ts b/packages/carbon-web-components/src/components/combo-box/combo-box-story.ts
@@ -74,7 +74,7 @@ export const Default = () => {
 export const WithLayer = () => {
   return html`
     <sb-template-layers>
-      <div style="width:400px">
+      <div style="width:300px">
         <cds-combo-box
           title-text="ComboBox label"
           helper-text="Combobox helper text"
@@ -178,7 +178,7 @@ export default {
   },
   decorators: [
     (story, { name }) => {
-      const width = !name.toLowerCase().includes('layer') ? `width:400px` : ``;
+      const width = !name.toLowerCase().includes('layer') ? `width:300px` : ``;
       return html` <div style="${width}">${story()}</div> `;
     },
   ],

diff --git a/packages/carbon-web-components/src/components/combo-box/combo-box.scss b/packages/carbon-web-components/src/components/combo-box/combo-box.scss
@@ -11,13 +11,15 @@ $css--plex: true !default;
 @use '@carbon/styles/scss/spacing' as *;
 @use '@carbon/styles/scss/theme' as *;
 @use '@carbon/styles/scss/utilities' as *;
-@use '@carbon/styles/scss/components/combo-box/combo-box';
+@use '@carbon/styles/scss/layout' as *;
+@use '@carbon/styles/scss/components/combo-box' as *;
 @use '@carbon/styles/scss/components/form';
 @use '@carbon/styles/scss/components/text-input/text-input';
 @use '../dropdown/dropdown.scss';
 
 :host(#{$prefix}-combo-box) {
   @extend :host(#{$prefix}-dropdown);
+  @include emit-layout-tokens();
 
   outline: none;
 
@@ -27,6 +29,10 @@ $css--plex: true !default;
     top: -100%;
   }
 
+  .#{$prefix}--list-box__field {
+    padding: 0;
+  }
+
   .#{$prefix}--list-box__menu {
     outline: none;
     top: 100%;
@@ -47,6 +53,12 @@ $css--plex: true !default;
   }
 }
 
+:host(#{$prefix}-combo-box[invalid]) {
+  .#{$prefix}--form__helper-text {
+    color: $text-error;
+  }
+}
+
 :host(#{$prefix}-combo-box[read-only]) {
   .#{$prefix}--list-box__selection svg {
     fill: $icon-disabled;
@@ -61,6 +73,10 @@ $css--plex: true !default;
   .#{$prefix}--list-box__menu-item__option {
     height: auto;
   }
+
+  &:hover {
+    background-color: $layer-hover;
+  }
 }
 
 :host(#{$prefix}-combo-box-item[disabled]) {

diff --git a/packages/eslint-config-ibmdotcom/CHANGELOG.md b/packages/eslint-config-ibmdotcom/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.42.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-09-06)
+
+**Note:** Version bump only for package @carbon/eslint-config-ibmdotcom
+
+
+
+
+
 # [1.41.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-22)
 
 **Note:** Version bump only for package @carbon/eslint-config-ibmdotcom