Skip to content

Commit

Permalink
Merge branch 'main' into 9229-dialog-role-needs-name
Browse files Browse the repository at this point in the history
  • Loading branch information
jnm2377 authored Aug 18, 2021
2 parents 3dbfddf + 3f42d06 commit 4d2c82f
Show file tree
Hide file tree
Showing 372 changed files with 20,409 additions and 15,273 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,15 @@
"contributions": [
"doc"
]
},
{
"login": "Kiittyka",
"name": "Krithika S Udupa",
"avatar_url": "https://avatars.githubusercontent.com/u/41021851?v=4",
"profile": "https://github.com/Kiittyka",
"contributions": [
"doc"
]
}
],
"commitConvention": "none"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: '14.x'
- name: Run yarn dedupe
Expand All @@ -23,7 +23,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: '14.x'
- name: Install dependencies
Expand All @@ -36,7 +36,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: '14.x'
- name: Install dependencies
Expand All @@ -51,7 +51,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: '14.x'
- uses: actions/[email protected]
Expand All @@ -77,7 +77,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: '14.x'
- uses: actions/[email protected]
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: '14.x'
- uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-react-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@main
- name: Use Node.js 14.x
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: '14.x'
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-vanilla-devenv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@main
- name: Use Node.js 14.x
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: '14.x'
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- uses: actions/checkout@main
- name: Use Node.js 14.x
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: '14.x'
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v1

- name: Use Node.js 14.x
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: '14.x'
registry-url: 'https://registry.npmjs.org'
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: stale
on:
schedule:
- cron: '0 8 * * *'

jobs:
comment:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v4
with:
any-of-issue-labels:
"status: waiting for author's response 💬,status: needs more info 🤷‍♀️"
only-pr-labels: ''
stale-issue-message: |
This issue has been marked as stale because it has required additional
info or a response from the author for over 7 days. When you get the
chance, please comment with the additional info requested.
Otherwise, this issue will be closed in 7 days.
close-issue-message: |
This issue has been closed because it has received no activity for
14 days.
stale-issue-label: 'status: stale 🍞'
days-before-stale: 7
days-before-close: 7
debug-only: true
2 changes: 1 addition & 1 deletion .github/workflows/sync-generated-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Use Node.js 14.x
uses: actions/setup-node@v2.3.0
uses: actions/setup-node@v2.4.0
with:
node-version: '14.x'
- name: Install dependencies
Expand Down
4 changes: 4 additions & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx --no-install commitlint --edit "$1"
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx --no-install lint-staged
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.
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.
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/del-npm-5.1.0-eb4ac07f4c-d9e4ef2c12.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 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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ we support!
## :books: Documentation

- See our documentation site
[here](https://www.carbondesignsystem.com/get-started/develop/react) for full
how-to docs and guidelines
[here](https://www.carbondesignsystem.com/developing/frameworks/react/) for
full how-to docs and guidelines
- [Contributing](/.github/CONTRIBUTING.md): Guidelines for making contributions
to this repo.
- 🏃‍♀️ Migration Guides
Expand Down Expand Up @@ -184,6 +184,8 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
</tr>
<tr>
<td align="center"><a href="https://github.com/szymonbrandys"><img src="https://avatars.githubusercontent.com/u/79149899?v=4?s=100" width="100px;" alt=""/><br /><sub><b>szymonbrandys</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=szymonbrandys" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/adamalston"><img src="https://avatars.githubusercontent.com/u/18297826?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Adam Alston</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=adamalston" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/Kiittyka"><img src="https://avatars.githubusercontent.com/u/41021851?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Krithika S Udupa</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Kiittyka" title="Documentation">📖</a></td>
</tr>
</table>

Expand Down
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": "2.7.0",
"version": "2.8.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": "0.7.0",
"version": "0.8.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
7 changes: 4 additions & 3 deletions docs/developer-handbook.md
Original file line number Diff line number Diff line change
Expand Up @@ -746,9 +746,10 @@ warning(
#### Publishing older library versions

We offer ad-hoc backwards-support for older version of the system. This work is
primarly driven by external contributors who may still need these older versions
for legacy code. When updates are received and merged into the codebase, the
release process will be a bit different than the one described above.
primarily driven by external contributors who may still need these older
versions for legacy code. When updates are received and merged into the
codebase, the release process will be a bit different than the one described
above.

For example, with
[`carbon-components-react`](https://github.com/carbon-design-system/carbon-components-react)
Expand Down
2 changes: 1 addition & 1 deletion docs/guides/accessibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ can dig into those points further:

Obscuring all or some of the page on mouse hover with an overlay or blur is a
problem for user of screen magnifiers. Maintain required contrast ration and
instead signal to your users with some other visual dinstinction.
instead signal to your users with some other visual distinction.

#### How to test

Expand Down
2 changes: 1 addition & 1 deletion docs/guides/icons.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ update PR:
![metadata.yml](https://github.com/IBM/carbon-elements/blob/master/packages/icons/metadata.yml)
in browser.
2. find the icon you'd like to edit. Please note that icon names are without
`--modifiers`. All icons with `--modifiers` are listed as vairants of the
`--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
Expand Down
18 changes: 9 additions & 9 deletions docs/guides/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ team are concerned with:

### Triaging a new issue

Triage is the process of determing the severity and priority of issues _as they
come in_. We need to make sure we know how serious a problem is and how quickly
it should be addressed.
Triage is the process of determining the severity and priority of issues _as
they come in_. We need to make sure we know how serious a problem is and how
quickly it should be addressed.

### Triage Process

Expand All @@ -97,10 +97,10 @@ _Process to triaged_

<summary>Is there a duplicate issue?</summary>

We recieve enough duplicate issues that it is always a good idea to check before
moving on in the triage process. We have issues related to accessibilty that
We receive enough duplicate issues that it is always a good idea to check before
moving on in the triage process. We have issues related to accessibility that
catalogue multiple problems so be sure to check especially with incoming
accessibilty problems.
accessibility problems.

If you find a duplicate, comment to the author, label it as a duplicate, and
close the issue.
Expand All @@ -126,7 +126,7 @@ directions in that section.
The most important part of the issue template is the "steps to reproduce"
section, if the author didn't provide that (and reproduction isn't obvious)
comment asking for reproduction and other relevant details not filled out in the
templete.
template.

</details>

Expand Down Expand Up @@ -327,9 +327,9 @@ typically _as complex_ as issue triage/tracking, but it's equally important!
If the pull request is a WIP (work in progress), RFC (request for comment), or
Draft then it can be moved to the appropriate swimlane. There are usually a fair
few of these active at a time and don't need the same regard as an _external_
pull requets, but they can be helpful to reference when a Work In Progress pull
pull requests, but they can be helpful to reference when a Work In Progress pull
request addresses an issue and the maker of that issue asks for a status report
or update (a common occurance).
or update (a common occurrence).

### Pull requests with failing tests or merge conflicts

Expand Down
10 changes: 8 additions & 2 deletions docs/migration/11.x-carbon-components.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ below that goes over any API changes for the file.
| [`scss/globals/grid/_grid.scss`](#scssglobalsgrid_gridscss) | Moved to `scss/_grid.scss` |
| [`scss/globals/scss/_colors.scss`](#scssglobalsscss_colorsscss) | Moved to `scss/_colors.scss` |
| [`scss/globals/scss/_css--body.scss`](#scssglobalsscss_css--bodyscss) | TODO |
| [`scss/globals/scss/_css--font-face.scss`](#scssglobalsscss_css--font-facescss) | TODO |
| [`scss/globals/scss/_css--font-face.scss`](#scssglobalsscss_css--font-facescss) | Moved to `scss/_font-face.scss` |
| [`scss/globals/scss/_css--helpers.scss`](#scssglobalsscss_css--helpersscss) | Moved to `scss/utilities/` |
| [`scss/globals/scss/_css--reset.scss`](#scssglobalsscss_css--resetscss) | Moved to `scss/_reset.scss` |
| [`scss/globals/scss/_helper-classes.scss`](#scssglobalsscss_helper-classesscss) | Moved to `scss/utilities/` |
Expand Down Expand Up @@ -150,7 +150,13 @@ TODO

### `scss/globals/scss/_css--font-face.scss`

TODO
Beginning in V11, the `@ibm/plex` package will be included as a dependency of
`@carbon/styles`. Because of this, we will no longer be serving the files via
Google Fonts. You will get the fonts by default by importing from the main
entrypoint (`@use '@carbon/styles'`), or by referencing the font face file
directly (`@use '@carbon/styles/scss/font-face'`). If you are already hosting
the font files, and do not want the font files to be emitted, you can set the
`$css--font-face` variable to `false`.

### `scss/globals/scss/_css--helpers.scss`

Expand Down
4 changes: 2 additions & 2 deletions docs/style.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ concepts, learn from our mistakes, and grow the number of languages that we
target or support as a design system.

Guidelines or practices outlined in this document are meant to help us as a
group build stable and reliable sofware. What this means to the developer may
group build stable and reliable software. What this means to the developer may
change depending on the environment in which one writes code.

At the end of the day, we as a group hold the following values about writing
Expand Down Expand Up @@ -584,7 +584,7 @@ commands one after another. Refer to the documentation of your shell.

#### Recipes

Below are some common receipes for component testing. Many of the pattern/syntax
Below are some common recipes for component testing. Many of the pattern/syntax
details contained within these recipes are enforced via eslint rules declared in
`eslint-config-carbon`.

Expand Down
Loading

0 comments on commit 4d2c82f

Please sign in to comment.