Skip to content

Commit

Permalink
chore: Merge master into prerelease/minor (#3037)
Browse files Browse the repository at this point in the history
Co-authored-by: @mannycarrera4 <mannycarrera4@users.noreply.github.com>
Co-authored-by: manuel.carrera <manuel.carrera@workday.com>
Co-authored-by: @snyk-bot <snyk-bot@snyk.io>
  • Loading branch information
4 people authored Nov 6, 2024
2 parents cbfbb06 + ba9825a commit 2fa9149
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

- uses: Workday/canvas-kit-actions/install@v1
with:
node_version: 16.x
node_version: 18.x

## Build Storybook and extract component stories for Storybook aggregation. This will be used
## for Chromatic rebaselining and publishing to GH Pages. Should be before `yarn build` since
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dist-tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- uses: Workday/canvas-kit-actions/install@v1
with:
node_version: 16.x
node_version: 18.x

- name: Check packages
run: node utils/dist-tag.mjs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/forward-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:

- uses: Workday/canvas-kit-actions/install@v1
with:
node_version: 16.x
node_version: 18.x

## A `yarn bump` will create a commit and a tag. We need to set up the git user to do this.
## We'll make that user be the github-actions user.
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

- uses: Workday/canvas-kit-actions/install@v1
with:
node_version: 16.x
node_version: 18.x

check:
runs-on: ubuntu-latest
Expand All @@ -24,7 +24,7 @@ jobs:

- uses: Workday/canvas-kit-actions/install@v1
with:
node_version: 16.x
node_version: 18.x

# Keep steps separate for Github Actions annotation matching: https://github.com/actions/setup-node/blob/83c9f7a7df54d6b57455f7c57ac414f2ae5fb8de/src/setup-node.ts#L26-L33
- name: Lint
Expand All @@ -48,7 +48,7 @@ jobs:

- uses: Workday/canvas-kit-actions/install@v1
with:
node_version: 16.x
node_version: 18.x

- name: Build Storybook
run: yarn build-storybook --quiet
Expand All @@ -71,7 +71,7 @@ jobs:

- uses: Workday/canvas-kit-actions/install@v1
with:
node_version: 16.x
node_version: 18.x

- name: Restore Build
uses: actions/cache@v3
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:

- uses: Workday/canvas-kit-actions/install@v1
with:
node_version: 16.x
node_version: 18.x

- name: Restore Build
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-major.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

- uses: Workday/canvas-kit-actions/install@v1
with:
node_version: 16.x
node_version: 18.x

# Run the release job to publish the next major version to npm
- uses: Workday/canvas-kit-actions/release@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-minor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: Workday/canvas-kit-actions/install@v1
with:
node_version: 16.x
node_version: 18.x

- uses: Workday/canvas-kit-actions/release@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

- uses: Workday/canvas-kit-actions/install@v1
with:
node_version: 16.x
node_version: 18.x

- uses: Workday/canvas-kit-actions/release@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion modules/codemod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"homepage": "https://github.com/Workday/canvas-kit#readme",
"dependencies": {
"chalk": "4.1.2",
"jscodeshift": "^0.14.0",
"jscodeshift": "^17.1.0",
"yargs": "^16.2.0"
},
"devDependencies": {
Expand Down
33 changes: 4 additions & 29 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11558,7 +11558,7 @@ jsbn@~0.1.0:
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=

jscodeshift@0.14.0, jscodeshift@^0.14.0, jscodeshift@^0.15.1:
jscodeshift@0.14.0, jscodeshift@^0.15.1, jscodeshift@^17.1.0:
version "0.14.0"
resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.14.0.tgz#7542e6715d6d2e8bde0b4e883f0ccea358b46881"
integrity sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==
Expand Down Expand Up @@ -15660,16 +15660,7 @@ string-replace-loader@^3.1.0:
loader-utils "^2.0.0"
schema-utils "^3.0.0"

"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand Down Expand Up @@ -15756,7 +15747,7 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand All @@ -15777,13 +15768,6 @@ strip-ansi@^6.0.0:
dependencies:
ansi-regex "^5.0.0"

strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

strip-ansi@^7.0.1:
version "7.1.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
Expand Down Expand Up @@ -16972,7 +16956,7 @@ wordwrap@^1.0.0:
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand All @@ -16990,15 +16974,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
Expand Down

0 comments on commit 2fa9149

Please sign in to comment.