Skip to content

Commit

Permalink
Merge branch 'main' into patch-12
Browse files Browse the repository at this point in the history
  • Loading branch information
tay1orjones authored Oct 5, 2021
2 parents 056f75c + cd6fc39 commit 25fc1c5
Showing 226 changed files with 2,733 additions and 1,152 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v2.4.1
with:
node-version: '14.x'
- name: Run yarn dedupe
@@ -23,7 +23,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v2.4.1
with:
node-version: '14.x'
- name: Install dependencies
@@ -36,7 +36,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v2.4.1
with:
node-version: '14.x'
- name: Install dependencies
@@ -51,7 +51,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v2.4.1
with:
node-version: '14.x'
- uses: actions/cache@v2.1.6
@@ -77,7 +77,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v2.4.1
with:
node-version: '14.x'
- uses: actions/cache@v2.1.6
@@ -113,7 +113,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v2.4.1
with:
node-version: '14.x'
- uses: actions/cache@v2.1.6
2 changes: 1 addition & 1 deletion .github/workflows/deploy-react-storybook.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@main
- name: Use Node.js 14.x
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v2.4.1
with:
node-version: '14.x'
- name: Install dependencies
2 changes: 1 addition & 1 deletion .github/workflows/deploy-vanilla-devenv.yml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@main
- name: Use Node.js 14.x
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v2.4.1
with:
node-version: '14.x'
- name: Install dependencies
2 changes: 1 addition & 1 deletion .github/workflows/nightly-release.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ jobs:
steps:
- uses: actions/checkout@main
- name: Use Node.js 14.x
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v2.4.1
with:
node-version: '14.x'
- name: Install dependencies
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v1

- name: Use Node.js 14.x
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v2.4.1
with:
node-version: '14.x'
registry-url: 'https://registry.npmjs.org'
2 changes: 1 addition & 1 deletion .github/workflows/sync-generated-files.yml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Use Node.js 14.x
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v2.4.1
with:
node-version: '14.x'
- name: Install dependencies
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/jest-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "jest-config-carbon",
"private": true,
"description": "Jest configuration and preset for Carbon",
"version": "0.8.0",
"version": "0.9.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
10 changes: 10 additions & 0 deletions config/jest-config-carbon/setup/setup.js
Original file line number Diff line number Diff line change
@@ -39,3 +39,13 @@ if (global.window) {
const { getComputedStyle } = window;
window.getComputedStyle = (element) => getComputedStyle(element);
}

if (global.window) {
window.ResizeObserver = jest.fn(() => {
return {
observe: jest.fn(),
unobserve: jest.fn(),
disconnect: jest.fn(),
};
});
}
3 changes: 3 additions & 0 deletions packages/carbon-react/.storybook/Welcome/Welcome.stories.js
Original file line number Diff line number Diff line change
@@ -16,6 +16,9 @@ export default {
docs: {
page: mdx,
},
controls: {
hideNoControlsWarning: true,
},
},
};

3 changes: 3 additions & 0 deletions packages/carbon-react/.storybook/preview.js
Original file line number Diff line number Diff line change
@@ -11,6 +11,9 @@ import { configureActions } from '@storybook/addon-actions';
import { white, g10, g90, g100 } from '@carbon/themes';
import React from 'react';
import { breakpoints } from '@carbon/layout';
import { settings } from 'carbon-components';

settings.prefix = 'cds';

export const globalTypes = {
locale: {
2 changes: 2 additions & 0 deletions packages/carbon-react/__tests__/index-test.js
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ Array [
"Accordion",
"AccordionItem",
"AccordionSkeleton",
"ActionableNotification",
"AspectRatio",
"Breadcrumb",
"BreadcrumbItem",
@@ -75,6 +76,7 @@ Array [
"IconSkeleton",
"InlineLoading",
"InlineNotification",
"Layer",
"Link",
"ListItem",
"Loading",
18 changes: 10 additions & 8 deletions packages/carbon-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/react",
"description": "React components for the Carbon Design System",
"version": "0.5.0-rc.0",
"version": "0.6.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
@@ -43,11 +43,11 @@
},
"dependencies": {
"@carbon/feature-flags": "^0.6.0",
"@carbon/icons-react": "^10.38.0",
"@carbon/styles": "^0.5.0-rc.0",
"@carbon/icons-react": "^10.40.0",
"@carbon/styles": "^0.6.0",
"@carbon/telemetry": "0.0.0-alpha.6",
"carbon-components": "^10.44.0-rc.0",
"carbon-components-react": "^7.44.0-rc.0",
"carbon-components": "^10.45.0",
"carbon-components-react": "^7.45.0",
"carbon-icons": "^7.0.7"
},
"devDependencies": {
@@ -58,7 +58,7 @@
"@babel/plugin-transform-react-constant-elements": "^7.14.5",
"@babel/preset-env": "^7.14.7",
"@babel/preset-react": "^7.14.5",
"@carbon/themes": "^10.42.0",
"@carbon/themes": "^10.44.0",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^18.0.0",
"@rollup/plugin-node-resolve": "^11.2.1",
@@ -85,13 +85,15 @@
"rollup": "^2.46.0",
"rollup-plugin-strip-banner": "^2.0.0",
"rtlcss": "^3.1.2",
"sass": "^1.36.0",
"sass": "^1.41.0",
"sass-loader": "10",
"style-loader": "^2.0.0",
"webpack": "^4.41.5"
},
"sideEffects": [
"es/feature-flags.js",
"lib/feature-flags.js"
"lib/feature-flags.js",
"es/prefix.js",
"lib/prefix.js"
]
}
9 changes: 9 additions & 0 deletions packages/carbon-react/scss/components/combo-box/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Code generated by @carbon/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/combo-box';
9 changes: 9 additions & 0 deletions packages/carbon-react/scss/components/dropdown/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Code generated by @carbon/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/dropdown';
9 changes: 9 additions & 0 deletions packages/carbon-react/scss/components/multiselect/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Code generated by @carbon/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/multiselect';
4 changes: 3 additions & 1 deletion packages/carbon-react/src/components/Layer/index.js
Original file line number Diff line number Diff line change
@@ -8,14 +8,16 @@
import React from 'react';
import PropTypes from 'prop-types';
import cx from 'classnames';
import { usePrefix } from '../../internal/usePrefix';

export function Layer({
as: BaseComponent = 'div',
className: customClassName,
children,
...rest
}) {
const className = cx('bx--layer', customClassName);
const prefix = usePrefix();
const className = cx(`${prefix}--layer`, customClassName);
return (
<BaseComponent {...rest} className={className}>
{children}
Loading

0 comments on commit 25fc1c5

Please sign in to comment.