Skip to content

Commit

Permalink
Merge branch 'main' into 17781-overflowmenu
Browse files Browse the repository at this point in the history
  • Loading branch information
guidari authored Oct 24, 2024
2 parents ce75600 + a603f05 commit f592e29
Show file tree
Hide file tree
Showing 174 changed files with 1,467 additions and 985 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1662,6 +1662,15 @@
"code"
]
},
{
"login": "mariat189",
"name": "Mariat",
"avatar_url": "https://avatars.githubusercontent.com/u/74430463?v=4",
"profile": "https://github.com/mariat189",
"contributions": [
"code"
]
}
],
"commitConvention": "none"
}
2 changes: 1 addition & 1 deletion .github/workflows/metrics-merge-rate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Calculate PR Merge Rate

on:
schedule:
- cron: '0 12 * * 1' # Runs every Monday at 12:00 UTC
- cron: '0 1 * * 3' # Runs at 1:00 AM UTC every Wednesday
workflow_dispatch: # Allows manual runs from the GitHub Actions tab

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .whitesource
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"settingsInheritedFrom": "ibm-mend-config/mend-config@issues_none",
"settingsInheritedFrom": "ibm-mend-config/mend-config",
"issueSettings": {
"minSeverityLevel": "NONE"
}
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,9 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<td align="center"><a href="https://github.com/soumyaraju"><img src="https://avatars.githubusercontent.com/u/41182657?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Soumya Raju</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=soumyaraju" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/ziyadzulfikar"><img src="https://avatars.githubusercontent.com/u/56788667?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ziyad Bin Sulfi</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=ziyadzulfikar" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/mariat189"><img src="https://avatars.githubusercontent.com/u/74430463?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mariat</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=mariat189" title="Code">💻</a></td>
</tr>
</table>

<!-- markdownlint-restore -->
Expand Down
4 changes: 2 additions & 2 deletions 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.18.0",
"version": "3.18.0-rc.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down Expand Up @@ -54,6 +54,6 @@
},
"devDependencies": {
"babel-preset-carbon": "workspace:^",
"prettier": "^2.8.8"
"prettier": "^3.3.3"
}
}
5 changes: 3 additions & 2 deletions 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.20.0",
"version": "1.20.0-rc.0",
"license": "Apache-2.0",
"type": "module",
"main": "index.js",
Expand Down Expand Up @@ -35,11 +35,12 @@
"stylelint-config-standard-scss": "^13.1.0",
"stylelint-no-unsupported-browser-features": "^8.0.1",
"stylelint-order": "^6.0.0",
"stylelint-prettier": "^5.0.0",
"stylelint-scss": "^6.2.1",
"stylelint-use-logical": "^2.1.0"
},
"devDependencies": {
"prettier": "^2.8.8",
"prettier": "^3.3.3",
"stylelint": "^16.0.0"
}
}
3 changes: 1 addition & 2 deletions docs/guides/icons.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@ update PR:
`--modifiers`. All icons with `--modifiers` are listed as variants of the
same icon.
3. make desired edits on the icon's `aliases` list.
4. commit changes, preferably with a commit message "[icon name] metadata
update".
4. commit changes, preferably with a commit message "[icon name] metadata update".
5. create a new branch, suggested branch name is `yourname-metadata-iconName`
6. create the PR from your branch, or click on `Propose file change` if you are
in browser.
Expand Down
4 changes: 2 additions & 2 deletions docs/guides/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ started in case you get stuck.
- “Could you share more about what you’ve already tried?”
- “Can you share more about your usecase?”
- “Can you add a repro (reproduction) using Stackblitz?”
- “After searching through [FILL IN RESOURCE HERE], I was able to find this and
thought it might be helpful... Let me know if that works.”
- “After searching through [FILL IN RESOURCE HERE], I was able to find this and thought
it might be helpful... Let me know if that works.”

### What does "ongoing support" mean regarding GitHub?

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.66.0",
"version": "0.66.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.69.0",
"@carbon/react": "^1.69.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.71.0",
"version": "0.71.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite"
Expand All @@ -11,6 +11,6 @@
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.68.0"
"@carbon/styles": "^1.68.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.67.0",
"version": "0.67.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.69.0",
"@carbon/react": "^1.69.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.66.0",
"version": "0.66.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.69.0",
"@carbon/react": "^1.69.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.67.0",
"version": "0.67.0-rc.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.69.0",
"@carbon/react": "^1.69.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.69.0",
"version": "0.69.0-rc.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.69.0",
"@carbon/react": "^1.69.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.67.0",
"version": "0.67.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.69.0",
"@carbon/react": "^1.69.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.67.0",
"version": "0.67.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.69.0",
"@carbon/react": "^1.69.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"jest-junit": "^16.0.0",
"lerna": "^8.0.0",
"lint-staged": "^15.0.0",
"prettier": "^2.8.8",
"prettier": "^3.3.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rimraf": "^5.0.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
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.69.0",
"version": "8.69.0-rc.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.69.0",
"@carbon/styles": "^1.68.0",
"@carbon/react": "^1.69.0-rc.0",
"@carbon/styles": "^1.68.0-rc.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
Expand All @@ -58,7 +58,7 @@
"@babel/preset-react": "^7.24.7",
"@carbon/test-utils": "^10.33.0",
"@rollup/plugin-babel": "^6.0.0",
"@rollup/plugin-commonjs": "^26.0.0",
"@rollup/plugin-commonjs": "^28.0.0",
"@rollup/plugin-node-resolve": "^15.0.0",
"babel-plugin-dev-expression": "^0.2.3",
"babel-preset-carbon": "^0.6.0",
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.68.0",
"version": "11.68.0-rc.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -44,7 +44,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.68.0",
"@carbon/styles": "^1.68.0-rc.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
Expand Down
6 changes: 3 additions & 3 deletions 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.23.0",
"version": "11.23.0-rc.0",
"license": "Apache-2.0",
"bin": {
"carbon-cli": "./bin/carbon-cli.js"
Expand Down Expand Up @@ -34,7 +34,7 @@
"@octokit/plugin-throttling": "^4.0.0",
"@octokit/rest": "^19.0.0",
"@rollup/plugin-babel": "^6.0.0",
"@rollup/plugin-commonjs": "^26.0.0",
"@rollup/plugin-commonjs": "^28.0.0",
"@rollup/plugin-node-resolve": "^15.0.0",
"chalk": "^4.1.1",
"change-case": "^4.1.2",
Expand All @@ -47,7 +47,7 @@
"klaw-sync": "^6.0.0",
"lodash.template": "^4.5.0",
"markdown-toc": "^1.2.0",
"prettier": "^2.8.8",
"prettier": "^3.3.3",
"prettier-config-carbon": "^0.11.0",
"progress-estimator": "^0.3.0",
"remark": "^10.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/sassdoc/tools.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

'use strict';

const prettier = require('prettier');
const prettier = require('prettier2');
const sassdoc = require('sassdoc');
const toc = require('markdown-toc');

Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/sync/readme.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

const fs = require('fs-extra');
const path = require('path');
const prettier = require('prettier');
const prettier = require('prettier2');
const prettierConfig = require('prettier-config-carbon');
const createRemark = require('remark');
const monorepo = require('./remark/remark-monorepo');
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.28.0",
"version": "11.28.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.23.0",
"@carbon/cli": "^11.23.0-rc.0",
"@carbon/cli-reporter": "^10.7.0",
"@carbon/scss-generator": "^10.18.0",
"@carbon/test-utils": "^10.33.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/colors/tasks/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ async function build() {
const MODULES_ENTRYPOINT = path.resolve(__dirname, '..', 'index.scss');

await Promise.all([
fs.writeFile(MODULES_ENTRYPOINT, generate(sassModule).code),
fs.writeFile(MODULES_ENTRYPOINT, await generate(sassModule).code),
]);
}

Expand Down
Loading

0 comments on commit f592e29

Please sign in to comment.