Skip to content

Commit

Permalink
Merge branch 'master' into fix-flaky-24-11
Browse files Browse the repository at this point in the history
  • Loading branch information
mannycarrera4 authored Nov 14, 2024
2 parents 8297800 + b0a9015 commit 8ab186b
Show file tree
Hide file tree
Showing 14 changed files with 43 additions and 32 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [v12.1.3](https://github.com/Workday/canvas-kit/releases/tag/v12.1.3) (2024-11-13)

### Dependencies

- chore: Upgrade storybook to 7.6.20 to fix vulnerabilities ([#3047](https://github.com/Workday/canvas-kit/pull/3047)) ([@mannycarrera4](https://github.com/mannycarrera4), manuel.carrera)

### Infrastructure

- fix: Prevent build step in modules from running in parallel ([#3053](https://github.com/Workday/canvas-kit/pull/3053)) ([@mannycarrera4](https://github.com/mannycarrera4), manuel.carrera)


## [v12.1.2](https://github.com/Workday/canvas-kit/releases/tag/v12.1.2) (2024-11-12)

### Documentation, Examples
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"modules/**"
],
"version": "12.1.2",
"version": "12.1.3",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
Expand Down
2 changes: 1 addition & 1 deletion modules/codemod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@workday/canvas-kit-codemod",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
"version": "12.1.2",
"version": "12.1.3",
"description": "A collection of codemods for use on Workday Canvas Kit packages.",
"main": "dist/es6/index.js",
"sideEffects": false,
Expand Down
2 changes: 1 addition & 1 deletion modules/css/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css",
"version": "12.1.2",
"version": "12.1.3",
"description": "The parent module that contains all Workday Canvas Kit CSS components",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down
12 changes: 6 additions & 6 deletions modules/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-docs",
"version": "12.1.2",
"version": "12.1.3",
"description": "Documentation components of Canvas Kit components",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -27,7 +27,7 @@
"build:docs": "node ./utils/build-docs.js",
"build:rebuild": "npm-run-all clean build",
"build:specs": "node ./utils/build-specifications.js",
"build": "npm-run-all --parallel build:es6 build:mdx --parallel build:specs build:docs",
"build": "npm-run-all build:es6 build:mdx build:specs build:docs",
"depcheck": "node ../../utils/check-dependencies-exist.js",
"typecheck:src": "tsc -p . --noEmit --incremental false"
},
Expand All @@ -44,10 +44,10 @@
"dependencies": {
"@emotion/styled": "^11.6.0",
"@storybook/csf": "0.0.1",
"@workday/canvas-kit-labs-react": "^12.1.2",
"@workday/canvas-kit-preview-react": "^12.1.2",
"@workday/canvas-kit-react": "^12.1.2",
"@workday/canvas-kit-styling": "^12.1.2",
"@workday/canvas-kit-labs-react": "^12.1.3",
"@workday/canvas-kit-preview-react": "^12.1.3",
"@workday/canvas-kit-react": "^12.1.3",
"@workday/canvas-kit-styling": "^12.1.3",
"@workday/canvas-system-icons-web": "^3.0.0",
"@workday/canvas-tokens-web": "^2.0.1",
"markdown-to-jsx": "^7.2.0",
Expand Down
2 changes: 1 addition & 1 deletion modules/labs-css/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-labs-css",
"version": "12.1.2",
"version": "12.1.3",
"description": "The parent module that contains all Workday Canvas Kit Labs CSS components",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down
8 changes: 4 additions & 4 deletions modules/labs-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-labs-react",
"version": "12.1.2",
"version": "12.1.3",
"description": "Canvas Kit Labs is an incubator for new and experimental components. Since we have a rather rigorous process for getting components in at a production level, it can be valuable to make them available earlier while we continuously iterate on the API/functionality. The Labs modules allow us to do that as needed.",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -27,7 +27,7 @@
"build:cjs": "tspc -p tsconfig.cjs.json",
"build:es6": "tspc -p tsconfig.es6.json",
"build:rebuild": "npm-run-all clean build",
"build": "npm-run-all --parallel build:cjs build:es6",
"build": "npm-run-all build:cjs build:es6",
"prepack": "node ../../utils/publish.js pre labs-react",
"postpack": "node ../../utils/publish.js post labs-react",
"depcheck": "node ../../utils/check-dependencies-exist.js",
Expand All @@ -46,8 +46,8 @@
"dependencies": {
"@emotion/react": "^11.7.1",
"@emotion/styled": "^11.6.0",
"@workday/canvas-kit-react": "^12.1.2",
"@workday/canvas-kit-styling": "^12.1.2",
"@workday/canvas-kit-react": "^12.1.3",
"@workday/canvas-kit-styling": "^12.1.3",
"@workday/canvas-system-icons-web": "^3.0.0",
"@workday/canvas-tokens-web": "^2.0.1",
"@workday/design-assets-types": "^0.2.8",
Expand Down
4 changes: 2 additions & 2 deletions modules/popup-stack/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-popup-stack",
"version": "12.1.2",
"version": "12.1.3",
"description": "Stack for managing popup UIs to coordinate global concerns like escape key handling and rendering order",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -24,7 +24,7 @@
"build:cjs": "tsc -p tsconfig.cjs.json",
"build:es6": "tsc -p tsconfig.es6.json",
"build:rebuild": "npm-run-all clean build",
"build": "npm-run-all --parallel build:cjs build:es6",
"build": "npm-run-all build:cjs build:es6",
"depcheck": "node ../../utils/check-dependencies-exist.js",
"typecheck:src": "tsc -p . --noEmit --incremental false"
},
Expand Down
2 changes: 1 addition & 1 deletion modules/preview-css/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-preview-css",
"version": "12.1.2",
"version": "12.1.3",
"description": "The parent module that contains all Workday Canvas Kit Preview CSS components",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down
8 changes: 4 additions & 4 deletions modules/preview-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-preview-react",
"version": "12.1.2",
"version": "12.1.3",
"description": "Canvas Kit Preview is made up of components that have the full design and a11y review, are part of the DS ecosystem and are approved for use in product. The API's could be subject to change, but not without strong communication and migration strategies.",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -27,7 +27,7 @@
"build:cjs": "tspc -p tsconfig.cjs.json",
"build:es6": "tspc -p tsconfig.es6.json",
"build:rebuild": "npm-run-all clean build",
"build": "npm-run-all --parallel build:cjs build:es6",
"build": "npm-run-all build:cjs build:es6",
"prepack": "node ../../utils/publish.js pre preview-react",
"postpack": "node ../../utils/publish.js post preview-react",
"depcheck": "node ../../utils/check-dependencies-exist.js",
Expand All @@ -46,8 +46,8 @@
"dependencies": {
"@emotion/react": "^11.7.1",
"@emotion/styled": "^11.6.0",
"@workday/canvas-kit-react": "^12.1.2",
"@workday/canvas-kit-styling": "^12.1.2",
"@workday/canvas-kit-react": "^12.1.3",
"@workday/canvas-kit-styling": "^12.1.3",
"@workday/canvas-system-icons-web": "^3.0.0",
"@workday/canvas-tokens-web": "^2.0.1",
"@workday/design-assets-types": "^0.2.8"
Expand Down
4 changes: 2 additions & 2 deletions modules/react-fonts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-react-fonts",
"version": "12.1.2",
"version": "12.1.3",
"description": "Fonts for canvas-kit-react",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -25,7 +25,7 @@
"build:cjs": "tsc -p tsconfig.cjs.json",
"build:es6": "tsc -p tsconfig.es6.json",
"build:rebuild": "npm-run-all clean build",
"build": "npm-run-all --parallel build:cjs build:es6",
"build": "npm-run-all build:cjs build:es6",
"depcheck": "node ../../utils/check-dependencies-exist.js",
"typecheck:src": "tsc -p . --noEmit --incremental false"
},
Expand Down
8 changes: 4 additions & 4 deletions modules/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-react",
"version": "12.1.2",
"version": "12.1.3",
"description": "The parent module that contains all Workday Canvas Kit React components",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -27,7 +27,7 @@
"build:cjs": "tspc -p tsconfig.cjs.json",
"build:es6": "tspc -p tsconfig.es6.json",
"build:rebuild": "npm-run-all clean build",
"build": "npm-run-all --parallel build:cjs build:es6",
"build": "npm-run-all build:cjs build:es6",
"prepack": "node ../../utils/publish.js pre react",
"postpack": "node ../../utils/publish.js post react",
"depcheck": "node ../../utils/check-dependencies-exist.js",
Expand All @@ -49,8 +49,8 @@
"@emotion/styled": "^11.6.0",
"@popperjs/core": "^2.5.4",
"@workday/canvas-colors-web": "^2.0.0",
"@workday/canvas-kit-popup-stack": "^12.1.2",
"@workday/canvas-kit-styling": "^12.1.2",
"@workday/canvas-kit-popup-stack": "^12.1.3",
"@workday/canvas-kit-styling": "^12.1.3",
"@workday/canvas-system-icons-web": "^3.0.0",
"@workday/canvas-tokens-web": "^2.0.1",
"@workday/design-assets-types": "^0.2.8",
Expand Down
4 changes: 2 additions & 2 deletions modules/styling-transform/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-styling-transform",
"version": "12.1.2",
"version": "12.1.3",
"description": "The custom CSS in JS solution that takes JS styles and turns them into static CSS",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down Expand Up @@ -34,7 +34,7 @@
],
"dependencies": {
"@emotion/serialize": "^1.0.2",
"@workday/canvas-kit-styling": "^12.1.2",
"@workday/canvas-kit-styling": "^12.1.3",
"@workday/canvas-tokens-web": "^2.0.1",
"stylis": "4.0.13",
"ts-node": "^10.9.1",
Expand Down
6 changes: 3 additions & 3 deletions modules/styling/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-styling",
"version": "12.1.2",
"version": "12.1.3",
"description": "The custom CSS in JS solution that takes JS styles and turns them into static CSS",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -27,7 +27,7 @@
"build:cjs": "tsc -p tsconfig.cjs.json",
"build:es6": "tsc -p tsconfig.es6.json",
"build:rebuild": "npm-run-all clean build",
"build": "npm-run-all --parallel build:cjs build:es6",
"build": "npm-run-all build:cjs build:es6",
"depcheck": "node ../../utils/check-dependencies-exist.js",
"typecheck:src": "tsc -p . --noEmit --incremental false"
},
Expand All @@ -53,7 +53,7 @@
"@emotion/react": "^11.7.1",
"@emotion/serialize": "^1.0.2",
"@emotion/styled": "^11.6.0",
"@workday/canvas-kit-react": "^12.1.2",
"@workday/canvas-kit-react": "^12.1.3",
"@workday/canvas-system-icons-web": "^3.0.0",
"@workday/canvas-tokens-web": "^2.0.1",
"typescript": "5.0"
Expand Down

0 comments on commit 8ab186b

Please sign in to comment.