Skip to content

Commit

Permalink
Merge branch 'main' into wcGrid
Browse files Browse the repository at this point in the history
  • Loading branch information
lee-chase authored Nov 22, 2024
2 parents 496694c + 626289a commit 1b5f8f8
Show file tree
Hide file tree
Showing 69 changed files with 1,785 additions and 230 deletions.
4 changes: 4 additions & 0 deletions e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,7 @@ Array [
"Invoice",
"IotMunich",
"ItInfrastructureSoftware",
"JapanMtFuji",
"Java",
"Javascript",
"Juice",
Expand Down Expand Up @@ -659,6 +660,7 @@ Array [
"MadridCathedral",
"MadridSkyscrapers",
"MadridStatue",
"MagicWand",
"Magnify",
"MailVerse",
"MainframeQualitiesOfService",
Expand Down Expand Up @@ -854,6 +856,7 @@ Array [
"RedHatApplications",
"RedefiningFinancialServices",
"ReducingCost",
"ReferenceArchitecture",
"Refinery",
"Refresh",
"RelationshipDiagram",
Expand Down Expand Up @@ -1165,6 +1168,7 @@ Array [
"WeddingCake",
"Wheat",
"Whistle",
"WhitePaper",
"Wifi",
"WindPower",
"Windows",
Expand Down
4 changes: 4 additions & 0 deletions e2e/pictograms/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,7 @@ Array [
"Invoice",
"IotMunich",
"ItInfrastructureSoftware",
"JapanMtFuji",
"Java",
"Javascript",
"Juice",
Expand Down Expand Up @@ -658,6 +659,7 @@ Array [
"MadridCathedral",
"MadridSkyscrapers",
"MadridStatue",
"MagicWand",
"Magnify",
"MailVerse",
"MainframeQualitiesOfService",
Expand Down Expand Up @@ -853,6 +855,7 @@ Array [
"RedHatApplications",
"RedefiningFinancialServices",
"ReducingCost",
"ReferenceArchitecture",
"Refinery",
"Refresh",
"RelationshipDiagram",
Expand Down Expand Up @@ -1164,6 +1167,7 @@ Array [
"WeddingCake",
"Wheat",
"Whistle",
"WhitePaper",
"Wifi",
"WindPower",
"Windows",
Expand Down
4 changes: 2 additions & 2 deletions examples/class-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "class-prefix",
"private": true,
"version": "0.68.0-rc.0",
"version": "0.68.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.71.0-rc.0",
"@carbon/react": "^1.71.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox-styles/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "codesandbox-styles",
"private": true,
"version": "0.73.0-rc.0",
"version": "0.73.0",
"type": "module",
"scripts": {
"dev": "vite"
Expand All @@ -11,6 +11,6 @@
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.70.0-rc.0"
"@carbon/styles": "^1.70.0"
}
}
4 changes: 2 additions & 2 deletions examples/custom-theme/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "custom-theme",
"private": true,
"version": "0.69.0-rc.0",
"version": "0.69.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.71.0-rc.0",
"@carbon/react": "^1.71.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/id-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "id-prefix",
"private": true,
"version": "0.68.0-rc.0",
"version": "0.68.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.71.0-rc.0",
"@carbon/react": "^1.71.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/light-dark-mode/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "examples-light-dark",
"private": true,
"version": "0.69.0-rc.0",
"version": "0.69.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.71.0-rc.0",
"@carbon/react": "^1.71.0",
"next": "14.1.1",
"react": "18.2.0",
"react-dom": "18.2.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/nextjs/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "examples-nextjs",
"private": true,
"version": "0.71.0-rc.0",
"version": "0.71.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.71.0-rc.0",
"@carbon/react": "^1.71.0",
"next": "14.1.1",
"react": "18.2.0",
"react-dom": "18.2.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/v10-token-compat-in-v11/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "v10-token-compat-in-v11",
"private": true,
"version": "0.69.0-rc.0",
"version": "0.69.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.71.0-rc.0",
"@carbon/react": "^1.71.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/vite/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "vite",
"private": true,
"version": "0.69.0-rc.0",
"version": "0.69.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.71.0-rc.0",
"@carbon/react": "^1.71.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/carbon-components-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "carbon-components-react",
"private": true,
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences. This package reached end of support on September 30, 2024 and will not receive any more updates.",
"version": "8.71.0-rc.0",
"version": "8.71.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -43,8 +43,8 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.71.0-rc.0",
"@carbon/styles": "^1.70.0-rc.0",
"@carbon/react": "^1.71.0",
"@carbon/styles": "^1.70.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/carbon-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "carbon-components",
"private": true,
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences. This package reached end of support on September 30, 2024 and will not receive any more updates.",
"version": "11.70.0-rc.0",
"version": "11.70.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -44,7 +44,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.70.0-rc.0",
"@carbon/styles": "^1.70.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/elements/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/elements",
"description": "A collection of design elements in code for the IBM Design Language",
"version": "11.56.0",
"version": "11.57.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -40,7 +40,7 @@
"dependencies": {
"@carbon/colors": "^11.28.0",
"@carbon/grid": "^11.29.0",
"@carbon/icons": "^11.52.0",
"@carbon/icons": "^11.53.0",
"@carbon/layout": "^11.28.0",
"@carbon/motion": "^11.24.0",
"@carbon/themes": "^11.43.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/icons-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons-react",
"description": "React components for icons in digital and software products using the Carbon Design System",
"version": "11.52.0",
"version": "11.53.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -44,7 +44,7 @@
},
"devDependencies": {
"@carbon/icon-build-helpers": "^1.32.0",
"@carbon/icons": "^11.52.0",
"@carbon/icons": "^11.53.0",
"rimraf": "^6.0.0"
},
"sideEffects": false
Expand Down
4 changes: 2 additions & 2 deletions packages/icons-vue/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons-vue",
"description": "Vue components for icons in digital and software products using the Carbon Design System",
"version": "10.101.0",
"version": "10.102.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -35,7 +35,7 @@
},
"devDependencies": {
"@carbon/cli-reporter": "^10.7.0",
"@carbon/icons": "^11.52.0",
"@carbon/icons": "^11.53.0",
"fs-extra": "^11.0.0",
"prettier": "^3.3.3",
"rimraf": "^6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/icons/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons",
"description": "Icons for digital and software products using the Carbon Design System",
"version": "11.52.0",
"version": "11.53.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/pictograms-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/pictograms-react",
"description": "React components for pictograms in digital and software products using the Carbon Design System",
"version": "11.68.0",
"version": "11.69.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -45,7 +45,7 @@
},
"devDependencies": {
"@carbon/icon-build-helpers": "^1.32.0",
"@carbon/pictograms": "^12.42.0",
"@carbon/pictograms": "^12.43.0",
"rimraf": "^6.0.0"
},
"sideEffects": false
Expand Down
4 changes: 4 additions & 0 deletions packages/pictograms/categories.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ categories:
- hong-kong--cityscape
- hong-kong
- ibm--uk-labs-hursley
- japan--mt-fuji
- kochi-houseboat
- kuala-lumpur
- london
Expand Down Expand Up @@ -406,6 +407,7 @@ categories:
- real-estate
- redefining-financial-services
- reducing-cost
- reference-architecture
- reliability--02
- reseller-programs
- resource-health
Expand Down Expand Up @@ -462,6 +464,7 @@ categories:
- visual--data
- websites
- websphere
- white-paper
- windows-hosting
- workflows
- name: Controls
Expand Down Expand Up @@ -1093,6 +1096,7 @@ categories:
- name: Strategy
members:
- innovate
- magic-wand
- presentation
- presenter
- puzzle
Expand Down
2 changes: 2 additions & 0 deletions packages/pictograms/deprecated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ deprecated:
reason:
This pictogram should no longer be used, as it represents the old avatar
for the Watson brand, which is retired since the watsonx brand launch.
- name: tokyo--volcano
reason: This icon has been replaced by japan--mt-fuji
2 changes: 1 addition & 1 deletion packages/pictograms/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/pictograms",
"description": "Pictograms for digital and software products using the Carbon Design System",
"version": "12.42.0",
"version": "12.43.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down
Loading

0 comments on commit 1b5f8f8

Please sign in to comment.