Merge branch 'carbon-design-system:master' into enhancement-localeInt…

…erface
carbon-design-system · Jan 29, 2024 · 4fae08f · 4fae08f
2 parents 40b9032 + de1a4ca
commit 4fae08f
Show file tree

Hide file tree

Showing 15 changed files with 99 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.13.24 (2024-01-26)
+
+**Note:** Version bump only for package @carbon/charts-monorepo
+
+# Change Log
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
 ## 1.13.23 (2024-01-20)
 
 **Note:** Version bump only for package @carbon/charts-monorepo

diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "node_modules/lerna/schemas/lerna-schema.json",
-	"version": "1.13.23",
+	"version": "1.13.24",
 	"npmClient": "yarn",
 	"command": {
 		"publish": {

diff --git a/packages/angular/CHANGELOG.md b/packages/angular/CHANGELOG.md
@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.13.24 (2024-01-26)
+
+**Note:** Version bump only for package @carbon/charts-angular
+
+# Change Log
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
 ## 1.13.23 (2024-01-20)
 
 **Note:** Version bump only for package @carbon/charts-angular

diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@carbon/charts-angular",
-	"version": "1.13.23",
+	"version": "1.13.24",
 	"description": "Carbon Charts component library for Angular",
 	"exports": {
 		"./styles.min.css": "./styles.min.css",

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.13.24 (2024-01-26)
+
+**Note:** Version bump only for package @carbon/charts
+
+# Change Log
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
 ## 1.13.23 (2024-01-20)
 
 **Note:** Version bump only for package @carbon/charts

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@carbon/charts",
-	"version": "1.13.23",
+	"version": "1.13.24",
 	"description": "Carbon Charts component library",
 	"type": "module",
 	"module": "./dist/index.mjs",

diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.13.24 (2024-01-26)
+
+**Note:** Version bump only for package @carbon/charts-react
+
+# Change Log
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
 ## 1.13.23 (2024-01-20)
 
 **Note:** Version bump only for package @carbon/charts-react

diff --git a/packages/react/README.md b/packages/react/README.md
@@ -48,3 +48,12 @@ For instructions on using the **tabular data format**, see
 
 Customizable options (specific to chart type) can be found
 [here](https://charts.carbondesignsystem.com/documentation/modules/interfaces.html)
+
+## <picture><source height="20" width="20" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/ibm-telemetry/telemetry-js/main/docs/images/ibm-telemetry-dark.svg"><source height="20" width="20" media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/ibm-telemetry/telemetry-js/main/docs/images/ibm-telemetry-light.svg"><img height="20" width="20" alt="IBM Telemetry" src="https://raw.githubusercontent.com/ibm-telemetry/telemetry-js/main/docs/images/ibm-telemetry-light.svg"></picture> IBM Telemetry
+
+This package uses IBM Telemetry to collect metrics data. By installing this
+package as a dependency you are agreeing to telemetry collection. To opt out,
+see
+[Opting out of IBM Telemetry data collection](https://github.com/ibm-telemetry/telemetry-js/tree/main#opting-out-of-ibm-telemetry-data-collection).
+For more information on the data being collected, please see the
+[IBM Telemetry documentation](https://github.com/ibm-telemetry/telemetry-js/tree/main#ibm-telemetry-collection-basics).
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@carbon/charts-react",
-	"version": "1.13.23",
+	"version": "1.13.24",
 	"description": "Carbon Charts component library for React",
 	"type": "module",
 	"main": "./dist/index.js",
@@ -18,10 +18,11 @@
 	},
 	"files": [
 		"dist",
-		"README.md"
+		"README.md",
+		"telemetry.yml"
 	],
 	"scripts": {
-		"postinstall": "carbon-telemetry collect --install",
+		"postinstall": "ibmtelemetry --config=telemetry.yml",
 		"file:styles": "cp ../core/dist/styles.* dist",
 		"file:downlevel:dts": "downlevel-dts dist dist",
 		"postbundle": "concurrently \"yarn:file:*\"",
@@ -41,7 +42,7 @@
 	"dependencies": {
 		"@carbon/charts": "workspace:*",
 		"@carbon/icons-react": "^11.34.0",
-		"@carbon/telemetry": "~0.1.0",
+		"@ibm/telemetry-js": "^1.2.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},

diff --git a/packages/react/telemetry.yml b/packages/react/telemetry.yml
@@ -0,0 +1,16 @@
+# yaml-language-server: $schema=https://unpkg.com/@ibm/telemetry-config-schema@v1/dist/config.schema.json
+version: 1
+projectId: 5784a186-6343-49d8-8e9a-1e591596f962
+endpoint: "https://collector-prod.1am6wm210aow.us-south.codeengine.appdomain.cloud/v1/metrics"
+collect:
+  npm:
+    dependencies: null
+  jsx:
+    elements:
+      allowedAttributeNames:
+        # General
+        - options
+        - data
+        # React
+        - key
+        - ref
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.13.24 (2024-01-26)
+
+**Note:** Version bump only for package @carbon/charts-svelte
+
+# Change Log
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
 ## 1.13.23 (2024-01-20)
 
 **Note:** Version bump only for package @carbon/charts-svelte

diff --git a/packages/svelte/package.json b/packages/svelte/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@carbon/charts-svelte",
-	"version": "1.13.23",
+	"version": "1.13.24",
 	"description": "Carbon Charts component library for Svelte",
 	"scripts": {
 		"postinstall": "carbon-telemetry collect --install",

diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md
@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.13.24 (2024-01-26)
+
+**Note:** Version bump only for package @carbon/charts-vue
+
+# Change Log
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
 ## 1.13.23 (2024-01-20)
 
 **Note:** Version bump only for package @carbon/charts-vue

diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@carbon/charts-vue",
-	"version": "1.13.23",
+	"version": "1.13.24",
 	"description": "Carbon Charts component library for Vue",
 	"type": "module",
 	"module": "./dist/index.mjs",

diff --git a/yarn.lock b/yarn.lock
@@ -2227,7 +2227,7 @@ __metadata:
   dependencies:
     "@carbon/charts": "workspace:*"
     "@carbon/icons-react": "npm:^11.34.0"
-    "@carbon/telemetry": "npm:~0.1.0"
+    "@ibm/telemetry-js": "npm:^1.2.0"
     "@stackblitz/sdk": "npm:1.9.0"
     "@types/react": "npm:^18.2.48"
     "@types/react-dom": "npm:^18.2.18"
@@ -3205,6 +3205,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ibm/telemetry-js@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "@ibm/telemetry-js@npm:1.2.0"
+  bin:
+    ibmtelemetry: dist/collect.js
+  checksum: 6b5a154067c52cc8f6abe7bf71308764aa5df361d3d867d8c96862e6196de67799eeb36435355f41ce201a57e75aa9a9279ab461ec7bd98ae5908f06694e3fc4
+  languageName: node
+  linkType: hard
+
 "@isaacs/cliui@npm:^8.0.2":
   version: 8.0.2
   resolution: "@isaacs/cliui@npm:8.0.2"