Skip to content

Commit

Permalink
Merge branch 'main' into update-slug-storybook-controls
Browse files Browse the repository at this point in the history
  • Loading branch information
tw15egan authored Apr 1, 2024
2 parents 8cf2c1e + daddb69 commit 17e3448
Show file tree
Hide file tree
Showing 62 changed files with 1,191 additions and 692 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/add-to-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
name: Add issue with enhancement label to the Proposals project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@1b844f0c5ac6446a402e0cb3693f9be5eca188c5 #v0.6.1
- uses: actions/add-to-project@2e5cc851ca7162e9eb510e6da6a5c64022e606a7 #v1.0.0
with:
labeled: ${{ env.LABEL_ENHANCEMENT }}
project-url: ${{ env.PROPOSALS_PROJECT_URL }}
Expand All @@ -29,7 +29,7 @@ jobs:
name: Add issue with typescript label to the TypeScript Adoption project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@1b844f0c5ac6446a402e0cb3693f9be5eca188c5 #v0.6.1
- uses: actions/add-to-project@2e5cc851ca7162e9eb510e6da6a5c64022e606a7 #v1.0.0
with:
labeled: ${{ env.LABEL_TYPESCRIPT }}
project-url: ${{ env.TYPESCRIPT_PROJECT_URL }}
Expand All @@ -39,7 +39,7 @@ jobs:
name: Add issue to the Design System project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@1b844f0c5ac6446a402e0cb3693f9be5eca188c5 #v0.6.1
- uses: actions/add-to-project@2e5cc851ca7162e9eb510e6da6a5c64022e606a7 #v1.0.0
with:
labeled: ${{ env.LABEL_ENHANCEMENT }}, ${{ env.LABEL_TYPESCRIPT }}
label-operator: NOT
Expand Down
Binary file not shown.
1 change: 1 addition & 0 deletions config/eslint-config-carbon/internal.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ module.exports = {
require.resolve('./plugins/storybook'),
require.resolve('./plugins/testing-library'),
require.resolve('./plugins/eslint-plugin-playwright'),
require.resolve('./plugins/eslint-plugin-ssr-friendly'),
],
};
3 changes: 2 additions & 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.12.0-rc.0",
"version": "3.12.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down Expand Up @@ -47,6 +47,7 @@
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-ssr-friendly": "^1.3.0",
"eslint-plugin-storybook": "^0.8.0",
"eslint-plugin-testing-library": "^6.0.1",
"eslint-restricted-globals": "^0.2.0"
Expand Down
19 changes: 19 additions & 0 deletions config/eslint-config-carbon/plugins/eslint-plugin-ssr-friendly.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/**
* Copyright IBM Corp. 2018, 2024
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

'use strict';

module.exports = {
plugins: ['ssr-friendly'],
ignorePatterns: ['*.stories.js', '*-test.js'],
overrides: [
{
extends: ['plugin:ssr-friendly/recommended'],
files: ['*.js', '*.ts', '*.tsx'],
},
],
};
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.51.0-rc.0",
"version": "0.51.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.54.0-rc.0",
"@carbon/react": "^1.54.0",
"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.57.0-rc.0",
"version": "0.57.0",
"type": "module",
"scripts": {
"dev": "vite"
Expand All @@ -11,6 +11,6 @@
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.54.0-rc.0"
"@carbon/styles": "^1.54.0"
}
}
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.52.0-rc.0",
"version": "0.52.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.54.0-rc.0",
"@carbon/react": "^1.54.0",
"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.51.0-rc.0",
"version": "0.51.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.54.0-rc.0",
"@carbon/react": "^1.54.0",
"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.19.0-rc.0",
"version": "0.19.0",
"scripts": {
"dev": "vite",
"build": "vite build",
Expand All @@ -12,7 +12,7 @@
},
"dependencies": {
"@carbon/icons-react": "^10.49.0",
"@carbon/react": "^1.54.0-rc.0",
"@carbon/react": "^1.54.0",
"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.52.0-rc.0",
"version": "0.52.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.54.0-rc.0",
"@carbon/react": "^1.54.0",
"next": "13.5.1",
"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.54.0-rc.0",
"version": "0.54.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.54.0-rc.0",
"@carbon/react": "^1.54.0",
"next": "13.5.6",
"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.52.0-rc.0",
"version": "0.52.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.54.0-rc.0",
"@carbon/react": "^1.54.0",
"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.52.0-rc.0",
"version": "0.52.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.54.0-rc.0",
"@carbon/react": "^1.54.0",
"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.54.0-rc.0",
"version": "8.54.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -42,8 +42,8 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.54.0-rc.0",
"@carbon/styles": "^1.54.0-rc.0",
"@carbon/react": "^1.54.0",
"@carbon/styles": "^1.54.0",
"@ibm/telemetry-js": "^1.2.1",
"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.54.0-rc.0",
"version": "11.54.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -43,7 +43,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.54.0-rc.0",
"@carbon/styles": "^1.54.0",
"@ibm/telemetry-js": "^1.2.1",
"chalk": "1.1.3"
},
Expand Down
6 changes: 3 additions & 3 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.43.0-rc.0",
"version": "11.43.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -40,10 +40,10 @@
"dependencies": {
"@carbon/colors": "^11.21.0",
"@carbon/grid": "^11.22.0",
"@carbon/icons": "^11.39.0-rc.0",
"@carbon/icons": "^11.39.0",
"@carbon/layout": "^11.21.0",
"@carbon/motion": "^11.17.0",
"@carbon/themes": "^11.34.0-rc.0",
"@carbon/themes": "^11.34.0",
"@carbon/type": "^11.26.0",
"@ibm/telemetry-js": "^1.2.1"
},
Expand Down
4 changes: 4 additions & 0 deletions packages/feature-flags/feature-flags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ feature-flags:
description: >
Enable the new TreeView controllable API
enabled: false
- name: enable-v12-structured-list-visible-icons
description: >
Enable rendering of radio icons in the StructuredList component
enabled: false
- name: enable-experimental-focus-wrap-without-sentinels
description: >
Enable the new focus wrap behavior that doesn't use sentinel nodes
Expand Down
2 changes: 1 addition & 1 deletion packages/feature-flags/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/feature-flags",
"description": "Build with feature flags in Carbon",
"version": "0.19.0-rc.0",
"version": "0.19.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/icon-build-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@carbon/icon-build-helpers",
"private": true,
"description": "Build helpers for the Carbon Design System icon library",
"version": "1.24.0-rc.0",
"version": "1.24.0",
"license": "Apache-2.0",
"main": "src/index.js",
"repository": {
Expand Down
6 changes: 3 additions & 3 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.39.0-rc.0",
"version": "11.39.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -43,8 +43,8 @@
"prop-types": "^15.7.2"
},
"devDependencies": {
"@carbon/icon-build-helpers": "^1.24.0-rc.0",
"@carbon/icons": "^11.39.0-rc.0",
"@carbon/icon-build-helpers": "^1.24.0",
"@carbon/icons": "^11.39.0",
"rimraf": "^5.0.0"
},
"sideEffects": false
Expand Down
Loading

0 comments on commit 17e3448

Please sign in to comment.