chore(merge): resolve merge conflicts

annawen1 · Apr 24, 2024 · e65b6aa · e65b6aa
2 parents 482a4b0 + 4ac6387
commit e65b6aa
Show file tree

Hide file tree

Showing 25 changed files with 89 additions and 55 deletions.
diff --git a/.yarn/cache/@carbon-ibm-products-styles-npm-2.32.0-5a620d7234-a5b2a6126c.zip b/.yarn/cache/@carbon-ibm-products-styles-npm-2.32.0-5a620d7234-a5b2a6126c.zip
diff --git a/.yarn/cache/@carbon-ibm-products-styles-npm-2.33.0-602e2a573a-75c7fa024a.zip b/.yarn/cache/@carbon-ibm-products-styles-npm-2.33.0-602e2a573a-75c7fa024a.zip
diff --git a/.yarn/cache/@carbon-icon-helpers-npm-10.45.1-3f2ee2290e-69da5ae85b.zip b/.yarn/cache/@carbon-icon-helpers-npm-10.45.1-3f2ee2290e-69da5ae85b.zip
diff --git a/.yarn/cache/@ibm-telemetry-js-npm-1.4.0-b184a1d59f-a6e7f56a90.zip b/.yarn/cache/@ibm-telemetry-js-npm-1.4.0-b184a1d59f-a6e7f56a90.zip
diff --git a/.yarn/cache/@ibm-telemetry-js-npm-1.5.0-da3bb2b1b8-063e1e4a49.zip b/.yarn/cache/@ibm-telemetry-js-npm-1.5.0-da3bb2b1b8-063e1e4a49.zip
diff --git a/.yarn/cache/eslint-plugin-jest-dom-npm-5.2.0-3e73d296e3-2b3d62ac3e.zip b/.yarn/cache/eslint-plugin-jest-dom-npm-5.2.0-3e73d296e3-2b3d62ac3e.zip
diff --git a/.yarn/cache/eslint-plugin-jest-dom-npm-5.4.0-e7d6b364a7-b8b0b0249d.zip b/.yarn/cache/eslint-plugin-jest-dom-npm-5.4.0-e7d6b364a7-b8b0b0249d.zip
diff --git a/...brary-npm-6.2.1-afd501edcc-12b6b5fe4b.zip → ...brary-npm-6.2.2-e24e9c065a-61947d0b81.zip b/...brary-npm-6.2.1-afd501edcc-12b6b5fe4b.zip → ...brary-npm-6.2.2-e24e9c065a-61947d0b81.zip
diff --git a/.yarn/cache/nwsapi-npm-2.2.7-3bed340fab-22c002080f.zip b/.yarn/cache/nwsapi-npm-2.2.7-3bed340fab-22c002080f.zip
diff --git a/.yarn/cache/nwsapi-npm-2.2.9-a7790a9eab-f542a8127a.zip b/.yarn/cache/nwsapi-npm-2.2.9-a7790a9eab-f542a8127a.zip
diff --git a/.yarn/cache/through2-filter-npm-3.0.0-2279108519-085e0d9edf.zip b/.yarn/cache/through2-filter-npm-3.0.0-2279108519-085e0d9edf.zip
diff --git a/.yarn/cache/through2-filter-npm-3.1.0-5cfc5919f2-de62207c85.zip b/.yarn/cache/through2-filter-npm-3.1.0-5cfc5919f2-de62207c85.zip
diff --git a/packages/carbon-web-components/CHANGELOG.md b/packages/carbon-web-components/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.
 
+# [2.8.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-04-23)
+
+**Note:** Version bump only for package @carbon/web-components
+
+
+
+
+
 # [2.8.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-04-17)
 
 

diff --git a/packages/carbon-web-components/package.json b/packages/carbon-web-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@carbon/web-components",
-  "version": "2.8.0-rc.0",
+  "version": "2.8.0",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/carbon-web-components/src/components/chat-button/chat-button.mdx b/packages/carbon-web-components/src/components/chat-button/chat-button.mdx
@@ -38,5 +38,5 @@ function App() {
 
 ## `<cds-chat-button>` attributes and properties
 
-<ArgsTable of="cds-chat-button" />
+<ArgTypes of="cds-chat-button" />
 ````
diff --git a/packages/carbon-web-components/src/components/slug/slug-example.mdx b/packages/carbon-web-components/src/components/slug/slug-example.mdx
@@ -43,4 +43,4 @@ Note: For `boolean` attributes, `true` means simply setting the attribute (e.g.
 `<cds-slug revert-active>`) and `false` means not setting the attribute (e.g.
 `<cds-slug>` without `revertActive` attribute).
 
-<ArgsTable of="cds-slug" />
+<ArgTypes of="cds-slug" />
diff --git a/packages/services/CHANGELOG.md b/packages/services/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.
 
+# [2.8.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-04-23)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-services
+
+
+
+
+
 # [2.8.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-04-17)
 
 **Note:** Version bump only for package @carbon/ibmdotcom-services

diff --git a/packages/services/package.json b/packages/services/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibmdotcom-services",
   "description": "Carbon for IBM.com Services",
-  "version": "2.8.0-rc.0",
+  "version": "2.8.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
-    "@carbon/ibmdotcom-utilities": "2.8.0-rc.0",
+    "@carbon/ibmdotcom-utilities": "2.8.0",
     "@ibm/telemetry-js": "^1.3.0",
     "axios": "^1.6.8",
     "marked": "^4.0.10",

diff --git a/packages/styles/CHANGELOG.md b/packages/styles/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.
 
+# [2.8.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-04-23)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-styles
+
+
+
+
+
 # [2.8.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-04-17)
 
 

diff --git a/packages/styles/package.json b/packages/styles/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibmdotcom-styles",
   "description": "Carbon for IBM.com Styles",
-  "version": "2.8.0-rc.0",
+  "version": "2.8.0",
   "license": "Apache-2.0",
   "main": "dist/ibm-dotcom-styles.min.css",
   "module": "src/scss",

diff --git a/packages/utilities/CHANGELOG.md b/packages/utilities/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.
 
+# [2.8.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-04-23)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-utilities
+
+
+
+
+
 # [2.8.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-04-17)
 
 **Note:** Version bump only for package @carbon/ibmdotcom-utilities

diff --git a/packages/utilities/package.json b/packages/utilities/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibmdotcom-utilities",
   "description": "Carbon for IBM.com Utilities",
-  "version": "2.8.0-rc.0",
+  "version": "2.8.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",

diff --git a/packages/web-components/CHANGELOG.md b/packages/web-components/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.
 
+# [2.8.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-04-23)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-web-components
+
+
+
+
+
 # [2.8.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-04-17)
 
 

diff --git a/packages/web-components/package.json b/packages/web-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@carbon/ibmdotcom-web-components",
-  "version": "2.8.0-rc.0",
+  "version": "2.8.0",
   "description": "Carbon for IBM.com Web Components",
   "license": "Apache-2.0",
   "exports": {
@@ -91,13 +91,13 @@
     "wca": "web-component-analyzer analyze src --outFile custom-elements.json"
   },
   "dependencies": {
-    "@carbon/ibmdotcom-services": "2.8.0-rc.0",
-    "@carbon/ibmdotcom-styles": "2.8.0-rc.0",
-    "@carbon/ibmdotcom-utilities": "2.8.0-rc.0",
+    "@carbon/ibmdotcom-services": "2.8.0",
+    "@carbon/ibmdotcom-styles": "2.8.0",
+    "@carbon/ibmdotcom-utilities": "2.8.0",
     "@carbon/layout": "11.21.0",
     "@carbon/motion": "11.17.0",
     "@carbon/styles": "1.54.0",
-    "@carbon/web-components": "2.8.0-rc.0",
+    "@carbon/web-components": "2.8.0",
     "@ibm/telemetry-js": "^1.3.0",
     "lit": "^3.1.0",
     "lodash-es": "^4.17.21",

diff --git a/yarn.lock b/yarn.lock
@@ -2329,7 +2329,7 @@ __metadata:
   resolution: "@babel/plugin-transform-dotall-regex@npm:7.23.3"
   dependencies:
     "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
   checksum: 10/a2dbbf7f1ea16a97948c37df925cb364337668c41a3948b8d91453f140507bd8a3429030c7ce66d09c299987b27746c19a2dd18b6f17dcb474854b14fd9159a3
@@ -4307,8 +4307,8 @@ __metadata:
   linkType: hard
 
 "@carbon/ibm-products-styles@npm:^2.30.1":
-  version: 2.32.0
-  resolution: "@carbon/ibm-products-styles@npm:2.32.0"
+  version: 2.33.0
+  resolution: "@carbon/ibm-products-styles@npm:2.33.0"
   dependencies:
     "@ibm/telemetry-js": "npm:^1.3.0"
   peerDependencies:
@@ -4317,7 +4317,7 @@ __metadata:
     "@carbon/motion": ^11.17.0
     "@carbon/themes": ^11.33.0
     "@carbon/type": ^11.26.0
-  checksum: 10/a5b2a6126ce3082f679ad1d93923b3682dca86a08a462bae6a6e393218635f4aecdc8b8290ea1c5e709001587a14fd069983d3a79570c212d51169d1d66ea8b9
+  checksum: 10/75c7fa024aff3f5a00b579bbc36d39367c9abcd1872a8113b7349c65bf89b3552e0557b29ea466c774c1e9f6533319ebd405cef6c8695d393dab073e29b2ce0c
   languageName: node
   linkType: hard
 
@@ -4371,7 +4371,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/ibmdotcom-services@npm:2.8.0-rc.0, @carbon/ibmdotcom-services@workspace:packages/services":
+"@carbon/ibmdotcom-services@npm:2.8.0, @carbon/ibmdotcom-services@workspace:packages/services":
   version: 0.0.0-use.local
   resolution: "@carbon/ibmdotcom-services@workspace:packages/services"
   dependencies:
@@ -4384,7 +4384,7 @@ __metadata:
     "@babel/plugin-transform-runtime": "npm:7.18.5"
     "@babel/preset-env": "npm:~7.23.2"
     "@babel/runtime": "npm:^7.16.3"
-    "@carbon/ibmdotcom-utilities": "npm:2.8.0-rc.0"
+    "@carbon/ibmdotcom-utilities": "npm:2.8.0"
     "@ibm/telemetry-js": "npm:^1.3.0"
     "@rollup/plugin-babel": "npm:^5.3.1"
     "@rollup/plugin-commonjs": "npm:^21.0.3"
@@ -4418,7 +4418,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@carbon/ibmdotcom-styles@npm:2.8.0-rc.0, @carbon/ibmdotcom-styles@workspace:packages/styles":
+"@carbon/ibmdotcom-styles@npm:2.8.0, @carbon/ibmdotcom-styles@workspace:packages/styles":
   version: 0.0.0-use.local
   resolution: "@carbon/ibmdotcom-styles@workspace:packages/styles"
   dependencies:
@@ -4456,7 +4456,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/ibmdotcom-utilities@npm:2.8.0-rc.0, @carbon/ibmdotcom-utilities@workspace:packages/utilities":
+"@carbon/ibmdotcom-utilities@npm:2.8.0, @carbon/ibmdotcom-utilities@workspace:packages/utilities":
   version: 0.0.0-use.local
   resolution: "@carbon/ibmdotcom-utilities@workspace:packages/utilities"
   dependencies:
@@ -4521,10 +4521,10 @@ __metadata:
     "@babel/preset-react": "npm:~7.12.1"
     "@babel/template": "npm:~7.12.0"
     "@babel/traverse": "npm:~7.23.7"
-    "@carbon/ibmdotcom-services": "npm:2.8.0-rc.0"
+    "@carbon/ibmdotcom-services": "npm:2.8.0"
     "@carbon/ibmdotcom-services-store": "npm:1.53.0"
-    "@carbon/ibmdotcom-styles": "npm:2.8.0-rc.0"
-    "@carbon/ibmdotcom-utilities": "npm:2.8.0-rc.0"
+    "@carbon/ibmdotcom-styles": "npm:2.8.0"
+    "@carbon/ibmdotcom-utilities": "npm:2.8.0"
     "@carbon/icon-helpers": "npm:10.47.0"
     "@carbon/icons": "npm:^11.31.0"
     "@carbon/icons-react": "npm:^11.33.0"
@@ -4534,7 +4534,7 @@ __metadata:
     "@carbon/react": "npm:1.55.0"
     "@carbon/styles": "npm:1.54.0"
     "@carbon/type": "npm:11.26.0"
-    "@carbon/web-components": "npm:2.8.0-rc.0"
+    "@carbon/web-components": "npm:2.8.0"
     "@ibm/telemetry-js": "npm:^1.3.0"
     "@mordech/vite-lit-loader": "npm:^0.31.3"
     "@open-wc/semantic-dom-diff": "npm:~0.18.0"
@@ -4658,7 +4658,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@carbon/icon-helpers@npm:10.47.0, @carbon/icon-helpers@npm:^10.47.0":
+"@carbon/icon-helpers@npm:10.47.0, @carbon/icon-helpers@npm:^10.45.0, @carbon/icon-helpers@npm:^10.47.0":
   version: 10.47.0
   resolution: "@carbon/icon-helpers@npm:10.47.0"
   dependencies:
@@ -4667,13 +4667,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/icon-helpers@npm:^10.45.0":
-  version: 10.45.1
-  resolution: "@carbon/icon-helpers@npm:10.45.1"
-  checksum: 10/69da5ae85b586c5bb754f1db90069fb48f556c9f5023318a25572faa07e6dca0f07aaec237eaec883029bb75819b64c30bf4716339cdbab590ca0ee648ef67bc
-  languageName: node
-  linkType: hard
-
 "@carbon/icons-react@npm:11.39.0, @carbon/icons-react@npm:^11.39.0":
   version: 11.39.0
   resolution: "@carbon/icons-react@npm:11.39.0"
@@ -4864,7 +4857,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/web-components@npm:2.8.0-rc.0, @carbon/web-components@workspace:packages/carbon-web-components":
+"@carbon/web-components@npm:2.8.0, @carbon/web-components@workspace:packages/carbon-web-components":
   version: 0.0.0-use.local
   resolution: "@carbon/web-components@workspace:packages/carbon-web-components"
   dependencies:
@@ -6196,11 +6189,11 @@ __metadata:
   linkType: hard
 
 "@ibm/telemetry-js@npm:^1.2.1, @ibm/telemetry-js@npm:^1.3.0":
-  version: 1.4.0
-  resolution: "@ibm/telemetry-js@npm:1.4.0"
+  version: 1.5.0
+  resolution: "@ibm/telemetry-js@npm:1.5.0"
   bin:
     ibmtelemetry: dist/collect.js
-  checksum: 10/a6e7f56a90983967150768ed39f2765297717feba18e3ff15b6086197577c488895a45739b9a6f72830927ee0220cecfac1e3a9ad7e5e0806cc80af0864168cd
+  checksum: 10/063e1e4a49aec6a61ca523287f090f005bf5032962df6407bcf7f86e7899e6163be7ac0b63cd9fbcffcbd90bc284288cb2b4f246289cd4fff7d27612d38a6221
   languageName: node
   linkType: hard
 
@@ -13977,7 +13970,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.21.4, browserslist@npm:^4.21.5, browserslist@npm:^4.22.2, browserslist@npm:^4.22.3, browserslist@npm:^4.23.0":
+"browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.21.4, browserslist@npm:^4.21.5, browserslist@npm:^4.22.2, browserslist@npm:^4.23.0":
   version: 4.23.0
   resolution: "browserslist@npm:4.23.0"
   dependencies:
@@ -15691,7 +15684,7 @@ __metadata:
   version: 3.36.0
   resolution: "core-js-compat@npm:3.36.0"
   dependencies:
-    browserslist: "npm:^4.22.3"
+    browserslist: "npm:^4.23.0"
   checksum: 10/633c49a254fe48981057e33651e5a74a0a14f14731aa5afed5d2e61fbe3c5cbc116ffd4feaa158c683c40d6dc4fd2e6aa0ebe12c45d157cfa571309d08400c98
   languageName: node
   linkType: hard
@@ -18501,18 +18494,18 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jest-dom@npm:^5.0.0":
-  version: 5.2.0
-  resolution: "eslint-plugin-jest-dom@npm:5.2.0"
+  version: 5.4.0
+  resolution: "eslint-plugin-jest-dom@npm:5.4.0"
   dependencies:
     "@babel/runtime": "npm:^7.16.3"
     requireindex: "npm:^1.2.0"
   peerDependencies:
-    "@testing-library/dom": ^8.0.0 || ^9.0.0
-    eslint: ^6.8.0 || ^7.0.0 || ^8.0.0
+    "@testing-library/dom": ^8.0.0 || ^9.0.0 || ^10.0.0
+    eslint: ^6.8.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
   peerDependenciesMeta:
     "@testing-library/dom":
       optional: true
-  checksum: 10/2b3d62ac3e2148ae3e926421c1b1c96064b9832f68d4851728786112179b48bb12823859ea45c39217e556632f135605f3eeb3dcbb99dd47692c12ba3450a590
+  checksum: 10/b8b0b0249d066658a75723892bc6f52d6bcf03ff0a69fc5020548c49f740613a8f3acce647f8f04b292606d2bd0ab3372a695aa3d90b4efb19e71870bbddf637
   languageName: node
   linkType: hard
 
@@ -18689,13 +18682,13 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-testing-library@npm:^6.0.1":
-  version: 6.2.1
-  resolution: "eslint-plugin-testing-library@npm:6.2.1"
+  version: 6.2.2
+  resolution: "eslint-plugin-testing-library@npm:6.2.2"
   dependencies:
     "@typescript-eslint/utils": "npm:^5.58.0"
   peerDependencies:
     eslint: ^7.5.0 || ^8.0.0
-  checksum: 10/12b6b5fe4b66513f576ca1c59d8ad8ade6e6f06c3be76a7fb2d0bf49b6f5a71f12de7c32a51641714afc2618120cb5770ce699fd4525f0a063ce74f4251cdcf9
+  checksum: 10/61947d0b81de1565c8627ec2d1e6636a8b6613cfe554a4671d011b3e88dfd77b498ce83b15bcf0a2df5570c44ad1d46d54058ed488f4e515d764196cbc6d65cf
   languageName: node
   linkType: hard
 
@@ -29250,9 +29243,9 @@ __metadata:
   linkType: hard
 
 "nwsapi@npm:^2.2.0, nwsapi@npm:^2.2.4":
-  version: 2.2.7
-  resolution: "nwsapi@npm:2.2.7"
-  checksum: 10/22c002080f0297121ad138aba5a6509e724774d6701fe2c4777627bd939064ecd9e1b6dc1c2c716bb7ca0b9f16247892ff2f664285202ac7eff6ec9543725320
+  version: 2.2.9
+  resolution: "nwsapi@npm:2.2.9"
+  checksum: 10/f542a8127ae12e930f4734876a5c0e9aa9af030b1987147bf00423171a6528a1ddd962b8427eb6f8b678ca1297c595ceb9a63d8660bdaae46dd6ffb1c5cb4ffb
   languageName: node
   linkType: hard
 
@@ -35994,11 +35987,12 @@ __metadata:
   linkType: hard
 
 "through2-filter@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "through2-filter@npm:3.1.0"
+  version: 3.0.0
+  resolution: "through2-filter@npm:3.0.0"
   dependencies:
-    through2: "npm:^4.0.2"
-  checksum: 10/de62207c855753a30fe881ef00cf87a3f5c6f937d6c0d4afeaab75db51c71464b20e04c49c8b50ebb134e70351cf50db87a806d0c8bf2fe41434510da15eda22
+    through2: "npm:~2.0.0"
+    xtend: "npm:~4.0.0"
+  checksum: 10/085e0d9edf6a30b11d453697d5bf095fde1a0c27626d905dab8c26c030dcc3185fe2cdf469732de216f4439269bbe165a848a8c73675135999ff35ac1f511093
   languageName: node
   linkType: hard
 
@@ -36021,7 +36015,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"through2@npm:^2.0.0, through2@npm:^2.0.1, through2@npm:^2.0.3":
+"through2@npm:^2.0.0, through2@npm:^2.0.1, through2@npm:^2.0.3, through2@npm:~2.0.0":
   version: 2.0.5
   resolution: "through2@npm:2.0.5"
   dependencies:
@@ -38708,7 +38702,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xtend@npm:>=4.0.0 <4.1.0-0, xtend@npm:^4.0.0, xtend@npm:^4.0.1, xtend@npm:~4.0.1":
+"xtend@npm:>=4.0.0 <4.1.0-0, xtend@npm:^4.0.0, xtend@npm:^4.0.1, xtend@npm:~4.0.0, xtend@npm:~4.0.1":
   version: 4.0.2
   resolution: "xtend@npm:4.0.2"
   checksum: 10/ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a