chore(merge): merge feat/cwc-v2 into feat/carbon-for-ibm-dotcom-v2 (

carbon-design-system#11157) chore(merge): merges feat/cwc-v2 into feat/carbon-for-ibm-dotcom-v2
sangeethababu9223 · Nov 20, 2023 · 3a5f274 · 3a5f274
1 parent c7e5a1f
commit 3a5f274
Show file tree

Hide file tree

Showing 34 changed files with 978 additions and 81 deletions.
diff --git a/lerna.json b/lerna.json
@@ -7,7 +7,6 @@
   "packages": [
     "packages/web-components",
     "packages/utilities",
-    "packages/react",
     "packages/eslint-*",
     "packages/services-*",
     "packages/storybook-addon-theme",

diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/slug/.babelrc b/packages/carbon-web-components/examples/codesandbox/basic/components/slug/.babelrc
@@ -0,0 +1,22 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "modules": false,
+        "targets": [
+          "last 1 version",
+          "Firefox ESR",
+          "not opera > 0",
+          "not op_mini > 0",
+          "not op_mob > 0",
+          "not android > 0",
+          "not edge > 0",
+          "not ie > 0",
+          "not ie_mob > 0"
+        ]
+      }
+    ]
+  ],
+  "plugins": [["@babel/plugin-transform-runtime", { "version": "7.3.0" }]]
+}
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/slug/.gitignore b/packages/carbon-web-components/examples/codesandbox/basic/components/slug/.gitignore
@@ -0,0 +1,22 @@
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.cache
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/slug/.sassrc b/packages/carbon-web-components/examples/codesandbox/basic/components/slug/.sassrc
@@ -0,0 +1,6 @@
+{
+  "includePaths": [
+    "node_modules",
+    "../../node_modules"
+  ]
+}
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/slug/cdn.html b/packages/carbon-web-components/examples/codesandbox/basic/components/slug/cdn.html
@@ -0,0 +1,31 @@
+<!--
+@license
+
+Copyright IBM Corp. 2020
+
+This source code is licensed under the Apache-2.0 license found in the
+LICENSE file in the root directory of this source tree.
+-->
+
+<html>
+<head>
+  <title>@carbon/ibmdotcom-web-components example</title>
+  <meta charset="UTF-8"/>
+  <link rel="stylesheet"
+        href="https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"/>
+  <link rel="stylesheet" href="https://1.www.s81c.com/common/carbon/web-components/tag/v2/latest/grid.css" />
+  <link rel="stylesheet" href="https://1.www.s81c.com/common/carbon/web-components/tag/v2/latest/themes.css" /> 
+  <style>
+    /* Suppress custom element until styles are loaded */
+    cds-slug:not(:defined) {
+      display: none;
+    }
+  </style>
+  <script type="module" src="https://1.www.s81c.com/common/carbon/web-components/slug/v2/latest/slug.min.js"></script>
+</head>
+<body class="cds-theme-zone-white">
+  <cds-slug size="mini" kind="hollow" alignment="bottom-left">
+    <span slot="body-text">AI was used to generate this content</span>
+  </cds-slug>
+</body>
+</html>
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/slug/index.html b/packages/carbon-web-components/examples/codesandbox/basic/components/slug/index.html
@@ -0,0 +1,31 @@
+<!--
+@license
+
+Copyright IBM Corp. 2020
+
+This source code is licensed under the Apache-2.0 license found in the
+LICENSE file in the root directory of this source tree.
+-->
+
+<html>
+<head>
+  <title>carbon-web-components example</title>
+  <meta charset="UTF-8" />
+  <link rel="stylesheet"
+        href="https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"/>
+
+  <link rel="stylesheet" href="src/styles.scss" />
+  <style>
+    /* Suppress custom element until styles are loaded */
+    cds-slug:not(:defined) {
+      display: none;
+    }
+  </style>
+  <script type="module" src="src/index.js"></script>
+</head>
+<body>
+  <cds-slug size="mini" kind="hollow" alignment="bottom-left">
+    <span slot="body-text">AI was used to generate this content</span>
+  </cds-slug>
+</body>
+</html>
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/slug/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/slug/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "carbon-web-components-slug-example",
+  "version": "0.1.0",
+  "private": true,
+  "description": "Sample project for getting started with the Web Components from Carbon.",
+  "license": "Apache-2",
+  "main": "index.html",
+  "scripts": {
+    "build": "parcel build *.html --no-minify --public-url ./",
+    "clean": "rimraf node_modules dist .cache",
+    "start": "parcel index.html --port=9000 --no-hmr"
+  },
+  "dependencies": {
+    "@carbon/styles": "^1.34.0",
+    "@carbon/web-components": "latest",
+    "sass": "^1.64.1"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.0.0-0",
+    "parcel-bundler": "1.12.3",
+    "rimraf": "^3.0.2"
+  }
+}
diff --git a/...ages/carbon-web-components/examples/codesandbox/basic/components/slug/sandbox.config.json b/...ages/carbon-web-components/examples/codesandbox/basic/components/slug/sandbox.config.json
@@ -0,0 +1,3 @@
+{
+  "template": "node"
+}
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/slug/src/index.js b/packages/carbon-web-components/examples/codesandbox/basic/components/slug/src/index.js
@@ -0,0 +1,10 @@
+/**
+ * @license
+ *
+ * Copyright IBM Corp. 2020, 2022
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import '@carbon/web-components/es/components/slug/index.js';
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/slug/src/styles.scss b/packages/carbon-web-components/examples/codesandbox/basic/components/slug/src/styles.scss
@@ -0,0 +1,10 @@
+@use '@carbon/styles/scss/reset';
+@use '@carbon/styles/scss/theme';
+@use '@carbon/styles/scss/themes';
+
+:root {
+  @include theme.theme(themes.$white);
+  background-color: var(--cds-background);
+  color: var(--cds-text-primary);
+}
+
diff --git a/packages/carbon-web-components/package.json b/packages/carbon-web-components/package.json
@@ -1,5 +1,6 @@
 {
   "name": "@carbon/web-components",
+  "private": true,
   "version": "2.0.1",
   "publishConfig": {
     "access": "public"
@@ -71,7 +72,7 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.16.3",
-    "@carbon/styles": "^1.39.0",
+    "@carbon/styles": "^1.42.0",
     "flatpickr": "4.6.1",
     "lit": "^2.7.6",
     "lodash-es": "^4.17.21"

diff --git a/packages/carbon-web-components/src/components/copy-button/copy-button.scss b/packages/carbon-web-components/src/components/copy-button/copy-button.scss
@@ -9,10 +9,10 @@ $css--plex: true !default;
 
 @use '@carbon/styles/scss/theme' as *;
 @use '@carbon/styles/scss/config' as *;
-@use '@carbon/styles/scss/spacing' as *;
 @use '@carbon/styles/scss/utilities' as *;
 @use '@carbon/styles/scss/utilities/keyframes' as *;
 @use '@carbon/styles/scss/motion' as *;
+@use '@carbon/styles/scss/spacing' as *;
 @use '@carbon/styles/scss/components/button';
 @use '@carbon/styles/scss/components/tooltip';
 @use '@carbon/styles/scss/components/code-snippet/code-snippet' as *;

diff --git a/packages/carbon-web-components/src/components/icon-button/icon-button.scss b/packages/carbon-web-components/src/components/icon-button/icon-button.scss
@@ -11,9 +11,14 @@ $css--plex: true !default;
 @use '@carbon/styles/scss/utilities' as *;
 @use '@carbon/styles/scss/breakpoint' as *;
 @use '@carbon/styles/scss/layout' as *;
+@use '@carbon/styles/scss/theme' as *;
 @use '../tooltip/tooltip';
 @use '../button/button';
 
 :host(#{$prefix}-icon-button) {
   @include emit-layout-tokens();
 }
+
+:host(#{$prefix}-icon-button[kind='ghost']) ::slotted([slot='icon']) {
+  color: $icon-primary;
+}