Skip to content

Commit

Permalink
Merge branch 'main' into 16541-floating-ui-in-new-overflowmenu
Browse files Browse the repository at this point in the history
  • Loading branch information
preetibansalui authored Jun 17, 2024
2 parents f61c578 + 3931ace commit 2c381cb
Show file tree
Hide file tree
Showing 38 changed files with 190 additions and 168 deletions.
10 changes: 9 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1538,7 +1538,15 @@
"login": "Kilian-Collender",
"name": "Kilian Collender",
"avatar_url": "https://avatars.githubusercontent.com/u/37899503?v=4",
"profile": "https://github.com/Kilian-Collender",
"contributions": [
"code"
]
},
{
"login": "nandininarayanofficial",
"name": "nandininarayanofficial",
"avatar_url": "https://avatars.githubusercontent.com/u/165769075?v=4",
"profile": "https://github.com/nandininarayanofficial",
"contributions": [
"code"
]
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ updates:
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: 'daily'
interval: 'weekly'
17 changes: 10 additions & 7 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
{
"extends": [
extends: [
// https://docs.renovatebot.com/presets-config/#configjs-lib
"config:js-lib",
'config:js-lib',

// https://docs.renovatebot.com/presets-default/#maintainlockfilesweekly
":maintainLockFilesWeekly",
':maintainLockFilesWeekly',

// https://docs.renovatebot.com/presets-default/#preservesemverranges
":preserveSemverRanges",
':preserveSemverRanges',

// https://docs.renovatebot.com/presets-npm/#npmunpublishsafe
"npm:unpublishSafe",
'npm:unpublishSafe',

// https://docs.renovatebot.com/presets-schedule/#scheduledaily
"schedule:earlyMondays",
'schedule:weekday',
],
"rebaseWhen": "never",
vulnerabilityAlerts: {
enabled: true,
},
rebaseWhen: 'never',
}
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
script: |
github.rest.repos.createRelease({
tag_name: context.ref,
name: context.ref,
name: ${{ github.ref_name }},
draft: false,
prerelease: true,
owner: context.repo.owner,
Expand Down
Binary file not shown.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,9 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<td align="center"><a href="https://github.com/digiacomo-a"><img src="https://avatars.githubusercontent.com/u/117646602?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andrea DG</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=digiacomo-a" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/Kilian-Collender"><img src="https://avatars.githubusercontent.com/u/37899503?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kilian Collender</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Kilian-Collender" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/nandininarayanofficial"><img src="https://avatars.githubusercontent.com/u/165769075?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nandininarayanofficial</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=nandininarayanofficial" title="Code">💻</a></td>
</tr>
</table>

<!-- markdownlint-restore -->
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.56.0",
"version": "0.57.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.59.0",
"@carbon/react": "^1.60.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.62.0",
"version": "0.63.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite"
Expand All @@ -11,6 +11,6 @@
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.59.0"
"@carbon/styles": "^1.60.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.57.0",
"version": "0.58.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.59.0",
"@carbon/react": "^1.60.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.56.0",
"version": "0.57.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.59.0",
"@carbon/react": "^1.60.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/incremental-migration-vite/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "incremental-migration-vite",
"private": true,
"version": "0.24.0",
"version": "0.25.0-rc.0",
"scripts": {
"dev": "vite",
"build": "vite build",
Expand All @@ -12,7 +12,7 @@
},
"dependencies": {
"@carbon/icons-react": "^10.49.0",
"@carbon/react": "^1.59.0",
"@carbon/react": "^1.60.0-rc.0",
"carbon-components": "^10.57.0",
"carbon-components-react": "^7.57.0",
"carbon-icons": "^7.0.7",
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.57.0",
"version": "0.58.0-rc.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.59.0",
"@carbon/react": "^1.60.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.59.0",
"version": "0.60.0-rc.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.59.0",
"@carbon/react": "^1.60.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.57.0",
"version": "0.58.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.59.0",
"@carbon/react": "^1.60.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.57.0",
"version": "0.58.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.59.0",
"@carbon/react": "^1.60.0-rc.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
@@ -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.59.0",
"version": "8.60.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.59.0",
"@carbon/styles": "^1.59.0",
"@carbon/react": "^1.60.0-rc.0",
"@carbon/styles": "^1.60.0-rc.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
@@ -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.59.0",
"version": "11.60.0-rc.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -43,7 +43,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.59.0",
"@carbon/styles": "^1.60.0-rc.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
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.17.0",
"version": "11.18.0-rc.0",
"license": "Apache-2.0",
"bin": {
"carbon-cli": "./bin/carbon-cli.js"
Expand Down
4 changes: 2 additions & 2 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.22.0",
"version": "11.23.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -39,7 +39,7 @@
"postinstall": "ibmtelemetry --config=telemetry.yml"
},
"devDependencies": {
"@carbon/cli": "^11.17.0",
"@carbon/cli": "^11.18.0-rc.0",
"@carbon/cli-reporter": "^10.7.0",
"@carbon/scss-generator": "^10.18.0",
"@carbon/test-utils": "^10.30.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.47.0",
"version": "11.48.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.22.0",
"@carbon/grid": "^11.23.0",
"@carbon/icons": "^11.43.0",
"@carbon/layout": "^11.22.0",
"@carbon/motion": "^11.18.0",
"@carbon/themes": "^11.36.0",
"@carbon/type": "^11.27.0",
"@carbon/colors": "^11.23.0-rc.0",
"@carbon/grid": "^11.24.0-rc.0",
"@carbon/icons": "^11.44.0-rc.0",
"@carbon/layout": "^11.23.0-rc.0",
"@carbon/motion": "^11.19.0-rc.0",
"@carbon/themes": "^11.37.0-rc.0",
"@carbon/type": "^11.28.0-rc.0",
"@ibm/telemetry-js": "^1.5.0"
},
"devDependencies": {
"@carbon/cli": "^11.17.0",
"@carbon/cli": "^11.18.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.23.0",
"version": "11.24.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.22.0",
"@carbon/layout": "^11.23.0-rc.0",
"@ibm/telemetry-js": "^1.5.0"
},
"devDependencies": {
"@carbon/cli": "^11.17.0",
"@carbon/cli": "^11.18.0-rc.0",
"rimraf": "^5.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.26.0",
"version": "1.27.0-rc.0",
"license": "Apache-2.0",
"main": "src/index.js",
"repository": {
Expand Down Expand Up @@ -30,7 +30,7 @@
"@babel/template": "^7.16.7",
"@babel/types": "^7.18.4",
"@carbon/cli-reporter": "^10.7.0",
"@carbon/icon-helpers": "^10.48.0",
"@carbon/icon-helpers": "^10.49.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.48.0",
"version": "10.49.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.17.0",
"@carbon/cli": "^11.18.0-rc.0",
"rimraf": "^5.0.0",
"typescript-config-carbon": "^0.2.0"
},
Expand Down
Loading

0 comments on commit 2c381cb

Please sign in to comment.