From 66d1c563168bd0c376e72c2dc439c7c2e8007e1a Mon Sep 17 00:00:00 2001 From: Manuel Carrera Date: Wed, 13 Nov 2024 16:10:06 -0700 Subject: [PATCH 1/2] fix: Prevent build step in modules from running in parallel (#3053) `ts-patch` was running our typescript builds in parallel, causing cache issues between modules. Removing `--parallel` from the `build` step within each package so that it is sequential. [category:Infrastructure] Co-authored-by: manuel.carrera --- modules/docs/package.json | 2 +- modules/labs-react/package.json | 2 +- modules/popup-stack/package.json | 2 +- modules/preview-react/package.json | 2 +- modules/react-fonts/package.json | 2 +- modules/react/package.json | 2 +- modules/styling/package.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/docs/package.json b/modules/docs/package.json index 2b29463d1e..5a99567172 100644 --- a/modules/docs/package.json +++ b/modules/docs/package.json @@ -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" }, diff --git a/modules/labs-react/package.json b/modules/labs-react/package.json index 150b4453d1..02b27780ea 100644 --- a/modules/labs-react/package.json +++ b/modules/labs-react/package.json @@ -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", diff --git a/modules/popup-stack/package.json b/modules/popup-stack/package.json index 3a09ca40cc..378fe43d26 100644 --- a/modules/popup-stack/package.json +++ b/modules/popup-stack/package.json @@ -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" }, diff --git a/modules/preview-react/package.json b/modules/preview-react/package.json index b0bd854ba9..a30b988659 100644 --- a/modules/preview-react/package.json +++ b/modules/preview-react/package.json @@ -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", diff --git a/modules/react-fonts/package.json b/modules/react-fonts/package.json index ec3491909e..815ab1677e 100644 --- a/modules/react-fonts/package.json +++ b/modules/react-fonts/package.json @@ -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" }, diff --git a/modules/react/package.json b/modules/react/package.json index 5b2b9ab1cf..b42e018fcf 100644 --- a/modules/react/package.json +++ b/modules/react/package.json @@ -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", diff --git a/modules/styling/package.json b/modules/styling/package.json index ac19b8950d..7acd495bc7 100644 --- a/modules/styling/package.json +++ b/modules/styling/package.json @@ -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" }, From b0a90152015ec3a58183521456a9c5550070b9a0 Mon Sep 17 00:00:00 2001 From: alanbsmith Date: Wed, 13 Nov 2024 23:11:50 +0000 Subject: [PATCH 2/2] chore: Release v12.1.3 [skip release] --- CHANGELOG.md | 11 +++++++++++ lerna.json | 2 +- modules/codemod/package.json | 2 +- modules/css/package.json | 2 +- modules/docs/package.json | 10 +++++----- modules/labs-css/package.json | 2 +- modules/labs-react/package.json | 6 +++--- modules/popup-stack/package.json | 2 +- modules/preview-css/package.json | 2 +- modules/preview-react/package.json | 6 +++--- modules/react-fonts/package.json | 2 +- modules/react/package.json | 6 +++--- modules/styling-transform/package.json | 4 ++-- modules/styling/package.json | 4 ++-- 14 files changed, 36 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f604354fad..e354e6656f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/lerna.json b/lerna.json index 4e84a6875f..4615506c3f 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "modules/**" ], - "version": "12.1.2", + "version": "12.1.3", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/modules/codemod/package.json b/modules/codemod/package.json index b3750bca32..5016b75e10 100644 --- a/modules/codemod/package.json +++ b/modules/codemod/package.json @@ -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, diff --git a/modules/css/package.json b/modules/css/package.json index 2b7f25620c..1e8500d1c0 100644 --- a/modules/css/package.json +++ b/modules/css/package.json @@ -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", diff --git a/modules/docs/package.json b/modules/docs/package.json index 5a99567172..e8ff66e004 100644 --- a/modules/docs/package.json +++ b/modules/docs/package.json @@ -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", @@ -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", diff --git a/modules/labs-css/package.json b/modules/labs-css/package.json index c06b1363c1..affbfd1921 100644 --- a/modules/labs-css/package.json +++ b/modules/labs-css/package.json @@ -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", diff --git a/modules/labs-react/package.json b/modules/labs-react/package.json index 02b27780ea..e8be72d7fe 100644 --- a/modules/labs-react/package.json +++ b/modules/labs-react/package.json @@ -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", @@ -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", diff --git a/modules/popup-stack/package.json b/modules/popup-stack/package.json index 378fe43d26..1e9292b824 100644 --- a/modules/popup-stack/package.json +++ b/modules/popup-stack/package.json @@ -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", diff --git a/modules/preview-css/package.json b/modules/preview-css/package.json index fb1941a829..8aee29c3f8 100644 --- a/modules/preview-css/package.json +++ b/modules/preview-css/package.json @@ -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", diff --git a/modules/preview-react/package.json b/modules/preview-react/package.json index a30b988659..5962a63033 100644 --- a/modules/preview-react/package.json +++ b/modules/preview-react/package.json @@ -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", @@ -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" diff --git a/modules/react-fonts/package.json b/modules/react-fonts/package.json index 815ab1677e..6d0fea0efb 100644 --- a/modules/react-fonts/package.json +++ b/modules/react-fonts/package.json @@ -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", diff --git a/modules/react/package.json b/modules/react/package.json index b42e018fcf..185dae4d4a 100644 --- a/modules/react/package.json +++ b/modules/react/package.json @@ -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", @@ -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", diff --git a/modules/styling-transform/package.json b/modules/styling-transform/package.json index c0d6637785..c7f108aff8 100644 --- a/modules/styling-transform/package.json +++ b/modules/styling-transform/package.json @@ -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", @@ -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", diff --git a/modules/styling/package.json b/modules/styling/package.json index 7acd495bc7..56ed8118c8 100644 --- a/modules/styling/package.json +++ b/modules/styling/package.json @@ -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", @@ -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"