Skip to content

Commit fa0b50b

Browse files
committed
Merge branch 'release/12.2' of https://github.com/Yoast/wordpress-seo into release/12.2
2 parents ec48598 + 134253f commit fa0b50b

File tree

2 files changed

+68
-78
lines changed

2 files changed

+68
-78
lines changed

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@
103103
"@wordpress/is-shallow-equal": "^1.2.0",
104104
"@wordpress/rich-text": "^3.2.2",
105105
"@wordpress/url": "^2.5.0",
106-
"@yoast/algolia-search-box": "^1.5.0",
107-
"@yoast/analysis-report": "^0.6.0",
108-
"@yoast/components": "^0.6.0",
109-
"@yoast/configuration-wizard": "^1.5.0",
110-
"@yoast/helpers": "^0.3.0",
111-
"@yoast/search-metadata-previews": "^1.8.0",
112-
"@yoast/style-guide": "^0.4.0",
106+
"@yoast/algolia-search-box": "^1.6.0-rc.0",
107+
"@yoast/analysis-report": "^0.7.0-rc.0",
108+
"@yoast/components": "^0.7.0-rc.0",
109+
"@yoast/configuration-wizard": "^1.6.0-rc.0",
110+
"@yoast/helpers": "^0.5.0-rc.0",
111+
"@yoast/search-metadata-previews": "^1.9.0-rc.0",
112+
"@yoast/style-guide": "^0.5.0-rc.0",
113113
"a11y-speak": "git+https://github.com/Yoast/a11y-speak.git#master",
114114
"babel-polyfill": "^6.26.0",
115115
"draft-js": "^0.10.5",
@@ -132,8 +132,8 @@
132132
"redux-thunk": "^2.2.0",
133133
"select2": "^4.0.5",
134134
"styled-components": "^4.2.0",
135-
"yoast-components": "^4.32.0",
136-
"yoastseo": "^1.59.0"
135+
"yoast-components": "^4.33.0-rc.0",
136+
"yoastseo": "^1.60.0-rc.0"
137137
},
138138
"yoast": {
139139
"pluginVersion": "12.2-RC1"

yarn.lock

Lines changed: 59 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -649,62 +649,62 @@
649649
resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
650650
integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
651651

652-
"@yoast/algolia-search-box@^1.5.0":
653-
version "1.5.0"
654-
resolved "https://registry.yarnpkg.com/@yoast/algolia-search-box/-/algolia-search-box-1.5.0.tgz#ca74bec4cf81689953b769fec45f412649049504"
655-
integrity sha512-eIVttWJsbv4qNXiH43vF2DyJr/M1MtzaYTeavGNwT0R6zk8EwdAIL1sg+5RZhj3sB91DkHI7Rf2Mxj+o/BIu9w==
652+
"@yoast/algolia-search-box@^1.6.0-rc.0":
653+
version "1.6.0-rc.0"
654+
resolved "https://registry.yarnpkg.com/@yoast/algolia-search-box/-/algolia-search-box-1.6.0-rc.0.tgz#7f4dc220f875f83a2d4dad7cd1d80f4d7442ba02"
655+
integrity sha512-wMP4YjD6Nj/REmMoURC1tb6U+gTx5MHK8PYylrWMWU74xVnv35ZGfURUjdxZxWAlGGTdnKxLy4R/i1zJmwU9JQ==
656656
dependencies:
657657
"@wordpress/a11y" "^1.0.7"
658658
"@wordpress/i18n" "^1.1.0"
659-
"@yoast/components" "^0.6.0"
660-
"@yoast/helpers" "^0.4.0-rc.2"
661-
"@yoast/style-guide" "^0.4.0"
659+
"@yoast/components" "^0.7.0-rc.0"
660+
"@yoast/helpers" "^0.5.0-rc.0"
661+
"@yoast/style-guide" "^0.5.0-rc.0"
662662
algoliasearch "^3.22.3"
663663
lodash "^4.17.4"
664664
prop-types "^15.6.0"
665665
react "16.6.3"
666666
styled-components "^4.2.0"
667667

668-
"@yoast/analysis-report@^0.6.0":
669-
version "0.6.0"
670-
resolved "https://registry.yarnpkg.com/@yoast/analysis-report/-/analysis-report-0.6.0.tgz#112000b67c681f0fa75da716d70f25ecfb177065"
671-
integrity sha512-2dvjrsPOLKJTQVBMsxMYYP7icxoyq5S5HdVfY7pqICSmuvfQOMD42k6n41/c8qG2OhKx2Wjjypurcb87lswKkQ==
668+
"@yoast/analysis-report@^0.7.0-rc.0":
669+
version "0.7.0-rc.0"
670+
resolved "https://registry.yarnpkg.com/@yoast/analysis-report/-/analysis-report-0.7.0-rc.0.tgz#4ba5a23234fcee75636a99d4b3cb1780265c7816"
671+
integrity sha512-iyi+PPEEoG78MSylWommZtFOqpJkbbNx9vgAy1bASQ8icoPRGfuoKnXdUFFW2uMHSqgGW45+Q4E+w2L9rRrCsg==
672672
dependencies:
673673
"@wordpress/i18n" "^1.1.0"
674-
"@yoast/components" "^0.6.0"
675-
"@yoast/helpers" "^0.4.0-rc.2"
676-
"@yoast/style-guide" "^0.4.0"
674+
"@yoast/components" "^0.7.0-rc.0"
675+
"@yoast/helpers" "^0.5.0-rc.0"
676+
"@yoast/style-guide" "^0.5.0-rc.0"
677677
lodash "^4.17.11"
678678
prop-types "^15.6.0"
679679
react "16.6.3"
680680
react-dom "16.6.3"
681681
styled-components "^4.2.0"
682682

683-
"@yoast/components@^0.6.0":
684-
version "0.6.0"
685-
resolved "https://registry.yarnpkg.com/@yoast/components/-/components-0.6.0.tgz#5ca4b3737764e32c64dfdfe2d3c74ee8a3e4cbdd"
686-
integrity sha512-qtmWbQRAqhLMyUst2l/pSA4gogAhyASUcYfor4UlpyE3UE9TI0gG4nNNNDpVXWGjPaPihnDOyiazuWGor+ww9w==
683+
"@yoast/components@^0.7.0-rc.0":
684+
version "0.7.0-rc.0"
685+
resolved "https://registry.yarnpkg.com/@yoast/components/-/components-0.7.0-rc.0.tgz#7f76cb49dde0622c6d0e22f5a910fa52bca64c1f"
686+
integrity sha512-c2Mfxcz206UO6KnOkjKxe73Hdj4mC1sFYDUedqWr7ACPwzxxPvy+/VaeupibXM09ZaXDhaacTyPIn7a3FRdm6g==
687687
dependencies:
688688
"@wordpress/a11y" "^1.1.3"
689689
"@wordpress/i18n" "^1.2.3"
690-
"@yoast/helpers" "^0.4.0-rc.2"
691-
"@yoast/style-guide" "^0.4.0"
690+
"@yoast/helpers" "^0.5.0-rc.0"
691+
"@yoast/style-guide" "^0.5.0-rc.0"
692692
interpolate-components "^1.1.1"
693693
lodash "^4.17.11"
694694
prop-types "^15.7.2"
695695
react-modal "^3.8.1"
696696
react-tabs "^2.3.0"
697697
styled-components "^4.2.0"
698698

699-
"@yoast/configuration-wizard@^1.5.0":
700-
version "1.5.0"
701-
resolved "https://registry.yarnpkg.com/@yoast/configuration-wizard/-/configuration-wizard-1.5.0.tgz#90bdc7f6e21dfb2da1776651e2e9f3f6cb8dc3b2"
702-
integrity sha512-N2AB2MJ2dEZRNd8Z9bNbdUapvHa23g2QKZIpqKxOjnXTCLKUZRS06ROffYP49W8J2lWE/6b657L6RC2siwWKEw==
699+
"@yoast/configuration-wizard@^1.6.0-rc.0":
700+
version "1.6.0-rc.0"
701+
resolved "https://registry.yarnpkg.com/@yoast/configuration-wizard/-/configuration-wizard-1.6.0-rc.0.tgz#5400acc4d878e6a9e8fd8fcf3aa7491faa18e8c4"
702+
integrity sha512-61zvB/0oQxtm0AKAcrtUQtQ1uxtJ247TwW/YZJscVIHrHxBkzlX/MLet2PT+j1gAAsSPpjJrfPp5PjTd/kEG9A==
703703
dependencies:
704704
"@wordpress/i18n" "^1.1.0"
705-
"@yoast/components" "^0.6.0"
706-
"@yoast/helpers" "^0.4.0-rc.2"
707-
"@yoast/style-guide" "^0.4.0"
705+
"@yoast/components" "^0.7.0-rc.0"
706+
"@yoast/helpers" "^0.5.0-rc.0"
707+
"@yoast/style-guide" "^0.5.0-rc.0"
708708
interpolate-components "^1.1.1"
709709
lodash "^4.17.11"
710710
prop-types "^15.7.2"
@@ -748,36 +748,26 @@
748748
node-sass "^4.12.0"
749749
time-grunt "^1.0.0"
750750

751-
"@yoast/helpers@^0.3.0":
752-
version "0.3.0"
753-
resolved "https://registry.yarnpkg.com/@yoast/helpers/-/helpers-0.3.0.tgz#0102d1c16c16ecafb5997e6ca241b7eb9e872f0e"
754-
integrity sha512-xu2pAnVjpwbHh1688GWc4FDaRpDFz1/67+V97fS9ksUd/S2iwrsWVQ1hbOavCuN24fAwJTqWpgzNHwWgA9Brwg==
751+
"@yoast/helpers@^0.5.0-rc.0":
752+
version "0.5.0-rc.0"
753+
resolved "https://registry.yarnpkg.com/@yoast/helpers/-/helpers-0.5.0-rc.0.tgz#097ac5e30305cb97d0db6f9b7630c5124867d653"
754+
integrity sha512-MyS6Xm9cWCKMeQs4Yd60jApxc7wBnM8lCv6plAR8YXFkTqwibx9fORsR3FddseqauieGNbRCj3L5S7otnP9DQg==
755755
dependencies:
756756
"@wordpress/i18n" "^1.2.3"
757757
prop-types "^15.7.2"
758758
styled-components "^2.4.1"
759759
whatwg-fetch "1.1.1"
760760

761-
"@yoast/helpers@^0.4.0-rc.2":
762-
version "0.4.0-rc.2"
763-
resolved "https://registry.yarnpkg.com/@yoast/helpers/-/helpers-0.4.0-rc.2.tgz#f91fc0004b2a9e67750b69b373a7e7b2dd2ab111"
764-
integrity sha512-/dHhj4w98EM1YNnw9N1QQZlE/eFPBR4eiwGysJUa7KRVelILYGJrRjkL+ptArD+wm9WWC6QxkyAfU+co/WjP9g==
765-
dependencies:
766-
"@wordpress/i18n" "^1.2.3"
767-
prop-types "^15.7.2"
768-
styled-components "^2.4.1"
769-
whatwg-fetch "1.1.1"
770-
771-
"@yoast/search-metadata-previews@^1.8.0":
772-
version "1.8.0"
773-
resolved "https://registry.yarnpkg.com/@yoast/search-metadata-previews/-/search-metadata-previews-1.8.0.tgz#d7b530857d5bd6c68c3f6dc619d67927a38d503b"
774-
integrity sha512-XQLdeuhsRGbAj5v5PrLhxl5Ocu/EVlJ90A0tLOc7kIXbfwb9NP4ywu98rKCf2KaJZrKrBoRKxyY6kzaDXq1Cng==
761+
"@yoast/search-metadata-previews@^1.9.0-rc.0":
762+
version "1.9.0-rc.0"
763+
resolved "https://registry.yarnpkg.com/@yoast/search-metadata-previews/-/search-metadata-previews-1.9.0-rc.0.tgz#30712b0bc8c401b0fe97d1ecd8e8336e174fe30e"
764+
integrity sha512-esteywNHvVrYJFwA0k9ZziKuDBNkhjHQAC1Q7HFckh+VPbwbWD+gbO/XY2iyS9dGcKBr2LfpqorPbWx7KLRP/w==
775765
dependencies:
776766
"@wordpress/a11y" "^1.0.7"
777767
"@wordpress/i18n" "^1.1.0"
778-
"@yoast/components" "^0.6.0"
779-
"@yoast/helpers" "^0.4.0-rc.2"
780-
"@yoast/style-guide" "^0.4.0"
768+
"@yoast/components" "^0.7.0-rc.0"
769+
"@yoast/helpers" "^0.5.0-rc.0"
770+
"@yoast/style-guide" "^0.5.0-rc.0"
781771
draft-js "^0.10.5"
782772
draft-js-mention-plugin "^3.0.4"
783773
draft-js-plugins-editor "^2.0.4"
@@ -787,12 +777,12 @@
787777
prop-types "^15.6.0"
788778
react-transition-group "^2.7.1"
789779
styled-components "^4.2.0"
790-
yoastseo "^1.59.0"
780+
yoastseo "^1.60.0-rc.0"
791781

792-
"@yoast/style-guide@^0.4.0":
793-
version "0.4.0"
794-
resolved "https://registry.yarnpkg.com/@yoast/style-guide/-/style-guide-0.4.0.tgz#ee52b42c921ff36cf7ce9397f4bcc726d847ea75"
795-
integrity sha512-PArQDsrXMRIut8LjyClKrTcFr3rmHth4V8DWQV5HrfQ1R64y5vY3NFCA7PTP+rnPcglGCRfBJczBE4Z6AjWDCA==
782+
"@yoast/style-guide@^0.5.0-rc.0":
783+
version "0.5.0-rc.0"
784+
resolved "https://registry.yarnpkg.com/@yoast/style-guide/-/style-guide-0.5.0-rc.0.tgz#229fc9e678a688747e74966b2d01dccc88b45bc0"
785+
integrity sha512-r49RIQbRwK+OfU1ald8+A2hGzWFx2tctm7eV/yDO6DIXwgdhOImGoOtVHKiiNK4y5Uz4zCjMl+LUhgmq12IKhA==
796786

797787
"a11y-speak@git+https://github.com/Yoast/a11y-speak.git#master":
798788
version "0.0.1"
@@ -13120,20 +13110,20 @@ yauzl@^2.4.2:
1312013110
buffer-crc32 "~0.2.3"
1312113111
fd-slicer "~1.1.0"
1312213112

13123-
yoast-components@^4.32.0:
13124-
version "4.32.0"
13125-
resolved "https://registry.yarnpkg.com/yoast-components/-/yoast-components-4.32.0.tgz#5369a11626b0fcf636880cca5213d1ce0a62be17"
13126-
integrity sha512-OPDv8Ns/O10HlTqwaT/zdlUMMGTmB94pS32chT45euTx7xrMCa7EFYEK/9OmioGvfL59dGbEz5JjnxR6ik5udA==
13113+
yoast-components@^4.33.0-rc.0:
13114+
version "4.33.0-rc.0"
13115+
resolved "https://registry.yarnpkg.com/yoast-components/-/yoast-components-4.33.0-rc.0.tgz#e217fb35dab273f58bef43a91f1f2f1dda7d236b"
13116+
integrity sha512-9CpjVGOCMSRtdjM9Os9VxQV/Wrp88o5mNpkNu98UTQ5rbFMK6ibZJ1gsJnNxrvu0fpdEv1J/xlAHobqH62hk6A==
1312713117
dependencies:
1312813118
"@wordpress/a11y" "^1.0.7"
1312913119
"@wordpress/i18n" "^1.1.0"
13130-
"@yoast/algolia-search-box" "^1.5.0"
13131-
"@yoast/analysis-report" "^0.6.0"
13132-
"@yoast/components" "^0.6.0"
13133-
"@yoast/configuration-wizard" "^1.5.0"
13134-
"@yoast/helpers" "^0.4.0-rc.2"
13135-
"@yoast/search-metadata-previews" "^1.8.0"
13136-
"@yoast/style-guide" "^0.4.0"
13120+
"@yoast/algolia-search-box" "^1.6.0-rc.0"
13121+
"@yoast/analysis-report" "^0.7.0-rc.0"
13122+
"@yoast/components" "^0.7.0-rc.0"
13123+
"@yoast/configuration-wizard" "^1.6.0-rc.0"
13124+
"@yoast/helpers" "^0.5.0-rc.0"
13125+
"@yoast/search-metadata-previews" "^1.9.0-rc.0"
13126+
"@yoast/style-guide" "^0.5.0-rc.0"
1313713127
algoliasearch "^3.22.3"
1313813128
clipboard "^1.5.15"
1313913129
draft-js "^0.10.5"
@@ -13152,12 +13142,12 @@ yoast-components@^4.32.0:
1315213142
styled-components "^4.2.0"
1315313143
whatwg-fetch "^1.0.0"
1315413144
wicked-good-xpath "^1.3.0"
13155-
yoastseo "^1.59.0"
13145+
yoastseo "^1.60.0-rc.0"
1315613146

13157-
yoastseo@^1.59.0:
13158-
version "1.59.0"
13159-
resolved "https://registry.yarnpkg.com/yoastseo/-/yoastseo-1.59.0.tgz#4ab2f20199482cdf45c7fcad5f612cfa1279e7ef"
13160-
integrity sha512-ECSyhDwabUH5eeC2/m/FhsYmU4j9JRMzN//lvJV5U0TIYjIYkvrxylrjx06C27fJ2irObtdEceDyyE8o0eFeUQ==
13147+
yoastseo@^1.60.0-rc.0:
13148+
version "1.60.0-rc.0"
13149+
resolved "https://registry.yarnpkg.com/yoastseo/-/yoastseo-1.60.0-rc.0.tgz#e4b43a2692cc96ff6b16982ab6eebd36cf492716"
13150+
integrity sha512-TdsPMu7XwUXEf7jNb/TgxuEwE10eGcgAxD5w2yGoLdpCud8/jGtCt8ABjjMrBLZdx+3yd60QLkqkylIr0jxnYg==
1316113151
dependencies:
1316213152
"@wordpress/autop" "^2.0.2"
1316313153
"@yoast/feature-flag" "^0.3.0-rc.1"

0 commit comments

Comments
 (0)