Skip to content

Commit

Permalink
Merge branch 'main' into renovate/rollup-plugin-typescript-12.x
Browse files Browse the repository at this point in the history
  • Loading branch information
kennylam authored Oct 23, 2024
2 parents 97d416c + 3b81c94 commit 389cb7b
Show file tree
Hide file tree
Showing 351 changed files with 6,427 additions and 4,557 deletions.
18 changes: 18 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1652,6 +1652,24 @@
"contributions": [
"code"
]
},
{
"login": "ziyadzulfikar",
"name": "ziyadzulfikar",
"avatar_url": "https://avatars.githubusercontent.com/u/56788667?v=4",
"profile": "https://github.com/ziyadzulfikar",
"contributions": [
"code"
]
},
{
"login": "mariat189",
"name": "Mariat",
"avatar_url": "https://avatars.githubusercontent.com/u/74430463?v=4",
"profile": "https://github.com/mariat189",
"contributions": [
"code"
]
}
],
"commitConvention": "none"
Expand Down
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.
324 changes: 162 additions & 162 deletions .yarn/releases/yarn-4.4.1.cjs → .yarn/releases/yarn-4.5.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ supportedArchitectures:
- linux
- win32

yarnPath: .yarn/releases/yarn-4.4.1.cjs
yarnPath: .yarn/releases/yarn-4.5.0.cjs
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,10 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<td align="center"><a href="https://github.com/Neues"><img src="https://avatars.githubusercontent.com/u/9409245?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noah Sgorbati</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Neues" title="Code">💻</a> <a href="https://github.com/carbon-design-system/carbon/commits?author=Neues" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/divya-281"><img src="https://avatars.githubusercontent.com/u/72991264?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Divya G</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=divya-281" title="Code">💻</a></td>
<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>

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.17.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.19.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
File renamed without changes.
File renamed without changes.
16 changes: 0 additions & 16 deletions e2e/components/OverflowMenu/OverflowMenu-test.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,6 @@ test.describe('OverflowMenu', () => {
theme,
});
});

test('feature flags default @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'OverflowMenu',
id: 'experimental-feature-flags-overflowmenu--overflow-menu',
theme,
});
});

test('feature flags render custom icon @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'OverflowMenu',
id: 'experimental-feature-flags-overflowmenu--custom-icon',
theme,
});
});
});
});
});
18 changes: 9 additions & 9 deletions e2e/components/Tile/Tile-test.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,55 +105,55 @@ test.describe('Tile', () => {
test('feature flags clickable @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Tile',
id: 'experimental-feature-flags-tile--clickable',
id: 'components-tile-feature-flag--clickable',
theme,
});
});

test('feature flags clickable with layer @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Tile',
id: 'experimental-feature-flags-tile--clickable-with-layer',
id: 'components-tile-feature-flag--clickable-with-layer',
theme,
});
});

test('feature flags selectable @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Tile',
id: 'experimental-feature-flags-tile--selectable',
id: 'components-tile-feature-flag--selectable',
theme,
});
});

test('feature flags multi select @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Tile',
id: 'experimental-feature-flags-tile--multi-select',
id: 'components-tile-feature-flag--multi-select',
theme,
});
});

test('feature flags radio @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Tile',
id: 'experimental-feature-flags-tile--radio',
id: 'components-tile-feature-flag--radio',
theme,
});
});

test('feature flags radio with layer @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Tile',
id: 'experimental-feature-flags-tile--radio-with-layer',
id: 'components-tile-feature-flag--radio-with-layer',
theme,
});
});

test('feature flags expandable @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Tile',
id: 'experimental-feature-flags-tile--expandable',
id: 'components-tile-feature-flag--expandable',
theme,
});
});
Expand All @@ -163,15 +163,15 @@ test.describe('Tile', () => {
}) => {
await snapshotStory(page, {
component: 'Tile',
id: 'experimental-feature-flags-tile--expandable-with-interactive',
id: 'components-tile-feature-flag--expandable-with-interactive',
theme,
});
});

test('feature flags expandable with layer @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Tile',
id: 'experimental-feature-flags-tile--expandable-with-layer',
id: 'components-tile-feature-flag--expandable-with-layer',
theme,
});
});
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.65.0",
"version": "0.66.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.68.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.70.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.67.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.66.0",
"version": "0.67.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.68.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.65.0",
"version": "0.66.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.68.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.66.0",
"version": "0.67.0-rc.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.68.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.68.0",
"version": "0.69.0-rc.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.68.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.66.0",
"version": "0.67.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.68.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.66.0",
"version": "0.67.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.68.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 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 Expand Up @@ -145,5 +145,5 @@
"./config/stylelint-config-carbon"
]
},
"packageManager": "yarn@4.4.1"
"packageManager": "yarn@4.5.0"
}
Loading

0 comments on commit 389cb7b

Please sign in to comment.