Skip to content

Commit

Permalink
Merge branch 'main' into use-logical-properties
Browse files Browse the repository at this point in the history
  • Loading branch information
tw15egan authored Aug 29, 2023
2 parents 41d73e9 + 30f17c6 commit 6d573cd
Show file tree
Hide file tree
Showing 24 changed files with 79 additions and 76 deletions.
19 changes: 11 additions & 8 deletions .github/workflows/contribution-approved.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,24 @@
# GitHub recommends pinning actions to a commit SHA.
# To get a newer version, you will need to update the SHA.
# You can also reference a tag or branch, but the action may change without warning
name: Add comment on Enhancement Label
name: Add comment on enhancement issue
on:
issues:
types:
- labeled
types: [labeled, opened]

permissions:
issues: write

jobs:
add-comment:
## TODO: figure out how to escape colons for labels
# if: github.event.label.name == "proposal: accepted" && github.event.label.name == "community contribution"
if: "${{ contains(github.event.label, 'proposal: accepted') && contains(github.event.label, 'communit contribution') }}"
name: Add comment to with proposal accepted and community contribution
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- name: Add comment
if:
${{ contains(github.event.issue.labels.*.name,
format('proposal{0} accepted', ':')) ||
contains(github.event.issue.labels.*.name, format('community contribution'))}}
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 #v6.4.1
with:
script: |
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": "3.8.0",
"version": "3.8.1-rc.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions examples/class-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "class-prefix",
"private": true,
"version": "0.34.0-rc.0",
"version": "0.34.0-rc.1",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.37.0-rc.0",
"@carbon/react": "^1.37.0-rc.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox-styles/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "codesandbox-styles",
"private": true,
"version": "0.39.0",
"version": "0.39.1-rc.0",
"type": "module",
"scripts": {
"dev": "vite"
Expand All @@ -11,6 +11,6 @@
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.36.0"
"@carbon/styles": "^1.36.1-rc.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.38.0-rc.0",
"version": "0.38.0-rc.1",
"private": true,
"dependencies": {
"@carbon/react": "^1.37.0-rc.0",
"@carbon/react": "^1.37.0-rc.1",
"react": "^18.2.0",
"react-dom": "^18.2.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.38.0-rc.0",
"version": "0.38.0-rc.1",
"private": true,
"dependencies": {
"@carbon/react": "^1.37.0-rc.0",
"@carbon/react": "^1.37.0-rc.1",
"react": "^18.2.0",
"react-dom": "^18.2.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,15 +1,15 @@
{
"name": "custom-theme",
"private": true,
"version": "0.35.0-rc.0",
"version": "0.35.0-rc.1",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.37.0-rc.0",
"@carbon/react": "^1.37.0-rc.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/id-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "id-prefix",
"private": true,
"version": "0.34.0-rc.0",
"version": "0.34.0-rc.1",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.37.0-rc.0",
"@carbon/react": "^1.37.0-rc.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/incremental-migration-vite/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "incremental-migration-vite",
"private": true,
"version": "0.2.0-rc.0",
"version": "0.2.0-rc.1",
"scripts": {
"dev": "vite",
"build": "vite build",
Expand All @@ -12,7 +12,7 @@
},
"dependencies": {
"@carbon/icons-react": "^10.49.0",
"@carbon/react": "^1.37.0-rc.0",
"@carbon/react": "^1.37.0-rc.1",
"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/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.37.0-rc.0",
"version": "0.37.0-rc.1",
"scripts": {
"build": "next build",
"dev": "next dev",
Expand All @@ -13,7 +13,7 @@
},
"dependencies": {
"@carbon/icons-react": "^10.49.0",
"@carbon/react": "^1.37.0-rc.0",
"@carbon/react": "^1.37.0-rc.1",
"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.35.0-rc.0",
"version": "0.35.0-rc.1",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.37.0-rc.0",
"@carbon/react": "^1.37.0-rc.1",
"next": "12.1.4",
"react": "18.2.0",
"react-dom": "18.2.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.37.0-rc.0",
"version": "0.37.0-rc.1",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.37.0-rc.0",
"@carbon/react": "^1.37.0-rc.1",
"next": "13.4.7",
"react": "18.2.0",
"react-dom": "18.2.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/v10-token-compat-in-v11/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "v10-token-compat-in-v11",
"private": true,
"version": "0.35.0-rc.0",
"version": "0.35.0-rc.1",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.37.0-rc.0",
"@carbon/react": "^1.37.0-rc.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/vite/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "vite",
"private": true,
"version": "0.35.0-rc.0",
"version": "0.35.0-rc.1",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.37.0-rc.0",
"@carbon/react": "^1.37.0-rc.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
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.37.0-rc.0",
"version": "8.37.0-rc.1",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -41,8 +41,8 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.37.0-rc.0",
"@carbon/styles": "^1.36.0",
"@carbon/react": "^1.37.0-rc.1",
"@carbon/styles": "^1.36.1-rc.0",
"@carbon/telemetry": "0.1.0",
"chalk": "1.1.3"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/carbon-components/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "carbon-components",
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
"version": "11.36.0",
"version": "11.36.1-rc.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -42,7 +42,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.36.0",
"@carbon/styles": "^1.36.1-rc.0",
"@carbon/telemetry": "0.1.0",
"chalk": "1.1.3"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/elements/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/elements",
"description": "A collection of design elements in code for the IBM Design Language",
"version": "11.28.0",
"version": "11.28.1-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -38,7 +38,7 @@
"dependencies": {
"@carbon/colors": "^11.19.0",
"@carbon/grid": "^11.19.0",
"@carbon/icons": "^11.25.0",
"@carbon/icons": "^11.25.1-rc.0",
"@carbon/layout": "^11.19.0",
"@carbon/motion": "^11.15.0",
"@carbon/themes": "^11.24.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/icons-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons-react",
"description": "React components for icons in digital and software products using the Carbon Design System",
"version": "11.25.0",
"version": "11.25.1-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -43,7 +43,7 @@
},
"devDependencies": {
"@carbon/icon-build-helpers": "^1.18.0",
"@carbon/icons": "^11.25.0",
"@carbon/icons": "^11.25.1-rc.0",
"rimraf": "^5.0.0"
},
"sideEffects": false
Expand Down
4 changes: 2 additions & 2 deletions packages/icons-vue/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons-vue",
"description": "Vue components for icons in digital and software products using the Carbon Design System",
"version": "10.74.0",
"version": "10.74.1-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -33,7 +33,7 @@
},
"devDependencies": {
"@carbon/cli-reporter": "^10.7.0",
"@carbon/icons": "^11.25.0",
"@carbon/icons": "^11.25.1-rc.0",
"fs-extra": "^11.0.0",
"prettier": "^2.8.8",
"rimraf": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/icons/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons",
"description": "Icons for digital and software products using the Carbon Design System",
"version": "11.25.0",
"version": "11.25.1-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down
6 changes: 3 additions & 3 deletions packages/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": "1.37.0-rc.0",
"version": "1.37.0-rc.1",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -46,9 +46,9 @@
"dependencies": {
"@babel/runtime": "^7.18.3",
"@carbon/feature-flags": "^0.16.0",
"@carbon/icons-react": "^11.25.0",
"@carbon/icons-react": "^11.25.1-rc.0",
"@carbon/layout": "^11.19.0",
"@carbon/styles": "^1.36.0",
"@carbon/styles": "^1.36.1-rc.0",
"@carbon/telemetry": "0.1.0",
"classnames": "2.3.2",
"copy-to-clipboard": "^3.3.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/styles/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/styles",
"description": "Styles for the Carbon Design System",
"version": "1.36.0",
"version": "1.36.1-rc.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions www/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "www",
"private": true,
"version": "0.46.0-rc.0",
"version": "0.46.0-rc.1",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand All @@ -22,7 +22,7 @@
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.37.0-rc.0",
"@carbon/react": "^1.37.0-rc.1",
"@octokit/core": "^4.0.0",
"@octokit/plugin-retry": "^3.0.9",
"@octokit/plugin-throttling": "^4.0.0",
Expand Down
Loading

0 comments on commit 6d573cd

Please sign in to comment.