Skip to content

Commit

Permalink
Merge branch 'develop' into feature/DES-756-hardcoded-labels
Browse files Browse the repository at this point in the history
  • Loading branch information
VincentSmedinga committed May 13, 2024
2 parents 03a1fca + 91ab652 commit df3a973
Show file tree
Hide file tree
Showing 26 changed files with 1,893 additions and 1,416 deletions.
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,29 @@
"devDependencies": {
"@lerna-lite/cli": "3.3.3",
"@lerna-lite/run": "3.3.3",
"@types/node": "20.12.7",
"@typescript-eslint/eslint-plugin": "7.7.1",
"@typescript-eslint/parser": "7.7.1",
"@types/node": "20.12.11",
"@typescript-eslint/eslint-plugin": "7.8.0",
"@typescript-eslint/parser": "7.8.0",
"conventional-changelog-conventionalcommits": "7.0.2",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-jest": "28.2.0",
"eslint-plugin-jest": "28.5.0",
"eslint-plugin-json": "3.1.0",
"eslint-plugin-mdx": "3.1.5",
"eslint-plugin-react": "7.34.1",
"html-validate": "8.18.2",
"husky": "9.0.11",
"lint-staged": "15.2.2",
"markdownlint-cli": "0.39.0",
"npm-check-updates": "16.14.18",
"markdownlint-cli": "0.40.0",
"npm-check-updates": "16.14.20",
"npm-package-json-lint": "7.1.0",
"npm-run-all": "4.1.5",
"plop": "4.0.1",
"postcss": "8.4.38",
"prettier": "3.2.5",
"rimraf": "5.0.5",
"stylelint": "16.4.0",
"rimraf": "5.0.7",
"stylelint": "16.5.0",
"stylelint-config-standard-scss": "13.1.0",
"stylelint-order": "6.0.4",
"typescript": "5.4.5",
Expand Down
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.75.0"
"sass": "1.77.1"
},
"peerDependencies": {
"@amsterdam/design-system-tokens": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/css/src/components/link-list/link-list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
color: var(--ams-link-list-link-color);
display: inline-flex;
font-family: var(--ams-link-list-link-font-family);
font-size: var(--ams-link-list-link-medium-font-size);
font-size: var(--ams-link-list-link-font-size);
font-weight: var(--ams-link-list-link-font-weight);
gap: var(--ams-link-list-link-gap);
line-height: var(--ams-link-list-link-medium-line-height);
line-height: var(--ams-link-list-link-line-height);
outline-offset: var(--ams-link-list-link-outline-offset);
text-decoration-line: var(--ams-link-list-link-text-decoration-line);
text-decoration-thickness: var(--ams-link-list-link-text-decoration-thickness);
Expand Down
4 changes: 2 additions & 2 deletions packages/css/src/components/paragraph/paragraph.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
.ams-paragraph {
color: var(--ams-paragraph-color);
font-family: var(--ams-paragraph-font-family);
font-size: var(--ams-paragraph-medium-font-size);
font-size: var(--ams-paragraph-font-size);
font-weight: var(--ams-paragraph-font-weight);
line-height: var(--ams-paragraph-medium-line-height);
line-height: var(--ams-paragraph-line-height);

@include text-rendering;
@include reset;
Expand Down
26 changes: 13 additions & 13 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,42 +33,42 @@
],
"dependencies": {
"@amsterdam/design-system-react-icons": "workspace:*",
"@babel/runtime": "7.24.4",
"@babel/runtime": "7.24.5",
"clsx": "2.1.1"
},
"devDependencies": {
"@babel/core": "7.24.4",
"@babel/core": "7.24.5",
"@babel/plugin-transform-runtime": "7.24.3",
"@babel/preset-env": "7.24.4",
"@babel/preset-env": "7.24.5",
"@babel/preset-react": "7.24.1",
"@rollup/plugin-babel": "6.0.4",
"@rollup/plugin-commonjs": "25.0.7",
"@rollup/plugin-node-resolve": "15.2.3",
"@rollup/pluginutils": "5.1.0",
"@testing-library/dom": "10.0.0",
"@testing-library/jest-dom": "6.4.2",
"@testing-library/react": "15.0.4",
"@testing-library/dom": "10.1.0",
"@testing-library/jest-dom": "6.4.5",
"@testing-library/react": "15.0.7",
"@testing-library/user-event": "14.5.2",
"@types/jest": "29.5.12",
"@types/lodash": "4.17.0",
"@types/react": "18.2.79",
"@types/lodash": "4.17.1",
"@types/react": "18.3.2",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"lodash": "4.17.21",
"next": "14.2.3",
"npm-run-all": "4.1.5",
"postcss": "8.4.38",
"react": "18.2.0",
"react-dom": "18.2.0",
"rollup": "4.16.4",
"react": "18.3.1",
"react-dom": "18.3.1",
"rollup": "4.17.2",
"rollup-plugin-delete": "2.0.0",
"rollup-plugin-dts": "6.1.0",
"rollup-plugin-filesize": "10.0.0",
"rollup-plugin-node-externals": "7.1.1",
"rollup-plugin-node-externals": "7.1.2",
"rollup-plugin-node-polyfills": "0.2.1",
"rollup-plugin-peer-deps-external": "2.2.4",
"rollup-plugin-typescript2": "0.36.0",
"sass": "1.75.0",
"sass": "1.77.1",
"tslib": "2.6.2"
},
"peerDependencies": {
Expand Down
8 changes: 8 additions & 0 deletions packages/react/src/UnorderedList/UnorderedList.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,14 @@ describe('Unordered list', () => {
expect(items.length).toBe(3)
})

it('renders the small size class', () => {
render(<UnorderedList size="small" />)

const component = screen.getByRole('list')

expect(component).toHaveClass('ams-unordered-list--small')
})

it('supports ForwardRef in React', () => {
const ref = createRef<HTMLUListElement>()

Expand Down
Loading

0 comments on commit df3a973

Please sign in to comment.