Skip to content

Commit e3f6f37

Browse files
committed
Merge main and resolve PostCSS lockfile conflicts
2 parents 4ceea2c + 6c42791 commit e3f6f37

3 files changed

Lines changed: 277 additions & 305 deletions

File tree

‎eslint-local-rules/yarn.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@ balanced-match@^1.0.0:
196196
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
197197

198198
brace-expansion@^2.0.1:
199-
version "2.0.2"
200-
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
201-
integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==
199+
version "2.1.7"
200+
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.1.7.tgz#14ea3836731823bb24740225ea43b941b436f9d1"
201+
integrity sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g==
202202
dependencies:
203203
balanced-match "^1.0.0"
204204

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"classnames": "^2.2.6",
3737
"debounce": "^1.2.1",
3838
"github-slugger": "^1.3.0",
39-
"next": "15.5.15",
39+
"next": "15.5.28",
4040
"next-remote-watch": "^1.0.0",
4141
"parse-numeric-range": "^1.2.0",
4242
"raw-loader": "^4.0.2",
@@ -91,7 +91,7 @@
9191
"postcss-flexbugs-fixes": "4.2.1",
9292
"postcss-preset-env": "^6.7.0",
9393
"prettier": "^2.5.1",
94-
"react-server-dom-webpack": "^19.2.4",
94+
"react-server-dom-webpack": "^19.2.5",
9595
"reading-time": "^1.2.0",
9696
"remark": "^12.0.1",
9797
"remark-external-links": "^7.0.0",

0 commit comments

Comments
 (0)