Skip to content

Commit

Permalink
Merge pull request #2048 from chanzuckerberg/release-v15.3.1
Browse files Browse the repository at this point in the history
### [15.3.1](v15.3.0...v15.3.1) (2024-08-26)

[Storybook](https://61313967cde49b003ae2a860-jyqlmpntqz.chromatic.com/)

### Bug Fixes

* **tailwind:** update animation token export types ([#2047](#2047)) ([0f95301](0f95301))
  • Loading branch information
booc0mtaco authored Aug 26, 2024
2 parents 4c6fe11 + 8978bfd commit 16c2681
Show file tree
Hide file tree
Showing 5 changed files with 318 additions and 114 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
# This workflow can also be triggered via "workflow_call".
# Since it's a push event we have access to these properties https://docs.github.com/en/webhooks/webhook-events-and-payloads#push
# Filtering on just the (required) .id https://docs.github.com/en/actions/learn-github-actions/expressions#object-filters
if: github.event_name == 'push' && github.ref != 'refs/head/main'
if: github.event_name == 'push' && github.ref != 'refs/heads/main'
run: |
COMMIT_COUNT=$(echo '${{ toJSON(github.event.commits.*.id) }}' | jq length)
echo "Number of commits in the push: $COMMIT_COUNT"
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [15.3.1](https://github.com/chanzuckerberg/edu-design-system/compare/v15.3.0...v15.3.1) (2024-08-26)


### Bug Fixes

* **tailwind:** update animation token export types ([#2047](https://github.com/chanzuckerberg/edu-design-system/issues/2047)) ([0f95301](https://github.com/chanzuckerberg/edu-design-system/commit/0f9530114f7f323b065688c4b5472ce2f041d64d))

## [15.3.0](https://github.com/chanzuckerberg/edu-design-system/compare/v15.2.1...v15.3.0) (2024-08-23)


Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@chanzuckerberg/eds",
"version": "15.3.0",
"version": "15.3.1",
"description": "The React-powered design system library for Chan Zuckerberg Initiative education web applications",
"author": "CZI <[email protected]>",
"homepage": "https://github.com/chanzuckerberg/edu-design-system",
Expand Down Expand Up @@ -112,7 +112,7 @@
"yargs": "^17.7.2"
},
"devDependencies": {
"@babel/preset-env": "^7.25.3",
"@babel/preset-env": "^7.25.4",
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@chanzuckerberg/axe-storybook-testing": "^8.2.0",
Expand Down Expand Up @@ -148,8 +148,8 @@
"@types/jest": "^29.5.12",
"@types/jsonfile": "^6",
"@types/lodash": "^4.17.7",
"@types/node": "^20.14.15",
"@types/react": "^18.3.3",
"@types/node": "^20.16.1",
"@types/react": "^18.3.4",
"@types/react-beautiful-dnd": "^13.1.8",
"@types/react-dom": "^18.3.0",
"@types/react-portal": "^4.0.7",
Expand Down Expand Up @@ -181,7 +181,7 @@
"prettier-plugin-tailwindcss": "^0.5.7",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rollup": "^4.20.0",
"rollup": "^4.21.0",
"rollup-plugin-postcss": "^4.0.2",
"size-limit": "^8.2.6",
"standard-version": "^9.5.0",
Expand Down
12 changes: 6 additions & 6 deletions tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ const {
...colorTokens
} = edsTokens.theme.color;

// Add a type to the token sizes to avoid literals for keys
// Add a type to the tokens to avoid literals for keys
const sizes: { [x: string]: string } = edsTokens.size;
const movements: { [x: string]: string } = edsTokens.anim.move;

// add a type to the token sizes for movement durations
const movement: { [x: string]: string } = {
...Object.keys(edsTokens.anim.move)
const movementTokens = {
...Object.keys(movements)
.map((movement) => {
return { [movement]: `${edsTokens.anim.move[movement]}s` };
return { [movement]: `${movements[movement]}s` };
})
.reduce((accumulate, current) => {
const entry = Object.entries(current)[0];
Expand Down Expand Up @@ -66,7 +66,7 @@ export default {
...sizeTokens,
},
transitionDuration: {
...movement,
...movementTokens,
},
},
fontWeight: {
Expand Down
Loading

0 comments on commit 16c2681

Please sign in to comment.