Merge branch 'develop' of github.com:Amsterdam/design-system into fix…

…/DES-962-grid-max-span-for-smaller-viewports-ts-guard
Amsterdam · Oct 16, 2024 · 9cad4c4 · 9cad4c4
2 parents 7ee4e59 + 5e97fbe
commit 9cad4c4
Show file tree

Hide file tree

Showing 12 changed files with 1,876 additions and 1,868 deletions.
diff --git a/package.json b/package.json
@@ -24,18 +24,18 @@
     "./storybook"
   ],
   "devDependencies": {
-    "@types/node": "22.7.4",
+    "@types/node": "22.7.5",
     "@typescript-eslint/eslint-plugin": "7.18.0",
     "@typescript-eslint/parser": "7.18.0",
     "conventional-changelog-conventionalcommits": "8.0.0",
     "eslint": "8.57.1",
     "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-import": "2.30.0",
+    "eslint-plugin-import": "2.31.0",
     "eslint-plugin-jest": "28.8.3",
     "eslint-plugin-json": "3.1.0",
     "eslint-plugin-mdx": "3.1.5",
-    "eslint-plugin-react": "7.37.0",
-    "html-validate": "8.24.0",
+    "eslint-plugin-react": "7.37.1",
+    "html-validate": "8.24.1",
     "husky": "9.1.6",
     "lint-staged": "15.2.10",
     "markdownlint-cli": "0.42.0",
@@ -46,11 +46,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": {
@@ -81,5 +81,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"
+    }
   }
 }
diff --git a/packages/css/package.json b/packages/css/package.json
@@ -19,7 +19,7 @@
     "clean": "rimraf dist/"
   },
   "devDependencies": {
-    "sass": "1.79.4"
+    "sass": "1.79.5"
   },
   "peerDependencies": {
     "@amsterdam/design-system-tokens": "workspace:*",

diff --git a/packages/css/src/components/ordered-list/ordered-list.scss b/packages/css/src/components/ordered-list/ordered-list.scss
@@ -5,15 +5,13 @@
 
 @import "../../common/text-rendering";
 
-/** Apply border box sizing, reset white space and list styles. */
 @mixin reset {
   box-sizing: border-box;
   list-style-type: none;
   margin-block: 0;
   padding-inline-start: 0;
 }
 
-/** A list is a grid column with a gap between items. */
 .ams-ordered-list {
   display: grid;
   gap: var(--ams-ordered-list-gap);
@@ -22,7 +20,6 @@
   @include reset;
 }
 
-/** A list with markers sets typography for its text content. */
 .ams-ordered-list:not(.ams-ordered-list--no-markers) {
   color: var(--ams-ordered-list-color);
   font-family: var(--ams-ordered-list-font-family);
@@ -31,7 +28,6 @@
   line-height: var(--ams-ordered-list-line-height);
   list-style-type: var(--ams-ordered-list-list-style-type);
 
-  /** List items are responsible for indentation and marker positioning. */
   .ams-ordered-list__item {
     margin-inline-start: var(--ams-ordered-list-item-margin-inline-start);
     padding-inline-start: var(--ams-ordered-list-item-padding-inline-start);
@@ -47,9 +43,11 @@
   line-height: var(--ams-ordered-list-small-line-height);
 }
 
-/** A nested list has a different marker and less indentation for correct alignment. */
 :is(.ams-ordered-list, .ams-unordered-list) .ams-ordered-list {
+  gap: var(--ams-ordered-list-ordered-list-gap);
   list-style-type: var(--ams-ordered-list-ordered-list-list-style-type);
+  padding-block-end: var(--ams-ordered-list-ordered-list-padding-block-end);
+  padding-block-start: var(--ams-ordered-list-ordered-list-padding-block-start);
 
   .ams-ordered-list__item {
     margin-inline-start: var(--ams-ordered-list-ordered-list-item-margin-inline-start);

diff --git a/packages/css/src/components/unordered-list/unordered-list.scss b/packages/css/src/components/unordered-list/unordered-list.scss
@@ -5,15 +5,13 @@
 
 @import "../../common/text-rendering";
 
-/** Apply border box sizing, reset white space and list styles. */
 @mixin reset {
   box-sizing: border-box;
   list-style: none;
   margin-block: 0;
   padding-inline-start: 0;
 }
 
-/** A list is a grid column with a gap between items. */
 .ams-unordered-list {
   display: grid;
   gap: var(--ams-unordered-list-gap);
@@ -22,7 +20,6 @@
   @include reset;
 }
 
-/** A list with markers sets typography for its text content. */
 .ams-unordered-list:not(.ams-unordered-list--no-markers) {
   color: var(--ams-unordered-list-color);
   font-family: var(--ams-unordered-list-font-family);
@@ -31,7 +28,6 @@
   line-height: var(--ams-unordered-list-line-height);
   list-style-type: var(--ams-unordered-list-list-style-type);
 
-  /** List items are responsible for indentation and marker positioning. */
   .ams-unordered-list__item {
     margin-inline-start: var(--ams-unordered-list-item-margin-inline-start);
     padding-inline-start: var(--ams-unordered-list-item-padding-inline-start);
@@ -47,9 +43,11 @@
   line-height: var(--ams-unordered-list-small-line-height);
 }
 
-/** A nested list has a different marker and less indentation for correct alignment. */
 :is(.ams-ordered-list, .ams-unordered-list) .ams-unordered-list {
+  gap: var(--ams-unordered-list-unordered-list-gap);
   list-style-type: var(--ams-unordered-list-unordered-list-list-style-type);
+  padding-block-end: var(--ams-unordered-list-unordered-list-padding-block-end);
+  padding-block-start: var(--ams-unordered-list-unordered-list-padding-block-start);
 
   .ams-unordered-list__item {
     margin-inline-start: var(--ams-unordered-list-unordered-list-item-margin-inline-start);

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -33,14 +33,14 @@
   ],
   "dependencies": {
     "@amsterdam/design-system-react-icons": "workspace:*",
-    "@babel/runtime": "7.25.6",
+    "@babel/runtime": "7.25.7",
     "clsx": "2.1.1"
   },
   "devDependencies": {
-    "@babel/core": "7.25.2",
-    "@babel/plugin-transform-runtime": "7.25.4",
-    "@babel/preset-env": "7.25.4",
-    "@babel/preset-react": "7.24.7",
+    "@babel/core": "7.25.8",
+    "@babel/plugin-transform-runtime": "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",
     "@rollup/plugin-node-resolve": "15.3.0",
@@ -50,25 +50,25 @@
     "@testing-library/react": "16.0.1",
     "@testing-library/user-event": "14.5.2",
     "@types/jest": "29.5.13",
-    "@types/lodash": "4.17.9",
-    "@types/react": "18.3.10",
+    "@types/lodash": "4.17.10",
+    "@types/react": "18.3.11",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "lodash": "4.17.21",
-    "next": "14.2.13",
+    "next": "14.2.15",
     "npm-run-all": "4.1.5",
     "postcss": "8.4.47",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "rollup": "4.22.5",
+    "rollup": "4.24.0",
     "rollup-plugin-delete": "2.1.0",
     "rollup-plugin-dts": "6.1.1",
     "rollup-plugin-filesize": "10.0.0",
     "rollup-plugin-node-externals": "7.1.3",
     "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": {