Skip to content

Commit

Permalink
Merge pull request #370 from plone/prepare-2.2-final
Browse files Browse the repository at this point in the history
Prepare 2.2 final
  • Loading branch information
petschki authored Feb 7, 2025
2 parents 46c2681 + 0aab061 commit c270679
Show file tree
Hide file tree
Showing 30 changed files with 43 additions and 51 deletions.
2 changes: 2 additions & 0 deletions news/370.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update `mockup=5.2.0`. See https://github.com/plone/mockup/releases/tag/5.2.0
[petschki]
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"stats": "NODE_ENV=production webpack --config webpack.config.js --json > stats.json"
},
"dependencies": {
"@plone/mockup": "5.2.0-beta.5",
"@plone/mockup": "5.2.0",
"bootstrap-icons": "1.11.3",
"svg-country-flags": "git+https://github.com/hampusborgos/country-flags.git"
},
Expand Down
4 changes: 2 additions & 2 deletions src/plone/staticresources/static/bundle-plone/bundle.min.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/plone/staticresources/static/bundle-plone/remote.min.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

31 changes: 12 additions & 19 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1850,16 +1850,16 @@
resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==

"@plone/[email protected]-beta.5":
version "5.2.0-beta.5"
resolved "https://registry.yarnpkg.com/@plone/mockup/-/mockup-5.2.0-beta.5.tgz#6e17b84fb06ba88bb2777e8abf942f91d75b59f1"
integrity sha512-jXKjnwMeMvUbbljEfISQqGCxJeR5YhsK5XPzWEGzp48X7QaYDFIyfOPrbkRSB1pkC5G/HUxPawk9UNdfCyJr4Q==
"@plone/[email protected]":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@plone/mockup/-/mockup-5.2.0.tgz#bd733fc450ce4b2141b552e3333d346a34de9763"
integrity sha512-izZnvGmEsEmCA9bvXARo5KIxZt8mEV5cRkrVCZzvH2zmmRvEeyTv73Bm2RFlpN+Dfh012F9qAYTUy22BG9QIHQ==
dependencies:
"@11ty/eleventy-upgrade-help" "2"
"@patternslib/pat-code-editor" "4.0.1"
"@patternslib/patternslib" "9.9.16"
"@plone/registry" "^2.1.0"
backbone "1.4.1"
backbone "1.6.0"
backbone.paginator "2.0.8"
bootstrap "5.3.3"
bootstrap-icons "1.11.3"
Expand Down Expand Up @@ -2877,20 +2877,13 @@ [email protected]:
backbone "1.1.2 || 1.2.3 || ^1.3.2"
underscore "^1.8.0"

"[email protected] || 1.2.3 || ^1.3.2":
"[email protected] || 1.2.3 || ^1.3.2", [email protected]:
version "1.6.0"
resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.6.0.tgz#5cdfa25257819b223109a77a74dde26d38995930"
integrity sha512-13PUjmsgw/49EowNcQvfG4gmczz1ximTMhUktj0Jfrjth0MVaTxehpU+qYYX4MxnuIuhmvBLC6/ayxuAGnOhbA==
dependencies:
underscore ">=1.8.3"

[email protected]:
version "1.4.1"
resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.4.1.tgz#099a78184bc07b034048a8332229c2ccca1e3e62"
integrity sha512-ADy1ztN074YkWbHi8ojJVFe3vAanO/lrzMGZWUClIP7oDD/Pjy2vrASraUP+2EVCfIiTtCW4FChVow01XneivA==
dependencies:
underscore ">=1.8.3"

balanced-match@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
Expand Down Expand Up @@ -3966,9 +3959,9 @@ domexception@^4.0.0:
webidl-conversions "^7.0.0"

dompurify@^3.1.6:
version "3.2.3"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.2.3.tgz#05dd2175225324daabfca6603055a09b2382a4cd"
integrity sha512-U1U5Hzc2MO0oW3DF+G9qYN0aT7atAou4AgI0XjWz061nyBPbdxkfdhfy5uMgGn6+oLFCfn44ZGbdDqCzVmlOWA==
version "3.2.4"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.2.4.tgz#af5a5a11407524431456cf18836c55d13441cd8e"
integrity sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==
optionalDependencies:
"@types/trusted-types" "^2.0.7"

Expand Down Expand Up @@ -6416,9 +6409,9 @@ mkdirp@^1.0.4:
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==

moment-timezone@^0.5.45:
version "0.5.46"
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.46.tgz#a21aa6392b3c6b3ed916cd5e95858a28d893704a"
integrity sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==
version "0.5.47"
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.47.tgz#d4d1a21b78372d914d6d69ae285454732a429749"
integrity sha512-UbNt/JAWS0m/NJOebR0QMRHBk0hu03r5dx9GK8Cs0AS3I81yDcOc9k+DytPItgVvBP7J6Mf6U2n3BPAacAV9oA==
dependencies:
moment "^2.29.4"

Expand Down

0 comments on commit c270679

Please sign in to comment.