chore(release): resolve merge conflict

.github/workflows/deploy-canary.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Install dependencies
         run: yarn install --offline
       - name: Build project
-        run: yarn lerna run --scope @carbon/carbon-web-components build
+        run: yarn lerna run --scope @carbon/web-components build
 
       - name: Set env vars
         uses: ./.github/actions/set-dotenv
@@ -35,7 +35,7 @@ jobs:
           KALTURA_PARTNER_ID: ${{ secrets.KALTURA_PARTNER_ID }}
           KALTURA_UICONF_ID: ${{ secrets.KALTURA_UICONF_ID }}
           PROFILE_HOST: ${{ secrets.PROFILE_HOST }}
-      - name: Building @carbon/carbon-web-components storybook
+      - name: Building @carbon/web-components storybook
         run: yarn build-storybook
         working-directory: packages/carbon-web-components
       - name: Move storybook to build folder
@@ -44,7 +44,7 @@ jobs:
           mkdir -p builds
           mv packages/carbon-web-components/storybook-static builds/carbon-web-components
 
-      - name: Deploying @carbon/carbon-web-components storybook to Github Pages
+      - name: Deploying @carbon/web-components storybook to Github Pages
         run: |
           git config --global user.email ${{ secrets.BOT_EMAIL }}
           git config --global user.name ${{ secrets.BOT_NAME }}

.github/workflows/deploy-next.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Install dependencies
         run: yarn install --offline
       - name: Build project
-        run: yarn lerna run --scope @carbon/carbon-web-components build
+        run: yarn lerna run --scope @carbon/web-components build
 
       - name: Set env vars
         uses: ./.github/actions/set-dotenv
@@ -35,7 +35,7 @@ jobs:
           KALTURA_PARTNER_ID: ${{ secrets.KALTURA_PARTNER_ID }}
           KALTURA_UICONF_ID: ${{ secrets.KALTURA_UICONF_ID }}
           PROFILE_HOST: ${{ secrets.PROFILE_HOST }}
-      - name: Building @carbon/carbon-web-components (next) storybook
+      - name: Building @carbon/web-components (next) storybook
         run: yarn build-storybook
         working-directory: packages/carbon-web-components
       - name: Move storybook to build folder
@@ -44,7 +44,7 @@ jobs:
           mkdir -p builds
           mv packages/carbon-web-components/storybook-static builds/carbon-web-components
 
-      - name: Deploying @carbon/carbon-web-components (next) storybook to Github Pages
+      - name: Deploying @carbon/web-components (next) storybook to Github Pages
         run: |
           git config --global user.email ${{ secrets.BOT_EMAIL }}
           git config --global user.name ${{ secrets.BOT_NAME }}

packages/carbon-web-components/CHANGELOG.md

@@ -3,9 +3,50 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [1.22.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/carbon-[email protected].0...@carbon/carbon-[email protected]-rc.1) (2022-11-23)
+# [1.22.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected].3...@carbon/[email protected]) (2022-12-06)
 
-**Note:** Version bump only for package @carbon/carbon-web-components
+**Note:** Version bump only for package @carbon/web-components
+
+
+
+
+
+# 1.22.0-rc.3 (2022-12-06)
+
+
+
+# 1.41.0-rc.2 (2022-12-05)
+
+
+
+# 1.41.0-rc.1 (2022-11-23)
+
+
+
+# 1.41.0-rc.0 (2022-11-22)
+
+
+### Bug Fixes
+
+* **cwc:** percy update ([5ac2674](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/5ac2674bdac3d7d033335c693e36a1ae33042242))
+* **cwc:** update package.json & karma test ([a52ab2f](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/a52ab2f5937d9576c79c63748065a1dcf03ee2b0))
+* **packages:** update versions to get working storybooks ([42d8eee](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/42d8eeee12c732c56599de24861252159e91905b))
+
+
+
+
+
+# [1.22.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2022-12-05)
+
+**Note:** Version bump only for package @carbon/web-components
+
+
+
+
+
+# [1.22.0-rc.1](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2022-11-23)
+
+**Note:** Version bump only for package @carbon/web-components
 
 
 

packages/carbon-web-components/README.md

@@ -190,18 +190,18 @@ artifacts:
 
 #### How to install
 
-To install `carbon-web-components` in your project, you will need to run the
+To install `@carbon/web-components` in your project, you will need to run the
 following command using [npm](https://www.npmjs.com/):
 
 ```bash
-npm install --save carbon-web-components
+npm install --save @carbon/web-components
 ```
 
 If you prefer [Yarn](https://yarnpkg.com/en/), use the following command
 instead:
 
 ```bash
-yarn add carbon-web-components
+yarn add @carbon/web-components
 ```
 
 > NOTE: Carbon and Lit dependencies will be managed by Carbon Web Components
@@ -224,7 +224,7 @@ yarn add carbon-web-components
 
 Our example at [CodeSandbox](https://codesandbox.io) shows the most basic usage:
 
-[![Edit carbon-web-components](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/carbon-design-system/carbon-web-components/tree/main/examples/codesandbox/basic)
+[![Edit carbon-web-components](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/carbon-design-system/carbon-for-ibm-dotcom/tree/main/packages/carbon-web-components/examples/codesandbox/basic)
 
 The first thing you need is **setting up a module bundler** to resolve
 ECMAScript `import`s. The above example uses [Webpack](https://webpack.js.org),
@@ -234,8 +234,8 @@ Once you set up a module bundler, you can start importing our component modules,
 for example:
 
 ```javascript
-import 'carbon-web-components/es/components/dropdown/dropdown.js';
-import 'carbon-web-components/es/components/dropdown/dropdown-item.js';
+import '@carbon/web-components/es/components/dropdown/dropdown.js';
+import '@carbon/web-components/es/components/dropdown/dropdown-item.js';
 ```
 
 Once you've imported the component modules, you can use our components in the
@@ -320,8 +320,8 @@ example:
 ```javascript
 import React from 'react';
 import { render } from 'react-dom';
-import BXDropdown from 'carbon-web-components/es/components-react/dropdown/dropdown.js';
-import BXDropdownItem from 'carbon-web-components/es/components-react/dropdown/dropdown-item.js';
+import BXDropdown from '@carbon/web-components/es/components-react/dropdown/dropdown.js';
+import BXDropdownItem from '@carbon/web-components/es/components-react/dropdown/dropdown-item.js';
 
 const App = () => (
   <BXDropdown triggerContent="Select an item">
@@ -374,8 +374,8 @@ any additional steps!
 ## List of available components
 
 View available web components at:
-https://web-components.carbondesignsystem.com/. You can see usage information in
-several ways:
+https://www.ibm.com/standards/carbon/carbon-web-components. You can see usage
+information in several ways:
 
 1. Going to Docs tab, where it shows the usage and available attributes,
    properties and custom events.

packages/carbon-web-components/examples/codesandbox/angular/package.json

@@ -18,7 +18,7 @@
     "@angular/platform-browser-dynamic": "^8.0.0",
     "@angular/router": "^8.0.0",
     "@babel/runtime": "^7.8.0",
-    "@carbon/carbon-web-components": "latest",
+    "@carbon/web-components": "latest",
     "rxjs": "^6.0.0",
     "tslib": "^1.10.0",
     "zone.js": "~0.9.0"

packages/carbon-web-components/examples/codesandbox/angular/src/app/app.component.ts

@@ -8,8 +8,8 @@
  */
 
 import { Component } from '@angular/core';
-import 'carbon-web-components/es/components/dropdown/dropdown';
-import 'carbon-web-components/es/components/dropdown/dropdown-item';
+import '@carbon/web-components/es/components/dropdown/dropdown';
+import '@carbon/web-components/es/components/dropdown/dropdown-item';
 
 @Component({
   selector: 'app-root',

packages/carbon-web-components/examples/codesandbox/basic/components/accordion/package.json

@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "@carbon/carbon-web-components": "latest"
+    "@carbon/web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",

packages/carbon-web-components/examples/codesandbox/basic/components/accordion/src/index.js

@@ -7,4 +7,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import 'carbon-web-components/es/components/accordion/index.js';
+import '@carbon/web-components/es/components/accordion/index.js';

packages/carbon-web-components/examples/codesandbox/basic/components/breadcrumb/package.json

@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "@carbon/carbon-web-components": "latest"
+    "@carbon/web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",

packages/carbon-web-components/examples/codesandbox/basic/components/breadcrumb/src/index.js

@@ -7,4 +7,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import 'carbon-web-components/es/components/breadcrumb/index.js';
+import '@carbon/web-components/es/components/breadcrumb/index.js';

packages/carbon-web-components/examples/codesandbox/basic/components/button/package.json

@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "@carbon/carbon-web-components": "latest"
+    "@carbon/web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",

packages/carbon-web-components/examples/codesandbox/basic/components/button/src/index.js

@@ -7,4 +7,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import 'carbon-web-components/es/components/button/index.js';
+import '@carbon/web-components/es/components/button/index.js';

packages/carbon-web-components/examples/codesandbox/basic/components/checkbox/package.json

@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "@carbon/carbon-web-components": "latest"
+    "@carbon/web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",

packages/carbon-web-components/examples/codesandbox/basic/components/checkbox/src/index.js

@@ -7,4 +7,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import 'carbon-web-components/es/components/checkbox/index.js';
+import '@carbon/web-components/es/components/checkbox/index.js';

packages/carbon-web-components/examples/codesandbox/basic/components/code-snippet/package.json

@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "@carbon/carbon-web-components": "latest"
+    "@carbon/web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",

packages/carbon-web-components/examples/codesandbox/basic/components/code-snippet/src/index.js

@@ -7,4 +7,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import 'carbon-web-components/es/components/code-snippet/index.js';
+import '@carbon/web-components/es/components/code-snippet/index.js';

packages/carbon-web-components/examples/codesandbox/basic/components/combo-box/package.json

@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "@carbon/carbon-web-components": "latest"
+    "@carbon/web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",

packages/carbon-web-components/examples/codesandbox/basic/components/combo-box/src/index.js

@@ -7,4 +7,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import 'carbon-web-components/es/components/combo-box/index.js';
+import '@carbon/web-components/es/components/combo-box/index.js';

packages/carbon-web-components/examples/codesandbox/basic/components/content-switcher/package.json

@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "@carbon/carbon-web-components": "latest"
+    "@carbon/web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",

packages/carbon-web-components/examples/codesandbox/basic/components/content-switcher/src/index.js

@@ -7,4 +7,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import 'carbon-web-components/es/components/content-switcher/index.js';
+import '@carbon/web-components/es/components/content-switcher/index.js';

packages/carbon-web-components/examples/codesandbox/basic/components/copy-button/package.json

@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "@carbon/carbon-web-components": "latest"
+    "@carbon/web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",

packages/carbon-web-components/examples/codesandbox/basic/components/copy-button/src/index.js

@@ -7,4 +7,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import 'carbon-web-components/es/components/copy-button/index.js';
+import '@carbon/web-components/es/components/copy-button/index.js';

packages/carbon-web-components/examples/codesandbox/basic/components/data-table/package.json

@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "@carbon/carbon-web-components": "latest"
+    "@carbon/web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",

packages/carbon-web-components/examples/codesandbox/basic/components/data-table/src/index.js

@@ -7,5 +7,5 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import 'carbon-web-components/es/components/data-table/index.js';
-import 'carbon-web-components/es/components/pagination/index.js';
+import '@carbon/web-components/es/components/data-table/index.js';
+import '@carbon/web-components/es/components/pagination/index.js';

packages/carbon-web-components/examples/codesandbox/basic/components/date-picker/package.json

@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "@carbon/carbon-web-components": "latest"
+    "@carbon/web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",

packages/carbon-web-components/examples/codesandbox/basic/components/date-picker/src/index.js

@@ -7,4 +7,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import 'carbon-web-components/es/components/date-picker/index.js';
+import '@carbon/web-components/es/components/date-picker/index.js';

packages/carbon-web-components/examples/codesandbox/basic/components/dropdown/package.json

@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "@carbon/carbon-web-components": "latest"
+    "@carbon/web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",

packages/carbon-web-components/examples/codesandbox/basic/components/dropdown/src/index.js

@@ -7,4 +7,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import 'carbon-web-components/es/components/dropdown/index.js';
+import '@carbon/web-components/es/components/dropdown/index.js';

packages/carbon-web-components/examples/codesandbox/basic/components/file-uploader/package.json

@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "@carbon/carbon-web-components": "latest"
+    "@carbon/web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",

packages/carbon-web-components/examples/codesandbox/basic/components/file-uploader/src/index.js

@@ -7,4 +7,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import 'carbon-web-components/es/components/file-uploader/index.js';
+import '@carbon/web-components/es/components/file-uploader/index.js';

packages/carbon-web-components/examples/codesandbox/basic/components/inline-loading/package.json

@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "@carbon/carbon-web-components": "latest"
+    "@carbon/web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",

packages/carbon-web-components/examples/codesandbox/basic/components/inline-loading/src/index.js

@@ -7,4 +7,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import 'carbon-web-components/es/components/inline-loading/index.js';
+import '@carbon/web-components/es/components/inline-loading/index.js';

packages/carbon-web-components/examples/codesandbox/basic/components/input/package.json

@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "@carbon/carbon-web-components": "latest"
+    "@carbon/web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",