Merge branch 'release/19.14' of github.com:Yoast/wordpress-seo into reverts/19.14

Author: FAMarfuaty

admin/class-gutenberg-compatibility.php

@@ -15,14 +15,14 @@ class WPSEO_Gutenberg_Compatibility {
 	 *
 	 * @var string
 	 */
-	const CURRENT_RELEASE = '14.7.1';
+	const CURRENT_RELEASE = '14.7.3';
 
 	/**
 	 * The minimally supported version of Gutenberg by the plugin.
 	 *
 	 * @var string
 	 */
-	const MINIMUM_SUPPORTED = '14.7.1';
+	const MINIMUM_SUPPORTED = '14.7.3';
 
 	/**
 	 * Holds the current version.

package.json

@@ -84,7 +84,7 @@
     "typescript": "^4.2.4"
   },
   "yoast": {
-    "pluginVersion": "19.14-RC1"
+    "pluginVersion": "19.14-RC4"
   },
   "version": "0.0.0"
 }

packages/js/src/components/contentAnalysis/SeoAnalysis.js

@@ -36,10 +36,11 @@ class SeoAnalysis extends Component {
 	 * Renders the keyword synonyms upsell modal.
 	 *
 	 * @param {string} location The location of the upsell component. Used to determine the shortlinks in the component.
+	 * @param {string} locationContext In which editor this component is rendered.
 	 *
 	 * @returns {wp.Element} A modalButtonContainer component with the modal for a keyword synonyms upsell.
 	 */
-	renderSynonymsUpsell( location ) {
+	renderSynonymsUpsell( location, locationContext ) {
 		const modalProps = {
 			classes: {
 				openButton: "wpseo-keyword-synonyms button-link",
@@ -67,6 +68,8 @@ class SeoAnalysis extends Component {
 			link = wpseoAdminL10n[ "shortlinks.upsell.sidebar.focus_keyword_synonyms_link" ];
 			buyLink = wpseoAdminL10n[ "shortlinks.upsell.sidebar.focus_keyword_synonyms_button" ];
 		}
+		link = addQueryArgs( link, { context: locationContext } );
+		buyLink = addQueryArgs( buyLink, { context: locationContext } );
 
 		return (
 			<Modal { ...modalProps }>
@@ -265,7 +268,7 @@ class SeoAnalysis extends Component {
 										>
 											<SynonymSlot location={ location } />
 											{ this.props.shouldUpsell && <Fragment>
-												{ this.renderSynonymsUpsell( location ) }
+												{ this.renderSynonymsUpsell( location, locationContext ) }
 												{ this.renderMultipleKeywordsUpsell( location ) }
 											</Fragment> }
 											{ this.props.shouldUpsellWordFormRecognition && this.renderWordFormsUpsell( location, locationContext ) }

packages/js/src/initializers/block-editor-integration.js

@@ -43,6 +43,13 @@ import { isWordProofIntegrationActive } from "../helpers/wordproof";
  */
 function registerFormats() {
 	if ( typeof get( window, "wp.blockEditor.__experimentalLinkControl" ) === "function" ) {
+		const unknownSettings = select( "core/rich-text" )
+			.getFormatType( "core/unknown" );
+
+		if ( typeof( unknownSettings ) !== "undefined" ) {
+			dispatch( "core/rich-text" ).removeFormatTypes( "core/unknown" );
+		}
+
 		[
 			link,
 		].forEach( ( { name, replaces, ...settings } ) => {
@@ -53,6 +60,10 @@ function registerFormats() {
 				registerFormatType( name, settings );
 			}
 		} );
+
+		if ( typeof( unknownSettings ) !== "undefined" ) {
+			registerFormatType( "core/unknown", unknownSettings );
+		}
 	} else {
 		console.warn(
 			__( "Marking links with nofollow/sponsored has been disabled for WordPress installs < 5.4.", "wordpress-seo" ) +

packages/yoastseo/spec/scoring/assessments/inclusiveLanguage/configuration/cultureAssessmentsSpec.js

@@ -199,7 +199,7 @@ describe( "A test for Culture Assessments", () => {
 		const assessmentResult = assessor.getResult();
 		expect( assessmentResult.getScore() ).toEqual( 3 );
 		expect( assessmentResult.getText() ).toEqual(
-			"Avoid using <i>first-world</i> as it is overgeneralizing. Consider using specific name for the country or region instead.  " +
+			"Avoid using <i>first-world</i> as it is overgeneralizing. Consider using the specific name for the country or region instead.  " +
 			"<a href='https://yoa.st/inclusive-language-culture' target='_blank'>Learn more.</a>"
 		);
 		expect( assessmentResult.hasMarks() ).toBeTruthy();
@@ -209,6 +209,28 @@ describe( "A test for Culture Assessments", () => {
 			original: "This sentence contains first-world." } } ]
 		);
 	} );
+	it( "correctly identifies 'first world countries'", () => {
+		const mockPaper = new Paper( "Many first world countries adopted the policy." );
+		const mockResearcher = Factory.buildMockResearcher( [ "first world countries" ] );
+		const assessor = new InclusiveLanguageAssessment( assessments.find( obj => obj.identifier === "firstWorldCountries" ) );
+
+		const isApplicable = assessor.isApplicable( mockPaper, mockResearcher );
+
+		expect( isApplicable ).toBeTruthy();
+		const assessmentResult = assessor.getResult();
+		expect( assessmentResult.getScore() ).toEqual( 3 );
+		expect( assessmentResult.getText() ).toEqual(
+			"Avoid using <i>first world countries</i> as it is overgeneralizing. " +
+			"Consider using the specific name for the countries or regions instead.  " +
+			"<a href='https://yoa.st/inclusive-language-culture' target='_blank'>Learn more.</a>"
+		);
+		expect( assessmentResult.hasMarks() ).toBeTruthy();
+		expect( assessor.getMarks() ).toEqual(   [ { _properties: {
+			fieldsToMark: [],
+			marked: "<yoastmark class='yoast-text-mark'>first world countries</yoastmark>",
+			original: "first world countries" } } ]
+		);
+	} );
 	it( "correctly identifies 'third-world country'", () => {
 		const mockPaper = new Paper( "This sentence contains third-world country." );
 		const mockResearcher = Factory.buildMockResearcher( [ "This sentence contains third-world country." ] );

packages/yoastseo/spec/scoring/assessments/inclusiveLanguage/configuration/disabilityAssessmentsSpec.js

@@ -389,7 +389,7 @@ describe( "a test for targetting non-inclusive phrases in disability assessments
 		expect( assessment.isApplicable( mockPaper, mockResearcher ) ).toBe( true );
 		expect( assessment.getResult().score ).toBe( 6 );
 		expect( assessment.getResult().text ).toBe( "Be careful when using <i>daft</i> as it is potentially harmful. " +
-			"Consider using an alternative, such as <i>dense, uninformed, ignorant, foolish, inconsiderate, irrational, reckless</i>." +
+			"Consider using an alternative, such as <i>uninformed, ignorant, foolish, inconsiderate, irrational, reckless</i>." +
 			" <a href='https://yoa.st/inclusive-language-disability' target='_blank'>Learn more.</a>" );
 	} );
 	it( "should return the appropriate score and feedback string for: 'imbecile'", () => {

packages/yoastseo/spec/scoring/assessments/inclusiveLanguage/configuration/sesAssessmentsSpec.js

@@ -185,4 +185,27 @@ describe( "A test for SES assessments", function() {
 			original: "This sentence contains ex-offender." } } ]
 		);
 	} );
+
+	it( "gives the correct feedback for 'the undocumented'", () => {
+		const mockPaper = new Paper( "This sentence contains the undocumented." );
+		const mockResearcher = Factory.buildMockResearcher( [ "This sentence contains the undocumented." ] );
+		const assessor = new InclusiveLanguageAssessment( assessments.find( obj => obj.identifier === "theUndocumented" ) );
+
+		const isApplicable = assessor.isApplicable( mockPaper, mockResearcher );
+
+		expect( isApplicable ).toBeTruthy();
+		const assessmentResult = assessor.getResult();
+		expect( assessmentResult.getScore() ).toEqual( 3 );
+		expect( assessmentResult.getText() ).toEqual(
+			"Avoid using <i>the undocumented</i> as it is potentially overgeneralizing. " +
+			"Consider using <i>people who are undocumented, undocumented people, people without papers </i> instead. " +
+			"<a href='https://yoa.st/inclusive-language-ses' target='_blank'>Learn more.</a>"
+		);
+		expect( assessmentResult.hasMarks() ).toBeTruthy();
+		expect( assessor.getMarks() ).toEqual(   [ { _properties: {
+			fieldsToMark: [],
+			marked: "<yoastmark class='yoast-text-mark'>This sentence contains the undocumented.</yoastmark>",
+			original: "This sentence contains the undocumented." } } ]
+		);
+	} );
 } );

packages/yoastseo/src/scoring/assessments/inclusiveLanguage/configuration/cultureAssessments.js

@@ -233,14 +233,14 @@ const cultureAssessments = [
 	{
 		identifier: "firstWorldCountries",
 		nonInclusivePhrases: [ "first world countries" ],
-		inclusiveAlternatives: "specific name for the countries or regions",
+		inclusiveAlternatives: "the specific name for the countries or regions",
 		score: SCORES.NON_INCLUSIVE,
 		feedbackFormat: overgeneralizing,
 	},
 	{
 		identifier: "firstWorldHyphen",
 		nonInclusivePhrases: [ "first-world" ],
-		inclusiveAlternatives: "specific name for the country or region",
+		inclusiveAlternatives: "the specific name for the country or region",
 		score: SCORES.NON_INCLUSIVE,
 		feedbackFormat: overgeneralizing,
 	},

packages/yoastseo/src/scoring/assessments/inclusiveLanguage/configuration/disabilityAssessments.js

@@ -94,7 +94,7 @@ const disabilityAssessments =  [
 	{
 		identifier: "daft",
 		nonInclusivePhrases: [ "daft" ],
-		inclusiveAlternatives: "<i>dense, uninformed, ignorant, foolish, inconsiderate, irrational, reckless</i>",
+		inclusiveAlternatives: "<i>uninformed, ignorant, foolish, inconsiderate, irrational, reckless</i>",
 		score: SCORES.POTENTIALLY_NON_INCLUSIVE,
 		feedbackFormat: potentiallyHarmfulCareful,
 	},

packages/yoastseo/src/scoring/assessments/inclusiveLanguage/configuration/sesAssessments.js

@@ -68,7 +68,7 @@ const sesAssessments = [
 	{
 		identifier: "theUndocumented",
 		nonInclusivePhrases: [ "the undocumented" ],
-		inclusiveAlternatives: "<i>people who are undocumented/ undocumented people, people without papers </i>",
+		inclusiveAlternatives: "<i>people who are undocumented, undocumented people, people without papers </i>",
 		score: SCORES.NON_INCLUSIVE,
 		feedbackFormat: "Avoid using <i>%1$s</i> as it is potentially overgeneralizing. Consider using %2$s instead.",
 		rule: ( words, nonInclusivePhrase ) => {