Skip to content

Commit

Permalink
Merge branch 'main' into feat/add-component-tokens-to-zones
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Apr 18, 2022
2 parents a877b43 + dde2947 commit 4d02c5d
Show file tree
Hide file tree
Showing 171 changed files with 1,042 additions and 1,648 deletions.
13 changes: 11 additions & 2 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -829,8 +829,8 @@
"contributions": [
"code"
]
},
{
},
{
"login": "TannerS",
"name": "Tanner Summers",
"avatar_url": "https://avatars.githubusercontent.com/u/8866319?v=4",
Expand Down Expand Up @@ -866,6 +866,15 @@
"contributions": [
"code"
]
},
{
"login": "jakubfaliszewski",
"name": "Jakub Faliszewski",
"avatar_url": "https://avatars.githubusercontent.com/u/25402419?v=4",
"profile": "http://jakubfaliszewski.github.io/portfolio/",
"contributions": [
"code"
]
}
],
"commitConvention": "none"
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/issue-triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,11 @@ jobs:
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
enabled: true
add-to-project:
name: Add issue to Design System project
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
with:
project-url: https://github.com/orgs/carbon-design-system/projects/39
github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
82 changes: 82 additions & 0 deletions .github/workflows/version.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
name: Version

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

on:
workflow_dispatch:
inputs:
type:
required: true
description: 'Specify the type of release'
type: choice
default: preminor
options:
- preminor
- minor
tag:
required: true
description: 'Specify the tag for this release'
type: string

jobs:
version:
runs-on: ubuntu-latest
if: github.repository == 'carbon-design-system/carbon'
timeout-minutes: 60
steps:
- uses: actions/checkout@v3
with:
fetch-depth: '0'
- name: Use Node.js 16.x
uses: actions/setup-node@v3
with:
node-version: '16.x'
registry-url: 'https://registry.npmjs.org'
- uses: actions/cache@v3
id: cache
with:
path: |
node_modules
*/**/node_modules
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
- name: Install dependencies
run: yarn install --immutable --immutable-cache --check-cache
- name: Create preminor release
if: ${{ github.event.inputs.type == 'preminor' }}
run: |
yarn lerna version preminor --no-git-tag-version --preid rc --yes
# We want the following command to update the lockfile since
# the package versions have been changed
yarn install --no-immutable
- name: Create minor release
if: ${{ github.event.inputs.type == 'minor' }}
run: |
yarn lerna version minor --no-git-tag-version --no-push --yes
# We want the following command to update the lockfile since
# the package versions have been changed
yarn install --no-immutable
- name: Generate token
uses: tibdex/github-app-token@v1
id: generate_token
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
with:
branch: 'release/${{ github.event.inputs.tag }}'
commit-message: 'chore(release): ${{ github.event.inputs.tag }}'
delete-branch: true
title: 'chore(release): ${{ github.event.inputs.tag }}'
token: ${{ steps.generate_token.outputs.token }}
body: |
Automated release PR for ${{ github.event.inputs.tag }}
**Checklist**
- [ ] Verify package version bumps are accurate
- [ ] Verify CI passes as expected
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 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/gaze-npm-1.1.3-cd09a2e834-d5fd375a02.zip
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/glob-npm-7.1.6-1ce3a5189a-351d549dd9.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 removed .yarn/cache/meow-npm-3.7.0-5653cc98af-65a412e5d0.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.
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.
7 changes: 5 additions & 2 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@ nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
spec: '@yarnpkg/plugin-interactive-tools'
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"
spec: '@yarnpkg/plugin-workspace-tools'

supportedArchitectures:
cpu:
- current
- x64
libc:
- current
- glibc
os:
- current
- darwin
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,13 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<td align="center"><a href="https://riantavares.github.io/"><img src="https://avatars.githubusercontent.com/u/8935295?v=4?s=100" width="100px;" alt=""/><br /><sub><b>@RianTavaresOn</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=RianTavares" title="Code">💻</a> <a href="#design-RianTavares" title="Design">🎨</a></td>
<td align="center"><a href="https://github.com/ColbyJohnIBM"><img src="https://avatars.githubusercontent.com/u/19613692?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ColbyJohnIBM</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=ColbyJohnIBM" title="Code">💻</a></td>
<td align="center"><a href="https://haakon.dev/"><img src="https://avatars.githubusercontent.com/u/1190770?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Håkon</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=imp-dance" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/TannerS"><img src="https://avatars.githubusercontent.com/u/8866319?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tanner Summers</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=TannerS" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/TannerS"><img src="https://avatars.githubusercontent.com/u/8866319?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tanner Summers</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=TannerS" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/motou"><img src="https://avatars.githubusercontent.com/u/1215956?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zhen Wang</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=motou" title="Code">💻</a> <a href="https://github.com/carbon-design-system/carbon/commits?author=motou" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/Kman316"><img src="https://avatars.githubusercontent.com/u/25666525?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cathal Kenneally</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Kman316" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/dezkareid"><img src="https://avatars.githubusercontent.com/u/1269896?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joel Humberto Gómez Paredes</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=dezkareid" title="Code">💻</a></td>
<td align="center"><a href="http://jakubfaliszewski.github.io/portfolio/"><img src="https://avatars.githubusercontent.com/u/25402419?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jakub Faliszewski</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=jakubfaliszewski" title="Code">💻</a></td>
</tr>
</table>

Expand Down
6 changes: 1 addition & 5 deletions docs/migration/v11.md
Original file line number Diff line number Diff line change
Expand Up @@ -873,10 +873,8 @@ notifications to closed by pressing the `escape` key. For more details, see the
Vertical margin is no longer included by default, use `<Stack>` for vertical
spacing.

ToastNotification` updates:
`ToastNotification` updates:

- The `title`, `subtitle` and `caption` props have been removed. Compose
notification contents using `children` instead.
- `children` can no longer contain interactive elements. A `ToastNotification`
containing an action or interactive children should be replaced with
`ActionableNotification`.
Expand All @@ -887,8 +885,6 @@ ToastNotification` updates:

`InlineNotification` updates:

- The `title`, `subtitle` props have been removed. Compose notification contents
using `children` instead.
- The `actions` prop has been removed. An `InlineNotification` containing an
action or interactive children should be replaced with
`ActionableNotification` configured with the `inline` prop.
Expand Down
33 changes: 0 additions & 33 deletions e2e/icons-handlebars/handlebars-test.js

This file was deleted.

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.3.3",
"version": "0.4.0",
"scripts": {
"develop": "vite"
},
"devDependencies": {
"vite": "^2.8.0"
},
"dependencies": {
"@carbon/styles": "^1.0.2",
"@carbon/styles": "^1.1.0",
"sass": "^1.49.7"
}
}
15 changes: 5 additions & 10 deletions examples/codesandbox/package.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
{
"name": "codesandbox",
"version": "0.1.2",
"version": "0.2.0",
"private": true,
"dependencies": {
"@carbon/react": "^1.0.3",
"@testing-library/jest-dom": "^5.16.3",
"@testing-library/react": "^12.1.4",
"@testing-library/user-event": "^13.5.0",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"@carbon/react": "^1.1.0",
"react": "^17.0.0",
"react-dom": "^17.0.0",
"react-scripts": "5.0.0",
"sass": "^1.49.11",
"web-vitals": "^2.1.4"
"sass": "^1.49.11"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
Expand Down
8 changes: 0 additions & 8 deletions examples/codesandbox/src/App.test.js

This file was deleted.

6 changes: 0 additions & 6 deletions examples/codesandbox/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,10 @@ import React from 'react';
import ReactDOM from 'react-dom';
import './index.scss';
import App from './App';
import reportWebVitals from './reportWebVitals';

ReactDOM.render(
<React.StrictMode>
<App />
</React.StrictMode>,
document.getElementById('root')
);

// If you want to start measuring performance in your app, pass a function
// to log results (for example: reportWebVitals(console.log))
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
reportWebVitals();
1 change: 0 additions & 1 deletion examples/codesandbox/src/logo.svg

This file was deleted.

13 changes: 0 additions & 13 deletions examples/codesandbox/src/reportWebVitals.js

This file was deleted.

5 changes: 0 additions & 5 deletions examples/codesandbox/src/setupTests.js

This file was deleted.

3 changes: 3 additions & 0 deletions examples/nextjs/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "next/core-web-vitals"
}
32 changes: 32 additions & 0 deletions examples/nextjs/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# local env files
.env*.local

# vercel
.vercel
48 changes: 48 additions & 0 deletions examples/nextjs/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
This is a [Next.js](https://nextjs.org/) project bootstrapped with
[`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).

## Getting Started

First, run the development server:

```bash
npm run dev
# or
yarn dev
```

Open [http://localhost:3000](http://localhost:3000) with your browser to see the
result.

You can start editing the page by modifying `pages/index.js`. The page
auto-updates as you edit the file.

[API routes](https://nextjs.org/docs/api-routes/introduction) can be accessed on
[http://localhost:3000/api/hello](http://localhost:3000/api/hello). This
endpoint can be edited in `pages/api/hello.js`.

The `pages/api` directory is mapped to `/api/*`. Files in this directory are
treated as [API routes](https://nextjs.org/docs/api-routes/introduction) instead
of React pages.

## Learn More

To learn more about Next.js, take a look at the following resources:

- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js
features and API.
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.

You can check out
[the Next.js GitHub repository](https://github.com/vercel/next.js/) - your
feedback and contributions are welcome!

## Deploy on Vercel

The easiest way to deploy your Next.js app is to use the
[Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme)
from the creators of Next.js.

Check out our
[Next.js deployment documentation](https://nextjs.org/docs/deployment) for more
details.
6 changes: 6 additions & 0 deletions examples/nextjs/next.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
reactStrictMode: true,
};

module.exports = nextConfig;
Loading

0 comments on commit 4d02c5d

Please sign in to comment.