Skip to content

Commit

Permalink
Merge branch 'main' into release/v10.40.1
Browse files Browse the repository at this point in the history
  • Loading branch information
andreancardona authored Jul 28, 2021
2 parents a0617d1 + bff2147 commit e266761
Show file tree
Hide file tree
Showing 113 changed files with 4,513 additions and 214 deletions.
14 changes: 7 additions & 7 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.2.0
uses: actions/setup-node@v2.3.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.2.0
uses: actions/setup-node@v2.3.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.2.0
uses: actions/setup-node@v2.3.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.2.0
uses: actions/setup-node@v2.3.0
with:
node-version: '14.x'
- uses: actions/[email protected]
Expand All @@ -67,7 +67,7 @@ jobs:
run: yarn build --ignore '@carbon/sketch'
- name: Check generated styles
run: |
yarn carbon-cli check --ignore '**/@(node_modules|examples|components|react|fixtures)/**' 'packages/**/*.scss'
yarn carbon-cli check --ignore '**/@(node_modules|examples|components|react|fixtures|compat)/**' 'packages/**/*.scss'
- name: Run tests
run: yarn test --ci

Expand All @@ -77,7 +77,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/setup-node@v2.2.0
uses: actions/setup-node@v2.3.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.2.0
uses: actions/setup-node@v2.3.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.2.0
uses: actions/setup-node@v2.3.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.2.0
uses: actions/setup-node@v2.3.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.2.0
uses: actions/setup-node@v2.3.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.2.0
uses: actions/setup-node@v2.3.0
with:
node-version: '14.x'
registry-url: 'https://registry.npmjs.org'
Expand Down
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.2.0
uses: actions/setup-node@v2.3.0
with:
node-version: '14.x'
- name: Install dependencies
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.
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.
2 changes: 1 addition & 1 deletion config/eslint-config-carbon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"eslint-plugin-cypress": "^2.11.3",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jest": "^24.3.6",
"eslint-plugin-jsdoc": "^35.3.0",
"eslint-plugin-jsdoc": "^36.0.3",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.24.0",
Expand Down
1 change: 1 addition & 0 deletions config/eslint-config-carbon/plugins/react.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ module.exports = {
{
files: ['*-story.js'],
rules: {
'react/display-name': 0,
'react/prop-types': 0,
},
},
Expand Down
13 changes: 10 additions & 3 deletions docs/guides/setup/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,18 @@ but can be unexpected.
WSL)
- `sudo umount /mnt/c`
- `sudo mount -t drvfs C: /mnt/c -o metadata`
12. Change directories into your projects folder
12. Increase Linux OS limits to avoid errors in build process (limited by WSL by
default).
- https://muhammadtriwibowo.medium.com/set-permanently-ulimit-n-open-files-in-ubuntu-4d61064429a
- `ulimit -l 65536` -> Increases the maximum amount of locked memory
available to OS
- `ulimit -n 1048576` -> Increases the maximum amount of files that can be
in an open state
13. Change directories into your projects folder
`cd /mnt/c/Users/{username}/projects` (Only an example, use whatever you'd
like)
13. Clone our repo
14. Clone our repo
`git clone https://github.com/carbon-design-system/carbon.git`
14. In the root folder of your freshly cloned repo install and build
15. In the root folder of your freshly cloned repo install and build
- `yarn install`
- `yarn build`
135 changes: 135 additions & 0 deletions docs/migration/11.x-color.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
## Color tokens

<InlineNotification>

**Note:** The Carbon v11 release is currently in beta release. Be on the lookout
for the public preview release available in the coming months.

</InlineNotification>

**Status key:**

**New:** a net new color token to the system in v11. It has no v10 counterpart.

**Updated name:** the v10 name has been updated to in v11 to replace the number
ending with a usage adjective. It just a name change the role stays the same
between v10 and v11.

**Split:** V10 token has been split into multiple v11 tokens for more specific
usage.

**No change:** token name has no change between versions.

**Depreciated:** v10 token was removed in v11

| **V10 token name** | **V11 token name** | **Status** |
| ------------------ | ------------------------- | ------------------- |
| visited-link | link-visited | Updated name |
| ui-background | background | Updated name |
| ui-05 | layer-selected-inverse | Updated name |
| ui-05 | border-inverse | Updated name |
| ui-04 | border-strong-01 | Split, Updated name |
| ui-04 | toggle-off | Split, Updated name |
| ui-03 | layer-accent-01 | Split, Updated name |
| ui-03 | border-subtle-01 | Split, Updated name |
| ui-02 | layer-02 | Updated name |
| ui-01 | layer-01 | Updated name |
| text-error | text-error | Updated name |
| text-05 | text-helper | Updated name |
| text-04 | text-on-color | Updated name |
| text-03 | text-placeholder | Updated name |
| text-02 | text-secondary | Updated name |
| text-01 | text-primary | Updated name |
| support-04 | support-info | Updated name |
| support-03 | support-warning | Updated name |
| support-02 | support-success | Updated name |
| support-01 | support-error | Updated name |
| skeleton-02 | skeleton-element | Updated name |
| skeleton-01 | skeleton-background | Updated name |
| selected-ui | background-selected | Split, Updated name |
| selected-ui | layer-selected-01 | Split, Updated name |
| selected-light-ui | layer-selected-02 | Updated name |
| overlay-01 | overlay | Updated name |
| link-02 | link-secondary | Updated name |
| link-01 | link-primary | Updated name |
| inverse-support-04 | support-info-inverse | Updated name |
| inverse-support-03 | support-warning-inverse | Updated name |
| inverse-support-02 | support-success-inverse | Updated name |
| inverse-support-01 | support-error-inverse | Updated name |
| inverse-link | link-inverse | Updated name |
| inverse-hover-ui | background-inverse-hover | Updated name |
| inverse-focus-ui | focus-inverse | Updated name |
| inverse-02 | background-inverse | Updated name |
| inverse-01 | text-inverse | Split, Updated name |
| inverse-01 | icon-inverse | Split, Updated name |
| inverse-01 | focus-inset | Split, Updated name |
| interactive-04 | interactive | Updated name |
| interactive-04 | border-interactive | Updated name |
| interactive-03 | button-tertiary | Updated name |
| interactive-02 | button-secondary | Updated name |
| interactive-01 | background-brand | Updated name |
| interactive-01 | button-primary | Updated name |
| icon-03 | icon-on-color | Updated name |
| icon-02 | icon-secondary | Updated name |
| icon-01 | icon-primary | Updated name |
| hover-ui | background-hover | Updated name |
| hover-ui | layer-hover-01 | Split, Updated name |
| hover-ui | field-hover-01 | Split, Updated name |
| hover-ui | field-hover-02 | Split, Updated name |
| hover-tertiary | button-tertiary-hover | Updated name |
| hover-selected-ui | background-selected-hover | Split, Updated name |
| hover-selected-ui | layer-selected-hover-01 | Split, Updated name |
| hover-selected-ui | layer-accent-hover-01 | Split, Updated name |
| hover-secondary | button-secondary-hover | Updated name |
| hover-primary-text | link-primary-hover | Updated name |
| hover-primary | button-primary-hover | Updated name |
| hover-light-ui | layer-hover-02 | Updated name |
| hover-danger | button-danger-hover | Updated name |
| highlight | highlight | No change |
| focus | focus | No change |
| field-02 | field-02 | No change |
| field-01 | field-01 | No change |
| disabled-03 | layer-selected-disabled | Split, Updated name |
| disabled-03 | text-on-color-disabled | Split, Updated name |
| disabled-03 | icon-on-color-disabled | Split, Updated name |
| disabled-02 | text-disabled | Split, Updated name |
| disabled-02 | icon-disabled | Split, Updated name |
| disabled-02 | button-disabled | Split, Updated name |
| disabled-01 | layer-disabled-01 | Split |
| disabled-01 | field-disabled-01 | Split |
| disabled-01 | border-disabled-01 | Split |
| disabled-01 | field-disabled-02 | Split |
| disabled-01 | border-disabled-03 | Split |
| decorative-01 | border-subtle-02 | Updated name |
| danger-02 | button-danger-secondary | Updated name |
| danger / danger-01 | button-danger-primary | Updated name |
| button-separator | button-separator | No change |
| active-ui | background-active | Split, Updated name |
| active-ui | layer-active-01 | Split, Updated name |
| active-ui | layer-accent-active-01 | Split, Updated name |
| active-ui | border-subtle-selected-01 | Split, Updated name |
| active-tertiary | button-tertiary-active | Updated name |
| active-secondary | button-secondary-active | Updated name |
| active-primary | button-primary-active | Updated name |
| active-light-ui | layer-active-02 | Updated name |
| active-danger | button-danger-active | Updated name |
| - | border-subtle-00 | New |
| - | layer-selected-hover-02 | New |
| - | layer-accent-02 | New |
| - | layer-accent-hover-02 | New |
| - | layer-accent-active-02 | New |
| - | border-strong-02 | New |
| - | border-subtle-selected-02 | New |
| - | layer-03 | New |
| - | layer-hover-03 | New |
| - | layer-active-03 | New |
| - | layer-selected-03 | New |
| - | layer-selected-hover-03 | New |
| - | layer-accent-03 | New |
| - | layer-accent-hover-03 | New |
| - | layer-accent-active-03 | New |
| - | field-03 | New |
| - | field-hover-03 | New |
| - | border-strong-03 | New |
| - | border-subtle-03 | New |
| - | border-subtle-selected-03 | New |
Loading

0 comments on commit e266761

Please sign in to comment.