diff --git a/apps/content-analysis-api/analyze.http b/apps/content-analysis-api/analyze.http new file mode 100644 index 00000000000..8f3f1d65e39 --- /dev/null +++ b/apps/content-analysis-api/analyze.http @@ -0,0 +1,8 @@ +### Creates a new request +GET http://localhost:3000/analyze +Content-Type: application/json + +{ + "text": "

Yoast SEO is a search engine optimization (SEO) tool plug-in for WordPress.

Yoast SEO created its first WordPress SEO plugin in 2007 - originally named WordPress SEO: it was developed as a WordPress plugin by SEO consultant Joost de Valk. In 2012, the plug-in was renamed Yoast SEO. In 2015, Yoast hosted the inaugural YoastCon conference at the Lindenberg Nijmegen Culture House in Nijmegen, Netherlands. In 2015, a flaw was discovered in version 1.7.3.3 and earlier versions. The flaw could have left users of Yoast SEO open to hackers and was discovered by a security consultant.

", + "keyword": "Yoast SEO" +} diff --git a/apps/content-analysis-api/index.js b/apps/content-analysis-api/index.js new file mode 100644 index 00000000000..ef67787f081 --- /dev/null +++ b/apps/content-analysis-api/index.js @@ -0,0 +1,124 @@ +const { SeoAssessor, Paper, ContentAssessor, App, interpreters, languageProcessing, assessments, helpers } = require( "yoastseo" ); +const express = require( "express" ); +const { "default": RelatedKeywordAssessor } = require( "yoastseo/build/scoring/relatedKeywordAssessor" ); +const { "default": InclusiveLanguageAssessor } = require( "yoastseo/build/scoring/InclusiveLanguageAssessor" ) + +// Premium assessments +const keyphraseDistribution = languageProcessing.researches.keyphraseDistribution; +const KeyphraseDistributionAssessment = assessments.seo.KeyphraseDistributionAssessment; + +const TextTitleAssessment = assessments.seo.TextTitleAssessment; + +const getLanguagesWithWordComplexity = helpers.getLanguagesWithWordComplexity; +const wordComplexity = languageProcessing.researches.wordComplexity; +const wordComplexityHelpers = { + de: languageProcessing.languageHelpers.wordComplexityHelperGerman, + en: languageProcessing.languageHelpers.wordComplexityHelperEnglish, + es: languageProcessing.languageHelpers.wordComplexityHelperSpanish, + fr: languageProcessing.languageHelpers.wordComplexityHelperFrench, +}; +const wordComplexityConfigs = { + de: languageProcessing.languageConfigs.wordComplexityConfigGerman, + en: languageProcessing.languageConfigs.wordComplexityConfigEnglish, + es: languageProcessing.languageConfigs.wordComplexityConfigSpanish, + fr: languageProcessing.languageConfigs.wordComplexityConfigFrench, +}; +const WordComplexityAssessment = assessments.readability.WordComplexityAssessment; + +const getLongCenterAlignedTexts = languageProcessing.researches.getLongCenterAlignedTexts; +const TextAlignmentAssessment = assessments.readability.TextAlignmentAssessment; + +const MORPHOLOGY_VERSIONS = { + en: "v5", + de: "v10", + es: "v10", + fr: "v11", + it: "v10", + nl: "v9", + ru: "v10", + id: "v9", + pt: "v9", + pl: "v9", + ar: "v9", + sv: "v1", + he: "v1", + hu: "v2", + nb: "v1", + tr: "v1", + cs: "v1", + sk: "v1", + ja: "v1", +}; + +/** + * Maps the result to a view model, ready to be sent to the client. + * @param {AssessmentResult[]} result The result to map. + * @returns {{score, editFieldName, text, marks}} The view model. + */ +const resultToVM = ( result ) => { + const { _identifier, score, text, marks, editFieldName } = result; + return { _identifier, score, text, marks, editFieldName, rating: interpreters.scoreToRating( score ) }; +}; + +const app = express(); +app.use( express.json() ); + +app.get( "/analyze", ( request, response ) => { + // Fetch the Researcher and set the morphology data for the given language (yes, this is a bit hacky) + const language = request.body.locale || "en"; + const dataVersion = MORPHOLOGY_VERSIONS[ language ]; + // eslint-disable-next-line global-require + const { "default": Researcher } = require( `yoastseo/build/languageProcessing/languages/${language}/Researcher` ); + // eslint-disable-next-line global-require + const premiumData = require( `yoastseo/premium-configuration/data/morphologyData-${language}-${dataVersion}.json` ); + + const researcher = new Researcher(); + researcher.addResearchData( "morphology", premiumData ); + researcher.addResearch( "keyphraseDistribution", keyphraseDistribution ); + if ( getLanguagesWithWordComplexity().includes( language ) ) { + researcher.addResearch( "wordComplexity", wordComplexity ); + researcher.addHelper( "checkIfWordIsComplex", wordComplexityHelpers[ language ] ); + researcher.addConfig( "wordComplexity", wordComplexityConfigs[ language ] ); + } + researcher.addResearch( "getLongCenterAlignedTexts", getLongCenterAlignedTexts ); + + const seoAssessor = new SeoAssessor( researcher ); + seoAssessor.addAssessment("keyphraseDistribution", new KeyphraseDistributionAssessment()); + seoAssessor.addAssessment("TextTitleAssessment", new TextTitleAssessment()); + const contentAssessor = new ContentAssessor( researcher ); + contentAssessor.addAssessment("wordComplexity", new WordComplexityAssessment()); + contentAssessor.addAssessment("textAlignment", new TextAlignmentAssessment()); + const relatedKeywordAssessor = new RelatedKeywordAssessor( researcher ); + const inclusiveLanguageAssessor = new InclusiveLanguageAssessor( researcher ); + + const paper = new Paper( + request.body.text || "", + request.body || {} + ); + + seoAssessor.assess( paper ); + contentAssessor.assess( paper ); + relatedKeywordAssessor.assess( paper ); + inclusiveLanguageAssessor.assess( paper ); + + response.json( { + seo: seoAssessor.getValidResults().map( resultToVM ), + readability: contentAssessor.getValidResults().map( resultToVM ), + relatedKeyword: relatedKeywordAssessor.getValidResults().map( resultToVM ), + inclusiveLanguage: inclusiveLanguageAssessor.getValidResults().map( resultToVM ), + } ); +} ); + + +// Failing example using the App class. App uses createMeasurementElement, which is a browser-only function. +app.get( "/app", ( req, res ) => { + const contentAnalysis = new App( { + callbacks: { getData: () => ( { text: "" } ) }, + targets: { snippet: "this field is required" }, + } ); + res.send( "done" ); +} ); + +const listener = app.listen( process.env.PORT, () => { + console.log( "Listening on : http://localhost:" + listener.address().port ); +} ); diff --git a/apps/content-analysis-api/package.json b/apps/content-analysis-api/package.json new file mode 100644 index 00000000000..b0b12f9d944 --- /dev/null +++ b/apps/content-analysis-api/package.json @@ -0,0 +1,13 @@ +{ + "name": "content-analysis-api", + "version": "0.1.0", + "main": "index.js", + "scripts": { + "postinstall": "yarn --cwd node_modules/yoastseo build", + "start": "node index.js" + }, + "dependencies": { + "express": "^4.19.2", + "yoastseo": "link:../../packages/yoastseo" + } +} diff --git a/apps/content-analysis-api/readme.md b/apps/content-analysis-api/readme.md new file mode 100644 index 00000000000..11608c2fd60 --- /dev/null +++ b/apps/content-analysis-api/readme.md @@ -0,0 +1,31 @@ +# Content Analysis API +This is a small sample/PoC project to demonstrate how to use yoastseo in a Node.js environment. +Using yoastseo should not require any additional build steps. + +## Getting started +```bash +yarn install + +# Either +yarn start # Picks a random port. +# Or +PORT=3000 yarn start # Specify a port. +``` + +## Usage +### /analyze +Send a `GET` request to http://localhost:3000/analyze (or whatever port your app is running on). Pass along a JSON body: +```json +{ + "text": "

The text you want to analyze.

", + "keyword": "The keyphrase you want to rank for.", +} +``` +You can add any of the properties described by the [`Paper`'s `attributes` parameter](../../packages/yoastseo/src/values/Paper.js) ([see this JSDoc block](https://github.com/Yoast/wordpress-seo/blob/434b6d0eb79659dffe44676da96c1640094137a1/packages/yoastseo/src/values/Paper.js#L26-L40)). + +This endpoint will run a set list of assessors on the text and return the results in JSON format. + +### /app +Send a `GET` request to http://localhost:3000/app (or whatever port your app is running on). + +This will fail with an error. This is to demonstrate that the App class is not (yet) available in the Node.js environment. diff --git a/apps/content-analysis-api/yarn.lock b/apps/content-analysis-api/yarn.lock new file mode 100644 index 00000000000..91d583a1a50 --- /dev/null +++ b/apps/content-analysis-api/yarn.lock @@ -0,0 +1,730 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/runtime@^7.16.0": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.1.tgz#431f9a794d173b53720e69a6464abc6f0e2a5c57" + integrity sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ== + dependencies: + regenerator-runtime "^0.14.0" + +"@tannin/compile@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@tannin/compile/-/compile-1.1.0.tgz#1e4d1c5364cbfeffa1c20352c053e19ef20ffe93" + integrity sha512-n8m9eNDfoNZoxdvWiTfW/hSPhehzLJ3zW7f8E7oT6mCROoMNWCB4TYtv041+2FMAxweiE0j7i1jubQU4MEC/Gg== + dependencies: + "@tannin/evaluate" "^1.2.0" + "@tannin/postfix" "^1.1.0" + +"@tannin/evaluate@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@tannin/evaluate/-/evaluate-1.2.0.tgz#468a13c45eff45340108836fc46c708457199c3f" + integrity sha512-3ioXvNowbO/wSrxsDG5DKIMxC81P0QrQTYai8zFNY+umuoHWRPbQ/TuuDEOju9E+jQDXmj6yI5GyejNuh8I+eg== + +"@tannin/plural-forms@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@tannin/plural-forms/-/plural-forms-1.1.0.tgz#cffbb060d2640a56a314e3c77cbf6ea6072b51d5" + integrity sha512-xl9R2mDZO/qiHam1AgMnAES6IKIg7OBhcXqy6eDsRCdXuxAFPcjrej9HMjyCLE0DJ/8cHf0i5OQTstuBRhpbHw== + dependencies: + "@tannin/compile" "^1.1.0" + +"@tannin/postfix@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@tannin/postfix/-/postfix-1.1.0.tgz#6071f4204ae26c2e885cf3a3f1203a9f71e3f291" + integrity sha512-oocsqY7g0cR+Gur5jRQLSrX2OtpMLMse1I10JQBm8CdGMrDkh1Mg2gjsiquMHRtBs4Qwu5wgEp5GgIYHk4SNPw== + +"@wordpress/hooks@^3.55.0": + version "3.55.0" + resolved "https://registry.yarnpkg.com/@wordpress/hooks/-/hooks-3.55.0.tgz#73a86bc4e3df92873f877029f70056a356d0483b" + integrity sha512-2bgHAbHR2srPBEkWthlT0i137q01WEYHPA8RQv0jbaBdO6uzkdtraSBZIJQQ1C7dYJloj7RqWuxaJ2TcN0/VXA== + dependencies: + "@babel/runtime" "^7.16.0" + +"@wordpress/i18n@^4.46.0": + version "4.55.0" + resolved "https://registry.yarnpkg.com/@wordpress/i18n/-/i18n-4.55.0.tgz#064ae19b717d84692878c67a91fea09a0fc3bde1" + integrity sha512-ZM1G0AQHgriIe44pp8r/dvbqqRlgfmCeo8ijXgga4GCuxwjENZpJdCjL4UaBljgNfCf+b/H4c6XUUVoHWDBCYw== + dependencies: + "@babel/runtime" "^7.16.0" + "@wordpress/hooks" "^3.55.0" + gettext-parser "^1.3.1" + memize "^2.1.0" + sprintf-js "^1.1.1" + tannin "^1.2.0" + +"@yoast/feature-flag@^0.5.2": + version "0.5.2" + resolved "https://registry.yarnpkg.com/@yoast/feature-flag/-/feature-flag-0.5.2.tgz#ef4cd8ddb959c5857c5d68639ab09ab75c381508" + integrity sha512-erHel5POEyPpt1B2fToLm8caZPruiOxBRZvn7X9nWqwb0lIbxbOkDp/XQnm168bcvVEL95Dg9JMaPgQwO3rA9w== + +accepts@~1.3.8: + version "1.3.8" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" + integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== + dependencies: + mime-types "~2.1.34" + negotiator "0.6.3" + +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== + +body-parser@1.20.2: + version "1.20.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" + integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== + dependencies: + bytes "3.1.2" + content-type "~1.0.5" + debug "2.6.9" + depd "2.0.0" + destroy "1.2.0" + http-errors "2.0.0" + iconv-lite "0.4.24" + on-finished "2.4.1" + qs "6.11.0" + raw-body "2.5.2" + type-is "~1.6.18" + unpipe "1.0.0" + +bytes@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== + +call-bind@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" + integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + set-function-length "^1.2.1" + +content-disposition@0.5.4: + version "0.5.4" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" + integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== + dependencies: + safe-buffer "5.2.1" + +content-type@~1.0.4, content-type@~1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" + integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== + +cookie@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" + integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== + +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + +debug@2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + gopd "^1.0.1" + +depd@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + +destroy@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" + integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== + +dom-serializer@0: + version "0.2.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" + integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== + dependencies: + domelementtype "^2.0.1" + entities "^2.0.0" + +domelementtype@1, domelementtype@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" + integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== + +domelementtype@^2.0.1: + version "2.3.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== + +domhandler@^2.3.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803" + integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA== + dependencies: + domelementtype "1" + +domutils@^1.5.1: + version "1.7.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" + integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== + dependencies: + dom-serializer "0" + domelementtype "1" + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== + +encoding@^0.1.12: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" + +entities@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" + integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== + +entities@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== + +entities@^4.4.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" + integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== + +es-define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" + integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== + dependencies: + get-intrinsic "^1.2.4" + +es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== + +express@^4.19.2: + version "4.19.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" + integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== + dependencies: + accepts "~1.3.8" + array-flatten "1.1.1" + body-parser "1.20.2" + content-disposition "0.5.4" + content-type "~1.0.4" + cookie "0.6.0" + cookie-signature "1.0.6" + debug "2.6.9" + depd "2.0.0" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "1.2.0" + fresh "0.5.2" + http-errors "2.0.0" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "2.4.1" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.7" + qs "6.11.0" + range-parser "~1.2.1" + safe-buffer "5.2.1" + send "0.18.0" + serve-static "1.15.0" + setprototypeof "1.2.0" + statuses "2.0.1" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + +finalhandler@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" + integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "2.4.1" + parseurl "~1.3.3" + statuses "2.0.1" + unpipe "~1.0.0" + +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== + +function-bind@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== + +get-intrinsic@^1.1.3, get-intrinsic@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" + integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== + dependencies: + es-errors "^1.3.0" + function-bind "^1.1.2" + has-proto "^1.0.1" + has-symbols "^1.0.3" + hasown "^2.0.0" + +gettext-parser@^1.3.1: + version "1.4.0" + resolved "https://registry.yarnpkg.com/gettext-parser/-/gettext-parser-1.4.0.tgz#f8baf34a292f03d5e42f02df099d301f167a7ace" + integrity sha512-sedZYLHlHeBop/gZ1jdg59hlUEcpcZJofLq2JFwJT1zTqAU3l2wFv6IsuwFHGqbiT9DWzMUW4/em2+hspnmMMA== + dependencies: + encoding "^0.1.12" + safe-buffer "^5.1.1" + +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" + +has-property-descriptors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== + dependencies: + es-define-property "^1.0.0" + +has-proto@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" + integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== + +has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== + +hasown@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== + dependencies: + function-bind "^1.1.2" + +htmlparser2@^3.9.2: + version "3.10.1" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" + integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== + dependencies: + domelementtype "^1.3.1" + domhandler "^2.3.0" + domutils "^1.5.1" + entities "^1.1.1" + inherits "^2.0.1" + readable-stream "^3.1.1" + +http-errors@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== + dependencies: + depd "2.0.0" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses "2.0.1" + toidentifier "1.0.1" + +iconv-lite@0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +iconv-lite@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ipaddr.js@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== + +lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +loglevel@^1.8.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.9.1.tgz#d63976ac9bcd03c7c873116d41c2a85bafff1be7" + integrity sha512-hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg== + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== + +memize@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/memize/-/memize-2.1.0.tgz#6ddd4717887d94825748149ece00d04cf868ce0d" + integrity sha512-yywVJy8ctVlN5lNPxsep5urnZ6TTclwPEyigM9M3Bi8vseJBOfqNrGWN/r8NzuIt3PovM323W04blJfGQfQSVg== + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== + +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@~2.1.24, mime-types@~2.1.34: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== + +ms@2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +negotiator@0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== + +object-inspect@^1.13.1: + version "1.13.1" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" + integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== + +on-finished@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" + integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== + dependencies: + ee-first "1.1.1" + +parse5@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" + integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== + dependencies: + entities "^4.4.0" + +parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +proxy-addr@~2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== + dependencies: + forwarded "0.2.0" + ipaddr.js "1.9.1" + +qs@6.11.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + dependencies: + side-channel "^1.0.4" + +range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" + integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== + dependencies: + bytes "3.1.2" + http-errors "2.0.0" + iconv-lite "0.4.24" + unpipe "1.0.0" + +readable-stream@^3.1.1: + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readable-stream@~2.3.6: + version "2.3.8" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" + integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +regenerator-runtime@^0.14.0: + version "0.14.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" + integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== + +safe-buffer@5.2.1, safe-buffer@^5.1.1, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +send@0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" + integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== + dependencies: + debug "2.6.9" + depd "2.0.0" + destroy "1.2.0" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "2.0.0" + mime "1.6.0" + ms "2.1.3" + on-finished "2.4.1" + range-parser "~1.2.1" + statuses "2.0.1" + +serve-static@1.15.0: + version "1.15.0" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" + integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.18.0" + +set-function-length@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" + integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + gopd "^1.0.1" + has-property-descriptors "^1.0.2" + +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== + +side-channel@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" + integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + object-inspect "^1.13.1" + +sprintf-js@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" + integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA== + +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +tannin@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/tannin/-/tannin-1.2.0.tgz#1da6fe65280dca4c3d84efb075b077b1b94362a6" + integrity sha512-U7GgX/RcSeUETbV7gYgoz8PD7Ni4y95pgIP/Z6ayI3CfhSujwKEBlGFTCRN+Aqnuyf4AN2yHL+L8x+TCGjb9uA== + dependencies: + "@tannin/plural-forms" "^1.1.0" + +through2@^2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== + dependencies: + readable-stream "~2.3.6" + xtend "~4.0.1" + +tiny-segmenter@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/tiny-segmenter/-/tiny-segmenter-0.2.0.tgz#4f91115efaa90d1f98b481623b0dcc830a9e1a69" + integrity sha512-m+aTJQ/CUBKurLaJRpLmJiwcL+Gpkzft5ZYnRU9AkuO45Y/k/2iJmuLEbN1XLrq6N3kDVyIUCCeqRzQx0feBag== + +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== + +tokenizer2@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/tokenizer2/-/tokenizer2-2.0.1.tgz#c62846214bd05d6b74e4924156d246e6cc070f3e" + integrity sha512-WAUyv8sbJuFMq4OgQAcXVYrJj1YALGz2Ah4yMyMxRD5DrMnogbtQV3r2RDZ69/Zxh3yYc/olp8rURZ0t3mLevQ== + dependencies: + through2 "^2.0.0" + +type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== + +util-deprecate@^1.0.1, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== + +vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== + +xtend@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + +"yoastseo@link:../../packages/yoastseo": + version "0.0.0" + uid "" diff --git a/composer.json b/composer.json index 71b6132ac83..5bad5b6086a 100644 --- a/composer.json +++ b/composer.json @@ -92,7 +92,7 @@ "Yoast\\WP\\SEO\\Composer\\Actions::check_coding_standards" ], "check-cs-thresholds": [ - "@putenv YOASTCS_THRESHOLD_ERRORS=2555", + "@putenv YOASTCS_THRESHOLD_ERRORS=2549", "@putenv YOASTCS_THRESHOLD_WARNINGS=267", "Yoast\\WP\\SEO\\Composer\\Actions::check_cs_thresholds" ], diff --git a/packages/yoastseo/Gruntfile.js b/packages/yoastseo/Gruntfile.js index 09912913588..f66cbf89238 100644 --- a/packages/yoastseo/Gruntfile.js +++ b/packages/yoastseo/Gruntfile.js @@ -26,14 +26,10 @@ module.exports = function( grunt ) { "<%= files.grunt %>", "!js", ], - jsDontLint: [ - "!src/templates.js", - ], jsTests: [ "spec/**/*.js", ], scss: "css/*.scss", - templates: "templates/*.jst", jed: "node_modules/jed/jed.js", /** * Gets the wildcard to get the grunt config files. diff --git a/packages/yoastseo/examples/PerformanceAnalyses/run.js b/packages/yoastseo/examples/PerformanceAnalyses/run.js index edb904f385d..ea5239a8b02 100755 --- a/packages/yoastseo/examples/PerformanceAnalyses/run.js +++ b/packages/yoastseo/examples/PerformanceAnalyses/run.js @@ -1,6 +1,6 @@ #!/usr/bin/env node -const merge = require( "lodash-es" ).merge; +const merge = require( "lodash" ).merge; const analysis = require( "./analysis" ); const texts = [ diff --git a/packages/yoastseo/package.json b/packages/yoastseo/package.json index 943f9f72377..a8c59f8e67a 100644 --- a/packages/yoastseo/package.json +++ b/packages/yoastseo/package.json @@ -61,7 +61,7 @@ "@wordpress/i18n": "^4.46.0", "@yoast/feature-flag": "^0.5.2", "htmlparser2": "^3.9.2", - "lodash-es": "^4.17.21", + "lodash": "^4.17.21", "loglevel": "^1.8.1", "parse5": "^7.1.2", "tiny-segmenter": "^0.2.0", diff --git a/packages/yoastseo/spec/languageProcessing/helpers/match/isDoubleQuotedSpec.js b/packages/yoastseo/spec/languageProcessing/helpers/match/isDoubleQuotedSpec.js index 9f953c99252..bb1e587277a 100644 --- a/packages/yoastseo/spec/languageProcessing/helpers/match/isDoubleQuotedSpec.js +++ b/packages/yoastseo/spec/languageProcessing/helpers/match/isDoubleQuotedSpec.js @@ -1,6 +1,6 @@ import isDoubleQuoted from "../../../../src/languageProcessing/helpers/match/isDoubleQuoted"; import doubleQuotes from "../../../../src/languageProcessing/helpers/sanitize/doubleQuotes"; -import sample from "lodash-es"; +import sample from "lodash"; const testCases = [ { diff --git a/packages/yoastseo/spec/languageProcessing/helpers/sentence/getSentencesSpec.js b/packages/yoastseo/spec/languageProcessing/helpers/sentence/getSentencesSpec.js index 60ff52dbe7b..4df080747a9 100644 --- a/packages/yoastseo/spec/languageProcessing/helpers/sentence/getSentencesSpec.js +++ b/packages/yoastseo/spec/languageProcessing/helpers/sentence/getSentencesSpec.js @@ -15,7 +15,7 @@ import { listParagraphsAndSentencesProcessed, } from "../sanitize/mergeListItemsSpec"; -import { forEach } from "lodash-es"; +import { forEach } from "lodash"; /** * Helper to test sentence detection. diff --git a/packages/yoastseo/spec/parsedPaper/build/linguisticParsing/parseTextSpec.js b/packages/yoastseo/spec/parsedPaper/build/linguisticParsing/parseTextSpec.js index 62f6216cbe0..d26858c8610 100644 --- a/packages/yoastseo/spec/parsedPaper/build/linguisticParsing/parseTextSpec.js +++ b/packages/yoastseo/spec/parsedPaper/build/linguisticParsing/parseTextSpec.js @@ -1,5 +1,5 @@ import { parseTextIntoSentences } from "../../../../src/parsedPaper/build/linguisticParsing/parseText"; -import { forEach } from "lodash-es"; +import { forEach } from "lodash"; import Sentence from "../../../../src/parsedPaper/build/linguisticParsing/Sentence"; /** diff --git a/packages/yoastseo/spec/scoring/assessments/inclusiveLanguage/exportInclusiveLanguageConfigSpec.js b/packages/yoastseo/spec/scoring/assessments/inclusiveLanguage/exportInclusiveLanguageConfigSpec.js index 1d6ebc8bbc3..3fc657295e8 100644 --- a/packages/yoastseo/spec/scoring/assessments/inclusiveLanguage/exportInclusiveLanguageConfigSpec.js +++ b/packages/yoastseo/spec/scoring/assessments/inclusiveLanguage/exportInclusiveLanguageConfigSpec.js @@ -1,5 +1,5 @@ import { sprintf } from "@wordpress/i18n"; -import { last } from "lodash-es"; +import { last } from "lodash"; import inclusiveLanguageAssessmentsConfigs from "../../../../src/scoring/assessments/inclusiveLanguage/configuration"; import { SCORES } from "../../../../src/scoring/assessments/inclusiveLanguage/configuration/scores"; diff --git a/packages/yoastseo/spec/scoring/assessments/seo/KeyphraseLengthAssessmentSpec.js b/packages/yoastseo/spec/scoring/assessments/seo/KeyphraseLengthAssessmentSpec.js index abcb4bf579a..4e61409f65d 100644 --- a/packages/yoastseo/spec/scoring/assessments/seo/KeyphraseLengthAssessmentSpec.js +++ b/packages/yoastseo/spec/scoring/assessments/seo/KeyphraseLengthAssessmentSpec.js @@ -1,5 +1,5 @@ /* eslint-disable capitalized-comments, spaced-comment */ -import { merge } from "lodash-es"; +import { merge } from "lodash"; import KeyphraseLengthAssessment from "../../../../src/scoring/assessments/seo/KeyphraseLengthAssessment"; import Paper from "../../../../src/values/Paper.js"; diff --git a/packages/yoastseo/spec/scoring/contentAssessorSpec.js b/packages/yoastseo/spec/scoring/contentAssessorSpec.js index 2da9a3a3d7f..7262366e07d 100644 --- a/packages/yoastseo/spec/scoring/contentAssessorSpec.js +++ b/packages/yoastseo/spec/scoring/contentAssessorSpec.js @@ -5,7 +5,7 @@ import ContentAssessor from "../../src/scoring/contentAssessor.js"; import AssessmentResult from "../../src/values/AssessmentResult.js"; import Paper from "../../src/values/Paper.js"; -import { forEach } from "lodash-es"; +import { forEach } from "lodash"; describe( "A content assessor", function() { describe( "calculatePenaltyPoints", function() { diff --git a/packages/yoastseo/spec/scoring/cornerstone/contentAssessorSpec.js b/packages/yoastseo/spec/scoring/cornerstone/contentAssessorSpec.js index 3a481829cb3..8006c7e3697 100644 --- a/packages/yoastseo/spec/scoring/cornerstone/contentAssessorSpec.js +++ b/packages/yoastseo/spec/scoring/cornerstone/contentAssessorSpec.js @@ -1,4 +1,4 @@ -import { forEach } from "lodash-es"; +import { forEach } from "lodash"; import DefaultResearcher from "../../../src/languageProcessing/languages/_default/Researcher"; import EnglishResearcher from "../../../src/languageProcessing/languages/en/Researcher"; import DutchResearcher from "../../../src/languageProcessing/languages/nl/Researcher"; diff --git a/packages/yoastseo/spec/scoring/scoreAggregators/ReadabilityScoreAggregatorSpec.js b/packages/yoastseo/spec/scoring/scoreAggregators/ReadabilityScoreAggregatorSpec.js index 88bcbcb3d75..5d77c70d098 100644 --- a/packages/yoastseo/spec/scoring/scoreAggregators/ReadabilityScoreAggregatorSpec.js +++ b/packages/yoastseo/spec/scoring/scoreAggregators/ReadabilityScoreAggregatorSpec.js @@ -1,4 +1,4 @@ -import { forEach } from "lodash-es"; +import { forEach } from "lodash"; import { ReadabilityScoreAggregator } from "../../../src/scoring/scoreAggregators"; import { READABILITY_SCORES } from "../../../src/scoring/scoreAggregators/ReadabilityScoreAggregator"; import AssessmentResult from "../../../src/values/AssessmentResult"; diff --git a/packages/yoastseo/spec/scoring/storePostsAndPages/contentAssessorSpec.js b/packages/yoastseo/spec/scoring/storePostsAndPages/contentAssessorSpec.js index 1bc565c9741..0cab8aeef83 100644 --- a/packages/yoastseo/spec/scoring/storePostsAndPages/contentAssessorSpec.js +++ b/packages/yoastseo/spec/scoring/storePostsAndPages/contentAssessorSpec.js @@ -1,4 +1,4 @@ -import { forEach } from "lodash-es"; +import { forEach } from "lodash"; import ContentAssessor from "../../../src/scoring/storePostsAndPages/contentAssessor.js"; import AssessmentResult from "../../../src/values/AssessmentResult.js"; import Paper from "../../../src/values/Paper.js"; diff --git a/packages/yoastseo/spec/scoring/storePostsAndPages/cornerstone/contentAssessorSpec.js b/packages/yoastseo/spec/scoring/storePostsAndPages/cornerstone/contentAssessorSpec.js index 64e9a49f70c..a125da67e46 100644 --- a/packages/yoastseo/spec/scoring/storePostsAndPages/cornerstone/contentAssessorSpec.js +++ b/packages/yoastseo/spec/scoring/storePostsAndPages/cornerstone/contentAssessorSpec.js @@ -1,4 +1,4 @@ -import { forEach } from "lodash-es"; +import { forEach } from "lodash"; import DefaultResearcher from "../../../../src/languageProcessing/languages/_default/Researcher"; import EnglishResearcher from "../../../../src/languageProcessing/languages/en/Researcher"; import DutchResearcher from "../../../../src/languageProcessing/languages/nl/Researcher"; diff --git a/packages/yoastseo/spec/specHelpers/tree/TestResearch.js b/packages/yoastseo/spec/specHelpers/tree/TestResearch.js index b150332c7ca..158912ab9de 100644 --- a/packages/yoastseo/spec/specHelpers/tree/TestResearch.js +++ b/packages/yoastseo/spec/specHelpers/tree/TestResearch.js @@ -1,4 +1,4 @@ -import { sum } from "lodash-es"; +import { sum } from "lodash"; import Research from "../../../src/parsedPaper/research/researches/Research"; import { LeafNode } from "../../../src/parsedPaper/structure/tree"; diff --git a/packages/yoastseo/spec/values/AssessmentResultSpec.js b/packages/yoastseo/spec/values/AssessmentResultSpec.js index 5fd352b0e10..078474bee96 100644 --- a/packages/yoastseo/spec/values/AssessmentResultSpec.js +++ b/packages/yoastseo/spec/values/AssessmentResultSpec.js @@ -1,5 +1,5 @@ import AssessmentResult from "../../src/values/AssessmentResult.js"; -import { noop } from "lodash-es"; +import { noop } from "lodash"; describe( "a result of an assessment", function() { it( "should receive a text and a score in the constructor", function() { diff --git a/packages/yoastseo/spec/worker/AnalysisWebWorkerSpec.js b/packages/yoastseo/spec/worker/AnalysisWebWorkerSpec.js index 57dc7e6a492..2a210d31253 100644 --- a/packages/yoastseo/spec/worker/AnalysisWebWorkerSpec.js +++ b/packages/yoastseo/spec/worker/AnalysisWebWorkerSpec.js @@ -1,5 +1,5 @@ // External dependencies -import { forEach, isArray, isNumber, isObject } from "lodash-es"; +import { forEach, isArray, isNumber, isObject } from "lodash"; import { getLogger } from "loglevel"; // Internal dependencies diff --git a/packages/yoastseo/spec/worker/wrapTryCatchAroundActionSpec.js b/packages/yoastseo/spec/worker/wrapTryCatchAroundActionSpec.js index 144f676bbd0..59f393b517c 100644 --- a/packages/yoastseo/spec/worker/wrapTryCatchAroundActionSpec.js +++ b/packages/yoastseo/spec/worker/wrapTryCatchAroundActionSpec.js @@ -1,4 +1,4 @@ -import { isFunction, isObject } from "lodash-es"; +import { isFunction, isObject } from "lodash"; import { getLogger } from "loglevel"; import wrapTryCatchAroundAction from "../../src/worker/wrapTryCatchAroundAction"; diff --git a/packages/yoastseo/src/app.js b/packages/yoastseo/src/app.js index fece3aa9037..17f63fce75a 100644 --- a/packages/yoastseo/src/app.js +++ b/packages/yoastseo/src/app.js @@ -1,5 +1,5 @@ import { setLocaleData } from "@wordpress/i18n"; -import { debounce, defaultsDeep, forEach, isArray, isEmpty, isFunction, isObject, isString, isUndefined, merge, noop, throttle } from "lodash-es"; +import { debounce, defaultsDeep, forEach, isArray, isEmpty, isFunction, isObject, isString, isUndefined, merge, noop, throttle } from "lodash"; import MissingArgument from "./errors/missingArgument"; import { measureTextWidth } from "./helpers/createMeasurementElement.js"; diff --git a/packages/yoastseo/src/bundledPlugins/previouslyUsedKeywords.js b/packages/yoastseo/src/bundledPlugins/previouslyUsedKeywords.js index e695df5aad3..40e90a2c587 100644 --- a/packages/yoastseo/src/bundledPlugins/previouslyUsedKeywords.js +++ b/packages/yoastseo/src/bundledPlugins/previouslyUsedKeywords.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { isUndefined } from "lodash-es"; +import { isUndefined } from "lodash"; import MissingArgument from "../errors/missingArgument"; import { createAnchorOpeningTag } from "../helpers/shortlinker"; diff --git a/packages/yoastseo/src/config/getTransliterations.js b/packages/yoastseo/src/config/getTransliterations.js index 75dfd675780..b5cbb0c109d 100644 --- a/packages/yoastseo/src/config/getTransliterations.js +++ b/packages/yoastseo/src/config/getTransliterations.js @@ -1,5 +1,5 @@ import getLanguage from "../languageProcessing/helpers/language/getLanguage.js"; -import { isUndefined } from "lodash-es"; +import { isUndefined } from "lodash"; export const transliterations = { // Language: Spanish. diff --git a/packages/yoastseo/src/config/transliterationsWPstyle.js b/packages/yoastseo/src/config/transliterationsWPstyle.js index 93fd0edf229..6091dce554f 100644 --- a/packages/yoastseo/src/config/transliterationsWPstyle.js +++ b/packages/yoastseo/src/config/transliterationsWPstyle.js @@ -4,7 +4,7 @@ import getLanguage from "../languageProcessing/helpers/language/getLanguage.js"; -import { isUndefined } from "lodash-es"; +import { isUndefined } from "lodash"; const transliterationsGeneral = [ diff --git a/packages/yoastseo/src/helpers/domManipulation.js b/packages/yoastseo/src/helpers/domManipulation.js index 2b84bb51f2d..77e4ca72e4a 100644 --- a/packages/yoastseo/src/helpers/domManipulation.js +++ b/packages/yoastseo/src/helpers/domManipulation.js @@ -1,4 +1,4 @@ -import { forEach } from "lodash-es"; +import { forEach } from "lodash"; /** * Adds a class to an element diff --git a/packages/yoastseo/src/helpers/errors.js b/packages/yoastseo/src/helpers/errors.js index 8af42c3bb25..5d2be4a1c80 100644 --- a/packages/yoastseo/src/helpers/errors.js +++ b/packages/yoastseo/src/helpers/errors.js @@ -1,4 +1,4 @@ -import { isUndefined } from "lodash-es"; +import { isUndefined } from "lodash"; /** * Shows and error trace of the error message in the console if the console is available. diff --git a/packages/yoastseo/src/helpers/factory.js b/packages/yoastseo/src/helpers/factory.js index 6f9e41b1680..af1439897b1 100644 --- a/packages/yoastseo/src/helpers/factory.js +++ b/packages/yoastseo/src/helpers/factory.js @@ -3,7 +3,7 @@ * * @returns {void} */ -import { isUndefined } from "lodash-es"; +import { isUndefined } from "lodash"; /** * Factory prototype. diff --git a/packages/yoastseo/src/helpers/formatString.js b/packages/yoastseo/src/helpers/formatString.js index 3fa9a0cf353..afc4ae11cb7 100644 --- a/packages/yoastseo/src/helpers/formatString.js +++ b/packages/yoastseo/src/helpers/formatString.js @@ -1,4 +1,4 @@ -import { escapeRegExp } from "lodash-es"; +import { escapeRegExp } from "lodash"; /** * Formats a string with named parameters as defined in the given parameter mapping. diff --git a/packages/yoastseo/src/helpers/includesAny.js b/packages/yoastseo/src/helpers/includesAny.js index 3059feaa1ba..d6626442c6a 100644 --- a/packages/yoastseo/src/helpers/includesAny.js +++ b/packages/yoastseo/src/helpers/includesAny.js @@ -1,4 +1,4 @@ -import { includes } from "lodash-es"; +import { includes } from "lodash"; /** * Checks if any of the values is in the collection. diff --git a/packages/yoastseo/src/languageProcessing/AbstractResearcher.js b/packages/yoastseo/src/languageProcessing/AbstractResearcher.js index 6761b982727..1cabbbe64cf 100644 --- a/packages/yoastseo/src/languageProcessing/AbstractResearcher.js +++ b/packages/yoastseo/src/languageProcessing/AbstractResearcher.js @@ -1,4 +1,4 @@ -import { merge, isUndefined, isEmpty } from "lodash-es"; +import { merge, isUndefined, isEmpty } from "lodash"; import InvalidTypeError from "../errors/invalidType"; import MissingArgument from "../errors/missingArgument"; diff --git a/packages/yoastseo/src/languageProcessing/helpers/html/getFieldsToMark.js b/packages/yoastseo/src/languageProcessing/helpers/html/getFieldsToMark.js index 04783418366..92b7a559fb7 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/html/getFieldsToMark.js +++ b/packages/yoastseo/src/languageProcessing/helpers/html/getFieldsToMark.js @@ -1,4 +1,4 @@ -import { flatten, isUndefined, uniq } from "lodash-es"; +import { flatten, isUndefined, uniq } from "lodash"; import { getSubheadings } from "./getSubheadings"; /** diff --git a/packages/yoastseo/src/languageProcessing/helpers/html/getSubheadingTexts.js b/packages/yoastseo/src/languageProcessing/helpers/html/getSubheadingTexts.js index 540de63e676..5e438310eac 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/html/getSubheadingTexts.js +++ b/packages/yoastseo/src/languageProcessing/helpers/html/getSubheadingTexts.js @@ -1,4 +1,4 @@ -import { isUndefined } from "lodash-es"; +import { isUndefined } from "lodash"; /** * Returns An array of found subheadings including the following text. diff --git a/packages/yoastseo/src/languageProcessing/helpers/html/html.js b/packages/yoastseo/src/languageProcessing/helpers/html/html.js index 309498b244c..3a9fcfbc538 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/html/html.js +++ b/packages/yoastseo/src/languageProcessing/helpers/html/html.js @@ -22,7 +22,7 @@ const greaterThanContentRegex = /^<[^><]*$/; const commentRegex = //g; -import { forEach, memoize } from "lodash-es"; +import { forEach, memoize } from "lodash"; import core from "tokenizer2/core"; let tokens = []; diff --git a/packages/yoastseo/src/languageProcessing/helpers/html/matchParagraphs.js b/packages/yoastseo/src/languageProcessing/helpers/html/matchParagraphs.js index 6a597c8fbfa..08c7ef8ac39 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/html/matchParagraphs.js +++ b/packages/yoastseo/src/languageProcessing/helpers/html/matchParagraphs.js @@ -1,4 +1,4 @@ -import { filter, flatMap, map } from "lodash-es"; +import { filter, flatMap, map } from "lodash"; import { getBlocks } from "./html"; diff --git a/packages/yoastseo/src/languageProcessing/helpers/match/findKeywordFormsInString.js b/packages/yoastseo/src/languageProcessing/helpers/match/findKeywordFormsInString.js index b16aaaa66d0..d23517c5093 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/match/findKeywordFormsInString.js +++ b/packages/yoastseo/src/languageProcessing/helpers/match/findKeywordFormsInString.js @@ -1,4 +1,4 @@ -import { isEmpty, sum } from "lodash-es"; +import { isEmpty, sum } from "lodash"; import matchTextWithArray from "./matchTextWithArray.js"; /** diff --git a/packages/yoastseo/src/languageProcessing/helpers/match/isDoubleQuoted.js b/packages/yoastseo/src/languageProcessing/helpers/match/isDoubleQuoted.js index ea1008addd2..1b87508bd6a 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/match/isDoubleQuoted.js +++ b/packages/yoastseo/src/languageProcessing/helpers/match/isDoubleQuoted.js @@ -1,5 +1,5 @@ import doubleQuotes from "../sanitize/doubleQuotes"; -import { includes } from "lodash-es"; +import { includes } from "lodash"; /** * Checks if the keyphrase is double-quoted. diff --git a/packages/yoastseo/src/languageProcessing/helpers/match/matchTextWithArray.js b/packages/yoastseo/src/languageProcessing/helpers/match/matchTextWithArray.js index 7936a37a26f..abe005cec5f 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/match/matchTextWithArray.js +++ b/packages/yoastseo/src/languageProcessing/helpers/match/matchTextWithArray.js @@ -1,7 +1,7 @@ /** @module stringProcessing/matchTextWithArray */ import matchTextWithWord from "./matchTextWithWord"; -import { uniq as unique } from "lodash-es"; +import { uniq as unique } from "lodash"; /** * Matches strings from an array against a given text. diff --git a/packages/yoastseo/src/languageProcessing/helpers/match/matchTextWithTransliteration.js b/packages/yoastseo/src/languageProcessing/helpers/match/matchTextWithTransliteration.js index 18dbe7a0adc..0addb9d5353 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/match/matchTextWithTransliteration.js +++ b/packages/yoastseo/src/languageProcessing/helpers/match/matchTextWithTransliteration.js @@ -1,4 +1,4 @@ -import { map } from "lodash-es"; +import { map } from "lodash"; import addWordBoundary from "../word/addWordboundary.js"; import stripSpaces from "../sanitize/stripSpaces.js"; import transliterate from "../transliterate/transliterate.js"; diff --git a/packages/yoastseo/src/languageProcessing/helpers/match/matchTextWithWord.js b/packages/yoastseo/src/languageProcessing/helpers/match/matchTextWithWord.js index 2594c34e6d9..3c16fc2a4bf 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/match/matchTextWithWord.js +++ b/packages/yoastseo/src/languageProcessing/helpers/match/matchTextWithWord.js @@ -6,7 +6,7 @@ import removePunctuation from "../sanitize/removePunctuation.js"; import { unifyAllSpaces as unifyWhitespace } from "../sanitize/unifyWhitespace.js"; import matchStringWithTransliteration from "./matchTextWithTransliteration.js"; import { normalize as normalizeQuotes } from "../sanitize/quotes.js"; -import { map } from "lodash-es"; +import { map } from "lodash"; /** * Returns the number of matches in a given string diff --git a/packages/yoastseo/src/languageProcessing/helpers/morphology/buildTopicStems.js b/packages/yoastseo/src/languageProcessing/helpers/morphology/buildTopicStems.js index 30e09606ef2..cf846eb1e8c 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/morphology/buildTopicStems.js +++ b/packages/yoastseo/src/languageProcessing/helpers/morphology/buildTopicStems.js @@ -2,7 +2,7 @@ import getWords from "../word/getWords.js"; import { normalizeSingle } from "../sanitize/quotes"; import { WORD_BOUNDARY_WITH_HYPHEN, WORD_BOUNDARY_WITHOUT_HYPHEN } from "../../../config/wordBoundariesWithoutPunctuation"; -import { isUndefined, escapeRegExp, memoize } from "lodash-es"; +import { isUndefined, escapeRegExp, memoize } from "lodash"; import isDoubleQuoted from "../match/isDoubleQuoted"; /** diff --git a/packages/yoastseo/src/languageProcessing/helpers/morphology/flattenSortLength.js b/packages/yoastseo/src/languageProcessing/helpers/morphology/flattenSortLength.js index b8204541c9d..1bb180ac5c2 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/morphology/flattenSortLength.js +++ b/packages/yoastseo/src/languageProcessing/helpers/morphology/flattenSortLength.js @@ -1,4 +1,4 @@ -import { flatten } from "lodash-es"; +import { flatten } from "lodash"; /** * Returns combined list of strings/words, sorted by length (descending). diff --git a/packages/yoastseo/src/languageProcessing/helpers/morphology/getAllWordsFromPaper.js b/packages/yoastseo/src/languageProcessing/helpers/morphology/getAllWordsFromPaper.js index 85ebce8c65d..1d36ce49ecd 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/morphology/getAllWordsFromPaper.js +++ b/packages/yoastseo/src/languageProcessing/helpers/morphology/getAllWordsFromPaper.js @@ -1,4 +1,4 @@ -import { escapeRegExp } from "lodash-es"; +import { escapeRegExp } from "lodash"; import getAltAttribute from "../image/getAltAttribute"; import { normalizeSingle } from "../sanitize/quotes"; import parseSlug from "../url/parseSlug"; diff --git a/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/directPrecedenceException.js b/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/directPrecedenceException.js index e63a11e4250..bab7dadb793 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/directPrecedenceException.js +++ b/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/directPrecedenceException.js @@ -1,4 +1,4 @@ -import { includes } from "lodash-es"; +import { includes } from "lodash"; import getWords from "../../word/getWords"; /** diff --git a/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/freeAuxiliaryParticipleOrder/getClausesSplitOnStopWords.js b/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/freeAuxiliaryParticipleOrder/getClausesSplitOnStopWords.js index 9834b30bcb1..c684ad08858 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/freeAuxiliaryParticipleOrder/getClausesSplitOnStopWords.js +++ b/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/freeAuxiliaryParticipleOrder/getClausesSplitOnStopWords.js @@ -1,4 +1,4 @@ -import { forEach, isEmpty, map } from "lodash-es"; +import { forEach, isEmpty, map } from "lodash"; import stripSpaces from "../../../sanitize/stripSpaces.js"; diff --git a/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/freeAuxiliaryParticipleOrder/nonDirectParticiplePrecedenceException.js b/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/freeAuxiliaryParticipleOrder/nonDirectParticiplePrecedenceException.js index a83080ac730..249a0c3d344 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/freeAuxiliaryParticipleOrder/nonDirectParticiplePrecedenceException.js +++ b/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/freeAuxiliaryParticipleOrder/nonDirectParticiplePrecedenceException.js @@ -1,4 +1,4 @@ -import { uniq } from "lodash-es"; +import { uniq } from "lodash"; import arrayToRegex from "../../../regex/createRegexFromArray.js"; import getWordIndices from "../getIndicesWithRegex.js"; diff --git a/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/getClauses.js b/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/getClauses.js index c2817bde2ca..6b6f1885594 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/getClauses.js +++ b/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/getClauses.js @@ -5,7 +5,7 @@ import getWordIndices from "./getIndicesWithRegex.js"; import includesIndex from "../../word/includesIndex"; import followsIndex from "../../word/followsIndex"; -import { forEach, isUndefined, map } from "lodash-es"; +import { forEach, isUndefined, map } from "lodash"; /** * Gets stop characters to determine sentence breakers. diff --git a/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/matchRegularParticiples.js b/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/matchRegularParticiples.js index bc57b73a3a2..e335ab80271 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/matchRegularParticiples.js +++ b/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/matchRegularParticiples.js @@ -1,4 +1,4 @@ -import { flattenDeep } from "lodash-es"; +import { flattenDeep } from "lodash"; /** * Returns words that have been determined to be a regular participle. diff --git a/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/precedenceException.js b/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/precedenceException.js index 5261362a772..d38b82da133 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/precedenceException.js +++ b/packages/yoastseo/src/languageProcessing/helpers/passiveVoice/periphrastic/precedenceException.js @@ -1,4 +1,4 @@ -import { includes } from "lodash-es"; +import { includes } from "lodash"; import getWords from "../../word/getWords"; /** diff --git a/packages/yoastseo/src/languageProcessing/helpers/prominentWords/determineProminentWords.js b/packages/yoastseo/src/languageProcessing/helpers/prominentWords/determineProminentWords.js index e3a8daf4b2e..f0399f9ec6c 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/prominentWords/determineProminentWords.js +++ b/packages/yoastseo/src/languageProcessing/helpers/prominentWords/determineProminentWords.js @@ -1,4 +1,4 @@ -import { memoize, uniq } from "lodash-es"; +import { memoize, uniq } from "lodash"; import getWords from "../word/getWords"; import { normalizeSingle } from "../sanitize/quotes"; diff --git a/packages/yoastseo/src/languageProcessing/helpers/regex/createRegexFromArray.js b/packages/yoastseo/src/languageProcessing/helpers/regex/createRegexFromArray.js index c005ca81deb..4c84354d0e1 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/regex/createRegexFromArray.js +++ b/packages/yoastseo/src/languageProcessing/helpers/regex/createRegexFromArray.js @@ -1,6 +1,6 @@ /** @module stringProcessing/createRegexFromArray */ -import { map } from "lodash-es"; +import { map } from "lodash"; import addWordBoundary from "../word/addWordboundary.js"; import replaceDiacritics from "../transliterate/replaceDiacritics"; import sanitizeString from "../sanitize/sanitizeString"; diff --git a/packages/yoastseo/src/languageProcessing/helpers/regex/createWordRegex.js b/packages/yoastseo/src/languageProcessing/helpers/regex/createWordRegex.js index 8432f3cd260..b08bb96b3fa 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/regex/createWordRegex.js +++ b/packages/yoastseo/src/languageProcessing/helpers/regex/createWordRegex.js @@ -1,5 +1,5 @@ /** @module stringProcessing/stringToRegex */ -import { escapeRegExp, isUndefined, memoize } from "lodash-es"; +import { escapeRegExp, isUndefined, memoize } from "lodash"; import sanitizeString from "../sanitize/sanitizeString"; import replaceDiacritics from "../transliterate/replaceDiacritics.js"; import addWordBoundary from "../word/addWordboundary.js"; diff --git a/packages/yoastseo/src/languageProcessing/helpers/sentence/SentenceTokenizer.js b/packages/yoastseo/src/languageProcessing/helpers/sentence/SentenceTokenizer.js index 9c0beb9f2de..beb7c356c6e 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/sentence/SentenceTokenizer.js +++ b/packages/yoastseo/src/languageProcessing/helpers/sentence/SentenceTokenizer.js @@ -1,4 +1,4 @@ -import { isNaN, isUndefined, map } from "lodash-es"; +import { isNaN, isUndefined, map } from "lodash"; import core from "tokenizer2/core"; diff --git a/packages/yoastseo/src/languageProcessing/helpers/sentence/getSentences.js b/packages/yoastseo/src/languageProcessing/helpers/sentence/getSentences.js index 6189751fe73..8b743c4d70c 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/sentence/getSentences.js +++ b/packages/yoastseo/src/languageProcessing/helpers/sentence/getSentences.js @@ -1,5 +1,5 @@ // Lodash imports. -import { filter, flatMap, isEmpty, negate } from "lodash-es"; +import { filter, flatMap, isEmpty, negate } from "lodash"; // Internal dependencies. import { getBlocks } from "../html/html.js"; diff --git a/packages/yoastseo/src/languageProcessing/helpers/sentence/memoizedSentenceTokenizer.js b/packages/yoastseo/src/languageProcessing/helpers/sentence/memoizedSentenceTokenizer.js index 14696cecba3..584336b6761 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/sentence/memoizedSentenceTokenizer.js +++ b/packages/yoastseo/src/languageProcessing/helpers/sentence/memoizedSentenceTokenizer.js @@ -1,5 +1,5 @@ import SentenceTokenizer from "./SentenceTokenizer"; -import { memoize } from "lodash-es"; +import { memoize } from "lodash"; /** * Returns the sentences from a certain text. diff --git a/packages/yoastseo/src/languageProcessing/helpers/sentence/sentencesLength.js b/packages/yoastseo/src/languageProcessing/helpers/sentence/sentencesLength.js index 53a9663e1bf..382d94e5411 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/sentence/sentencesLength.js +++ b/packages/yoastseo/src/languageProcessing/helpers/sentence/sentencesLength.js @@ -1,5 +1,5 @@ import wordCount from "../word/countWords.js"; -import { forEach } from "lodash-es"; +import { forEach } from "lodash"; import { stripFullTags as stripHTMLTags } from "../sanitize/stripHTMLTags.js"; /** diff --git a/packages/yoastseo/src/languageProcessing/helpers/syllables/DeviationFragment.js b/packages/yoastseo/src/languageProcessing/helpers/syllables/DeviationFragment.js index f0c15715e96..c7f77ae6165 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/syllables/DeviationFragment.js +++ b/packages/yoastseo/src/languageProcessing/helpers/syllables/DeviationFragment.js @@ -1,4 +1,4 @@ -import { isUndefined, pick } from "lodash-es"; +import { isUndefined, pick } from "lodash"; /** * Represents a partial deviation when counting syllables diff --git a/packages/yoastseo/src/languageProcessing/helpers/syllables/countSyllables.js b/packages/yoastseo/src/languageProcessing/helpers/syllables/countSyllables.js index 931978b8c6a..09c2b556880 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/syllables/countSyllables.js +++ b/packages/yoastseo/src/languageProcessing/helpers/syllables/countSyllables.js @@ -2,7 +2,7 @@ import getWords from "../word/getWords.js"; -import { filter, find, flatMap, forEach, isUndefined, map, memoize, sum } from "lodash-es"; +import { filter, find, flatMap, forEach, isUndefined, map, memoize, sum } from "lodash"; import SyllableCountIterator from "./syllableCountIterator.js"; import DeviationFragment from "./DeviationFragment"; diff --git a/packages/yoastseo/src/languageProcessing/helpers/syllables/syllableCountIterator.js b/packages/yoastseo/src/languageProcessing/helpers/syllables/syllableCountIterator.js index 640a7f16ea7..7a8853aaecf 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/syllables/syllableCountIterator.js +++ b/packages/yoastseo/src/languageProcessing/helpers/syllables/syllableCountIterator.js @@ -1,6 +1,6 @@ import SyllableCountStep from "./syllableCountStep.js"; -import { forEach, isUndefined } from "lodash-es"; +import { forEach, isUndefined } from "lodash"; /** * Creates a syllable count iterator. diff --git a/packages/yoastseo/src/languageProcessing/helpers/syllables/syllableCountStep.js b/packages/yoastseo/src/languageProcessing/helpers/syllables/syllableCountStep.js index 1c4e2a6da0a..e6a7197a94b 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/syllables/syllableCountStep.js +++ b/packages/yoastseo/src/languageProcessing/helpers/syllables/syllableCountStep.js @@ -1,4 +1,4 @@ -import { isUndefined } from "lodash-es"; +import { isUndefined } from "lodash"; import arrayToRegex from "../regex/createRegexFromArray.js"; diff --git a/packages/yoastseo/src/languageProcessing/helpers/transliterate/specialCharacterMappings.js b/packages/yoastseo/src/languageProcessing/helpers/transliterate/specialCharacterMappings.js index 488af8a3fcd..97125f36d29 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/transliterate/specialCharacterMappings.js +++ b/packages/yoastseo/src/languageProcessing/helpers/transliterate/specialCharacterMappings.js @@ -1,4 +1,4 @@ -import { filter, includes, isEqual, memoize } from "lodash-es"; +import { filter, includes, isEqual, memoize } from "lodash"; import getWords from "../word/getWords"; /** diff --git a/packages/yoastseo/src/languageProcessing/helpers/word/areWordsInSentence.js b/packages/yoastseo/src/languageProcessing/helpers/word/areWordsInSentence.js index c92e30c3414..be30e0fdabe 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/word/areWordsInSentence.js +++ b/packages/yoastseo/src/languageProcessing/helpers/word/areWordsInSentence.js @@ -1,4 +1,4 @@ -import { filter } from "lodash-es"; +import { filter } from "lodash"; import getWords from "./getWords.js"; /** diff --git a/packages/yoastseo/src/languageProcessing/helpers/word/filterWordsFromArray.js b/packages/yoastseo/src/languageProcessing/helpers/word/filterWordsFromArray.js index 949f5aa6de0..30afe4b2bba 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/word/filterWordsFromArray.js +++ b/packages/yoastseo/src/languageProcessing/helpers/word/filterWordsFromArray.js @@ -1,4 +1,4 @@ -import { filter, includes } from "lodash-es"; +import { filter, includes } from "lodash"; /** * Filters certain words from an array of words. diff --git a/packages/yoastseo/src/languageProcessing/helpers/word/followsIndex.js b/packages/yoastseo/src/languageProcessing/helpers/word/followsIndex.js index a2e1d029d4a..808274fc149 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/word/followsIndex.js +++ b/packages/yoastseo/src/languageProcessing/helpers/word/followsIndex.js @@ -1,4 +1,4 @@ -import { isEmpty, forEach, includes } from "lodash-es"; +import { isEmpty, forEach, includes } from "lodash"; /** * Checks whether a given word is followed by any word from a given list. diff --git a/packages/yoastseo/src/languageProcessing/helpers/word/getAllWordsFromTree.js b/packages/yoastseo/src/languageProcessing/helpers/word/getAllWordsFromTree.js index 945821cdf82..7266af95299 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/word/getAllWordsFromTree.js +++ b/packages/yoastseo/src/languageProcessing/helpers/word/getAllWordsFromTree.js @@ -1,5 +1,5 @@ import getSentencesFromTree from "../sentence/getSentencesFromTree"; -import { flatMap } from "lodash-es"; +import { flatMap } from "lodash"; import removePunctuation from "../sanitize/removePunctuation"; /** diff --git a/packages/yoastseo/src/languageProcessing/helpers/word/getWords.js b/packages/yoastseo/src/languageProcessing/helpers/word/getWords.js index fb7cf9d6241..a9d7c21abbe 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/word/getWords.js +++ b/packages/yoastseo/src/languageProcessing/helpers/word/getWords.js @@ -1,6 +1,6 @@ /** @module stringProcessing/countWords */ import sanitizeString from "../sanitize/sanitizeString"; -import { filter, flatMap } from "lodash-es"; +import { filter, flatMap } from "lodash"; import removePunctuation, { punctuationRegexString } from "../sanitize/removePunctuation.js"; const punctuationRegex = new RegExp( `([${punctuationRegexString}])`, "g" ); diff --git a/packages/yoastseo/src/languageProcessing/helpers/word/includesIndex.js b/packages/yoastseo/src/languageProcessing/helpers/word/includesIndex.js index 1e06bbe2a17..69d66a80dce 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/word/includesIndex.js +++ b/packages/yoastseo/src/languageProcessing/helpers/word/includesIndex.js @@ -1,4 +1,4 @@ -import { forEach, includes, isEmpty } from "lodash-es"; +import { forEach, includes, isEmpty } from "lodash"; /** * Checks whether a given word is directly preceded by a word from a list of words. diff --git a/packages/yoastseo/src/languageProcessing/helpers/word/indices.js b/packages/yoastseo/src/languageProcessing/helpers/word/indices.js index 45526a6de81..4d7fb8c460a 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/word/indices.js +++ b/packages/yoastseo/src/languageProcessing/helpers/word/indices.js @@ -1,4 +1,4 @@ -import { isUndefined, forEach } from "lodash-es"; +import { isUndefined, forEach } from "lodash"; import stripSpaces from "../sanitize/stripSpaces.js"; import { isWordInSentence as matchWordInSentence, characterInBoundary } from "./matchWordInSentence.js"; diff --git a/packages/yoastseo/src/languageProcessing/helpers/word/markWordsInSentences.js b/packages/yoastseo/src/languageProcessing/helpers/word/markWordsInSentences.js index bb558bcc374..47ed0198b01 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/word/markWordsInSentences.js +++ b/packages/yoastseo/src/languageProcessing/helpers/word/markWordsInSentences.js @@ -2,7 +2,7 @@ import matchWords from "../match/matchTextWithArray"; import arrayToRegex from "../regex/createRegexFromArray"; import addMark from "../../../markers/addMarkSingleWord"; import Mark from "../../../values/Mark"; -import { escapeRegExp } from "lodash-es"; +import { escapeRegExp } from "lodash"; import getAnchorsFromText from "../link/getAnchorsFromText"; import { SINGLE_QUOTES_ARRAY, SINGLE_QUOTES_REGEX } from "../sanitize/quotes"; diff --git a/packages/yoastseo/src/languageProcessing/helpers/word/matchWordInSentence.js b/packages/yoastseo/src/languageProcessing/helpers/word/matchWordInSentence.js index 8f44bc8180a..d1cfc5022ba 100644 --- a/packages/yoastseo/src/languageProcessing/helpers/word/matchWordInSentence.js +++ b/packages/yoastseo/src/languageProcessing/helpers/word/matchWordInSentence.js @@ -1,6 +1,6 @@ import wordBoundariesFactory from "../../../config/wordBoundaries.js"; const wordBoundaries = wordBoundariesFactory(); -import { escapeRegExp, includes } from "lodash-es"; +import { escapeRegExp, includes } from "lodash"; import addWordBoundary from "./addWordboundary.js"; /** diff --git a/packages/yoastseo/src/languageProcessing/languages/ar/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/ar/helpers/getStemmer.js index 1d45a038bca..9ee9b48fe07 100644 --- a/packages/yoastseo/src/languageProcessing/languages/ar/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/ar/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/cs/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/cs/helpers/getStemmer.js index d2d8a1df63a..14718cdebba 100644 --- a/packages/yoastseo/src/languageProcessing/languages/cs/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/cs/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/de/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/de/helpers/getStemmer.js index 24e72916de5..ff053530d2f 100644 --- a/packages/yoastseo/src/languageProcessing/languages/de/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/de/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/de/helpers/internal/determineStem.js b/packages/yoastseo/src/languageProcessing/languages/de/helpers/internal/determineStem.js index 4d986a980e6..8e84092e4fa 100644 --- a/packages/yoastseo/src/languageProcessing/languages/de/helpers/internal/determineStem.js +++ b/packages/yoastseo/src/languageProcessing/languages/de/helpers/internal/determineStem.js @@ -1,4 +1,4 @@ -import { flatten } from "lodash-es"; +import { flatten } from "lodash"; import { languageProcessing } from "yoastseo"; const { flattenSortLength } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/de/helpers/internal/getParticiples.js b/packages/yoastseo/src/languageProcessing/languages/de/helpers/internal/getParticiples.js index 9c284df8335..0d7616b8c60 100644 --- a/packages/yoastseo/src/languageProcessing/languages/de/helpers/internal/getParticiples.js +++ b/packages/yoastseo/src/languageProcessing/languages/de/helpers/internal/getParticiples.js @@ -1,4 +1,4 @@ -import { forEach } from "lodash-es"; +import { forEach } from "lodash"; import { languageProcessing } from "yoastseo"; const { getWords } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/de/helpers/memoizedSentenceTokenizer.js b/packages/yoastseo/src/languageProcessing/languages/de/helpers/memoizedSentenceTokenizer.js index be66a17cbec..3941de33665 100644 --- a/packages/yoastseo/src/languageProcessing/languages/de/helpers/memoizedSentenceTokenizer.js +++ b/packages/yoastseo/src/languageProcessing/languages/de/helpers/memoizedSentenceTokenizer.js @@ -1,4 +1,4 @@ -import { memoize } from "lodash-es"; +import { memoize } from "lodash"; import SentenceTokenizer from "./internal/SentenceTokenizer"; /** diff --git a/packages/yoastseo/src/languageProcessing/languages/de/values/Clause.js b/packages/yoastseo/src/languageProcessing/languages/de/values/Clause.js index 60819999647..6fac7585371 100644 --- a/packages/yoastseo/src/languageProcessing/languages/de/values/Clause.js +++ b/packages/yoastseo/src/languageProcessing/languages/de/values/Clause.js @@ -1,4 +1,4 @@ -import { includes, map } from "lodash-es"; +import { includes, map } from "lodash"; import { languageProcessing } from "yoastseo"; const { indices, values } = languageProcessing; const { getIndicesByWord, getIndicesByWordList } = indices; diff --git a/packages/yoastseo/src/languageProcessing/languages/el/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/el/helpers/getStemmer.js index dc0d172a6e4..4a85222c4fd 100644 --- a/packages/yoastseo/src/languageProcessing/languages/el/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/el/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; import stem from "./internal/stem"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/en/helpers/getClauses.js b/packages/yoastseo/src/languageProcessing/languages/en/helpers/getClauses.js index 4ccd3d3407e..40e6949cf51 100644 --- a/packages/yoastseo/src/languageProcessing/languages/en/helpers/getClauses.js +++ b/packages/yoastseo/src/languageProcessing/languages/en/helpers/getClauses.js @@ -4,7 +4,7 @@ const { createRegexFromArray, getClauses } = languageProcessing; import Clause from "../values/Clause"; import auxiliaries from "../config/internal/passiveVoiceAuxiliaries.js"; import stopwords from "../config/stopWords.js"; -import { includes } from "lodash-es"; +import { includes } from "lodash"; import stripSpaces from "../../../helpers/sanitize/stripSpaces"; import { getIndicesByWordList as getIndicesOfList } from "../../../helpers/word/indices"; diff --git a/packages/yoastseo/src/languageProcessing/languages/en/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/en/helpers/getStemmer.js index d59478e577b..dcbd8dbde2a 100644 --- a/packages/yoastseo/src/languageProcessing/languages/en/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/en/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/en/helpers/internal/determineStem.js b/packages/yoastseo/src/languageProcessing/languages/en/helpers/internal/determineStem.js index 37d7ee235b7..3276d09e6d4 100644 --- a/packages/yoastseo/src/languageProcessing/languages/en/helpers/internal/determineStem.js +++ b/packages/yoastseo/src/languageProcessing/languages/en/helpers/internal/determineStem.js @@ -1,4 +1,4 @@ -import { isUndefined, flatten } from "lodash-es"; +import { isUndefined, flatten } from "lodash"; import { languageProcessing } from "yoastseo"; const { buildFormRule, createRulesFromArrays } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/en/helpers/internal/getParticiples.js b/packages/yoastseo/src/languageProcessing/languages/en/helpers/internal/getParticiples.js index 4d24a5154ff..ba1ea985cfe 100644 --- a/packages/yoastseo/src/languageProcessing/languages/en/helpers/internal/getParticiples.js +++ b/packages/yoastseo/src/languageProcessing/languages/en/helpers/internal/getParticiples.js @@ -1,4 +1,4 @@ -import { forEach, includes } from "lodash-es"; +import { forEach, includes } from "lodash"; import { languageProcessing } from "yoastseo"; const { matchRegularParticiples, getWords } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/en/helpers/internal/getVerbStem.js b/packages/yoastseo/src/languageProcessing/languages/en/helpers/internal/getVerbStem.js index fc502e5310a..6044dc41158 100644 --- a/packages/yoastseo/src/languageProcessing/languages/en/helpers/internal/getVerbStem.js +++ b/packages/yoastseo/src/languageProcessing/languages/en/helpers/internal/getVerbStem.js @@ -1,5 +1,5 @@ // "use strict"; -import { isUndefined } from "lodash-es"; +import { isUndefined } from "lodash"; import { languageProcessing } from "yoastseo"; const { buildFormRule, createRulesFromArrays } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/en/values/Clause.js b/packages/yoastseo/src/languageProcessing/languages/en/values/Clause.js index c157703a527..4ad9e301d61 100644 --- a/packages/yoastseo/src/languageProcessing/languages/en/values/Clause.js +++ b/packages/yoastseo/src/languageProcessing/languages/en/values/Clause.js @@ -1,4 +1,4 @@ -import { includes, intersection, isEmpty } from "lodash-es"; +import { includes, intersection, isEmpty } from "lodash"; import { cannotBeBetweenPassiveAuxiliaryAndParticiple, cannotDirectlyPrecedePassiveParticiple, diff --git a/packages/yoastseo/src/languageProcessing/languages/es/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/es/helpers/getStemmer.js index caca7212ff4..c573f4a3956 100644 --- a/packages/yoastseo/src/languageProcessing/languages/es/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/es/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/fr/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/fr/helpers/getStemmer.js index c79d76722f5..dee7b73ce05 100644 --- a/packages/yoastseo/src/languageProcessing/languages/fr/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/fr/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/fr/helpers/internal/getParticiples.js b/packages/yoastseo/src/languageProcessing/languages/fr/helpers/internal/getParticiples.js index 562b1a0587a..5ecc2d31caa 100644 --- a/packages/yoastseo/src/languageProcessing/languages/fr/helpers/internal/getParticiples.js +++ b/packages/yoastseo/src/languageProcessing/languages/fr/helpers/internal/getParticiples.js @@ -1,4 +1,4 @@ -import { forEach, includes } from "lodash-es"; +import { forEach, includes } from "lodash"; import { languageProcessing } from "yoastseo"; const { getWords, matchRegularParticiples } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/fr/values/Clause.js b/packages/yoastseo/src/languageProcessing/languages/fr/values/Clause.js index c6a13cc5f99..eff7b366651 100644 --- a/packages/yoastseo/src/languageProcessing/languages/fr/values/Clause.js +++ b/packages/yoastseo/src/languageProcessing/languages/fr/values/Clause.js @@ -1,4 +1,4 @@ -import { includes } from "lodash-es"; +import { includes } from "lodash"; import getParticiples from "../helpers/internal/getParticiples.js"; import { languageProcessing } from "yoastseo"; const { precedenceException, directPrecedenceException, values } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/he/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/he/helpers/getStemmer.js index 96f44135b48..b42d9282d2e 100644 --- a/packages/yoastseo/src/languageProcessing/languages/he/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/he/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/hu/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/hu/helpers/getStemmer.js index 87e0e6a5956..334541fde4c 100644 --- a/packages/yoastseo/src/languageProcessing/languages/hu/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/hu/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/id/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/id/helpers/getStemmer.js index 89b2f0de0e0..10c6687d019 100644 --- a/packages/yoastseo/src/languageProcessing/languages/id/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/id/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/it/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/it/helpers/getStemmer.js index ab471e8a283..97201d6f903 100644 --- a/packages/yoastseo/src/languageProcessing/languages/it/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/it/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/ja/customResearches/findKeyphraseInSEOTitle.js b/packages/yoastseo/src/languageProcessing/languages/ja/customResearches/findKeyphraseInSEOTitle.js index 88059208ac6..951a2860513 100644 --- a/packages/yoastseo/src/languageProcessing/languages/ja/customResearches/findKeyphraseInSEOTitle.js +++ b/packages/yoastseo/src/languageProcessing/languages/ja/customResearches/findKeyphraseInSEOTitle.js @@ -1,4 +1,4 @@ -import { isEmpty } from "lodash-es"; +import { isEmpty } from "lodash"; import { findWordFormsInString } from "../../../helpers/match/findKeywordFormsInString"; import wordMatch from "../../../helpers/match/matchTextWithArray"; import processExactMatchRequest from "../../../helpers/match/processExactMatchRequest"; diff --git a/packages/yoastseo/src/languageProcessing/languages/ja/customResearches/getWordForms.js b/packages/yoastseo/src/languageProcessing/languages/ja/customResearches/getWordForms.js index 6d143a3bea1..def8cfe1455 100644 --- a/packages/yoastseo/src/languageProcessing/languages/ja/customResearches/getWordForms.js +++ b/packages/yoastseo/src/languageProcessing/languages/ja/customResearches/getWordForms.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import parseSynonyms from "../../../helpers/sanitize/parseSynonyms"; import getContentWords from "../helpers/getContentWords"; import createWordForms from "../helpers/internal/createWordForms"; diff --git a/packages/yoastseo/src/languageProcessing/languages/ja/helpers/customGetStemmer.js b/packages/yoastseo/src/languageProcessing/languages/ja/helpers/customGetStemmer.js index 723bf8ffc82..234b4c991bb 100644 --- a/packages/yoastseo/src/languageProcessing/languages/ja/helpers/customGetStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/ja/helpers/customGetStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; import determineStem from "./internal/determineStem"; diff --git a/packages/yoastseo/src/languageProcessing/languages/ja/helpers/getWords.js b/packages/yoastseo/src/languageProcessing/languages/ja/helpers/getWords.js index 401db21393c..b831c8f22c8 100644 --- a/packages/yoastseo/src/languageProcessing/languages/ja/helpers/getWords.js +++ b/packages/yoastseo/src/languageProcessing/languages/ja/helpers/getWords.js @@ -1,4 +1,4 @@ -import { filter, map } from "lodash-es"; +import { filter, map } from "lodash"; import { languageProcessing } from "yoastseo"; const { sanitizeString, removePunctuation } = languageProcessing; import TinySegmenter from "tiny-segmenter"; diff --git a/packages/yoastseo/src/languageProcessing/languages/ja/helpers/internal/SentenceTokenizer.js b/packages/yoastseo/src/languageProcessing/languages/ja/helpers/internal/SentenceTokenizer.js index 812345b076a..072dcf42486 100644 --- a/packages/yoastseo/src/languageProcessing/languages/ja/helpers/internal/SentenceTokenizer.js +++ b/packages/yoastseo/src/languageProcessing/languages/ja/helpers/internal/SentenceTokenizer.js @@ -1,4 +1,4 @@ -import { isNaN } from "lodash-es"; +import { isNaN } from "lodash"; import { normalize as normalizeQuotes } from "../../../../helpers/sanitize/quotes.js"; import SentenceTokenizer from "../../../../helpers/sentence/SentenceTokenizer"; diff --git a/packages/yoastseo/src/languageProcessing/languages/ja/helpers/internal/createWordForms.js b/packages/yoastseo/src/languageProcessing/languages/ja/helpers/internal/createWordForms.js index c343ff0a7af..0e5f05355f2 100644 --- a/packages/yoastseo/src/languageProcessing/languages/ja/helpers/internal/createWordForms.js +++ b/packages/yoastseo/src/languageProcessing/languages/ja/helpers/internal/createWordForms.js @@ -1,4 +1,4 @@ -import { flatten, uniq } from "lodash-es"; +import { flatten, uniq } from "lodash"; /** * Checks if the word matches any paradigm and creates the forms from the matched paradigm(s). diff --git a/packages/yoastseo/src/languageProcessing/languages/ja/helpers/memoizedSentenceTokenizer.js b/packages/yoastseo/src/languageProcessing/languages/ja/helpers/memoizedSentenceTokenizer.js index 89bb7db4267..6372fd353ae 100644 --- a/packages/yoastseo/src/languageProcessing/languages/ja/helpers/memoizedSentenceTokenizer.js +++ b/packages/yoastseo/src/languageProcessing/languages/ja/helpers/memoizedSentenceTokenizer.js @@ -1,4 +1,4 @@ -import { memoize } from "lodash-es"; +import { memoize } from "lodash"; import SentenceTokenizer from "./internal/SentenceTokenizer"; /** diff --git a/packages/yoastseo/src/languageProcessing/languages/ja/helpers/splitIntoTokensCustom.js b/packages/yoastseo/src/languageProcessing/languages/ja/helpers/splitIntoTokensCustom.js index 529a31c749e..88a86071906 100644 --- a/packages/yoastseo/src/languageProcessing/languages/ja/helpers/splitIntoTokensCustom.js +++ b/packages/yoastseo/src/languageProcessing/languages/ja/helpers/splitIntoTokensCustom.js @@ -1,4 +1,4 @@ -import { map } from "lodash-es"; +import { map } from "lodash"; import TinySegmenter from "tiny-segmenter"; /** diff --git a/packages/yoastseo/src/languageProcessing/languages/nb/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/nb/helpers/getStemmer.js index db674f76256..29eb548b265 100644 --- a/packages/yoastseo/src/languageProcessing/languages/nb/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/nb/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/nb/helpers/internal/getParticiples.js b/packages/yoastseo/src/languageProcessing/languages/nb/helpers/internal/getParticiples.js index d349adddd4d..adf89bfdd25 100644 --- a/packages/yoastseo/src/languageProcessing/languages/nb/helpers/internal/getParticiples.js +++ b/packages/yoastseo/src/languageProcessing/languages/nb/helpers/internal/getParticiples.js @@ -2,7 +2,7 @@ import { languageProcessing } from "yoastseo"; const { getWords } = languageProcessing; import participles from "../../config/internal/participles.js"; -import { forEach, includes } from "lodash-es"; +import { forEach, includes } from "lodash"; /** * Creates an array of participles found in a clause. diff --git a/packages/yoastseo/src/languageProcessing/languages/nl/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/nl/helpers/getStemmer.js index 990c74db918..aba172f35db 100644 --- a/packages/yoastseo/src/languageProcessing/languages/nl/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/nl/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/nl/helpers/internal/checkExceptionsWithFullForms.js b/packages/yoastseo/src/languageProcessing/languages/nl/helpers/internal/checkExceptionsWithFullForms.js index 556bc06bdb0..38303c3aa89 100644 --- a/packages/yoastseo/src/languageProcessing/languages/nl/helpers/internal/checkExceptionsWithFullForms.js +++ b/packages/yoastseo/src/languageProcessing/languages/nl/helpers/internal/checkExceptionsWithFullForms.js @@ -1,4 +1,4 @@ -import { flatten } from "lodash-es"; +import { flatten } from "lodash"; import { languageProcessing } from "yoastseo"; const { flattenSortLength } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/nl/helpers/internal/determineStem.js b/packages/yoastseo/src/languageProcessing/languages/nl/helpers/internal/determineStem.js index e3f00317f96..4c998c3d9b7 100644 --- a/packages/yoastseo/src/languageProcessing/languages/nl/helpers/internal/determineStem.js +++ b/packages/yoastseo/src/languageProcessing/languages/nl/helpers/internal/determineStem.js @@ -1,4 +1,4 @@ -import { flatten } from "lodash-es"; +import { flatten } from "lodash"; import { languageProcessing } from "yoastseo"; const { flattenSortLength, diff --git a/packages/yoastseo/src/languageProcessing/languages/nl/helpers/internal/getParticiples.js b/packages/yoastseo/src/languageProcessing/languages/nl/helpers/internal/getParticiples.js index 5466e0c36f2..999593886a7 100644 --- a/packages/yoastseo/src/languageProcessing/languages/nl/helpers/internal/getParticiples.js +++ b/packages/yoastseo/src/languageProcessing/languages/nl/helpers/internal/getParticiples.js @@ -1,4 +1,4 @@ -import { includes } from "lodash-es"; +import { includes } from "lodash"; import { languageProcessing } from "yoastseo"; const { getWords, matchRegularParticiples } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/nl/values/Clause.js b/packages/yoastseo/src/languageProcessing/languages/nl/values/Clause.js index 1464160326a..28acbfbbc1c 100644 --- a/packages/yoastseo/src/languageProcessing/languages/nl/values/Clause.js +++ b/packages/yoastseo/src/languageProcessing/languages/nl/values/Clause.js @@ -1,4 +1,4 @@ -import { includes } from "lodash-es"; +import { includes } from "lodash"; import { languageProcessing } from "yoastseo"; const { directPrecedenceException, values } = languageProcessing; const { Clause } = values; diff --git a/packages/yoastseo/src/languageProcessing/languages/pl/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/pl/helpers/getStemmer.js index b2a11176885..80642765157 100644 --- a/packages/yoastseo/src/languageProcessing/languages/pl/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/pl/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/pl/helpers/internal/getParticiples.js b/packages/yoastseo/src/languageProcessing/languages/pl/helpers/internal/getParticiples.js index 14b73ad060c..a46cbb875ca 100644 --- a/packages/yoastseo/src/languageProcessing/languages/pl/helpers/internal/getParticiples.js +++ b/packages/yoastseo/src/languageProcessing/languages/pl/helpers/internal/getParticiples.js @@ -1,4 +1,4 @@ -import { includes } from "lodash-es"; +import { includes } from "lodash"; import { languageProcessing } from "yoastseo"; const { getWords } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/pt/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/pt/helpers/getStemmer.js index f6ca18a21c4..541ba7940bc 100644 --- a/packages/yoastseo/src/languageProcessing/languages/pt/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/pt/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/ru/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/ru/helpers/getStemmer.js index ecda6aa72de..f8200e43d67 100644 --- a/packages/yoastseo/src/languageProcessing/languages/ru/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/ru/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/sk/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/sk/helpers/getStemmer.js index d7bb71fc544..e03625ac9a6 100644 --- a/packages/yoastseo/src/languageProcessing/languages/sk/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/sk/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/sv/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/sv/helpers/getStemmer.js index 85ba8bedca9..9075b8edb6b 100644 --- a/packages/yoastseo/src/languageProcessing/languages/sv/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/sv/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/languages/tr/helpers/getStemmer.js b/packages/yoastseo/src/languageProcessing/languages/tr/helpers/getStemmer.js index 2e9392ed087..74325e5f22d 100644 --- a/packages/yoastseo/src/languageProcessing/languages/tr/helpers/getStemmer.js +++ b/packages/yoastseo/src/languageProcessing/languages/tr/helpers/getStemmer.js @@ -1,4 +1,4 @@ -import { get } from "lodash-es"; +import { get } from "lodash"; import { languageProcessing } from "yoastseo"; const { baseStemmer } = languageProcessing; diff --git a/packages/yoastseo/src/languageProcessing/researches/altTagCount.js b/packages/yoastseo/src/languageProcessing/researches/altTagCount.js index 74341a1b1a1..74c64313980 100644 --- a/packages/yoastseo/src/languageProcessing/researches/altTagCount.js +++ b/packages/yoastseo/src/languageProcessing/researches/altTagCount.js @@ -2,7 +2,7 @@ import imageAltAttribute from "../helpers/image/getAltAttribute"; import { findTopicFormsInString } from "../helpers/match/findKeywordFormsInString"; -import { isEmpty } from "lodash-es"; +import { isEmpty } from "lodash"; import getImagesInTree from "../helpers/image/getImagesInTree"; /** diff --git a/packages/yoastseo/src/languageProcessing/researches/findKeyphraseInSEOTitle.js b/packages/yoastseo/src/languageProcessing/researches/findKeyphraseInSEOTitle.js index b61d9dc6a38..8a3ec0362e4 100644 --- a/packages/yoastseo/src/languageProcessing/researches/findKeyphraseInSEOTitle.js +++ b/packages/yoastseo/src/languageProcessing/researches/findKeyphraseInSEOTitle.js @@ -1,4 +1,4 @@ -import { escapeRegExp, filter, includes, isEmpty, uniq } from "lodash-es"; +import { escapeRegExp, filter, includes, isEmpty, uniq } from "lodash"; import wordMatch from "../helpers/match/matchTextWithWord.js"; import { findTopicFormsInString } from "../helpers/match/findKeywordFormsInString.js"; diff --git a/packages/yoastseo/src/languageProcessing/researches/findKeywordInFirstParagraph.js b/packages/yoastseo/src/languageProcessing/researches/findKeywordInFirstParagraph.js index 25746564d7b..27f811850df 100644 --- a/packages/yoastseo/src/languageProcessing/researches/findKeywordInFirstParagraph.js +++ b/packages/yoastseo/src/languageProcessing/researches/findKeywordInFirstParagraph.js @@ -2,7 +2,7 @@ import { findTopicFormsInString } from "../helpers/match/findKeywordFormsInString.js"; -import { isEmpty } from "lodash-es"; +import { isEmpty } from "lodash"; /** * Checks if the introductory paragraph contains keyphrase or synonyms. diff --git a/packages/yoastseo/src/languageProcessing/researches/findTransitionWords.js b/packages/yoastseo/src/languageProcessing/researches/findTransitionWords.js index 89588e096dc..8099456fe45 100644 --- a/packages/yoastseo/src/languageProcessing/researches/findTransitionWords.js +++ b/packages/yoastseo/src/languageProcessing/researches/findTransitionWords.js @@ -4,7 +4,7 @@ import { normalizeSingle as normalizeSingleQuotes } from "../helpers/sanitize/qu import { isWordInSentence as matchWordInSentence } from "../helpers/word/matchWordInSentence.js"; import removeHtmlBlocks from "../helpers/html/htmlParser"; -import { flattenDeep } from "lodash-es"; +import { flattenDeep } from "lodash"; import { filterShortcodesFromHTML } from "../helpers"; let regexFromDoubleArray = null; diff --git a/packages/yoastseo/src/languageProcessing/researches/functionWordsInKeyphrase.js b/packages/yoastseo/src/languageProcessing/researches/functionWordsInKeyphrase.js index 173f37f3781..a8d8e7f68ca 100644 --- a/packages/yoastseo/src/languageProcessing/researches/functionWordsInKeyphrase.js +++ b/packages/yoastseo/src/languageProcessing/researches/functionWordsInKeyphrase.js @@ -1,4 +1,4 @@ -import { filter, includes, isEmpty } from "lodash-es"; +import { filter, includes, isEmpty } from "lodash"; import getWords from "../helpers/word/getWords"; import processExactMatchRequest from "../helpers/match/processExactMatchRequest"; import { WORD_BOUNDARY_WITH_HYPHEN } from "../../config/wordBoundariesWithoutPunctuation"; diff --git a/packages/yoastseo/src/languageProcessing/researches/getAnchorsWithKeyphrase.js b/packages/yoastseo/src/languageProcessing/researches/getAnchorsWithKeyphrase.js index b4960894e9f..98d9b36b06c 100644 --- a/packages/yoastseo/src/languageProcessing/researches/getAnchorsWithKeyphrase.js +++ b/packages/yoastseo/src/languageProcessing/researches/getAnchorsWithKeyphrase.js @@ -1,4 +1,4 @@ -import { flatten, uniq } from "lodash-es"; +import { flatten, uniq } from "lodash"; import filterWordsFromArray from "../helpers/word/filterWordsFromArray"; import { findTopicFormsInString } from "../helpers/match/findKeywordFormsInString"; import getWords from "../helpers/word/getWords"; diff --git a/packages/yoastseo/src/languageProcessing/researches/getFleschReadingScore.js b/packages/yoastseo/src/languageProcessing/researches/getFleschReadingScore.js index 1f827684277..e5082f32f76 100644 --- a/packages/yoastseo/src/languageProcessing/researches/getFleschReadingScore.js +++ b/packages/yoastseo/src/languageProcessing/researches/getFleschReadingScore.js @@ -4,7 +4,7 @@ import stripNumbers from "../helpers/sanitize/stripNumbers.js"; import countSentences from "../helpers/sentence/countSentences.js"; import countWords from "../helpers/word/countWords.js"; import countSyllables from "../helpers/syllables/countSyllables.js"; -import { clamp, inRange } from "lodash-es"; +import { clamp, inRange } from "lodash"; /** * Calculates an average from a total and an amount diff --git a/packages/yoastseo/src/languageProcessing/researches/getLinks.js b/packages/yoastseo/src/languageProcessing/researches/getLinks.js index 82ae8190d97..187116c53c7 100644 --- a/packages/yoastseo/src/languageProcessing/researches/getLinks.js +++ b/packages/yoastseo/src/languageProcessing/researches/getLinks.js @@ -2,7 +2,7 @@ import getAnchors from "../helpers/link/getAnchorsFromText.js"; -import { map } from "lodash-es"; +import { map } from "lodash"; import url from "../helpers/url/url.js"; /** diff --git a/packages/yoastseo/src/languageProcessing/researches/getLongCenterAlignedTexts.js b/packages/yoastseo/src/languageProcessing/researches/getLongCenterAlignedTexts.js index 1be10b104ad..90d8717f74a 100644 --- a/packages/yoastseo/src/languageProcessing/researches/getLongCenterAlignedTexts.js +++ b/packages/yoastseo/src/languageProcessing/researches/getLongCenterAlignedTexts.js @@ -1,4 +1,4 @@ -import { flatten } from "lodash-es"; +import { flatten } from "lodash"; import removeHtmlBlocks from "../helpers/html/htmlParser"; import matchStringWithRegex from "../helpers/regex/matchStringWithRegex"; import sanitizeString from "../helpers/sanitize/sanitizeString"; diff --git a/packages/yoastseo/src/languageProcessing/researches/getParagraphLength.js b/packages/yoastseo/src/languageProcessing/researches/getParagraphLength.js index f45b223f85e..353d71a5648 100644 --- a/packages/yoastseo/src/languageProcessing/researches/getParagraphLength.js +++ b/packages/yoastseo/src/languageProcessing/researches/getParagraphLength.js @@ -2,7 +2,7 @@ import { imageRegex } from "../helpers/image/imageInText"; import sanitizeLineBreakTag from "../helpers/sanitize/sanitizeLineBreakTag"; import countWords from "../helpers/word/countWords.js"; import matchParagraphs from "../helpers/html/matchParagraphs.js"; -import { filter } from "lodash-es"; +import { filter } from "lodash"; import removeHtmlBlocks from "../helpers/html/htmlParser"; import { filterShortcodesFromHTML } from "../helpers"; diff --git a/packages/yoastseo/src/languageProcessing/researches/getParagraphs.js b/packages/yoastseo/src/languageProcessing/researches/getParagraphs.js index 62b70fb26a1..3e7f7d5f670 100644 --- a/packages/yoastseo/src/languageProcessing/researches/getParagraphs.js +++ b/packages/yoastseo/src/languageProcessing/researches/getParagraphs.js @@ -1,4 +1,4 @@ -import { reject } from "lodash-es"; +import { reject } from "lodash"; /** * Returns all paragraphs in a given Paper. diff --git a/packages/yoastseo/src/languageProcessing/researches/getPassiveVoiceResult.js b/packages/yoastseo/src/languageProcessing/researches/getPassiveVoiceResult.js index d099d005e63..dcb80637626 100644 --- a/packages/yoastseo/src/languageProcessing/researches/getPassiveVoiceResult.js +++ b/packages/yoastseo/src/languageProcessing/researches/getPassiveVoiceResult.js @@ -2,7 +2,7 @@ import getSentences from "../helpers/sentence/getSentences.js"; import { stripFullTags as stripHTMLTags } from "../helpers/sanitize/stripHTMLTags.js"; import Sentence from "../../languageProcessing/values/Sentence.js"; -import { forEach } from "lodash-es"; +import { forEach } from "lodash"; import removeHtmlBlocks from "../helpers/html/htmlParser"; import { filterShortcodesFromHTML } from "../helpers"; diff --git a/packages/yoastseo/src/languageProcessing/researches/getProminentWordsForInsights.js b/packages/yoastseo/src/languageProcessing/researches/getProminentWordsForInsights.js index 0079fb5442b..bab86c1e36e 100644 --- a/packages/yoastseo/src/languageProcessing/researches/getProminentWordsForInsights.js +++ b/packages/yoastseo/src/languageProcessing/researches/getProminentWordsForInsights.js @@ -1,4 +1,4 @@ -import { take } from "lodash-es"; +import { take } from "lodash"; import { collapseProminentWordsOnStem, filterProminentWords, diff --git a/packages/yoastseo/src/languageProcessing/researches/getProminentWordsForInternalLinking.js b/packages/yoastseo/src/languageProcessing/researches/getProminentWordsForInternalLinking.js index 1894fc44ff7..feca93e50b2 100644 --- a/packages/yoastseo/src/languageProcessing/researches/getProminentWordsForInternalLinking.js +++ b/packages/yoastseo/src/languageProcessing/researches/getProminentWordsForInternalLinking.js @@ -1,4 +1,4 @@ -import { take } from "lodash-es"; +import { take } from "lodash"; import countWords from "../helpers/word/countWords"; import { collapseProminentWordsOnStem, diff --git a/packages/yoastseo/src/languageProcessing/researches/getSentenceBeginnings.js b/packages/yoastseo/src/languageProcessing/researches/getSentenceBeginnings.js index 22f9c3ae56a..8d06b7d7bf0 100644 --- a/packages/yoastseo/src/languageProcessing/researches/getSentenceBeginnings.js +++ b/packages/yoastseo/src/languageProcessing/researches/getSentenceBeginnings.js @@ -3,7 +3,7 @@ import getSentences from "../helpers/sentence/getSentences"; import stripSpaces from "../helpers/sanitize/stripSpaces.js"; import { stripFullTags as stripTags } from "../helpers/sanitize/stripHTMLTags.js"; -import { filter, forEach, isEmpty } from "lodash-es"; +import { filter, forEach, isEmpty } from "lodash"; import removeHtmlBlocks from "../helpers/html/htmlParser"; import { filterShortcodesFromHTML } from "../helpers"; diff --git a/packages/yoastseo/src/languageProcessing/researches/getSubheadingTextLengths.js b/packages/yoastseo/src/languageProcessing/researches/getSubheadingTextLengths.js index 9cc81f4acac..6a98fedc124 100644 --- a/packages/yoastseo/src/languageProcessing/researches/getSubheadingTextLengths.js +++ b/packages/yoastseo/src/languageProcessing/researches/getSubheadingTextLengths.js @@ -1,6 +1,6 @@ import getSubheadingTexts from "../helpers/html/getSubheadingTexts"; import countWords from "../helpers/word/countWords"; -import { forEach } from "lodash-es"; +import { forEach } from "lodash"; import removeHtmlBlocks from "../helpers/html/htmlParser"; import { filterShortcodesFromHTML } from "../helpers"; diff --git a/packages/yoastseo/src/languageProcessing/researches/getWordForms.js b/packages/yoastseo/src/languageProcessing/researches/getWordForms.js index 3cb6083623d..92721312a88 100644 --- a/packages/yoastseo/src/languageProcessing/researches/getWordForms.js +++ b/packages/yoastseo/src/languageProcessing/researches/getWordForms.js @@ -1,7 +1,7 @@ import { normalizeSingle } from "../helpers/sanitize/quotes"; import { collectStems, StemOriginalPair } from "../helpers/morphology/buildTopicStems"; -import { escapeRegExp, flattenDeep } from "lodash-es"; +import { escapeRegExp, flattenDeep } from "lodash"; import getAllWordsFromPaper from "../helpers/morphology/getAllWordsFromPaper"; import parseSynonyms from "../helpers/sanitize/parseSynonyms"; diff --git a/packages/yoastseo/src/languageProcessing/researches/keyphraseDistribution.js b/packages/yoastseo/src/languageProcessing/researches/keyphraseDistribution.js index cc2a097a2de..14d1005bc4f 100644 --- a/packages/yoastseo/src/languageProcessing/researches/keyphraseDistribution.js +++ b/packages/yoastseo/src/languageProcessing/researches/keyphraseDistribution.js @@ -1,4 +1,4 @@ -import { flattenDeep, max, uniq as unique, zipWith } from "lodash-es"; +import { flattenDeep, max, uniq as unique, zipWith } from "lodash"; import { findWordFormsInString } from "../helpers/match/findKeywordFormsInString"; import { markWordsInSentences } from "../helpers/word/markWordsInSentences"; import getSentences from "../helpers/sentence/getSentences"; diff --git a/packages/yoastseo/src/languageProcessing/researches/keywordCount.js b/packages/yoastseo/src/languageProcessing/researches/keywordCount.js index fe1165091e0..2512317c8b7 100644 --- a/packages/yoastseo/src/languageProcessing/researches/keywordCount.js +++ b/packages/yoastseo/src/languageProcessing/researches/keywordCount.js @@ -1,4 +1,4 @@ -import { flatten, flattenDeep } from "lodash-es"; +import { flatten, flattenDeep } from "lodash"; import getSentencesFromTree from "../helpers/sentence/getSentencesFromTree"; import { normalizeSingle } from "../helpers/sanitize/quotes"; import getMarkingsInSentence from "../helpers/highlighting/getMarkingsInSentence"; diff --git a/packages/yoastseo/src/languageProcessing/researches/keywordCountInUrl.js b/packages/yoastseo/src/languageProcessing/researches/keywordCountInUrl.js index b034e5ef639..c2ea45b2788 100644 --- a/packages/yoastseo/src/languageProcessing/researches/keywordCountInUrl.js +++ b/packages/yoastseo/src/languageProcessing/researches/keywordCountInUrl.js @@ -1,7 +1,7 @@ /** @module researches/keywordCountInSlug */ import parseSlug from "../helpers/url/parseSlug"; import { findTopicFormsInString } from "../helpers/match/findKeywordFormsInString.js"; -import { cloneDeep } from "lodash-es"; +import { cloneDeep } from "lodash"; /** * Matches the keyword in the slug. Replaces all dashes and underscores with whitespaces and uses whitespace as word boundary. diff --git a/packages/yoastseo/src/languageProcessing/researches/wordComplexity.js b/packages/yoastseo/src/languageProcessing/researches/wordComplexity.js index 2830bd7ac27..ecbbcacad12 100644 --- a/packages/yoastseo/src/languageProcessing/researches/wordComplexity.js +++ b/packages/yoastseo/src/languageProcessing/researches/wordComplexity.js @@ -1,4 +1,4 @@ -import { flatMap, get } from "lodash-es"; +import { flatMap, get } from "lodash"; import getSentences from "../helpers/sentence/getSentences"; import getWords from "../helpers/word/getWords"; diff --git a/packages/yoastseo/src/markers/addMarkSingleWord.js b/packages/yoastseo/src/markers/addMarkSingleWord.js index 94ef26ae916..c3fb785b7fd 100644 --- a/packages/yoastseo/src/markers/addMarkSingleWord.js +++ b/packages/yoastseo/src/markers/addMarkSingleWord.js @@ -1,5 +1,5 @@ import { stripWordBoundariesStart, stripWordBoundariesEnd } from "../languageProcessing/helpers/sanitize/stripWordBoundaries"; -import { escapeRegExp } from "lodash-es"; +import { escapeRegExp } from "lodash"; /** * Marks a text with HTML tags, deals with word boundaries that were matched by regexes, but which should not be marked. diff --git a/packages/yoastseo/src/markers/removeDuplicateMarks.js b/packages/yoastseo/src/markers/removeDuplicateMarks.js index 04df1cd5745..3f69f60b80e 100644 --- a/packages/yoastseo/src/markers/removeDuplicateMarks.js +++ b/packages/yoastseo/src/markers/removeDuplicateMarks.js @@ -1,4 +1,4 @@ -import { uniqBy } from "lodash-es"; +import { uniqBy } from "lodash"; /** * Removes duplicate marks from an array. diff --git a/packages/yoastseo/src/parse/build/private/adapt.js b/packages/yoastseo/src/parse/build/private/adapt.js index 96ca6d2da4a..1f76f1d9391 100644 --- a/packages/yoastseo/src/parse/build/private/adapt.js +++ b/packages/yoastseo/src/parse/build/private/adapt.js @@ -1,7 +1,7 @@ import combineIntoImplicitParagraphs from "./combineIntoImplicitParagraphs"; import adaptAttributes from "./adaptAttributes"; import isPhrasingContent from "./isPhrasingContent"; -import { isEmpty } from "lodash-es"; +import { isEmpty } from "lodash"; import { Paragraph, Text, Heading, Node } from "../../structure"; /** diff --git a/packages/yoastseo/src/parse/build/private/combineIntoImplicitParagraphs.js b/packages/yoastseo/src/parse/build/private/combineIntoImplicitParagraphs.js index d35c87b67e8..5157f0c8e08 100644 --- a/packages/yoastseo/src/parse/build/private/combineIntoImplicitParagraphs.js +++ b/packages/yoastseo/src/parse/build/private/combineIntoImplicitParagraphs.js @@ -1,6 +1,6 @@ import isPhrasingContent from "./isPhrasingContent"; import { Paragraph } from "../../structure"; -import { isEmpty } from "lodash-es"; +import { isEmpty } from "lodash"; import SourceCodeLocation from "../../structure/SourceCodeLocation"; /** diff --git a/packages/yoastseo/src/parse/build/private/filterBeforeTokenizing.js b/packages/yoastseo/src/parse/build/private/filterBeforeTokenizing.js index b8ee831d8a9..8e20beafbe0 100644 --- a/packages/yoastseo/src/parse/build/private/filterBeforeTokenizing.js +++ b/packages/yoastseo/src/parse/build/private/filterBeforeTokenizing.js @@ -1,4 +1,4 @@ -import { isEmpty } from "lodash-es"; +import { isEmpty } from "lodash"; import { canBeChildOfParagraph as excludeFromAnalysis } from "./alwaysFilterElements"; /** diff --git a/packages/yoastseo/src/parse/structure/Node.js b/packages/yoastseo/src/parse/structure/Node.js index a0fb631904b..a3cdc39f15d 100644 --- a/packages/yoastseo/src/parse/structure/Node.js +++ b/packages/yoastseo/src/parse/structure/Node.js @@ -1,6 +1,6 @@ import { findAllInTree, innerText } from "../traverse"; import SourceCodeLocation from "./SourceCodeLocation"; -import { isEmpty } from "lodash-es"; +import { isEmpty } from "lodash"; /** * A node in the tree. diff --git a/packages/yoastseo/src/parse/traverse/innerText.js b/packages/yoastseo/src/parse/traverse/innerText.js index 71df6b6dfce..5d99c5c6953 100644 --- a/packages/yoastseo/src/parse/traverse/innerText.js +++ b/packages/yoastseo/src/parse/traverse/innerText.js @@ -1,4 +1,4 @@ -import { isEmpty } from "lodash-es"; +import { isEmpty } from "lodash"; /** * Gathers the text content of the given node. diff --git a/packages/yoastseo/src/parsedPaper/build/PaperParser.js b/packages/yoastseo/src/parsedPaper/build/PaperParser.js index 23f51df3b34..03722cf0c5b 100644 --- a/packages/yoastseo/src/parsedPaper/build/PaperParser.js +++ b/packages/yoastseo/src/parsedPaper/build/PaperParser.js @@ -1,5 +1,5 @@ import ParsedPaper from "../ParsedPaper"; -import { forEach } from "lodash-es"; +import { forEach } from "lodash"; /** * A class responsible for pre-processing the Paper, returning a ParsedPaper. diff --git a/packages/yoastseo/src/parsedPaper/build/linguisticParsing/SentenceTokenizer.js b/packages/yoastseo/src/parsedPaper/build/linguisticParsing/SentenceTokenizer.js index 11da232b460..8d04496f4dd 100644 --- a/packages/yoastseo/src/parsedPaper/build/linguisticParsing/SentenceTokenizer.js +++ b/packages/yoastseo/src/parsedPaper/build/linguisticParsing/SentenceTokenizer.js @@ -1,4 +1,4 @@ -import { isNaN, isUndefined } from "lodash-es"; +import { isNaN, isUndefined } from "lodash"; import core from "tokenizer2/core"; import { normalize as normalizeQuotes } from "../../../languageProcessing/helpers/sanitize/quotes"; diff --git a/packages/yoastseo/src/parsedPaper/build/tree/cleanup/calculateTextIndices.js b/packages/yoastseo/src/parsedPaper/build/tree/cleanup/calculateTextIndices.js index 96f56b77dbd..fdf36f0f9c4 100644 --- a/packages/yoastseo/src/parsedPaper/build/tree/cleanup/calculateTextIndices.js +++ b/packages/yoastseo/src/parsedPaper/build/tree/cleanup/calculateTextIndices.js @@ -1,4 +1,4 @@ -import { pullAll } from "lodash-es"; +import { pullAll } from "lodash"; import { ignoredHtmlElements } from "../html/htmlConstants"; diff --git a/packages/yoastseo/src/parsedPaper/research/TreeResearcher.js b/packages/yoastseo/src/parsedPaper/research/TreeResearcher.js index 1e9fbe0ae42..31975384c21 100644 --- a/packages/yoastseo/src/parsedPaper/research/TreeResearcher.js +++ b/packages/yoastseo/src/parsedPaper/research/TreeResearcher.js @@ -1,4 +1,4 @@ -import { get, has } from "lodash-es"; +import { get, has } from "lodash"; /** * This contains all possible, default researches diff --git a/packages/yoastseo/src/parsedPaper/research/researches/Research.js b/packages/yoastseo/src/parsedPaper/research/researches/Research.js index b56e05098b8..5066f00b8cf 100644 --- a/packages/yoastseo/src/parsedPaper/research/researches/Research.js +++ b/packages/yoastseo/src/parsedPaper/research/researches/Research.js @@ -1,4 +1,4 @@ -import { flatten } from "lodash-es"; +import { flatten } from "lodash"; import { LeafNode } from "../../structure/tree"; /** diff --git a/packages/yoastseo/src/parsedPaper/structure/tree/TextContainer.js b/packages/yoastseo/src/parsedPaper/structure/tree/TextContainer.js index 96fe992ec8d..fae22c7932b 100644 --- a/packages/yoastseo/src/parsedPaper/structure/tree/TextContainer.js +++ b/packages/yoastseo/src/parsedPaper/structure/tree/TextContainer.js @@ -1,4 +1,4 @@ -import { isEmpty } from "lodash-es"; +import { isEmpty } from "lodash"; import { parseTextIntoSentences } from "../../build/linguisticParsing/parseText"; /** diff --git a/packages/yoastseo/src/parsedPaper/structure/tree/nodes/Node.js b/packages/yoastseo/src/parsedPaper/structure/tree/nodes/Node.js index feec2fe5722..3a147dd01ef 100644 --- a/packages/yoastseo/src/parsedPaper/structure/tree/nodes/Node.js +++ b/packages/yoastseo/src/parsedPaper/structure/tree/nodes/Node.js @@ -1,4 +1,4 @@ -import { has, get } from "lodash-es"; +import { has, get } from "lodash"; import SourceCodeLocation from "../SourceCodeLocation"; /** diff --git a/packages/yoastseo/src/pluggable.js b/packages/yoastseo/src/pluggable.js index fcb32fd0c2d..89836007ce3 100644 --- a/packages/yoastseo/src/pluggable.js +++ b/packages/yoastseo/src/pluggable.js @@ -1,4 +1,4 @@ -import { forEach, isObject, isString, isUndefined, reduce } from "lodash-es"; +import { forEach, isObject, isString, isUndefined, reduce } from "lodash"; import InvalidTypeError from "./errors/invalidType"; /** diff --git a/packages/yoastseo/src/scoring/assessments/inclusiveLanguage/InclusiveLanguageAssessment.js b/packages/yoastseo/src/scoring/assessments/inclusiveLanguage/InclusiveLanguageAssessment.js index 981709e0f56..ca0cc1aa4be 100644 --- a/packages/yoastseo/src/scoring/assessments/inclusiveLanguage/InclusiveLanguageAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/inclusiveLanguage/InclusiveLanguageAssessment.js @@ -1,5 +1,5 @@ import { sprintf } from "@wordpress/i18n"; -import { isString } from "lodash-es"; +import { isString } from "lodash"; import AssessmentResult from "../../../values/AssessmentResult"; import Mark from "../../../values/Mark"; diff --git a/packages/yoastseo/src/scoring/assessments/inclusiveLanguage/configuration/disabilityRulesData.js b/packages/yoastseo/src/scoring/assessments/inclusiveLanguage/configuration/disabilityRulesData.js index 8899426d57a..a3cc9f38429 100644 --- a/packages/yoastseo/src/scoring/assessments/inclusiveLanguage/configuration/disabilityRulesData.js +++ b/packages/yoastseo/src/scoring/assessments/inclusiveLanguage/configuration/disabilityRulesData.js @@ -1,5 +1,5 @@ import passiveAuxiliaries from "../../../../languageProcessing/languages/en/config/internal/passiveVoiceAuxiliaries"; -import { flatMap } from "lodash-es"; +import { flatMap } from "lodash"; const intensifiersAndAdverbs = [ "so", "very", "a bit", "really", "pretty", "kind of", "that", "too", "totally", "completely", "absolutely", "even", "also", "as" ]; diff --git a/packages/yoastseo/src/scoring/assessments/inclusiveLanguage/helpers/isFollowedByParticiple.js b/packages/yoastseo/src/scoring/assessments/inclusiveLanguage/helpers/isFollowedByParticiple.js index 94ea01a3cf0..257760504ac 100644 --- a/packages/yoastseo/src/scoring/assessments/inclusiveLanguage/helpers/isFollowedByParticiple.js +++ b/packages/yoastseo/src/scoring/assessments/inclusiveLanguage/helpers/isFollowedByParticiple.js @@ -1,4 +1,4 @@ -import { includes, isNull } from "lodash-es"; +import { includes, isNull } from "lodash"; import irregularParticiples from "../../../../languageProcessing/languages/en/config/internal/passiveVoiceIrregulars"; diff --git a/packages/yoastseo/src/scoring/assessments/readability/ListAssessment.js b/packages/yoastseo/src/scoring/assessments/readability/ListAssessment.js index f173bc6774c..45e89893e0e 100644 --- a/packages/yoastseo/src/scoring/assessments/readability/ListAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/readability/ListAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; import Assessment from "../assessment"; import AssessmentResult from "../../../values/AssessmentResult"; diff --git a/packages/yoastseo/src/scoring/assessments/readability/ParagraphTooLongAssessment.js b/packages/yoastseo/src/scoring/assessments/readability/ParagraphTooLongAssessment.js index 29d992d02f0..8db546553ed 100644 --- a/packages/yoastseo/src/scoring/assessments/readability/ParagraphTooLongAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/readability/ParagraphTooLongAssessment.js @@ -1,5 +1,5 @@ import { __, _n, sprintf } from "@wordpress/i18n"; -import { filter, map, merge } from "lodash-es"; +import { filter, map, merge } from "lodash"; import { stripBlockTagsAtStartEnd as stripHTMLTags } from "../../../languageProcessing/helpers/sanitize/stripHTMLTags"; import marker from "../../../markers/addMark"; import { createAnchorOpeningTag } from "../../../helpers/shortlinker"; diff --git a/packages/yoastseo/src/scoring/assessments/readability/PassiveVoiceAssessment.js b/packages/yoastseo/src/scoring/assessments/readability/PassiveVoiceAssessment.js index 5224808c4f5..4994e6475d6 100644 --- a/packages/yoastseo/src/scoring/assessments/readability/PassiveVoiceAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/readability/PassiveVoiceAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { map, merge } from "lodash-es"; +import { map, merge } from "lodash"; import formatNumber from "../../../helpers/formatNumber"; import { inRangeEndInclusive as inRange } from "../../helpers/assessments/inRange"; diff --git a/packages/yoastseo/src/scoring/assessments/readability/SentenceBeginningsAssessment.js b/packages/yoastseo/src/scoring/assessments/readability/SentenceBeginningsAssessment.js index c44c7d60c52..f8d77fe8cf1 100644 --- a/packages/yoastseo/src/scoring/assessments/readability/SentenceBeginningsAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/readability/SentenceBeginningsAssessment.js @@ -1,4 +1,4 @@ -import { filter, flatten, map, merge, partition, sortBy } from "lodash-es"; +import { filter, flatten, map, merge, partition, sortBy } from "lodash"; import { _n, __, sprintf } from "@wordpress/i18n"; import marker from "../../../markers/addMark"; diff --git a/packages/yoastseo/src/scoring/assessments/readability/SentenceLengthInTextAssessment.js b/packages/yoastseo/src/scoring/assessments/readability/SentenceLengthInTextAssessment.js index da0b2b399c4..155bbce76eb 100644 --- a/packages/yoastseo/src/scoring/assessments/readability/SentenceLengthInTextAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/readability/SentenceLengthInTextAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { map, merge } from "lodash-es"; +import { map, merge } from "lodash"; import Assessment from "../assessment"; import getTooLongSentences from "../../helpers/assessments/checkForTooLongSentences"; diff --git a/packages/yoastseo/src/scoring/assessments/readability/SubheadingDistributionTooLongAssessment.js b/packages/yoastseo/src/scoring/assessments/readability/SubheadingDistributionTooLongAssessment.js index c8ce583e1c9..9b3d9c2f9e3 100644 --- a/packages/yoastseo/src/scoring/assessments/readability/SubheadingDistributionTooLongAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/readability/SubheadingDistributionTooLongAssessment.js @@ -1,5 +1,5 @@ import { __, _n, sprintf } from "@wordpress/i18n"; -import { filter, map, merge } from "lodash-es"; +import { filter, map, merge } from "lodash"; import marker from "../../../markers/addMark"; import Mark from "../../../values/Mark"; import Assessment from "../assessment"; diff --git a/packages/yoastseo/src/scoring/assessments/readability/TextAlignmentAssessment.js b/packages/yoastseo/src/scoring/assessments/readability/TextAlignmentAssessment.js index 49c273ea56c..9cf8f2b23b0 100644 --- a/packages/yoastseo/src/scoring/assessments/readability/TextAlignmentAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/readability/TextAlignmentAssessment.js @@ -1,5 +1,5 @@ import { _n, sprintf } from "@wordpress/i18n"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; import Assessment from "../assessment"; import Mark from "../../../values/Mark"; diff --git a/packages/yoastseo/src/scoring/assessments/readability/TextPresenceAssessment.js b/packages/yoastseo/src/scoring/assessments/readability/TextPresenceAssessment.js index c8a80563f78..9b6d6ffcae7 100644 --- a/packages/yoastseo/src/scoring/assessments/readability/TextPresenceAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/readability/TextPresenceAssessment.js @@ -2,7 +2,7 @@ import { __, sprintf } from "@wordpress/i18n"; import { createAnchorOpeningTag } from "../../../helpers/shortlinker"; import AssessmentResult from "../../../values/AssessmentResult"; import Assessment from "../assessment"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; /** * Represents the assessment that checks whether there is enough text in the paper. diff --git a/packages/yoastseo/src/scoring/assessments/readability/TransitionWordsAssessment.js b/packages/yoastseo/src/scoring/assessments/readability/TransitionWordsAssessment.js index c468f79748a..68e5d7cbe35 100644 --- a/packages/yoastseo/src/scoring/assessments/readability/TransitionWordsAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/readability/TransitionWordsAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { map, merge } from "lodash-es"; +import { map, merge } from "lodash"; import formatNumber from "../../../helpers/formatNumber"; import { inRangeStartInclusive as inRange } from "../../helpers/assessments/inRange"; diff --git a/packages/yoastseo/src/scoring/assessments/readability/WordComplexityAssessment.js b/packages/yoastseo/src/scoring/assessments/readability/WordComplexityAssessment.js index 5356f95f535..a3a1e3d6b1f 100644 --- a/packages/yoastseo/src/scoring/assessments/readability/WordComplexityAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/readability/WordComplexityAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; import Assessment from "../assessment"; import Mark from "../../../values/Mark"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/FunctionWordsInKeyphraseAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/FunctionWordsInKeyphraseAssessment.js index 431f8d20089..3b7be549ae7 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/FunctionWordsInKeyphraseAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/FunctionWordsInKeyphraseAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { escape, merge } from "lodash-es"; +import { escape, merge } from "lodash"; import Assessment from "../assessment"; import { createAnchorOpeningTag } from "../../../helpers/shortlinker"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/ImageAltTagsAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/ImageAltTagsAssessment.js index a3294d0fe8a..6ff161b627b 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/ImageAltTagsAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/ImageAltTagsAssessment.js @@ -1,5 +1,5 @@ import { __, _n, sprintf } from "@wordpress/i18n"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; import Assessment from "../assessment"; import AssessmentResult from "../../../values/AssessmentResult"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/ImageCountAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/ImageCountAssessment.js index fe466a4c3b3..e5a8ba00702 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/ImageCountAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/ImageCountAssessment.js @@ -1,5 +1,5 @@ import { __, _n, sprintf } from "@wordpress/i18n"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; import { inRangeStartEndInclusive } from "../../helpers/assessments/inRange"; import Assessment from "../assessment"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/InternalLinksAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/InternalLinksAssessment.js index fee70e4ed5d..f8a17cc9b30 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/InternalLinksAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/InternalLinksAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; import Assessment from "../assessment"; import { createAnchorOpeningTag } from "../../../helpers/shortlinker"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/IntroductionKeywordAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/IntroductionKeywordAssessment.js index 6db99fd2dca..0cb99babda2 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/IntroductionKeywordAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/IntroductionKeywordAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; import Assessment from "../assessment"; import { createAnchorOpeningTag } from "../../../helpers/shortlinker"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/KeyphraseDistributionAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/KeyphraseDistributionAssessment.js index 80fc3d7778d..02181a94957 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/KeyphraseDistributionAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/KeyphraseDistributionAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; import Assessment from "../assessment"; import AssessmentResult from "../../../values/AssessmentResult"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/KeyphraseInImageTextAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/KeyphraseInImageTextAssessment.js index 4a191ce828b..17dbb26585c 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/KeyphraseInImageTextAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/KeyphraseInImageTextAssessment.js @@ -1,5 +1,5 @@ import { __, _n, sprintf } from "@wordpress/i18n"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; import Assessment from "../assessment"; import { inRangeStartEndInclusive } from "../../helpers/assessments/inRange.js"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/KeyphraseInSEOTitleAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/KeyphraseInSEOTitleAssessment.js index 58caf6f8509..8df4c6047d6 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/KeyphraseInSEOTitleAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/KeyphraseInSEOTitleAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { escape, merge } from "lodash-es"; +import { escape, merge } from "lodash"; import getLanguage from "../../../languageProcessing/helpers/language/getLanguage"; import Assessment from "../assessment"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/KeyphraseLengthAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/KeyphraseLengthAssessment.js index caf1df2ee67..f395862469a 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/KeyphraseLengthAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/KeyphraseLengthAssessment.js @@ -1,5 +1,5 @@ import { __, _n, sprintf } from "@wordpress/i18n"; -import { merge, inRange } from "lodash-es"; +import { merge, inRange } from "lodash"; import Assessment from "../assessment"; import { createAnchorOpeningTag } from "../../../helpers"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/KeywordDensityAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/KeywordDensityAssessment.js index e75ba11bebf..fc26826dd47 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/KeywordDensityAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/KeywordDensityAssessment.js @@ -1,5 +1,5 @@ import { __, _n, sprintf } from "@wordpress/i18n"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; import recommendedKeyphraseCount from "../../helpers/assessments/recommendedKeywordCount.js"; import Assessment from "../assessment"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/MetaDescriptionKeywordAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/MetaDescriptionKeywordAssessment.js index 5da4749193d..03cbccd0398 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/MetaDescriptionKeywordAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/MetaDescriptionKeywordAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; import Assessment from "../assessment"; import { createAnchorOpeningTag } from "../../../helpers/shortlinker"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/MetaDescriptionLengthAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/MetaDescriptionLengthAssessment.js index 0cf2f60025a..8d999b4be12 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/MetaDescriptionLengthAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/MetaDescriptionLengthAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; import Assessment from "../assessment"; import { createAnchorOpeningTag } from "../../../helpers/shortlinker"; import AssessmentResult from "../../../values/AssessmentResult"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/OutboundLinksAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/OutboundLinksAssessment.js index 8e15012484b..9d29d57750e 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/OutboundLinksAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/OutboundLinksAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { isEmpty, merge } from "lodash-es"; +import { isEmpty, merge } from "lodash"; import Assessment from "../assessment"; import { createAnchorOpeningTag } from "../../../helpers/shortlinker"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/PageTitleWidthAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/PageTitleWidthAssessment.js index 20c6739bd87..763d1fd07b2 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/PageTitleWidthAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/PageTitleWidthAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; import Assessment from "../assessment"; import { inRangeEndInclusive as inRange } from "../../helpers/assessments/inRange"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/ProductIdentifiersAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/ProductIdentifiersAssessment.js index d9a728f666b..b2f58662d66 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/ProductIdentifiersAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/ProductIdentifiersAssessment.js @@ -1,4 +1,4 @@ -import { merge } from "lodash-es"; +import { merge } from "lodash"; import { __, sprintf } from "@wordpress/i18n"; import Assessment from "../assessment"; import AssessmentResult from "../../../values/AssessmentResult"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/ProductSKUAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/ProductSKUAssessment.js index 1f5de941adf..f74179c4aa7 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/ProductSKUAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/ProductSKUAssessment.js @@ -1,4 +1,4 @@ -import { merge } from "lodash-es"; +import { merge } from "lodash"; import { __, sprintf } from "@wordpress/i18n"; import Assessment from "../assessment"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/SingleH1Assessment.js b/packages/yoastseo/src/scoring/assessments/seo/SingleH1Assessment.js index 319062bff58..8f3eb842d2b 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/SingleH1Assessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/SingleH1Assessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { isUndefined, merge } from "lodash-es"; +import { isUndefined, merge } from "lodash"; import Assessment from "../assessment.js"; import { createAnchorOpeningTag } from "../../../helpers"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/SubHeadingsKeywordAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/SubHeadingsKeywordAssessment.js index 85fdbdf70b2..add9d8daf30 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/SubHeadingsKeywordAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/SubHeadingsKeywordAssessment.js @@ -1,5 +1,5 @@ import { __, _n, sprintf } from "@wordpress/i18n"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; import { getSubheadingsTopLevel } from "../../../languageProcessing/helpers/html/getSubheadings"; import Assessment from "../assessment"; import { createAnchorOpeningTag } from "../../../helpers/shortlinker"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/TextCompetingLinksAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/TextCompetingLinksAssessment.js index 92e0bb1fa1e..af0ce836355 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/TextCompetingLinksAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/TextCompetingLinksAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { isUndefined, merge } from "lodash-es"; +import { isUndefined, merge } from "lodash"; import Assessment from "../assessment"; import { createAnchorOpeningTag } from "../../../helpers"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/TextLengthAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/TextLengthAssessment.js index a0b9f33f504..09556b3ed93 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/TextLengthAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/TextLengthAssessment.js @@ -1,5 +1,5 @@ import { __, _n, sprintf } from "@wordpress/i18n"; -import { inRange, merge } from "lodash-es"; +import { inRange, merge } from "lodash"; import Assessment from "../assessment"; import { createAnchorOpeningTag } from "../../../helpers/shortlinker"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/TextTitleAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/TextTitleAssessment.js index 19349f4ff79..5f90c866806 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/TextTitleAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/TextTitleAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; import Assessment from "../assessment"; import AssessmentResult from "../../../values/AssessmentResult"; diff --git a/packages/yoastseo/src/scoring/assessments/seo/UrlKeywordAssessment.js b/packages/yoastseo/src/scoring/assessments/seo/UrlKeywordAssessment.js index 6c7c0f470a8..890a076e622 100644 --- a/packages/yoastseo/src/scoring/assessments/seo/UrlKeywordAssessment.js +++ b/packages/yoastseo/src/scoring/assessments/seo/UrlKeywordAssessment.js @@ -1,5 +1,5 @@ import { __, sprintf } from "@wordpress/i18n"; -import { merge } from "lodash-es"; +import { merge } from "lodash"; import Assessment from "../assessment"; import { createAnchorOpeningTag } from "../../../helpers/shortlinker"; diff --git a/packages/yoastseo/src/scoring/assessor.js b/packages/yoastseo/src/scoring/assessor.js index fedab386dce..9d99662c64d 100644 --- a/packages/yoastseo/src/scoring/assessor.js +++ b/packages/yoastseo/src/scoring/assessor.js @@ -4,7 +4,7 @@ import AssessmentResult from "../values/AssessmentResult.js"; import { showTrace } from "../helpers/errors.js"; import { __, sprintf } from "@wordpress/i18n"; -import { filter, find, findIndex, isFunction, isUndefined, map } from "lodash-es"; +import { filter, find, findIndex, isFunction, isUndefined, map } from "lodash"; import LanguageProcessor from "../parse/language/LanguageProcessor"; import { build } from "../parse/build"; diff --git a/packages/yoastseo/src/scoring/contentAssessor.js b/packages/yoastseo/src/scoring/contentAssessor.js index f5a161c171f..0ff14bb18ae 100644 --- a/packages/yoastseo/src/scoring/contentAssessor.js +++ b/packages/yoastseo/src/scoring/contentAssessor.js @@ -14,7 +14,7 @@ import TextPresence from "./assessments/readability/TextPresenceAssessment.js"; import scoreToRating from "./interpreters/scoreToRating"; -import { map, sum } from "lodash-es"; +import { map, sum } from "lodash"; /** * Creates the Assessor diff --git a/packages/yoastseo/src/scoring/helpers/assessments/checkForTooLongSentences.js b/packages/yoastseo/src/scoring/helpers/assessments/checkForTooLongSentences.js index 25ea28a690e..088ba70fe39 100644 --- a/packages/yoastseo/src/scoring/helpers/assessments/checkForTooLongSentences.js +++ b/packages/yoastseo/src/scoring/helpers/assessments/checkForTooLongSentences.js @@ -1,4 +1,4 @@ -import { filter } from "lodash-es"; +import { filter } from "lodash"; /** * Checks for too long sentences. diff --git a/packages/yoastseo/src/scoring/renderers/AssessorPresenter.js b/packages/yoastseo/src/scoring/renderers/AssessorPresenter.js index 00a64bac13a..ecc022c7d2b 100644 --- a/packages/yoastseo/src/scoring/renderers/AssessorPresenter.js +++ b/packages/yoastseo/src/scoring/renderers/AssessorPresenter.js @@ -1,6 +1,4 @@ -import { __ } from "@wordpress/i18n"; -import { difference, forEach, isNumber, isObject, isUndefined } from "lodash-es"; -import { assessmentPresenterResult as template } from "../../snippetPreview/templates.js"; +import { difference, forEach, isNumber, isObject, isUndefined } from "lodash"; import scoreToRating from "../interpreters/scoreToRating.js"; import createConfig from "../../config/presenter.js"; @@ -39,7 +37,7 @@ AssessorPresenter.prototype.setKeyword = function( keyword ) { }; /** - * Checks whether or not a specific property exists in the presenter configuration. + * Checks whether a specific property exists in the presenter configuration. * * @param {string} property The property name to search for. * @returns {boolean} Whether or not the property exists. @@ -332,26 +330,11 @@ AssessorPresenter.prototype.removeAllMarks = function() { /** * Renders out the individual ratings. + * Here, this method is set to noop. In `post-scraper.js` and `term-scraper.js` where this method is called, it is overridden with noop as well. * * @returns {void} */ -AssessorPresenter.prototype.renderIndividualRatings = function() { - var outputTarget = document.getElementById( this.output ); - var scores = this.getIndividualRatings(); - - outputTarget.innerHTML = template( { - scores: scores, - i18n: { - disabledMarkText: __( "Marks are disabled in current view", "wordpress-seo" ), - markInText: __( "Mark this result in the text", "wordpress-seo" ), - removeMarksInText: __( "Remove marks in the text", "wordpress-seo" ), - }, - activeMarker: this._activeMarker, - markerButtonsDisabled: this._disableMarkerButtons, - } ); - - this.bindMarkButtons( scores ); -}; +AssessorPresenter.prototype.renderIndividualRatings = function() {}; /** * Renders out the overall rating. diff --git a/packages/yoastseo/src/snippetPreview/snippetPreview.js b/packages/yoastseo/src/snippetPreview/snippetPreview.js index 93e30106862..347039cd659 100644 --- a/packages/yoastseo/src/snippetPreview/snippetPreview.js +++ b/packages/yoastseo/src/snippetPreview/snippetPreview.js @@ -1,5 +1,5 @@ import { __ } from "@wordpress/i18n"; -import { clone, debounce, defaultsDeep, forEach, isElement, isEmpty, isUndefined } from "lodash-es"; +import { clone, debounce, defaultsDeep, forEach, isElement, isEmpty, isUndefined } from "lodash"; import createWordRegex from "../languageProcessing/helpers/regex/createWordRegex"; import { stripFullTags as stripHTMLTags } from "../languageProcessing/helpers/sanitize/stripHTMLTags"; @@ -7,10 +7,6 @@ import stripSpaces from "../languageProcessing/helpers/sanitize/stripSpaces"; import replaceDiacritics from "../languageProcessing/helpers/transliterate/replaceDiacritics"; import transliterate from "../languageProcessing/helpers/transliterate/transliterate"; -import templates from "./templates.js"; -var snippetEditorTemplate = templates.snippetEditor; -var hiddenElement = templates.hiddenSpan; - import SnippetPreviewToggler from "./snippetPreviewToggler"; import domManipulation from "../helpers/domManipulation.js"; @@ -349,40 +345,6 @@ var SnippetPreview = function( opts ) { SnippetPreview.prototype.renderTemplate = function() { var targetElement = this.opts.targetElement; - targetElement.innerHTML = snippetEditorTemplate( { - raw: { - title: this.data.title, - snippetCite: this.data.urlPath, - meta: this.data.metaDesc, - }, - rendered: { - title: this.formatTitle(), - baseUrl: this.formatUrl(), - snippetCite: this.formatCite(), - meta: this.formatMeta(), - }, - metaDescriptionDate: this.opts.metaDescriptionDate, - placeholder: this.opts.placeholder, - i18n: { - edit: __( "Edit snippet", "wordpress-seo" ), - title: __( "SEO title", "wordpress-seo" ), - slug: __( "Slug", "wordpress-seo" ), - metaDescription: __( "Meta description", "wordpress-seo" ), - save: __( "Close snippet editor", "wordpress-seo" ), - snippetPreview: __( "Search appearance", "wordpress-seo" ), - titleLabel: __( "SEO title preview:", "wordpress-seo" ), - slugLabel: __( "Slug preview:", "wordpress-seo" ), - metaDescriptionLabel: __( "Meta description preview:", "wordpress-seo" ), - snippetPreviewDescription: __( - "You can click on each element in the preview to jump to the Snippet Editor.", - "wordpress-seo" - ), - desktopPreviewMode: __( "Desktop preview", "wordpress-seo" ), - mobilePreviewMode: __( "Mobile preview", "wordpress-seo" ), - isScrollableHint: __( "Scroll to see the preview content.", "wordpress-seo" ), - }, - } ); - this.element = { measurers: { metaHeight: null, @@ -1216,19 +1178,11 @@ SnippetPreview.prototype.setMetaDescription = function( metaDesc ) { * @returns {void} */ SnippetPreview.prototype.createMeasurementElements = function() { - var metaDescriptionElement, spanHolder; - metaDescriptionElement = hiddenElement( - { - width: document.getElementById( "meta_container" ).offsetWidth + "px", - whiteSpace: "", - } - ); + var spanHolder; spanHolder = document.createElement( "div" ); spanHolder.className = "yoast-measurement-elements-holder"; - spanHolder.innerHTML = metaDescriptionElement; - document.body.appendChild( spanHolder ); this.element.measurers.metaHeight = spanHolder.childNodes[ 0 ]; diff --git a/packages/yoastseo/src/snippetPreview/snippetPreviewToggler.js b/packages/yoastseo/src/snippetPreview/snippetPreviewToggler.js index 3bf605529a7..e386338c924 100644 --- a/packages/yoastseo/src/snippetPreview/snippetPreviewToggler.js +++ b/packages/yoastseo/src/snippetPreview/snippetPreviewToggler.js @@ -1,4 +1,4 @@ -import { forEach } from "lodash-es"; +import { forEach } from "lodash"; import domManipulation from "../helpers/domManipulation.js"; var previewModes = { diff --git a/packages/yoastseo/src/snippetPreview/templates.js b/packages/yoastseo/src/snippetPreview/templates.js deleted file mode 100644 index fcc6a7ffc98..00000000000 --- a/packages/yoastseo/src/snippetPreview/templates.js +++ /dev/null @@ -1,532 +0,0 @@ -/* eslint-disable */ -;(function() { - var undefined; - - var freeGlobal = typeof global == 'object' && global && global.Object === Object && global; - - var freeSelf = typeof self == 'object' && self && self.Object === Object && self; - - var root = freeGlobal || freeSelf || Function('return this')(); - - var freeExports = typeof exports == 'object' && exports && !exports.nodeType && exports; - - var freeModule = freeExports && typeof module == 'object' && module && !module.nodeType && module; - - /** Used as a safe reference for `undefined` in pre-ES5 environments. */ - var undefined; - - /** Used as the semantic version number. */ - var VERSION = '4.17.4'; - - /** Used as references for various `Number` constants. */ - var INFINITY = 1 / 0; - - /** `Object#toString` result references. */ - var nullTag = '[object Null]', - symbolTag = '[object Symbol]', - undefinedTag = '[object Undefined]'; - - /** Used to match HTML entities and HTML characters. */ - var reUnescapedHtml = /[&<>"']/g, - reHasUnescapedHtml = RegExp(reUnescapedHtml.source); - - /** Used to map characters to HTML entities. */ - var htmlEscapes = { - '&': '&', - '<': '<', - '>': '>', - '"': '"', - "'": ''' - }; - - /** Detect free variable `global` from Node.js. */ - var freeGlobal = typeof global == 'object' && global && global.Object === Object && global; - - /** Detect free variable `self`. */ - var freeSelf = typeof self == 'object' && self && self.Object === Object && self; - - /** Used as a reference to the global object. */ - var root = freeGlobal || freeSelf || Function('return this')(); - - /*--------------------------------------------------------------------------*/ - - /** - * A specialized version of `_.map` for arrays without support for iteratee - * shorthands. - * - * @private - * @param {Array} [array] The array to iterate over. - * @param {Function} iteratee The function invoked per iteration. - * @returns {Array} Returns the new mapped array. - */ - function arrayMap(array, iteratee) { - var index = -1, - length = array == null ? 0 : array.length, - result = Array(length); - - while (++index < length) { - result[index] = iteratee(array[index], index, array); - } - return result; - } - - /** - * The base implementation of `_.propertyOf` without support for deep paths. - * - * @private - * @param {Object} object The object to query. - * @returns {Function} Returns the new accessor function. - */ - function basePropertyOf(object) { - return function(key) { - return object == null ? undefined : object[key]; - }; - } - - /** - * Used by `_.escape` to convert characters to HTML entities. - * - * @private - * @param {string} chr The matched character to escape. - * @returns {string} Returns the escaped character. - */ - var escapeHtmlChar = basePropertyOf(htmlEscapes); - - /*--------------------------------------------------------------------------*/ - - /** Used for built-in method references. */ - var objectProto = Object.prototype; - - /** Used to check objects for own properties. */ - var hasOwnProperty = objectProto.hasOwnProperty; - - /** - * Used to resolve the - * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring) - * of values. - */ - var nativeObjectToString = objectProto.toString; - - /** Built-in value references. */ - var Symbol = root.Symbol, - symToStringTag = Symbol ? Symbol.toStringTag : undefined; - - /** Used to lookup unminified function names. */ - var realNames = {}; - - /** Used to convert symbols to primitives and strings. */ - var symbolProto = Symbol ? Symbol.prototype : undefined, - symbolToString = symbolProto ? symbolProto.toString : undefined; - - /*------------------------------------------------------------------------*/ - - /** - * The base implementation of `getTag` without fallbacks for buggy environments. - * - * @private - * @param {*} value The value to query. - * @returns {string} Returns the `toStringTag`. - */ - function baseGetTag(value) { - if (value == null) { - return value === undefined ? undefinedTag : nullTag; - } - return (symToStringTag && symToStringTag in Object(value)) - ? getRawTag(value) - : objectToString(value); - } - - /** - * The base implementation of `_.toString` which doesn't convert nullish - * values to empty strings. - * - * @private - * @param {*} value The value to process. - * @returns {string} Returns the string. - */ - function baseToString(value) { - // Exit early for strings to avoid a performance hit in some environments. - if (typeof value == 'string') { - return value; - } - if (isArray(value)) { - // Recursively convert values (susceptible to call stack limits). - return arrayMap(value, baseToString) + ''; - } - if (isSymbol(value)) { - return symbolToString ? symbolToString.call(value) : ''; - } - var result = (value + ''); - return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result; - } - - /** - * A specialized version of `baseGetTag` which ignores `Symbol.toStringTag` values. - * - * @private - * @param {*} value The value to query. - * @returns {string} Returns the raw `toStringTag`. - */ - function getRawTag(value) { - var isOwn = hasOwnProperty.call(value, symToStringTag), - tag = value[symToStringTag]; - - try { - value[symToStringTag] = undefined; - var unmasked = true; - } catch (e) {} - - var result = nativeObjectToString.call(value); - if (unmasked) { - if (isOwn) { - value[symToStringTag] = tag; - } else { - delete value[symToStringTag]; - } - } - return result; - } - - /** - * Converts `value` to a string using `Object.prototype.toString`. - * - * @private - * @param {*} value The value to convert. - * @returns {string} Returns the converted string. - */ - function objectToString(value) { - return nativeObjectToString.call(value); - } - - /*------------------------------------------------------------------------*/ - - /** - * Checks if `value` is classified as an `Array` object. - * - * @static - * @memberOf _ - * @since 0.1.0 - * @category Lang - * @param {*} value The value to check. - * @returns {boolean} Returns `true` if `value` is an array, else `false`. - * @example - * - * _.isArray([1, 2, 3]); - * // => true - * - * _.isArray(document.body.children); - * // => false - * - * _.isArray('abc'); - * // => false - * - * _.isArray(_.noop); - * // => false - */ - var isArray = Array.isArray; - - /** - * Checks if `value` is object-like. A value is object-like if it's not `null` - * and has a `typeof` result of "object". - * - * @static - * @memberOf _ - * @since 4.0.0 - * @category Lang - * @param {*} value The value to check. - * @returns {boolean} Returns `true` if `value` is object-like, else `false`. - * @example - * - * _.isObjectLike({}); - * // => true - * - * _.isObjectLike([1, 2, 3]); - * // => true - * - * _.isObjectLike(_.noop); - * // => false - * - * _.isObjectLike(null); - * // => false - */ - function isObjectLike(value) { - return value != null && typeof value == 'object'; - } - - /** - * Checks if `value` is classified as a `Symbol` primitive or object. - * - * @static - * @memberOf _ - * @since 4.0.0 - * @category Lang - * @param {*} value The value to check. - * @returns {boolean} Returns `true` if `value` is a symbol, else `false`. - * @example - * - * _.isSymbol(Symbol.iterator); - * // => true - * - * _.isSymbol('abc'); - * // => false - */ - function isSymbol(value) { - return typeof value == 'symbol' || - (isObjectLike(value) && baseGetTag(value) == symbolTag); - } - - /** - * Converts `value` to a string. An empty string is returned for `null` - * and `undefined` values. The sign of `-0` is preserved. - * - * @static - * @memberOf _ - * @since 4.0.0 - * @category Lang - * @param {*} value The value to convert. - * @returns {string} Returns the converted string. - * @example - * - * _.toString(null); - * // => '' - * - * _.toString(-0); - * // => '-0' - * - * _.toString([1, 2, 3]); - * // => '1,2,3' - */ - function toString(value) { - return value == null ? '' : baseToString(value); - } - - /*------------------------------------------------------------------------*/ - - /** - * Converts the characters "&", "<", ">", '"', and "'" in `string` to their - * corresponding HTML entities. - * - * **Note:** No other characters are escaped. To escape additional - * characters use a third-party library like [_he_](https://mths.be/he). - * - * Though the ">" character is escaped for symmetry, characters like - * ">" and "/" don't need escaping in HTML and have no special meaning - * unless they're part of a tag or unquoted attribute value. See - * [Mathias Bynens's article](https://mathiasbynens.be/notes/ambiguous-ampersands) - * (under "semi-related fun fact") for more details. - * - * When working with HTML you should always - * [quote attribute values](http://wonko.com/post/html-escaping) to reduce - * XSS vectors. - * - * @static - * @since 0.1.0 - * @memberOf _ - * @category String - * @param {string} [string=''] The string to escape. - * @returns {string} Returns the escaped string. - * @example - * - * _.escape('fred, barney, & pebbles'); - * // => 'fred, barney, & pebbles' - */ - function escape(string) { - string = toString(string); - return (string && reHasUnescapedHtml.test(string)) - ? string.replace(reUnescapedHtml, escapeHtmlChar) - : string; - } - - var _ = { 'escape': escape }; - - /*----------------------------------------------------------------------------*/ - - var templates = { - 'assessmentPresenterResult': {}, - 'hiddenSpan': {}, - 'relevantWords': {}, - 'snippetEditor': {} - }; - - templates['assessmentPresenterResult'] = function(obj) { - obj || (obj = {}); - const { scores, markerButtonsDisabled, i18n, activeMarker } = obj; - var __t, __p = '', __e = _.escape, __j = Array.prototype.join; - function print() { __p += __j.call(arguments, '') } - __p += '\n'; - return __p - }; - - templates['hiddenSpan'] = function(obj) { - obj || (obj = {}); - const { whiteSpace, width } = obj; - var __t, __p = '', __e = _.escape, __j = Array.prototype.join; - function print() { __p += __j.call(arguments, '') } - __p += '