Skip to content

Commit

Permalink
Merge branch 'main' into 16864-fix/combobox-allowcustomvalue
Browse files Browse the repository at this point in the history
  • Loading branch information
kennylam committed Sep 10, 2024
2 parents 115fe60 + 68799ee commit 76668ca
Show file tree
Hide file tree
Showing 38 changed files with 234 additions and 173 deletions.
2 changes: 1 addition & 1 deletion config/eslint-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "eslint-config-carbon",
"description": "ESLint configuration for Carbon",
"version": "3.15.0",
"version": "3.16.0-rc.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion config/jest-config-carbon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "jest-config-carbon",
"private": true,
"description": "Jest configuration and preset for Carbon",
"version": "1.14.0",
"version": "1.15.0-rc.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion config/stylelint-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "stylelint-config-carbon",
"description": "Stylelint configuration for Carbon",
"version": "1.17.0",
"version": "1.18.0-rc.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
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.62.0",
"version": "0.63.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.65.0",
"@carbon/react": "^1.66.0-rc.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.67.0",
"version": "0.68.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite"
Expand All @@ -11,6 +11,6 @@
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.64.0"
"@carbon/styles": "^1.65.0-rc.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.63.0",
"version": "0.64.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.65.0",
"@carbon/react": "^1.66.0-rc.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.62.0",
"version": "0.63.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.65.0",
"@carbon/react": "^1.66.0-rc.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.63.0",
"version": "0.64.0-rc.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.65.0",
"@carbon/react": "^1.66.0-rc.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.65.0",
"version": "0.66.0-rc.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.65.0",
"@carbon/react": "^1.66.0-rc.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.63.0",
"version": "0.64.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.65.0",
"@carbon/react": "^1.66.0-rc.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.63.0",
"version": "0.64.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.65.0",
"@carbon/react": "^1.66.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/carbon-components-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "carbon-components-react",
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
"version": "8.65.0",
"version": "8.66.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -42,8 +42,8 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.65.0",
"@carbon/styles": "^1.64.0",
"@carbon/react": "^1.66.0-rc.0",
"@carbon/styles": "^1.65.0-rc.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
Expand All @@ -55,7 +55,7 @@
"@babel/plugin-transform-react-constant-elements": "^7.24.7",
"@babel/preset-env": "^7.24.7",
"@babel/preset-react": "^7.24.7",
"@carbon/test-utils": "^10.31.0",
"@carbon/test-utils": "^10.32.0-rc.0",
"@rollup/plugin-babel": "^6.0.0",
"@rollup/plugin-commonjs": "^26.0.0",
"@rollup/plugin-node-resolve": "^15.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/carbon-components/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "carbon-components",
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
"version": "11.64.0",
"version": "11.65.0-rc.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -43,12 +43,12 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.64.0",
"@carbon/styles": "^1.65.0-rc.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
"devDependencies": {
"@carbon/test-utils": "^10.31.0",
"@carbon/test-utils": "^10.32.0-rc.0",
"fs-extra": "^11.0.0",
"rimraf": "^6.0.0",
"sass": "^1.77.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/cli",
"description": "Task automation for working with the Carbon Design System",
"version": "11.20.0",
"version": "11.21.0-rc.0",
"license": "Apache-2.0",
"bin": {
"carbon-cli": "./bin/carbon-cli.js"
Expand Down
6 changes: 3 additions & 3 deletions packages/colors/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/colors",
"description": "Colors for digital and software products using the Carbon Design System",
"version": "11.25.0",
"version": "11.26.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -39,10 +39,10 @@
"postinstall": "ibmtelemetry --config=telemetry.yml"
},
"devDependencies": {
"@carbon/cli": "^11.20.0",
"@carbon/cli": "^11.21.0-rc.0",
"@carbon/cli-reporter": "^10.7.0",
"@carbon/scss-generator": "^10.18.0",
"@carbon/test-utils": "^10.31.0",
"@carbon/test-utils": "^10.32.0-rc.0",
"change-case": "^4.1.1",
"fs-extra": "^11.0.0",
"rimraf": "^6.0.0"
Expand Down
18 changes: 9 additions & 9 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.52.0",
"version": "11.53.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -38,17 +38,17 @@
"postinstall": "ibmtelemetry --config=telemetry.yml"
},
"dependencies": {
"@carbon/colors": "^11.25.0",
"@carbon/grid": "^11.26.0",
"@carbon/icons": "^11.48.0",
"@carbon/layout": "^11.25.0",
"@carbon/motion": "^11.21.0",
"@carbon/themes": "^11.39.0",
"@carbon/type": "^11.30.0",
"@carbon/colors": "^11.26.0-rc.0",
"@carbon/grid": "^11.27.0-rc.0",
"@carbon/icons": "^11.49.0-rc.0",
"@carbon/layout": "^11.26.0-rc.0",
"@carbon/motion": "^11.22.0-rc.0",
"@carbon/themes": "^11.40.0-rc.0",
"@carbon/type": "^11.31.0-rc.0",
"@ibm/telemetry-js": "^1.5.0"
},
"devDependencies": {
"@carbon/cli": "^11.20.0",
"@carbon/cli": "^11.21.0-rc.0",
"fs-extra": "^11.0.0",
"klaw-sync": "^6.0.0",
"replace-in-file": "^7.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/grid/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/grid",
"description": "Grid for digital and software products using the Carbon Design System",
"version": "11.26.0",
"version": "11.27.0-rc.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -35,11 +35,11 @@
"postinstall": "ibmtelemetry --config=telemetry.yml"
},
"dependencies": {
"@carbon/layout": "^11.25.0",
"@carbon/layout": "^11.26.0-rc.0",
"@ibm/telemetry-js": "^1.5.0"
},
"devDependencies": {
"@carbon/cli": "^11.20.0",
"@carbon/cli": "^11.21.0-rc.0",
"rimraf": "^6.0.0"
},
"eyeglass": {
Expand Down
4 changes: 2 additions & 2 deletions packages/icon-build-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@carbon/icon-build-helpers",
"private": true,
"description": "Build helpers for the Carbon Design System icon library",
"version": "1.29.0",
"version": "1.30.0-rc.0",
"license": "Apache-2.0",
"main": "src/index.js",
"repository": {
Expand Down Expand Up @@ -30,7 +30,7 @@
"@babel/template": "^7.24.7",
"@babel/types": "^7.24.7",
"@carbon/cli-reporter": "^10.7.0",
"@carbon/icon-helpers": "^10.51.0",
"@carbon/icon-helpers": "^10.52.0-rc.0",
"@hapi/joi": "^17.1.1",
"@rollup/plugin-babel": "^6.0.0",
"@rollup/plugin-replace": "^5.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/icon-helpers/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icon-helpers",
"description": "Helpers used alongside icons for digital and software products using the Carbon Design System",
"version": "10.51.0",
"version": "10.52.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -36,7 +36,7 @@
"postinstall": "ibmtelemetry --config=telemetry.yml"
},
"devDependencies": {
"@carbon/cli": "^11.20.0",
"@carbon/cli": "^11.21.0-rc.0",
"rimraf": "^6.0.0",
"typescript-config-carbon": "^0.3.0"
},
Expand Down
8 changes: 4 additions & 4 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.48.0",
"version": "11.49.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -38,13 +38,13 @@
"react": ">=16"
},
"dependencies": {
"@carbon/icon-helpers": "^10.51.0",
"@carbon/icon-helpers": "^10.52.0-rc.0",
"@ibm/telemetry-js": "^1.5.0",
"prop-types": "^15.7.2"
},
"devDependencies": {
"@carbon/icon-build-helpers": "^1.29.0",
"@carbon/icons": "^11.48.0",
"@carbon/icon-build-helpers": "^1.30.0-rc.0",
"@carbon/icons": "^11.49.0-rc.0",
"rimraf": "^6.0.0"
},
"sideEffects": false
Expand Down
6 changes: 3 additions & 3 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.97.0",
"version": "10.98.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -30,12 +30,12 @@
"postinstall": "ibmtelemetry --config=telemetry.yml"
},
"dependencies": {
"@carbon/icon-helpers": "^10.51.0",
"@carbon/icon-helpers": "^10.52.0-rc.0",
"@ibm/telemetry-js": "^1.5.0"
},
"devDependencies": {
"@carbon/cli-reporter": "^10.7.0",
"@carbon/icons": "^11.48.0",
"@carbon/icons": "^11.49.0-rc.0",
"fs-extra": "^11.0.0",
"prettier": "^2.8.8",
"rimraf": "^6.0.0",
Expand Down
Loading

0 comments on commit 76668ca

Please sign in to comment.