chore(merge): resolve merge conflicts

ariellalgilmore · Sep 19, 2023 · acffcb3 · acffcb3
2 parents 51dfa1e + 194f9d0
commit acffcb3
Show file tree

Hide file tree

Showing 26 changed files with 138 additions and 280 deletions.
diff --git a/...e/@babel-plugin-proposal-private-property-in-object-npm-7.12.13-a60a4f989f-469e7d45b5.zip b/...e/@babel-plugin-proposal-private-property-in-object-npm-7.12.13-a60a4f989f-469e7d45b5.zip
diff --git a/...e/@babel-plugin-proposal-private-property-in-object-npm-7.21.11-d474c5e67a-1b880543bc.zip b/...e/@babel-plugin-proposal-private-property-in-object-npm-7.21.11-d474c5e67a-1b880543bc.zip
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/react/package.json b/packages/react/package.json
@@ -81,7 +81,7 @@
     "@babel/plugin-proposal-class-properties": "~7.12.0",
     "@babel/plugin-proposal-export-default-from": "~7.12.0",
     "@babel/plugin-proposal-export-namespace-from": "~7.12.0",
-    "@babel/plugin-proposal-private-property-in-object": "~7.12.0",
+    "@babel/plugin-proposal-private-property-in-object": "~7.21.0",
     "@babel/plugin-transform-runtime": "7.18.5",
     "@babel/preset-env": "~7.12.0",
     "@babel/preset-react": "~7.12.1",

diff --git a/packages/styles/scss/components/filter-panel/_filter-panel.scss b/packages/styles/scss/components/filter-panel/_filter-panel.scss
@@ -134,7 +134,8 @@
 
     &:not([has-selections]) {
       .#{$prefix}--clear {
-        display: none;
+        color: $disabled-02;
+        cursor: not-allowed;
       }
     }
     @include carbon--breakpoint-down('lg') {