Skip to content

Commit

Permalink
Merge branch 'develop' into docs/DES-982-tokens-package-readme
Browse files Browse the repository at this point in the history
  • Loading branch information
alimpens authored Oct 16, 2024
2 parents 0d59383 + e080739 commit ee7b3a1
Show file tree
Hide file tree
Showing 7 changed files with 1,002 additions and 977 deletions.
25 changes: 18 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@
"npm": "^10",
"pnpm": "^9"
},
"volta": {
"node": "20.13.1",
"npm": "10.5.2",
"pnpm": "9.1.1"
},
"workspaces": [
"./packages/*",
"./proprietary/*",
Expand Down Expand Up @@ -46,11 +41,11 @@
"postcss": "8.4.47",
"prettier": "3.3.3",
"rimraf": "6.0.1",
"stylelint": "16.9.0",
"stylelint": "16.10.0",
"stylelint-config-standard-scss": "13.1.0",
"stylelint-order": "6.0.4",
"stylelint-use-logical": "2.1.2",
"typescript": "5.6.2",
"typescript": "5.6.3",
"wait-on": "8.0.1"
},
"scripts": {
Expand Down Expand Up @@ -81,5 +76,21 @@
"watch:react": "npm run --workspace packages/react build:watch",
"watch:storybook": "npm run --workspace storybook start",
"watch:tokens": "npm run --workspace proprietary/tokens watch"
},
"pnpm": {
"overrides": {
"tar@<6.2.1": ">=6.2.1",
"tough-cookie@<4.1.3": ">=4.1.3",
"braces@<3.0.3": ">=3.0.3",
"ws@>=8.0.0 <8.17.1": ">=8.17.1",
"semver@<5.7.2": ">=5.7.2",
"micromatch@<4.0.8": ">=4.0.8",
"body-parser@<1.20.3": ">=1.20.3",
"send@<0.19.0": ">=0.19.0",
"serve-static@<1.16.0": ">=1.16.0",
"express@<4.20.0": ">=4.20.0",
"path-to-regexp@<0.1.10": ">=0.1.10",
"cookie@<0.7.0": ">=0.7.0"
}
}
}
2 changes: 1 addition & 1 deletion packages/css/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"clean": "rimraf dist/"
},
"devDependencies": {
"sass": "1.79.4"
"sass": "1.79.5"
},
"peerDependencies": {
"@amsterdam/design-system-tokens": "workspace:*",
Expand Down
9 changes: 4 additions & 5 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
"clsx": "2.1.1"
},
"devDependencies": {
"@babel/core": "7.25.7",
"@babel/core": "7.25.8",
"@babel/plugin-transform-runtime": "7.25.7",
"@babel/preset-env": "7.25.7",
"@babel/preset-env": "7.25.8",
"@babel/preset-react": "7.25.7",
"@rollup/plugin-babel": "6.0.4",
"@rollup/plugin-commonjs": "28.0.0",
Expand All @@ -54,8 +54,7 @@
"@types/react": "18.3.11",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"lodash": "4.17.21",
"next": "14.2.14",
"next": "14.2.15",
"npm-run-all": "4.1.5",
"postcss": "8.4.47",
"react": "18.3.1",
Expand All @@ -68,7 +67,7 @@
"rollup-plugin-node-polyfills": "0.2.1",
"rollup-plugin-peer-deps-external": "2.2.4",
"rollup-plugin-typescript2": "0.36.0",
"sass": "1.79.4",
"sass": "1.79.5",
"tslib": "2.7.0"
},
"peerDependencies": {
Expand Down
6 changes: 2 additions & 4 deletions packages/react/src/ImageSlider/ImageSlider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
*/

import clsx from 'clsx'
import { debounce } from 'lodash'
import { forwardRef, useCallback, useEffect, useMemo, useRef, useState } from 'react'
import type { ForwardedRef, HTMLAttributes } from 'react'
import { ImageSliderContext } from './ImageSliderContext'
Expand Down Expand Up @@ -148,9 +147,8 @@ export const ImageSliderRoot = forwardRef(
goToSlide(currentSlideElement)
}

const debouncedHandleResize = debounce(handleResize, 200)
window.addEventListener('resize', debouncedHandleResize)
return () => window.removeEventListener('resize', debouncedHandleResize)
window.addEventListener('resize', handleResize)
return () => window.removeEventListener('resize', handleResize)
}, [currentSlideId, goToSlide])

return (
Expand Down
Loading

0 comments on commit ee7b3a1

Please sign in to comment.