Skip to content

Commit

Permalink
Merge branch 'main' into readonlyTextArea
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Dec 2, 2022
2 parents caf1d61 + 2551cd5 commit 54fd1ac
Show file tree
Hide file tree
Showing 166 changed files with 2,872 additions and 3,173 deletions.
19 changes: 19 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,16 @@
"code"
]
},
{
"login": "61130061",
"name": "Llam4u",
"avatar_url": "https://avatars.githubusercontent.com/u/54393468?v=4",
"profile": "https://61130061.github.io/llam4u-terminal/",
"contributions": [
"code",
"bug"
]
},
{
"login": "torresga",
"name": "G. Torres",
Expand Down Expand Up @@ -949,6 +959,15 @@
"contributions": [
"code"
]
},
{
"login": "Shankar-CodeJunkie",
"name": "ShankarV-CodeJunkie",
"avatar_url": "https://avatars.githubusercontent.com/u/56068832?v=4",
"profile": "https://github.com/Shankar-CodeJunkie",
"contributions": [
"code"
]
}
],
"commitConvention": "none"
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/add-to-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Add To Project
on:
issues:
types: [opened, labeled]
workflow_call:
secrets:
ADD_TO_PROJECT_PAT:
required: true

env:
DESIGN_SYSTEM_PROJECT_URL: https://github.com/orgs/carbon-design-system/projects/39
PROPOSALS_PROJECT_URL: https://github.com/orgs/carbon-design-system/projects/51
TYPESCRIPT_PROJECT_URL: https://github.com/orgs/carbon-design-system/projects/51
LABEL_ENHANCEMENT: 'type: enhancement 💡'
LABEL_TYPESCRIPT: 'area: typescript'

jobs:
add-to-proposals-project:
name: Add issue with enhancement label to the Proposals project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@v0.4.0
with:
labeled: ${{ env.LABEL_ENHANCEMENT }}
project-url: ${{ env.PROPOSALS_PROJECT_URL }}
github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}

add-to-typescript-project:
name: Add issue with typescript label to the TypeScript Adoption project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@v0.4.0
with:
labeled: ${{ env.LABEL_TYPESCRIPT }}
project-url: ${{ env.TYPESCRIPT_PROJECT_URL }}
github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}

add-to-design-system-project:
name: Add issue to the Design System project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@v0.4.0
with:
labeled: ${{ env.LABEL_ENHANCEMENT }}, ${{ env.LABEL_TYPESCRIPT }}
label-operator: NOT
project-url: ${{ env.DESIGN_SYSTEM_PROJECT_URL }}
github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
10 changes: 0 additions & 10 deletions .github/workflows/issue-triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ on:
required: true
APP_PRIVATE_KEY:
required: true
ADD_TO_PROJECT_PAT:
required: true

jobs:
comment:
Expand All @@ -28,11 +26,3 @@ jobs:
with:
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
enabled: true
add-to-project:
name: Add issue to Design System project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@v0.3.0
with:
project-url: https://github.com/orgs/carbon-design-system/projects/39
github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
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.
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/mime-npm-3.0.0-8d911e4c06-f43f9b7bfa.zip
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.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/ws-npm-8.4.2-f66010800e-4369caaac8.zip
Binary file not shown.
Binary file removed .yarn/cache/yazl-npm-2.5.1-07fc697bef-daec5154b5.zip
Binary file not shown.
554 changes: 280 additions & 274 deletions .yarn/releases/yarn-3.2.4.cjs → .yarn/releases/yarn-3.3.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 @@ -19,4 +19,4 @@ supportedArchitectures:
- linux
- win32

yarnPath: .yarn/releases/yarn-3.2.4.cjs
yarnPath: .yarn/releases/yarn-3.3.0.cjs
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,16 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
</tr>
<tr>
<td align="center"><a href="https://github.com/hannelevaltanen"><img src="https://avatars.githubusercontent.com/u/26527460?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hannele Valtanen</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=hannelevaltanen" title="Code">💻</a></td>
<td align="center"><a href="https://61130061.github.io/llam4u-terminal/"><img src="https://avatars.githubusercontent.com/u/54393468?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Llam4u</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=61130061" title="Code">💻</a> <a href="https://github.com/carbon-design-system/carbon/issues?q=author%3A61130061" title="Bug reports">🐛</a></td>
<td align="center"><a href="http://torresga.github.io/"><img src="https://avatars.githubusercontent.com/u/6892410?v=4?s=100" width="100px;" alt=""/><br /><sub><b>G. Torres</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=torresga" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/FionaDL"><img src="https://avatars.githubusercontent.com/u/28625558?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Fiona</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=FionaDL" title="Code">💻</a></td>
<td align="center"><a href="https://lewisdavanzo.com/"><img src="https://avatars.githubusercontent.com/u/70274722?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kindoflew</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=kindoflew" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/mgueyraud"><img src="https://avatars.githubusercontent.com/u/9916318?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mario Gueyraud</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=mgueyraud" title="Code">💻</a></td>
<td align="center"><a href="https://velog.io/@djunnni"><img src="https://avatars.githubusercontent.com/u/49237205?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dongjoon Lee</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Djunnni" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/Shankar-CodeJunkie"><img src="https://avatars.githubusercontent.com/u/56068832?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ShankarV-CodeJunkie</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Shankar-CodeJunkie" title="Code">💻</a></td>
</tr>
</table>

<!-- markdownlint-restore -->
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.5.0",
"version": "1.6.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
37 changes: 37 additions & 0 deletions e2e/components/FluidTimePicker/FluidTextInput-test.e2e.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/**
* Copyright IBM Corp. 2016, 2018
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

'use strict';

const { expect, test } = require('@playwright/test');
const { themes } = require('../../test-utils/env');
const { snapshotStory, visitStory } = require('../../test-utils/storybook');

test.describe('FluidTimePicker', () => {
themes.forEach((theme) => {
test.describe(theme, () => {
test('fluid text input @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'FluidTimePicker',
id: 'experimental-unstable-fluidtimepicker--default',
theme,
});
});
});
});

test('accessibility-checker @avt', async ({ page }) => {
await visitStory(page, {
component: 'FluidTimePicker',
id: 'experimental-unstable-fluidtimepicker--default',
globals: {
theme: 'white',
},
});
await expect(page).toHaveNoACViolations('FluidTimePicker');
});
});
1 change: 1 addition & 0 deletions e2e/icons-react/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,7 @@ Array [
"DewPointFilled",
"Diagram",
"DiagramReference",
"DiamondFill",
"DirectLink",
"DirectionBearRight_01",
"DirectionBearRight_01Filled",
Expand Down
2 changes: 1 addition & 1 deletion e2e/icons-vue/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1993,6 +1993,7 @@ Array [
"DiagramReference20",
"DiagramReference24",
"DiagramReference32",
"DiamondFillGlyph",
"DirectLink16",
"DirectLink20",
"DirectLink24",
Expand Down Expand Up @@ -6924,7 +6925,6 @@ Array [
"UndefinedFilled20",
"UndefinedFilled24",
"UndefinedFilled32",
"UndefinedGlyph",
"Undo16",
"Undo20",
"Undo24",
Expand Down
2 changes: 1 addition & 1 deletion e2e/icons/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1992,6 +1992,7 @@ Array [
"DiagramReference20",
"DiagramReference24",
"DiagramReference32",
"DiamondFillGlyph",
"DirectLink16",
"DirectLink20",
"DirectLink24",
Expand Down Expand Up @@ -6923,7 +6924,6 @@ Array [
"UndefinedFilled20",
"UndefinedFilled24",
"UndefinedFilled32",
"UndefinedGlyph",
"Undo16",
"Undo20",
"Undo24",
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox-styles/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "codesandbox-styles",
"private": true,
"version": "0.20.0",
"version": "0.21.0",
"scripts": {
"develop": "vite"
},
"devDependencies": {
"vite": "^2.8.0"
},
"dependencies": {
"@carbon/styles": "^1.17.0",
"@carbon/styles": "^1.18.0",
"sass": "^1.51.0"
}
}
4 changes: 2 additions & 2 deletions examples/codesandbox-with-sass-compilation/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "codesandbox-with-sass-compilation",
"version": "0.18.0",
"version": "0.19.0",
"private": true,
"dependencies": {
"@carbon/react": "^1.17.0",
"@carbon/react": "^1.18.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "codesandbox",
"version": "0.18.0",
"version": "0.19.0",
"private": true,
"dependencies": {
"@carbon/react": "^1.17.0",
"@carbon/react": "^1.18.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-theme/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "custom-theme",
"private": true,
"version": "0.15.0",
"version": "0.16.0",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.17.0",
"@carbon/react": "^1.18.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/incremental-migration/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "incremental-migration",
"private": true,
"version": "0.17.0",
"version": "0.18.0",
"scripts": {
"build": "next build",
"dev": "next dev",
Expand All @@ -13,7 +13,7 @@
},
"dependencies": {
"@carbon/icons-react": "^10.49.0",
"@carbon/react": "^1.17.0",
"@carbon/react": "^1.18.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.15.0",
"version": "0.16.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.17.0",
"@carbon/react": "^1.18.0",
"next": "12.1.4",
"react": "18.0.0",
"react-dom": "18.0.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.17.0",
"version": "0.18.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.17.0",
"@carbon/react": "^1.18.0",
"next": "12.1.4",
"react": "18.0.0",
"react-dom": "18.0.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/vite/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "vite",
"private": true,
"version": "0.15.0",
"version": "0.16.0",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.17.0",
"@carbon/react": "^1.18.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
"@commitlint/cli": "^17.0.0",
"@commitlint/config-conventional": "^17.0.0",
"@percy/cli": "^1.1.0",
"@percy/playwright": "^1.0.2",
"@playwright/test": "^1.21.1",
"@percy/playwright": "^1.0.4",
"@playwright/test": "^1.28.0",
"@testing-library/dom": "^8.11.1",
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/react": "^12.1.2",
Expand Down Expand Up @@ -139,5 +139,5 @@
"./config/stylelint-config-carbon"
]
},
"packageManager": "yarn@3.2.4"
"packageManager": "yarn@3.3.0"
}
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.17.0",
"version": "8.18.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -39,8 +39,8 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.17.0",
"@carbon/styles": "^1.17.0",
"@carbon/react": "^1.18.0",
"@carbon/styles": "^1.18.0",
"@carbon/telemetry": "0.1.0"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Code generated by carbon-components-react. DO NOT EDIT.
//
// Copyright IBM Corp. 2018, 2018
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@forward '@carbon/styles/scss/components/fluid-time-picker/fluid-time-picker';
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Code generated by carbon-components-react. DO NOT EDIT.
//
// Copyright IBM Corp. 2018, 2018
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@forward '@carbon/styles/scss/components/fluid-time-picker';
Loading

0 comments on commit 54fd1ac

Please sign in to comment.