Merge branch 'develop' into feature/DES-1018-update-tabs-design

Amsterdam · Dec 10, 2024 · 43e0fd8 · 43e0fd8
2 parents 7294df5 + 5886026
commit 43e0fd8
Show file tree

Hide file tree

Showing 7 changed files with 438 additions and 453 deletions.
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "npm-run-all": "4.1.5",
     "plop": "4.0.1",
     "postcss": "8.4.49",
-    "prettier": "3.4.1",
+    "prettier": "3.4.2",
     "rimraf": "6.0.1",
     "stylelint": "16.11.0",
     "stylelint-config-standard-scss": "13.1.0",

diff --git a/packages/css/package.json b/packages/css/package.json
@@ -24,7 +24,7 @@
     "clean": "rimraf dist/"
   },
   "devDependencies": {
-    "sass": "1.81.0"
+    "sass": "1.82.0"
   },
   "peerDependencies": {
     "@amsterdam/design-system-tokens": "workspace:*",

diff --git a/packages/css/src/components/overlap/overlap.scss b/packages/css/src/components/overlap/overlap.scss
@@ -7,6 +7,7 @@
   display: grid;
 
   > * {
-    grid-area: 1 / -1;
+    grid-column: 1 / -1;
+    grid-row: 1 / -1;
   }
 }
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -45,34 +45,34 @@
     "@babel/core": "7.26.0",
     "@babel/plugin-transform-runtime": "7.25.9",
     "@babel/preset-env": "7.26.0",
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@rollup/plugin-babel": "6.0.4",
     "@rollup/plugin-commonjs": "28.0.1",
     "@rollup/plugin-node-resolve": "15.3.0",
     "@rollup/pluginutils": "5.1.3",
     "@testing-library/dom": "10.4.0",
     "@testing-library/jest-dom": "6.6.3",
-    "@testing-library/react": "16.0.1",
+    "@testing-library/react": "16.1.0",
     "@testing-library/user-event": "14.5.2",
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.13",
     "@types/react": "18.3.12",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
-    "next": "15.0.3",
+    "next": "15.0.4",
     "npm-run-all": "4.1.5",
     "postcss": "8.4.49",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "rollup": "4.28.0",
+    "rollup": "4.28.1",
     "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.81.0",
+    "sass": "1.82.0",
     "tslib": "2.8.1"
   },
   "peerDependencies": {