chore(v11): update to @carbon/react and @carbon/web-components

carbon-design-system · Aug 19, 2024 · 45ee408 · 45ee408
1 parent 4dc2391
commit 45ee408
Show file tree

Hide file tree

Showing 24 changed files with 88 additions and 68 deletions.
diff --git a/packages/component-list/package.json b/packages/component-list/package.json
@@ -20,9 +20,9 @@
     "@carbon/ibm-products": "^2.47.0",
     "@carbon/ibm-security": "^2.15.0",
     "@carbon/ibmdotcom-web-components": "^2.11.1",
+    "@carbon/react": "^1.64.1",
     "@carbon/web-components": "^2.11.1",
-    "carbon-components": "^11.63.0",
-    "carbon-components-react": "^8.64.0"
+    "carbon-components": "^11.63.0"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

diff --git a/packages/component-list/src/libraries/carbon-web-components.js b/packages/component-list/src/libraries/carbon-web-components.js
@@ -3,7 +3,7 @@ import { carbonPrefix } from '../../../web-extension/src/globals/prefixSelectors
 import { _initStats, camelCase } from '../helpers.js';
 
 const _carbonWebComponentsDir =
-  '../../node_modules/carbon-web-components/es/components';
+  '../../node_modules/@carbon/web-components/es/components';
 const { _stats, success } = new _initStats();
 const carbonWebComponents = {
   name: 'Carbon web components',

diff --git a/packages/component-list/src/libraries/carbon.js b/packages/component-list/src/libraries/carbon.js
@@ -1,4 +1,4 @@
-import * as componentList from 'carbon-components-react';
+import * as componentList from '@carbon/react';
 import { carbonPrefix } from '../../../web-extension/src/globals/prefixSelectors.js';
 import { buildReactComponentList } from '../helpers.js';
 

diff --git a/packages/component-list/src/libraries/index.js b/packages/component-list/src/libraries/index.js
@@ -1,6 +1,6 @@
 export * from './carbon';
 export * from './carbon-web-components';
 export * from './ibmdotcom';
-export * from './cloud-cognitive';
+// export * from './cloud-cognitive';
 export * from './security';
 export * from './cloud-pal';
diff --git a/packages/component-list/src/libraries/security.js b/packages/component-list/src/libraries/security.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import * as securityComponentList from '@carbon/ibm-security';
-import * as carbonComponentList from 'carbon-components-react';
+import * as carbonComponentList from '@carbon/react';
 import { getSecurityPrefix } from '../../../web-extension/src/globals/prefixSelectors.js';
 import { buildReactComponentList } from '../helpers.js';
 

diff --git a/packages/web-extension/package.json b/packages/web-extension/package.json
@@ -29,10 +29,10 @@
     "@carbon/icons": "^11.47.0",
     "@carbon/layout": "^11.24.0",
     "@carbon/motion": "^11.20.0",
+    "@carbon/react": "^1.64.1",
     "@carbon/themes": "^11.38.0",
     "@carbon/type": "^11.29.0",
     "carbon-components": "^11.63.0",
-    "carbon-components-react": "^8.64.0",
     "color": "^4.2.3",
     "node-fetch": "^3.3.2",
     "url": "^0.11.4"

diff --git a/packages/web-extension/src/options/components/Footer/index.js b/packages/web-extension/src/options/components/Footer/index.js
@@ -1,5 +1,6 @@
 import { prefix } from '@carbon/web-components/es/globals/settings.js';
-import Link from 'carbon-components-react/es/components/Link';
+import Link from '@carbon/react/es/components/Link';
+import {  } from "@carbon/react/es/components/Link";
 import React from 'react';
 
 import packageJSON from '../../../../package.json';

diff --git a/packages/web-extension/src/options/components/General/index.js b/packages/web-extension/src/options/components/General/index.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { prefix } from '@carbon/web-components/es/globals/settings.js';
-import Select from 'carbon-components-react/es/components/Select';
-import SelectItem from 'carbon-components-react/es/components/SelectItem';
-import Toggle from 'carbon-components-react/es/components/Toggle';
+import Select from '@carbon/react/es/components/Select';
+import SelectItem from '@carbon/react/es/components/SelectItem';
+import Toggle from '@carbon/react/es/components/Toggle';
 import { setStorage } from '@carbon/devtools-utilities/src/setStorage';
 import { configuration } from '../';
 import { themes } from '@carbon/themes';

diff --git a/packages/web-extension/src/options/components/Grid/index.js b/packages/web-extension/src/options/components/Grid/index.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { prefix } from '@carbon/web-components/es/globals/settings.js';
-import Select from 'carbon-components-react/es/components/Select';
-import SelectItem from 'carbon-components-react/es/components/SelectItem';
+import Select from '@carbon/react/es/components/Select';
+import SelectItem from '@carbon/react/es/components/SelectItem';
 import { configuration } from '../';
 import { gridVersions } from '../../../globals/options';
 import { defaults } from '../../../globals/defaults';

diff --git a/packages/web-extension/src/options/components/Reset/index.js b/packages/web-extension/src/options/components/Reset/index.js
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { prefix } from '@carbon/web-components/es/globals/settings.js';
-import Button from 'carbon-components-react/es/components/Button';
+import Button from '@carbon/react/es/components/Button';
 import CheckmarkOutline from '@carbon/icons/svg/32/checkmark--outline.svg';
 import { configuration } from '../';
 

diff --git a/packages/web-extension/src/popup/components/Empty/index.js b/packages/web-extension/src/popup/components/Empty/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { prefix } from '@carbon/web-components/es/globals/settings.js';
 import packageJSON from '../../../../package.json';
-import Link from 'carbon-components-react/es/components/Link';
+import Link from '@carbon/react/es/components/Link';
 
 
 

diff --git a/packages/web-extension/src/popup/components/Grid/Grid2xOptions.js b/packages/web-extension/src/popup/components/Grid/Grid2xOptions.js
@@ -1,12 +1,12 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { prefix } from '@carbon/web-components/es/globals/settings.js';
-import Checkbox from 'carbon-components-react/es/components/Checkbox';
-import FormGroup from 'carbon-components-react/es/components/FormGroup';
-import NumberInput from 'carbon-components-react/es/components/NumberInput';
-import ContentSwitcher from 'carbon-components-react/es/components/ContentSwitcher';
-import Switch from 'carbon-components-react/es/components/Switch';
-import FormLabel from 'carbon-components-react/es/components/FormLabel';
+import Checkbox from '@carbon/react/es/components/Checkbox';
+import FormGroup from '@carbon/react/es/components/FormGroup';
+import NumberInput from '@carbon/react/es/components/NumberInput';
+import ContentSwitcher from '@carbon/react/es/components/ContentSwitcher';
+import Switch from '@carbon/react/es/components/Switch';
+import FormLabel from '@carbon/react/es/components/FormLabel';
 import { setStorage } from '@carbon/devtools-utilities/src/setStorage';
 import { getStorage } from '@carbon/devtools-utilities/src/getStorage';
 import { defaults } from '../../../globals/defaults';

diff --git a/packages/web-extension/src/popup/components/Grid/GridMiniUnitOptions.js b/packages/web-extension/src/popup/components/Grid/GridMiniUnitOptions.js
@@ -1,8 +1,8 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { prefix } from '@carbon/web-components/es/globals/settings.js';
-import Checkbox from 'carbon-components-react/es/components/Checkbox';
-import FormGroup from 'carbon-components-react/es/components/FormGroup';
+import Checkbox from '@carbon/react/es/components/Checkbox';
+import FormGroup from '@carbon/react/es/components/FormGroup';
 import { setStorage } from '@carbon/devtools-utilities/src/setStorage';
 import { getStorage } from '@carbon/devtools-utilities/src/getStorage';
 import { defaults } from '../../../globals/defaults';

diff --git a/packages/web-extension/src/popup/components/Grid/index.js b/packages/web-extension/src/popup/components/Grid/index.js
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { prefix } from '@carbon/web-components/es/globals/settings.js';
-import Toggle from 'carbon-components-react/es/components/Toggle';
+import Toggle from '@carbon/react/es/components/Toggle';
 import { setStorage } from '@carbon/devtools-utilities/src/setStorage';
 import { getStorage } from '@carbon/devtools-utilities/src/getStorage';
 import { gridVersions } from '../../../globals/options';

diff --git a/packages/web-extension/src/popup/components/Inventory/index.js b/packages/web-extension/src/popup/components/Inventory/index.js
@@ -6,8 +6,8 @@ import Accordion, {
   AccordionSkeleton,
 } from 'carbon-components-react/es/components/Accordion';
 import { ClickableTile } from 'carbon-components-react/es/components/Tile';
-import Link from 'carbon-components-react/es/components/Link';
-import Search from 'carbon-components-react/es/components/Search';
+import Link from '@carbon/react/es/components/Link';
+import Search from '@carbon/react/es/components/Search';
 import { sendTabMessage } from '@carbon/devtools-utilities/src/sendMessage';
 import { safeObj } from '@carbon/devtools-utilities/src/safeObj';
 import { moderate02 } from '@carbon/motion';

diff --git a/packages/web-extension/src/popup/components/Loading/index.js b/packages/web-extension/src/popup/components/Loading/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { prefix } from '@carbon/web-components/es/globals/settings.js';
-import SkeletonPlaceholder from 'carbon-components-react/es/components/SkeletonPlaceholder';
+import SkeletonPlaceholder from '@carbon/react/es/components/SkeletonPlaceholder';
 
 
 

diff --git a/packages/web-extension/src/popup/components/Main/index.js b/packages/web-extension/src/popup/components/Main/index.js
@@ -5,8 +5,8 @@ import Accordion, {
   AccordionItem,
 } from 'carbon-components-react/es/components/Accordion';
 import { InlineNotification } from 'carbon-components-react/es/components/Notification';
-import Link from 'carbon-components-react/es/components/Link';
-import Toggle from 'carbon-components-react/es/components/Toggle';
+import Link from '@carbon/react/es/components/Link';
+import Toggle from '@carbon/react/es/components/Toggle';
 import { setStorage } from '@carbon/devtools-utilities/src/setStorage';
 import { getStorage } from '@carbon/devtools-utilities/src/getStorage';
 import { experimentalFlag } from '@carbon/devtools-utilities/src/experimental';

diff --git a/packages/web-extension/src/popup/components/MoreOptions/index.js b/packages/web-extension/src/popup/components/MoreOptions/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { prefix } from '@carbon/web-components/es/globals/settings.js';
-import OverflowMenu from 'carbon-components-react/es/components/OverflowMenu';
-import OverflowMenuItem from 'carbon-components-react/es/components/OverflowMenuItem';
+import OverflowMenu from '@carbon/react/es/components/OverflowMenu';
+import OverflowMenuItem from '@carbon/react/es/components/OverflowMenuItem';
 import { openChromeExtensionOptions } from '@carbon/devtools-utilities/src/openChromeExtensionOptions';
 import packageJSON from '../../../../package.json';
 

diff --git a/packages/web-extension/src/popup/components/PageInfo/index.js b/packages/web-extension/src/popup/components/PageInfo/index.js
@@ -1,9 +1,9 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { prefix } from '@carbon/web-components/es/globals/settings.js';
-import Link from 'carbon-components-react/es/components/Link';
-import CodeSnippet from 'carbon-components-react/es/components/CodeSnippet';
-import Search from 'carbon-components-react/es/components/Search';
+import Link from '@carbon/react/es/components/Link';
+import CodeSnippet from '@carbon/react/es/components/CodeSnippet';
+import Search from '@carbon/react/es/components/Search';
 import { moderate02 } from '@carbon/motion';
 import {
   formGeneralRows,

diff --git a/packages/web-extension/src/popup/components/ResizeBrowser/index.js b/packages/web-extension/src/popup/components/ResizeBrowser/index.js
@@ -1,9 +1,9 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { prefix } from '@carbon/web-components/es/globals/settings.js';
-import ContentSwitcher from 'carbon-components-react/es/components/ContentSwitcher';
-import Switch from 'carbon-components-react/es/components/Switch';
-import Checkbox from 'carbon-components-react/es/components/Checkbox';
+import ContentSwitcher from '@carbon/react/es/components/ContentSwitcher';
+import Switch from '@carbon/react/es/components/Switch';
+import Checkbox from '@carbon/react/es/components/Checkbox';
 import { breakpoints } from '@carbon/layout';
 import { remtopx } from '@carbon/devtools-utilities/src/remtopx';
 import { getStorage } from '@carbon/devtools-utilities/src/getStorage';

diff --git a/packages/web-extension/src/popup/components/Specs/index.js b/packages/web-extension/src/popup/components/Specs/index.js
@@ -7,9 +7,9 @@ import { setStorage } from '@carbon/devtools-utilities/src/setStorage';
 import { getStorage } from '@carbon/devtools-utilities/src/getStorage';
 import { defaults } from '../../../globals/defaults';
 
-import Checkbox from 'carbon-components-react/es/components/Checkbox';
-import TileGroup from 'carbon-components-react/es/components/TileGroup';
-import RadioTile from 'carbon-components-react/es/components/RadioTile';
+import Checkbox from '@carbon/react/es/components/Checkbox';
+import TileGroup from '@carbon/react/es/components/TileGroup';
+import RadioTile from '@carbon/react/es/components/RadioTile';
 
 import ColorPalette from '@carbon/icons/svg/32/color-palette.svg';
 import TextScale from '@carbon/icons/svg/32/text--scale.svg';

diff --git a/packages/web-extension/src/popup/components/ValidationErrors/index.js b/packages/web-extension/src/popup/components/ValidationErrors/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { prefix } from '@carbon/web-components/es/globals/settings.js';
-import Link from 'carbon-components-react/es/components/Link';
+import Link from '@carbon/react/es/components/Link';
 import { InlineNotification } from 'carbon-components-react/es/components/Notification';
 import { safeObj } from '@carbon/devtools-utilities/src/safeObj';
 

diff --git a/packages/web-extension/src/popup/index.js b/packages/web-extension/src/popup/index.js
@@ -2,8 +2,8 @@ import React, { useState, useEffect } from 'react';
 import ReactDOM from 'react-dom';
 
 import { prefix } from '@carbon/web-components/es/globals/settings.js';
-import Tag from 'carbon-components-react/es/components/Tag';
-import Button from 'carbon-components-react/es/components/Button';
+import Tag from '@carbon/react/es/components/Tag';
+import Button from '@carbon/react/es/components/Button';
 import ChevronLeft from '@carbon/icons/svg/32/chevron--left.svg';
 import { getMessage } from '@carbon/devtools-utilities/src/getMessage';
 import {

diff --git a/yarn.lock b/yarn.lock
@@ -2970,12 +2970,12 @@ __metadata:
     "@carbon/ibm-products": "npm:^2.47.0"
     "@carbon/ibm-security": "npm:^2.15.0"
     "@carbon/ibmdotcom-web-components": "npm:^2.11.1"
+    "@carbon/react": "npm:^1.64.1"
     "@carbon/web-components": "npm:^2.11.1"
     "@testing-library/react": "npm:^16.0.0"
     babel-loader: "npm:^9.1.3"
     babel-preset-carbon: "npm:^0.0.14"
     carbon-components: "npm:^11.63.0"
-    carbon-components-react: "npm:^8.64.0"
     cheerio: "npm:1.0.0"
     enzyme: "npm:^3.11.0"
     enzyme-adapter-react-16: "npm:^1.15.8"
@@ -3293,7 +3293,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/icons-react@npm:^11.33.0, @carbon/icons-react@npm:^11.47.0":
+"@carbon/icons-react@npm:^11.33.0":
   version: 11.47.0
   resolution: "@carbon/icons-react@npm:11.47.0"
   dependencies:
@@ -3306,6 +3306,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@carbon/icons-react@npm:^11.47.1":
+  version: 11.47.1
+  resolution: "@carbon/icons-react@npm:11.47.1"
+  dependencies:
+    "@carbon/icon-helpers": "npm:^10.50.0"
+    "@ibm/telemetry-js": "npm:^1.5.0"
+    prop-types: "npm:^15.7.2"
+  peerDependencies:
+    react: ">=16"
+  checksum: 10c0/005f67160ae29454986e064d0be2425a8322ef30037c862005be4499d4623da574272bef6d0e7d33bc1ca7565be5cd1edffe79d24650adaf95c5ec45caef573c
+  languageName: node
+  linkType: hard
+
 "@carbon/icons@npm:^11.47.0":
   version: 11.47.0
   resolution: "@carbon/icons@npm:11.47.0"
@@ -3390,15 +3403,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/react@npm:^1.64.0":
-  version: 1.64.0
-  resolution: "@carbon/react@npm:1.64.0"
+"@carbon/react@npm:^1.64.1":
+  version: 1.64.1
+  resolution: "@carbon/react@npm:1.64.1"
   dependencies:
     "@babel/runtime": "npm:^7.24.7"
     "@carbon/feature-flags": "npm:^0.21.0"
-    "@carbon/icons-react": "npm:^11.47.0"
+    "@carbon/icons-react": "npm:^11.47.1"
     "@carbon/layout": "npm:^11.24.0"
-    "@carbon/styles": "npm:^1.63.0"
+    "@carbon/styles": "npm:^1.63.1"
     "@floating-ui/react": "npm:^0.26.0"
     "@ibm/telemetry-js": "npm:^1.5.0"
     classnames: "npm:2.5.1"
@@ -3420,7 +3433,7 @@ __metadata:
     react: ^16.8.6 || ^17.0.1 || ^18.2.0
     react-dom: ^16.8.6 || ^17.0.1 || ^18.2.0
     sass: ^1.33.0
-  checksum: 10c0/4c24ee8295fac1316cac866f16db23dc428acd6417d1084231aae6e38eb8aeaa33344d4ddab906126f3ee9789fdc505f29be24254ecc3fb7b3016f4179c139be
+  checksum: 10c0/06898db06726958051346e606ef9944649ed713da02f724cfd45b6abaae983602fa89991aefd19a00fee452961ceefd5acf5a00e89d536451b2362c818dcfb04
   languageName: node
   linkType: hard
 
@@ -3475,6 +3488,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@carbon/styles@npm:^1.63.1":
+  version: 1.63.1
+  resolution: "@carbon/styles@npm:1.63.1"
+  dependencies:
+    "@carbon/colors": "npm:^11.24.0"
+    "@carbon/feature-flags": "npm:^0.21.0"
+    "@carbon/grid": "npm:^11.25.0"
+    "@carbon/layout": "npm:^11.24.0"
+    "@carbon/motion": "npm:^11.20.0"
+    "@carbon/themes": "npm:^11.38.0"
+    "@carbon/type": "npm:^11.29.0"
+    "@ibm/plex": "npm:6.0.0-next.6"
+    "@ibm/telemetry-js": "npm:^1.5.0"
+  peerDependencies:
+    sass: ^1.33.0
+  peerDependenciesMeta:
+    sass:
+      optional: true
+  checksum: 10c0/762d974c024a90fb19e4950e431202f6450d6eee9c35ac1dfa9c7ba2fb38507dbdb234f346427143dd8fb422f770e8da1226d201e033954ec26ccad8c4d083b1
+  languageName: node
+  linkType: hard
+
 "@carbon/telemetry@npm:0.0.0-alpha.6":
   version: 0.0.0-alpha.6
   resolution: "@carbon/telemetry@npm:0.0.0-alpha.6"
@@ -8108,22 +8143,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"carbon-components-react@npm:^8.64.0":
-  version: 8.64.0
-  resolution: "carbon-components-react@npm:8.64.0"
-  dependencies:
-    "@carbon/react": "npm:^1.64.0"
-    "@carbon/styles": "npm:^1.63.0"
-    "@ibm/telemetry-js": "npm:^1.5.0"
-    chalk: "npm:1.1.3"
-  peerDependencies:
-    react: ^16.8.6 || ^17.0.1 || ^18.2.0
-    react-dom: ^16.8.6 || ^17.0.1 || ^18.2.0
-    sass: ^1.33.0
-  checksum: 10c0/cbef9c693cc967f0600eefaa6737065af57a6313eb7cbe51eb9b57b8be99ab31790792cb737bbccf84d755343cc2ed39cde4c0704f96db051cc497f3c18a06b5
-  languageName: node
-  linkType: hard
-
 "carbon-components@npm:10.47.0":
   version: 10.47.0
   resolution: "carbon-components@npm:10.47.0"
@@ -8191,11 +8210,11 @@ __metadata:
     "@carbon/icons-react": "npm:^10.49.5"
     "@carbon/layout": "npm:^11.24.0"
     "@carbon/motion": "npm:^11.20.0"
+    "@carbon/react": "npm:^1.64.1"
     "@carbon/themes": "npm:^11.38.0"
     "@carbon/type": "npm:^11.29.0"
     babel-loader: "npm:^9.1.3"
     carbon-components: "npm:^11.63.0"
-    carbon-components-react: "npm:^8.64.0"
     clean-webpack-plugin: "npm:^4.0.0"
     color: "npm:^4.2.3"
     copy-webpack-plugin: "npm:^12.0.2"