Skip to content

Commit

Permalink
Merge branch 'v4-dev' into chore-chromatic
Browse files Browse the repository at this point in the history
  • Loading branch information
planctus authored Dec 20, 2024
2 parents c37ee4e + b473f9c commit 584b638
Show file tree
Hide file tree
Showing 7 changed files with 627 additions and 570 deletions.
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"jest-environment-jsdom": "29.7.0",
"lerna": "8.1.9",
"lerna-changelog": "2.2.0",
"lint-staged": "15.2.10",
"lint-staged": "15.2.11",
"npm-run-all": "4.1.5",
"patch-package": "8.0.0",
"postinstall-postinstall": "2.1.0",
Expand All @@ -75,7 +75,7 @@
"rimraf": "6.0.1",
"size-limit": "11.1.6",
"ssri": "12.0.0",
"stylelint": "16.11.0",
"stylelint": "16.12.0",
"stylelint-config-css-modules": "4.4.0",
"stylelint-config-prettier": "9.0.5",
"stylelint-config-standard": "36.0.1",
Expand Down Expand Up @@ -121,7 +121,8 @@
"ws": ">=8.17.1",
"micromatch": ">=4.0.8",
"serve-static": ">=1.16.0",
"path-to-regexp": "0.1.12"
"path-to-regexp": "0.1.12",
"nanoid": "3.3.8"
},
"engines": {
"node": ">=12.0.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
* Mega Menu print
* @define megaMenu
*/

.ecl-mega-menu {
display: none;
}
1 change: 1 addition & 0 deletions src/presets/ec/src/ec-print.scss
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@
@use '@ecl/vanilla-component-menu/menu-print' with (
$theme: theme.$theme
);
@use '@ecl/vanilla-component-mega-menu/mega-menu-print';
@use '@ecl/vanilla-component-site-footer/site-footer-print';
@use '@ecl/vanilla-component-site-header/site-header-print' with (
$theme: theme.$theme
Expand Down
1 change: 1 addition & 0 deletions src/presets/eu/src/eu-print.scss
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@
@use '@ecl/vanilla-component-menu/menu-print' with (
$theme: theme.$theme
);
@use '@ecl/vanilla-component-mega-menu/mega-menu-print';
@use '@ecl/vanilla-component-site-footer/site-footer-print';
@use '@ecl/vanilla-component-site-header/site-header-print' with (
$theme: theme.$theme
Expand Down
6 changes: 3 additions & 3 deletions src/tools/builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@babel/eslint-parser": "7.25.9",
"@babel/preset-env": "7.26.0",
"@babel/runtime": "7.26.0",
"@rollup/plugin-replace": "6.0.1",
"@rollup/plugin-replace": "6.0.2",
"autoprefixer": "10.4.20",
"browser-sync": "3.0.3",
"commander": "12.1.0",
Expand All @@ -25,13 +25,13 @@
"postcss": "8.4.49",
"postcss-banner": "4.0.1",
"postcss-input-range": "6.0.0",
"rollup": "4.27.4",
"rollup": "4.28.1",
"rollup-plugin-babel": "4.4.0",
"rollup-plugin-commonjs": "10.1.0",
"rollup-plugin-node-resolve": "5.2.0",
"rollup-plugin-svg": "2.0.0",
"rollup-plugin-uglify": "6.0.4",
"sass": "1.81.0"
"sass": "1.83.0"
},
"engines": {
"node": ">=18.12.0"
Expand Down
6 changes: 3 additions & 3 deletions src/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,17 @@
"remark-gfm": "1.0.0",
"remark-unwrap-images": "2.1.0",
"rimraf": "6.0.1",
"sass": "1.82.0",
"sass": "1.83.0",
"sass-loader": "16.0.4",
"serve": "14.2.4",
"style-loader": "4.0.0",
"terser-webpack-plugin": "5.3.10",
"terser-webpack-plugin": "5.3.11",
"twing": "5.2.2",
"twing-loader": "4.0.1",
"url-loader": "4.1.1",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-dev-server": "5.1.0",
"webpack-dev-server": "5.2.0",
"webpack-manifest-plugin": "5.0.0"
},
"reactSnap": {
Expand Down
1,168 changes: 607 additions & 561 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 584b638

Please sign in to comment.