Skip to content

Commit 734ab98

Browse files
committed
Merge branch '5.0' into 5
2 parents b9fa32e + c2a43f8 commit 734ab98

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
"devDependencies": {
5050
"@babel/runtime": "^7.20.0",
5151
"@silverstripe/eslint-config": "^1.3.0",
52-
"@silverstripe/webpack-config": "^3.0.0-alpha1",
53-
"@testing-library/jest-dom": "^6.4.2",
52+
"@silverstripe/webpack-config": "^3",
5453
"@testing-library/dom": "^10.4.0",
54+
"@testing-library/jest-dom": "^6.4.2",
5555
"@testing-library/react": "^16.1.0",
5656
"@testing-library/user-event": "^14.5.2",
5757
"babel-jest": "^29.2.2",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1800,10 +1800,10 @@
18001800
stylelint-config-standard "^36.0.0"
18011801
stylelint-scss "^6.2.1"
18021802

1803-
"@silverstripe/webpack-config@^3.0.0-alpha1":
1804-
version "3.0.0-alpha2"
1805-
resolved "https://registry.yarnpkg.com/@silverstripe/webpack-config/-/webpack-config-3.0.0-alpha2.tgz#ea2c50a953e5de4e53dacfc42501c9b3c88835f2"
1806-
integrity sha512-KsqwAxKLvutDnYf755Z16gUO4EeRH6GnAgl1qaejFRN+6bRI2wTnPuiGZz0OLKvH8Fz+/zEmL1WFLmm5iQIk5A==
1803+
"@silverstripe/webpack-config@^3":
1804+
version "3.0.0"
1805+
resolved "https://registry.yarnpkg.com/@silverstripe/webpack-config/-/webpack-config-3.0.0.tgz#e52d1295231450ee33e640216e59b3a7ec8a6c61"
1806+
integrity sha512-UnYEpH0SQ5vDN/67u5xrkNUAnJah39jezA+AbQmrnqNMU4FBm6kynashnYoGK2zPQWCsGIifJG2+hY+xns2+Ig==
18071807
dependencies:
18081808
"@babel/core" "^7.19.6"
18091809
"@babel/preset-env" "^7.19.4"

0 commit comments

Comments
 (0)