Skip to content

Commit

Permalink
Merge branch 'main' into issue-9443
Browse files Browse the repository at this point in the history
  • Loading branch information
@tay1orjones
tay1orjones authored Oct 31, 2023
2 parents f12a330 + 3434c93 commit d52cbf0
Show file tree
Hide file tree
Showing 40 changed files with 182 additions and 189 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ jobs:
with:
node-version: '20.x'
- uses: actions/cache@v3
if: github.event_name != 'merge_group'
id: cache
with:
path: |
Expand All @@ -88,6 +89,7 @@ jobs:
with:
node-version: '20.x'
- uses: actions/cache@v3
if: github.event_name != 'merge_group'
id: cache
with:
path: |
Expand Down Expand Up @@ -127,6 +129,7 @@ jobs:
with:
node-version: '20.x'
- uses: actions/cache@v3
if: github.event_name != 'merge_group'
id: cache
with:
path: |
Expand Down Expand Up @@ -186,6 +189,7 @@ jobs:
with:
node-version: '20.x'
- uses: actions/cache@v3
if: github.event_name != 'merge_group'
id: cache
with:
path: |
Expand Down
Binary file removed .yarn/cache/@carbon-icon-helpers-npm-10.44.0-159592a2ec-c61b711ef7.zip
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion config/typescript-config-carbon/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "typescript-config-carbon",
"description": "TypeScript configuration for Carbon",
"version": "0.2.0-rc.0",
"version": "0.2.0",
"license": "Apache-2.0",
"main": "index.js",
"types": "index.d.ts",
Expand Down
4 changes: 2 additions & 2 deletions examples/class-prefix/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "class-prefix",
"private": true,
"version": "0.38.0-rc.0",
"version": "0.38.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.41.0-rc.0",
"@carbon/react": "^1.41.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox-styles/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "codesandbox-styles",
"private": true,
"version": "0.44.0-rc.0",
"version": "0.44.0",
"type": "module",
"scripts": {
"dev": "vite"
Expand All @@ -11,6 +11,6 @@
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.41.0-rc.0"
"@carbon/styles": "^1.41.0"
}
}
4 changes: 2 additions & 2 deletions examples/codesandbox-with-sass-compilation/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "codesandbox-with-sass-compilation",
"version": "0.42.0-rc.0",
"version": "0.42.0",
"private": true,
"dependencies": {
"@carbon/react": "^1.41.0-rc.0",
"@carbon/react": "^1.41.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "codesandbox",
"version": "0.42.0-rc.0",
"version": "0.42.0",
"private": true,
"dependencies": {
"@carbon/react": "^1.41.0-rc.0",
"@carbon/react": "^1.41.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-theme/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "custom-theme",
"private": true,
"version": "0.39.0-rc.0",
"version": "0.39.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.41.0-rc.0",
"@carbon/react": "^1.41.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/id-prefix/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "id-prefix",
"private": true,
"version": "0.38.0-rc.0",
"version": "0.38.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.41.0-rc.0",
"@carbon/react": "^1.41.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/incremental-migration-vite/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "incremental-migration-vite",
"private": true,
"version": "0.6.0-rc.0",
"version": "0.6.0",
"scripts": {
"dev": "vite",
"build": "vite build",
Expand All @@ -12,7 +12,7 @@
},
"dependencies": {
"@carbon/icons-react": "^10.49.0",
"@carbon/react": "^1.41.0-rc.0",
"@carbon/react": "^1.41.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
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "examples-light-dark",
"private": true,
"version": "0.39.0-rc.0",
"version": "0.39.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.41.0-rc.0",
"@carbon/react": "^1.41.0",
"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
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "examples-nextjs",
"private": true,
"version": "0.41.0-rc.0",
"version": "0.41.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.41.0-rc.0",
"@carbon/react": "^1.41.0",
"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
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "v10-token-compat-in-v11",
"private": true,
"version": "0.39.0-rc.0",
"version": "0.39.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.41.0-rc.0",
"@carbon/react": "^1.41.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/vite/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "vite",
"private": true,
"version": "0.39.0-rc.0",
"version": "0.39.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.41.0-rc.0",
"@carbon/react": "^1.41.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/carbon-components-react/package.json
View file
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.41.0-rc.0",
"version": "8.41.0",
"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.41.0-rc.0",
"@carbon/styles": "^1.41.0-rc.0",
"@carbon/react": "^1.41.0",
"@carbon/styles": "^1.41.0",
"@carbon/telemetry": "0.1.0",
"chalk": "1.1.3"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/carbon-components/package.json
View file
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.41.0-rc.0",
"version": "11.41.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -42,7 +42,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.41.0-rc.0",
"@carbon/styles": "^1.41.0",
"@carbon/telemetry": "0.1.0",
"chalk": "1.1.3"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/cli",
"description": "Task automation for working with the Carbon Design System",
"version": "11.15.0-rc.0",
"version": "11.15.0",
"license": "Apache-2.0",
"bin": {
"carbon-cli": "./bin/carbon-cli.js"
Expand Down Expand Up @@ -51,7 +51,7 @@
"rollup": "^2.79.1",
"sass": "^1.51.0",
"sassdoc": "^2.7.3",
"typescript-config-carbon": "^0.2.0-rc.0",
"typescript-config-carbon": "^0.2.0",
"yargs": "^17.0.1"
}
}
4 changes: 2 additions & 2 deletions packages/colors/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/colors",
"description": "Colors for digital and software products using the Carbon Design System",
"version": "11.20.0-rc.0",
"version": "11.20.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -37,7 +37,7 @@
"clean": "rimraf css es lib umd scss index.scss"
},
"devDependencies": {
"@carbon/cli": "^11.15.0-rc.0",
"@carbon/cli": "^11.15.0",
"@carbon/cli-reporter": "^10.7.0",
"@carbon/scss-generator": "^10.18.0",
"@carbon/test-utils": "^10.30.0",
Expand Down
18 changes: 9 additions & 9 deletions packages/elements/package.json
View file
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.32.0-rc.0",
"version": "11.32.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -36,16 +36,16 @@
"clean": "rimraf es lib umd"
},
"dependencies": {
"@carbon/colors": "^11.20.0-rc.0",
"@carbon/grid": "^11.21.0-rc.0",
"@carbon/icons": "^11.29.0-rc.0",
"@carbon/layout": "^11.20.0-rc.0",
"@carbon/motion": "^11.16.0-rc.0",
"@carbon/themes": "^11.26.0-rc.0",
"@carbon/type": "^11.25.0-rc.0"
"@carbon/colors": "^11.20.0",
"@carbon/grid": "^11.21.0",
"@carbon/icons": "^11.29.0",
"@carbon/layout": "^11.20.0",
"@carbon/motion": "^11.16.0",
"@carbon/themes": "^11.26.0",
"@carbon/type": "^11.25.0"
},
"devDependencies": {
"@carbon/cli": "^11.15.0-rc.0",
"@carbon/cli": "^11.15.0",
"fs-extra": "^11.0.0",
"klaw-sync": "^6.0.0",
"replace-in-file": "^7.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/grid/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/grid",
"description": "Grid for digital and software products using the Carbon Design System",
"version": "11.21.0-rc.0",
"version": "11.21.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,10 +33,10 @@
"clean": "rimraf scss/_inlined scss/vendor"
},
"dependencies": {
"@carbon/layout": "^11.20.0-rc.0"
"@carbon/layout": "^11.20.0"
},
"devDependencies": {
"@carbon/cli": "^11.15.0-rc.0",
"@carbon/cli": "^11.15.0",
"rimraf": "^5.0.0"
},
"eyeglass": {
Expand Down
6 changes: 3 additions & 3 deletions packages/icon-build-helpers/package.json
View file
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.19.0-rc.0",
"version": "1.19.0",
"license": "Apache-2.0",
"main": "src/index.js",
"repository": {
Expand Down Expand Up @@ -30,7 +30,7 @@
"@babel/template": "^7.16.7",
"@babel/types": "^7.18.4",
"@carbon/cli-reporter": "^10.7.0",
"@carbon/icon-helpers": "^10.45.0-rc.0",
"@carbon/icon-helpers": "^10.45.0",
"@rollup/plugin-babel": "^6.0.0",
"@rollup/plugin-replace": "^5.0.0",
"browserslist-config-carbon": "^11.2.0",
Expand All @@ -51,6 +51,6 @@
"svg-parser": "^2.0.4",
"svgo": "^1.1.1",
"svgson": "^5.2.1",
"typescript-config-carbon": "^0.2.0-rc.0"
"typescript-config-carbon": "^0.2.0"
}
}
Loading

0 comments on commit d52cbf0

Please sign in to comment.