From 48c3d32b366c2272f24380b1e59b373864c9dae0 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Mon, 16 Mar 2020 13:44:00 +0100 Subject: [PATCH 01/29] Updated package.json so Jest excludes dist and node_modules directories --- packages/analysis-report/package.json | 5 ++++- packages/browserslist-config/package.json | 5 ++++- packages/components/package.json | 5 ++++- packages/configuration-wizard/package.json | 3 +++ packages/feature-flag/package.json | 5 ++++- packages/helpers/package.json | 5 ++++- packages/search-metadata-previews/package.json | 5 ++++- packages/yoast-components/package.json | 3 +++ packages/yoastseo/package.json | 5 ++++- 9 files changed, 34 insertions(+), 7 deletions(-) diff --git a/packages/analysis-report/package.json b/packages/analysis-report/package.json index 0823ca8ffe..a6227b8746 100644 --- a/packages/analysis-report/package.json +++ b/packages/analysis-report/package.json @@ -51,7 +51,10 @@ "transformIgnorePatterns": [ "/node_modules/(?!yoastseo|lodash-es).+\\.js$" ], - "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js" + "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js", + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" + ] }, "publishConfig": { "access": "public" diff --git a/packages/browserslist-config/package.json b/packages/browserslist-config/package.json index 5860b4ec91..6e7f8becf7 100644 --- a/packages/browserslist-config/package.json +++ b/packages/browserslist-config/package.json @@ -25,7 +25,10 @@ }, "jest": { "testRegex": ".*Test.js$", - "testEnvironment": "node" + "testEnvironment": "node", + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" + ] }, "devDependencies": { "browserslist": "^4.7.3" diff --git a/packages/components/package.json b/packages/components/package.json index 258115bdc2..6b37338960 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -19,7 +19,10 @@ "jest": { "testRegex": ".*Test.js$", "testURL": "http://localhost", - "setupTestFrameworkScriptFile": "/jest/setupTests.js" + "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js", + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" + ] }, "dependencies": { "@wordpress/a11y": "^1.1.3", diff --git a/packages/configuration-wizard/package.json b/packages/configuration-wizard/package.json index a58cc0b14c..6ba1b9b801 100644 --- a/packages/configuration-wizard/package.json +++ b/packages/configuration-wizard/package.json @@ -61,6 +61,9 @@ }, "transformIgnorePatterns": [ "/node_modules/(?!yoastseo|lodash-es).+\\.js$" + ], + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" ] }, "publishConfig": { diff --git a/packages/feature-flag/package.json b/packages/feature-flag/package.json index a76b952907..84776da483 100644 --- a/packages/feature-flag/package.json +++ b/packages/feature-flag/package.json @@ -27,7 +27,10 @@ "transformIgnorePatterns": [ "/node_modules/(?!yoastseo|lodash-es).+\\.js$" ], - "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js" + "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js", + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" + ] }, "publishConfig": { "access": "public" diff --git a/packages/helpers/package.json b/packages/helpers/package.json index 2e0807150b..8b7a316ab8 100644 --- a/packages/helpers/package.json +++ b/packages/helpers/package.json @@ -28,7 +28,10 @@ "jest": { "testRegex": ".*Test.js$", "testEnvironment": "node", - "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js" + "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js", + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" + ] }, "devDependencies": { "@yoast/browserslist-config": "^1.2.1", diff --git a/packages/search-metadata-previews/package.json b/packages/search-metadata-previews/package.json index f93f49604f..2cf356e734 100644 --- a/packages/search-metadata-previews/package.json +++ b/packages/search-metadata-previews/package.json @@ -55,7 +55,10 @@ "transformIgnorePatterns": [ "/node_modules/(?!yoastseo|lodash-es).+\\.js$" ], - "setupTestFrameworkScriptFile": "/tests/setupTests.js" + "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js", + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" + ] }, "publishConfig": { "access": "public" diff --git a/packages/yoast-components/package.json b/packages/yoast-components/package.json index db3d91c4d8..5e7b41931b 100644 --- a/packages/yoast-components/package.json +++ b/packages/yoast-components/package.json @@ -52,6 +52,9 @@ }, "transformIgnorePatterns": [ "/node_modules/(?!yoastseo|lodash-es).+\\.js$" + ], + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" ] }, "author": "Yoast", diff --git a/packages/yoastseo/package.json b/packages/yoastseo/package.json index 26982508e8..92c87762c3 100644 --- a/packages/yoastseo/package.json +++ b/packages/yoastseo/package.json @@ -115,7 +115,10 @@ "lines": 83, "statements": 83 } - } + }, + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" + ] }, "yoast": { "premiumConfiguration": "" From 8033563cc94dd1b1baca02cae34b17ff0f1d1a76 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Mon, 16 Mar 2020 15:04:29 +0100 Subject: [PATCH 02/29] Ensured eslint package has a proper file structure --- packages/eslint/package.json | 2 +- packages/eslint/{ => src}/default.yml | 0 packages/eslint/{ => src}/index.js | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename packages/eslint/{ => src}/default.yml (100%) rename packages/eslint/{ => src}/index.js (100%) diff --git a/packages/eslint/package.json b/packages/eslint/package.json index 7821266b66..c41a9af247 100644 --- a/packages/eslint/package.json +++ b/packages/eslint/package.json @@ -7,7 +7,7 @@ "eslint", "eslintconfig" ], - "main": "index.js", + "main": "src/index.js", "repository": { "type": "git", "url": "https://github.com/Yoast/javascript.git", diff --git a/packages/eslint/default.yml b/packages/eslint/src/default.yml similarity index 100% rename from packages/eslint/default.yml rename to packages/eslint/src/default.yml diff --git a/packages/eslint/index.js b/packages/eslint/src/index.js similarity index 100% rename from packages/eslint/index.js rename to packages/eslint/src/index.js From 5ad383230c0b9adaaa564d48569af78554f37b59 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Mon, 16 Mar 2020 16:31:38 +0100 Subject: [PATCH 03/29] Moved setupTests to tools directory. --- .../search-metadata-previews/{tests => tools/jest}/setupTests.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/search-metadata-previews/{tests => tools/jest}/setupTests.js (100%) diff --git a/packages/search-metadata-previews/tests/setupTests.js b/packages/search-metadata-previews/tools/jest/setupTests.js similarity index 100% rename from packages/search-metadata-previews/tests/setupTests.js rename to packages/search-metadata-previews/tools/jest/setupTests.js From 59f4c2a39ec59e7ffb3aa7b81619762e69e4062d Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Mon, 16 Mar 2020 16:42:06 +0100 Subject: [PATCH 04/29] Moved components setupTests file to tools directory --- packages/components/tools/jest/setupTests.js | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 packages/components/tools/jest/setupTests.js diff --git a/packages/components/tools/jest/setupTests.js b/packages/components/tools/jest/setupTests.js new file mode 100644 index 0000000000..ae2c5706e1 --- /dev/null +++ b/packages/components/tools/jest/setupTests.js @@ -0,0 +1,6 @@ +import "raf/polyfill"; +import "jest-styled-components"; +import Enzyme from "enzyme"; +import EnzymeAdapter from "enzyme-adapter-react-16"; + +Enzyme.configure( { adapter: new EnzymeAdapter() } ); From f71104f604ff59a3774281bc82e3430cb0b17679 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Mon, 16 Mar 2020 16:59:22 +0100 Subject: [PATCH 05/29] Updated folder structure for the yoast-components package --- .../reducers/contentAnalysisReducer.js | 8 -------- .../css-dist/yoast-components-standalone.min.css | 1 - .../css-dist/yoast-components.min.css | 1 - packages/yoast-components/package.json | 14 +++++++------- .../{ => src}/a11y/examples/example.html | 0 .../{ => src}/a11y/examples/example.js | 0 .../{ => src}/composites/CoursesOverview/Card.js | 0 .../composites/CoursesOverview/CardBanner.js | 0 .../composites/CoursesOverview/CardDetails.js | 0 .../composites/LinkSuggestions/LinkSuggestion.js | 0 .../composites/LinkSuggestions/LinkSuggestions.js | 0 .../ContentAnalysis/actions/contentAnalysis.js | 0 .../actions/tests/contentAnalysisTest.js | 0 .../ContentAnalysis/components/AnalysisList.js | 0 .../ContentAnalysis/components/AnalysisResult.js | 0 .../ContentAnalysis/components/ContentAnalysis.js | 0 .../composites/Plugin/ContentAnalysis/index.js | 0 .../contentAnalysis/keywordResultsReducer.js | 0 .../contentAnalysis/readabilityResultsReducer.js | 0 .../reducers/contentAnalysisReducer.js | 8 ++++++++ .../reducers/tests/contentAnalysisReducerTest.js | 2 +- .../reducers/tests/keywordResultsReducerTest.js | 0 .../tests/readabilityResultsReducerTest.js | 0 .../components/CornerstoneToggle.js | 0 .../tests/CornerstoneToggleTest.js | 0 .../__snapshots__/CornerstoneToggleTest.js.snap | 0 .../composites/Plugin/DashboardWidget/index.js | 0 .../Plugin/Shared/components/ButtonSection.js | 0 .../Plugin/Shared/components/Collapsible.js | 0 .../Plugin/Shared/components/KeywordInput.js | 0 .../Plugin/Shared/tests/KeywordInputTest.js | 0 .../tests/__snapshots__/KeywordInputTest.js.snap | 0 .../Facebook/components/FacebookImage.js | 0 .../Facebook/components/FacebookPreview.js | 0 .../Facebook/components/FacebookSiteName.js | 0 .../helpers/determineFacebookImageProperties.js | 0 .../Facebook/tests/FacebookImageTest.js | 0 .../Facebook/tests/FacebookPreviewTest.js | 0 .../Facebook/tests/FacebookSiteNameTest.js | 0 .../tests/__snapshots__/FacebookImageTest.js.snap | 0 .../__snapshots__/FacebookPreviewTest.js.snap | 0 .../__snapshots__/FacebookSiteNameTest.js.snap | 0 .../tests/determineFacebookImagePropertiesTest.js | 0 .../tests/testHelpers/delayComponentSnapshot.js | 0 .../{ => src}/config/defaults.json | 0 .../yoast-components/{ => src}/css/_mixins.scss | 0 .../{ => src}/css/accessibility.scss | 0 packages/yoast-components/{ => src}/css/all.scss | 0 .../yoast-components/{ => src}/css/standalone.scss | 4 ++-- packages/yoast-components/{ => src}/forms/index.js | 0 packages/yoast-components/{ => src}/index.js | 0 .../{ => src}/redux/actions/insights.js | 0 .../{ => src}/redux/actions/linkSuggestions.js | 0 .../{ => src}/redux/actions/tests/insightsTest.js | 0 .../redux/actions/tests/linkSuggestionsTest.js | 0 .../{ => src}/redux/reducers/index.js | 0 .../{ => src}/redux/reducers/insights.js | 0 .../{ => src}/redux/reducers/linkSuggestions.js | 0 .../{ => src}/redux/reducers/prominentWords.js | 0 .../{ => src}/redux/reducers/tests/indexTest.js | 0 .../{ => src}/redux/reducers/tests/insightsTest.js | 0 .../redux/reducers/tests/linkSuggestionsTest.js | 0 .../redux/reducers/tests/prominentWordsTest.js | 0 .../{ => src}/style-guide/index.js | 0 .../{ => src}/utils/buildStructuredUrl.js | 0 packages/yoast-components/{ => src}/utils/i18n.js | 0 packages/yoast-components/{ => src}/utils/index.js | 0 .../yoast-components/{ => src}/utils/reactUtils.js | 0 .../utils/tests/buildStructuredUrlTest.js | 0 .../{jest => tests}/__mocks__/@wordpress/i18n.js | 0 .../{jest => tests}/__mocks__/fileMock.js | 0 .../{ => tools}/grunt/config/aliases.yaml | 0 .../{ => tools}/grunt/config/copy.js | 2 +- .../{ => tools}/grunt/config/postcss.js | 2 +- .../{ => tools}/grunt/config/sass.js | 4 ++-- .../{ => tools}/jest/setupTests.js | 0 76 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer.js delete mode 100644 packages/yoast-components/css-dist/yoast-components-standalone.min.css delete mode 100644 packages/yoast-components/css-dist/yoast-components.min.css rename packages/yoast-components/{ => src}/a11y/examples/example.html (100%) rename packages/yoast-components/{ => src}/a11y/examples/example.js (100%) rename packages/yoast-components/{ => src}/composites/CoursesOverview/Card.js (100%) rename packages/yoast-components/{ => src}/composites/CoursesOverview/CardBanner.js (100%) rename packages/yoast-components/{ => src}/composites/CoursesOverview/CardDetails.js (100%) rename packages/yoast-components/{ => src}/composites/LinkSuggestions/LinkSuggestion.js (100%) rename packages/yoast-components/{ => src}/composites/LinkSuggestions/LinkSuggestions.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/actions/contentAnalysis.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/actions/tests/contentAnalysisTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/components/AnalysisList.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/components/AnalysisResult.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/components/ContentAnalysis.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/index.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/keywordResultsReducer.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/readabilityResultsReducer.js (100%) create mode 100644 packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer.js rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/reducers/tests/contentAnalysisReducerTest.js (91%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/reducers/tests/keywordResultsReducerTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/reducers/tests/readabilityResultsReducerTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/CornerstoneContent/components/CornerstoneToggle.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/CornerstoneContent/tests/CornerstoneToggleTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/CornerstoneContent/tests/__snapshots__/CornerstoneToggleTest.js.snap (100%) rename packages/yoast-components/{ => src}/composites/Plugin/DashboardWidget/index.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/Shared/components/ButtonSection.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/Shared/components/Collapsible.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/Shared/components/KeywordInput.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/Shared/tests/KeywordInputTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/Shared/tests/__snapshots__/KeywordInputTest.js.snap (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/components/FacebookImage.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/components/FacebookPreview.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/components/FacebookSiteName.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/helpers/determineFacebookImageProperties.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/tests/FacebookImageTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/tests/FacebookPreviewTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/tests/FacebookSiteNameTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookImageTest.js.snap (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookPreviewTest.js.snap (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookSiteNameTest.js.snap (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/tests/determineFacebookImagePropertiesTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/tests/testHelpers/delayComponentSnapshot.js (100%) rename packages/yoast-components/{ => src}/config/defaults.json (100%) rename packages/yoast-components/{ => src}/css/_mixins.scss (100%) rename packages/yoast-components/{ => src}/css/accessibility.scss (100%) rename packages/yoast-components/{ => src}/css/all.scss (100%) rename packages/yoast-components/{ => src}/css/standalone.scss (79%) rename packages/yoast-components/{ => src}/forms/index.js (100%) rename packages/yoast-components/{ => src}/index.js (100%) rename packages/yoast-components/{ => src}/redux/actions/insights.js (100%) rename packages/yoast-components/{ => src}/redux/actions/linkSuggestions.js (100%) rename packages/yoast-components/{ => src}/redux/actions/tests/insightsTest.js (100%) rename packages/yoast-components/{ => src}/redux/actions/tests/linkSuggestionsTest.js (100%) rename packages/yoast-components/{ => src}/redux/reducers/index.js (100%) rename packages/yoast-components/{ => src}/redux/reducers/insights.js (100%) rename packages/yoast-components/{ => src}/redux/reducers/linkSuggestions.js (100%) rename packages/yoast-components/{ => src}/redux/reducers/prominentWords.js (100%) rename packages/yoast-components/{ => src}/redux/reducers/tests/indexTest.js (100%) rename packages/yoast-components/{ => src}/redux/reducers/tests/insightsTest.js (100%) rename packages/yoast-components/{ => src}/redux/reducers/tests/linkSuggestionsTest.js (100%) rename packages/yoast-components/{ => src}/redux/reducers/tests/prominentWordsTest.js (100%) rename packages/yoast-components/{ => src}/style-guide/index.js (100%) rename packages/yoast-components/{ => src}/utils/buildStructuredUrl.js (100%) rename packages/yoast-components/{ => src}/utils/i18n.js (100%) rename packages/yoast-components/{ => src}/utils/index.js (100%) rename packages/yoast-components/{ => src}/utils/reactUtils.js (100%) rename packages/yoast-components/{ => src}/utils/tests/buildStructuredUrlTest.js (100%) rename packages/yoast-components/{jest => tests}/__mocks__/@wordpress/i18n.js (100%) rename packages/yoast-components/{jest => tests}/__mocks__/fileMock.js (100%) rename packages/yoast-components/{ => tools}/grunt/config/aliases.yaml (100%) rename packages/yoast-components/{ => tools}/grunt/config/copy.js (92%) rename packages/yoast-components/{ => tools}/grunt/config/postcss.js (83%) rename packages/yoast-components/{ => tools}/grunt/config/sass.js (69%) rename packages/yoast-components/{ => tools}/jest/setupTests.js (100%) diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer.js b/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer.js deleted file mode 100644 index 650a8130bb..0000000000 --- a/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer.js +++ /dev/null @@ -1,8 +0,0 @@ -import { readabilityResultsReducer } from "../reducers/contentAnalysis/readabilityResultsReducer"; -import { keywordResultsReducer } from "../reducers/contentAnalysis/keywordResultsReducer"; -import { combineReducers } from "redux"; - -export default combineReducers( { - seo: keywordResultsReducer, - readability: readabilityResultsReducer, -} ); diff --git a/packages/yoast-components/css-dist/yoast-components-standalone.min.css b/packages/yoast-components/css-dist/yoast-components-standalone.min.css deleted file mode 100644 index 00a194db59..0000000000 --- a/packages/yoast-components/css-dist/yoast-components-standalone.min.css +++ /dev/null @@ -1 +0,0 @@ -.screen-reader-text{position:absolute !important;clip:rect(1px, 1px, 1px, 1px);clip-path:inset(50%);width:1px;height:1px;border:0;padding:0;overflow:hidden;word-wrap:normal !important}body{background:#f1f1f1;font-family:arial, sans-serif;line-height:1.375}.yoast-search-result-editor{width:640px;margin:0 auto;font-family:Arial, sans-serif} diff --git a/packages/yoast-components/css-dist/yoast-components.min.css b/packages/yoast-components/css-dist/yoast-components.min.css deleted file mode 100644 index c7d3ead9a5..0000000000 --- a/packages/yoast-components/css-dist/yoast-components.min.css +++ /dev/null @@ -1 +0,0 @@ -.screen-reader-text{position:absolute !important;clip:rect(1px, 1px, 1px, 1px);-webkit-clip-path:inset(50%);clip-path:inset(50%);width:1px;height:1px;border:0;padding:0;overflow:hidden;word-wrap:normal !important} diff --git a/packages/yoast-components/package.json b/packages/yoast-components/package.json index 5e7b41931b..1d03243967 100644 --- a/packages/yoast-components/package.json +++ b/packages/yoast-components/package.json @@ -8,7 +8,7 @@ "url": "https://github.com/Yoast/javascript.git", "directory": "packages/yoast-components" }, - "main": "index.js", + "main": "src/index.js", "scripts": { "start": "echo 'The yoast-components demo app has been moved to javascript/apps/components (https://github.com/Yoast/javascript/tree/develop/apps/components). Please run yarn start there.'", "test": "jest", @@ -18,8 +18,8 @@ "jest": { "testURL": "http://localhost", "moduleNameMapper": { - "\\.(jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "/jest/__mocks__/fileMock.js", - "\\.(css|less)$": "/jest/__mocks__/styleMock.js" + "\\.(jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "/tests/__mocks__/fileMock.js", + "\\.(css|less)$": "/tests/__mocks__/styleMock.js" }, "unmockedModulePathPatterns": [ "react", @@ -33,15 +33,15 @@ ], "testRegex": ".*Test.js$", "coverageDirectory": "coverage", - "setupTestFrameworkScriptFile": "/jest/setupTests.js", + "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js", "collectCoverageFrom": [ - "**/*.js", + "src/**/*.js", "!**/*.*Test.js", "!grunt/**/*.js", "!*.js", "!app/**/*.js", - "!a11y/examples/example.js", - "!utils/helpers/*.js", + "!src/a11y/examples/example.js", + "!src/utils/helpers/*.js", "!coverage/**/*.js" ], "snapshotSerializers": [ diff --git a/packages/yoast-components/a11y/examples/example.html b/packages/yoast-components/src/a11y/examples/example.html similarity index 100% rename from packages/yoast-components/a11y/examples/example.html rename to packages/yoast-components/src/a11y/examples/example.html diff --git a/packages/yoast-components/a11y/examples/example.js b/packages/yoast-components/src/a11y/examples/example.js similarity index 100% rename from packages/yoast-components/a11y/examples/example.js rename to packages/yoast-components/src/a11y/examples/example.js diff --git a/packages/yoast-components/composites/CoursesOverview/Card.js b/packages/yoast-components/src/composites/CoursesOverview/Card.js similarity index 100% rename from packages/yoast-components/composites/CoursesOverview/Card.js rename to packages/yoast-components/src/composites/CoursesOverview/Card.js diff --git a/packages/yoast-components/composites/CoursesOverview/CardBanner.js b/packages/yoast-components/src/composites/CoursesOverview/CardBanner.js similarity index 100% rename from packages/yoast-components/composites/CoursesOverview/CardBanner.js rename to packages/yoast-components/src/composites/CoursesOverview/CardBanner.js diff --git a/packages/yoast-components/composites/CoursesOverview/CardDetails.js b/packages/yoast-components/src/composites/CoursesOverview/CardDetails.js similarity index 100% rename from packages/yoast-components/composites/CoursesOverview/CardDetails.js rename to packages/yoast-components/src/composites/CoursesOverview/CardDetails.js diff --git a/packages/yoast-components/composites/LinkSuggestions/LinkSuggestion.js b/packages/yoast-components/src/composites/LinkSuggestions/LinkSuggestion.js similarity index 100% rename from packages/yoast-components/composites/LinkSuggestions/LinkSuggestion.js rename to packages/yoast-components/src/composites/LinkSuggestions/LinkSuggestion.js diff --git a/packages/yoast-components/composites/LinkSuggestions/LinkSuggestions.js b/packages/yoast-components/src/composites/LinkSuggestions/LinkSuggestions.js similarity index 100% rename from packages/yoast-components/composites/LinkSuggestions/LinkSuggestions.js rename to packages/yoast-components/src/composites/LinkSuggestions/LinkSuggestions.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/actions/contentAnalysis.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/actions/contentAnalysis.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/actions/contentAnalysis.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/actions/contentAnalysis.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/actions/tests/contentAnalysisTest.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/actions/tests/contentAnalysisTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/actions/tests/contentAnalysisTest.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/actions/tests/contentAnalysisTest.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/components/AnalysisList.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/components/AnalysisList.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/components/AnalysisList.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/components/AnalysisList.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/components/AnalysisResult.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/components/AnalysisResult.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/components/AnalysisResult.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/components/AnalysisResult.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/components/ContentAnalysis.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/components/ContentAnalysis.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/components/ContentAnalysis.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/components/ContentAnalysis.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/index.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/index.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/index.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/index.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/keywordResultsReducer.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/keywordResultsReducer.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/keywordResultsReducer.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/keywordResultsReducer.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/readabilityResultsReducer.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/readabilityResultsReducer.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/readabilityResultsReducer.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/readabilityResultsReducer.js diff --git a/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer.js new file mode 100644 index 0000000000..d59327e463 --- /dev/null +++ b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer.js @@ -0,0 +1,8 @@ +import { readabilityResultsReducer } from "./contentAnalysis/readabilityResultsReducer"; +import { keywordResultsReducer } from "./contentAnalysis/keywordResultsReducer"; +import { combineReducers } from "redux"; + +export default combineReducers( { + seo: keywordResultsReducer, + readability: readabilityResultsReducer, +} ); diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/tests/contentAnalysisReducerTest.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/tests/contentAnalysisReducerTest.js similarity index 91% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/tests/contentAnalysisReducerTest.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/tests/contentAnalysisReducerTest.js index 2c71d9f915..9b7d780ccb 100644 --- a/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/tests/contentAnalysisReducerTest.js +++ b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/tests/contentAnalysisReducerTest.js @@ -1,5 +1,5 @@ import { UPDATE_SEO_RESULT } from "../../actions/contentAnalysis"; -import contentAnalysisReducer from "../../reducers/contentAnalysisReducer"; +import contentAnalysisReducer from "../contentAnalysisReducer"; jest.mock( "../../reducers/contentAnalysis/readabilityResultsReducer", () => { return { diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/tests/keywordResultsReducerTest.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/tests/keywordResultsReducerTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/tests/keywordResultsReducerTest.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/tests/keywordResultsReducerTest.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/tests/readabilityResultsReducerTest.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/tests/readabilityResultsReducerTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/tests/readabilityResultsReducerTest.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/tests/readabilityResultsReducerTest.js diff --git a/packages/yoast-components/composites/Plugin/CornerstoneContent/components/CornerstoneToggle.js b/packages/yoast-components/src/composites/Plugin/CornerstoneContent/components/CornerstoneToggle.js similarity index 100% rename from packages/yoast-components/composites/Plugin/CornerstoneContent/components/CornerstoneToggle.js rename to packages/yoast-components/src/composites/Plugin/CornerstoneContent/components/CornerstoneToggle.js diff --git a/packages/yoast-components/composites/Plugin/CornerstoneContent/tests/CornerstoneToggleTest.js b/packages/yoast-components/src/composites/Plugin/CornerstoneContent/tests/CornerstoneToggleTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/CornerstoneContent/tests/CornerstoneToggleTest.js rename to packages/yoast-components/src/composites/Plugin/CornerstoneContent/tests/CornerstoneToggleTest.js diff --git a/packages/yoast-components/composites/Plugin/CornerstoneContent/tests/__snapshots__/CornerstoneToggleTest.js.snap b/packages/yoast-components/src/composites/Plugin/CornerstoneContent/tests/__snapshots__/CornerstoneToggleTest.js.snap similarity index 100% rename from packages/yoast-components/composites/Plugin/CornerstoneContent/tests/__snapshots__/CornerstoneToggleTest.js.snap rename to packages/yoast-components/src/composites/Plugin/CornerstoneContent/tests/__snapshots__/CornerstoneToggleTest.js.snap diff --git a/packages/yoast-components/composites/Plugin/DashboardWidget/index.js b/packages/yoast-components/src/composites/Plugin/DashboardWidget/index.js similarity index 100% rename from packages/yoast-components/composites/Plugin/DashboardWidget/index.js rename to packages/yoast-components/src/composites/Plugin/DashboardWidget/index.js diff --git a/packages/yoast-components/composites/Plugin/Shared/components/ButtonSection.js b/packages/yoast-components/src/composites/Plugin/Shared/components/ButtonSection.js similarity index 100% rename from packages/yoast-components/composites/Plugin/Shared/components/ButtonSection.js rename to packages/yoast-components/src/composites/Plugin/Shared/components/ButtonSection.js diff --git a/packages/yoast-components/composites/Plugin/Shared/components/Collapsible.js b/packages/yoast-components/src/composites/Plugin/Shared/components/Collapsible.js similarity index 100% rename from packages/yoast-components/composites/Plugin/Shared/components/Collapsible.js rename to packages/yoast-components/src/composites/Plugin/Shared/components/Collapsible.js diff --git a/packages/yoast-components/composites/Plugin/Shared/components/KeywordInput.js b/packages/yoast-components/src/composites/Plugin/Shared/components/KeywordInput.js similarity index 100% rename from packages/yoast-components/composites/Plugin/Shared/components/KeywordInput.js rename to packages/yoast-components/src/composites/Plugin/Shared/components/KeywordInput.js diff --git a/packages/yoast-components/composites/Plugin/Shared/tests/KeywordInputTest.js b/packages/yoast-components/src/composites/Plugin/Shared/tests/KeywordInputTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/Shared/tests/KeywordInputTest.js rename to packages/yoast-components/src/composites/Plugin/Shared/tests/KeywordInputTest.js diff --git a/packages/yoast-components/composites/Plugin/Shared/tests/__snapshots__/KeywordInputTest.js.snap b/packages/yoast-components/src/composites/Plugin/Shared/tests/__snapshots__/KeywordInputTest.js.snap similarity index 100% rename from packages/yoast-components/composites/Plugin/Shared/tests/__snapshots__/KeywordInputTest.js.snap rename to packages/yoast-components/src/composites/Plugin/Shared/tests/__snapshots__/KeywordInputTest.js.snap diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/components/FacebookImage.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/components/FacebookImage.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/components/FacebookImage.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/components/FacebookImage.js diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/components/FacebookPreview.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/components/FacebookPreview.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/components/FacebookPreview.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/components/FacebookPreview.js diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/components/FacebookSiteName.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/components/FacebookSiteName.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/components/FacebookSiteName.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/components/FacebookSiteName.js diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/helpers/determineFacebookImageProperties.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/helpers/determineFacebookImageProperties.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/helpers/determineFacebookImageProperties.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/helpers/determineFacebookImageProperties.js diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/FacebookImageTest.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/FacebookImageTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/FacebookImageTest.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/FacebookImageTest.js diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/FacebookPreviewTest.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/FacebookPreviewTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/FacebookPreviewTest.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/FacebookPreviewTest.js diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/FacebookSiteNameTest.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/FacebookSiteNameTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/FacebookSiteNameTest.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/FacebookSiteNameTest.js diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookImageTest.js.snap b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookImageTest.js.snap similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookImageTest.js.snap rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookImageTest.js.snap diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookPreviewTest.js.snap b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookPreviewTest.js.snap similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookPreviewTest.js.snap rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookPreviewTest.js.snap diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookSiteNameTest.js.snap b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookSiteNameTest.js.snap similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookSiteNameTest.js.snap rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookSiteNameTest.js.snap diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/determineFacebookImagePropertiesTest.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/determineFacebookImagePropertiesTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/determineFacebookImagePropertiesTest.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/determineFacebookImagePropertiesTest.js diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/testHelpers/delayComponentSnapshot.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/testHelpers/delayComponentSnapshot.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/testHelpers/delayComponentSnapshot.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/testHelpers/delayComponentSnapshot.js diff --git a/packages/yoast-components/config/defaults.json b/packages/yoast-components/src/config/defaults.json similarity index 100% rename from packages/yoast-components/config/defaults.json rename to packages/yoast-components/src/config/defaults.json diff --git a/packages/yoast-components/css/_mixins.scss b/packages/yoast-components/src/css/_mixins.scss similarity index 100% rename from packages/yoast-components/css/_mixins.scss rename to packages/yoast-components/src/css/_mixins.scss diff --git a/packages/yoast-components/css/accessibility.scss b/packages/yoast-components/src/css/accessibility.scss similarity index 100% rename from packages/yoast-components/css/accessibility.scss rename to packages/yoast-components/src/css/accessibility.scss diff --git a/packages/yoast-components/css/all.scss b/packages/yoast-components/src/css/all.scss similarity index 100% rename from packages/yoast-components/css/all.scss rename to packages/yoast-components/src/css/all.scss diff --git a/packages/yoast-components/css/standalone.scss b/packages/yoast-components/src/css/standalone.scss similarity index 79% rename from packages/yoast-components/css/standalone.scss rename to packages/yoast-components/src/css/standalone.scss index 11a67c1e7b..e7949e6f26 100644 --- a/packages/yoast-components/css/standalone.scss +++ b/packages/yoast-components/src/css/standalone.scss @@ -1,6 +1,6 @@ // Requires Sass Dash -@import "../node_modules/sassdash/scss/sassdash"; -@import "./all"; +@import "../../node_modules/sassdash/scss/sassdash"; +@import "all"; body { background: #f1f1f1; diff --git a/packages/yoast-components/forms/index.js b/packages/yoast-components/src/forms/index.js similarity index 100% rename from packages/yoast-components/forms/index.js rename to packages/yoast-components/src/forms/index.js diff --git a/packages/yoast-components/index.js b/packages/yoast-components/src/index.js similarity index 100% rename from packages/yoast-components/index.js rename to packages/yoast-components/src/index.js diff --git a/packages/yoast-components/redux/actions/insights.js b/packages/yoast-components/src/redux/actions/insights.js similarity index 100% rename from packages/yoast-components/redux/actions/insights.js rename to packages/yoast-components/src/redux/actions/insights.js diff --git a/packages/yoast-components/redux/actions/linkSuggestions.js b/packages/yoast-components/src/redux/actions/linkSuggestions.js similarity index 100% rename from packages/yoast-components/redux/actions/linkSuggestions.js rename to packages/yoast-components/src/redux/actions/linkSuggestions.js diff --git a/packages/yoast-components/redux/actions/tests/insightsTest.js b/packages/yoast-components/src/redux/actions/tests/insightsTest.js similarity index 100% rename from packages/yoast-components/redux/actions/tests/insightsTest.js rename to packages/yoast-components/src/redux/actions/tests/insightsTest.js diff --git a/packages/yoast-components/redux/actions/tests/linkSuggestionsTest.js b/packages/yoast-components/src/redux/actions/tests/linkSuggestionsTest.js similarity index 100% rename from packages/yoast-components/redux/actions/tests/linkSuggestionsTest.js rename to packages/yoast-components/src/redux/actions/tests/linkSuggestionsTest.js diff --git a/packages/yoast-components/redux/reducers/index.js b/packages/yoast-components/src/redux/reducers/index.js similarity index 100% rename from packages/yoast-components/redux/reducers/index.js rename to packages/yoast-components/src/redux/reducers/index.js diff --git a/packages/yoast-components/redux/reducers/insights.js b/packages/yoast-components/src/redux/reducers/insights.js similarity index 100% rename from packages/yoast-components/redux/reducers/insights.js rename to packages/yoast-components/src/redux/reducers/insights.js diff --git a/packages/yoast-components/redux/reducers/linkSuggestions.js b/packages/yoast-components/src/redux/reducers/linkSuggestions.js similarity index 100% rename from packages/yoast-components/redux/reducers/linkSuggestions.js rename to packages/yoast-components/src/redux/reducers/linkSuggestions.js diff --git a/packages/yoast-components/redux/reducers/prominentWords.js b/packages/yoast-components/src/redux/reducers/prominentWords.js similarity index 100% rename from packages/yoast-components/redux/reducers/prominentWords.js rename to packages/yoast-components/src/redux/reducers/prominentWords.js diff --git a/packages/yoast-components/redux/reducers/tests/indexTest.js b/packages/yoast-components/src/redux/reducers/tests/indexTest.js similarity index 100% rename from packages/yoast-components/redux/reducers/tests/indexTest.js rename to packages/yoast-components/src/redux/reducers/tests/indexTest.js diff --git a/packages/yoast-components/redux/reducers/tests/insightsTest.js b/packages/yoast-components/src/redux/reducers/tests/insightsTest.js similarity index 100% rename from packages/yoast-components/redux/reducers/tests/insightsTest.js rename to packages/yoast-components/src/redux/reducers/tests/insightsTest.js diff --git a/packages/yoast-components/redux/reducers/tests/linkSuggestionsTest.js b/packages/yoast-components/src/redux/reducers/tests/linkSuggestionsTest.js similarity index 100% rename from packages/yoast-components/redux/reducers/tests/linkSuggestionsTest.js rename to packages/yoast-components/src/redux/reducers/tests/linkSuggestionsTest.js diff --git a/packages/yoast-components/redux/reducers/tests/prominentWordsTest.js b/packages/yoast-components/src/redux/reducers/tests/prominentWordsTest.js similarity index 100% rename from packages/yoast-components/redux/reducers/tests/prominentWordsTest.js rename to packages/yoast-components/src/redux/reducers/tests/prominentWordsTest.js diff --git a/packages/yoast-components/style-guide/index.js b/packages/yoast-components/src/style-guide/index.js similarity index 100% rename from packages/yoast-components/style-guide/index.js rename to packages/yoast-components/src/style-guide/index.js diff --git a/packages/yoast-components/utils/buildStructuredUrl.js b/packages/yoast-components/src/utils/buildStructuredUrl.js similarity index 100% rename from packages/yoast-components/utils/buildStructuredUrl.js rename to packages/yoast-components/src/utils/buildStructuredUrl.js diff --git a/packages/yoast-components/utils/i18n.js b/packages/yoast-components/src/utils/i18n.js similarity index 100% rename from packages/yoast-components/utils/i18n.js rename to packages/yoast-components/src/utils/i18n.js diff --git a/packages/yoast-components/utils/index.js b/packages/yoast-components/src/utils/index.js similarity index 100% rename from packages/yoast-components/utils/index.js rename to packages/yoast-components/src/utils/index.js diff --git a/packages/yoast-components/utils/reactUtils.js b/packages/yoast-components/src/utils/reactUtils.js similarity index 100% rename from packages/yoast-components/utils/reactUtils.js rename to packages/yoast-components/src/utils/reactUtils.js diff --git a/packages/yoast-components/utils/tests/buildStructuredUrlTest.js b/packages/yoast-components/src/utils/tests/buildStructuredUrlTest.js similarity index 100% rename from packages/yoast-components/utils/tests/buildStructuredUrlTest.js rename to packages/yoast-components/src/utils/tests/buildStructuredUrlTest.js diff --git a/packages/yoast-components/jest/__mocks__/@wordpress/i18n.js b/packages/yoast-components/tests/__mocks__/@wordpress/i18n.js similarity index 100% rename from packages/yoast-components/jest/__mocks__/@wordpress/i18n.js rename to packages/yoast-components/tests/__mocks__/@wordpress/i18n.js diff --git a/packages/yoast-components/jest/__mocks__/fileMock.js b/packages/yoast-components/tests/__mocks__/fileMock.js similarity index 100% rename from packages/yoast-components/jest/__mocks__/fileMock.js rename to packages/yoast-components/tests/__mocks__/fileMock.js diff --git a/packages/yoast-components/grunt/config/aliases.yaml b/packages/yoast-components/tools/grunt/config/aliases.yaml similarity index 100% rename from packages/yoast-components/grunt/config/aliases.yaml rename to packages/yoast-components/tools/grunt/config/aliases.yaml diff --git a/packages/yoast-components/grunt/config/copy.js b/packages/yoast-components/tools/grunt/config/copy.js similarity index 92% rename from packages/yoast-components/grunt/config/copy.js rename to packages/yoast-components/tools/grunt/config/copy.js index 223c08b38b..b57d933466 100644 --- a/packages/yoast-components/grunt/config/copy.js +++ b/packages/yoast-components/tools/grunt/config/copy.js @@ -4,7 +4,7 @@ module.exports = { files: [ { src: [ ".babelrc", - "**/*", + "src/**/*", "!dist/**/*", "!node_modules/**/*", ], diff --git a/packages/yoast-components/grunt/config/postcss.js b/packages/yoast-components/tools/grunt/config/postcss.js similarity index 83% rename from packages/yoast-components/grunt/config/postcss.js rename to packages/yoast-components/tools/grunt/config/postcss.js index 2a4b504233..59ea83c4e2 100644 --- a/packages/yoast-components/grunt/config/postcss.js +++ b/packages/yoast-components/tools/grunt/config/postcss.js @@ -8,6 +8,6 @@ module.exports = { ], }, build: { - src: "css-dist/yoast-components.min.css", + src: "dist/css/yoast-components.min.css", }, }; diff --git a/packages/yoast-components/grunt/config/sass.js b/packages/yoast-components/tools/grunt/config/sass.js similarity index 69% rename from packages/yoast-components/grunt/config/sass.js rename to packages/yoast-components/tools/grunt/config/sass.js index 8434a26a3d..285df58603 100644 --- a/packages/yoast-components/grunt/config/sass.js +++ b/packages/yoast-components/tools/grunt/config/sass.js @@ -8,8 +8,8 @@ module.exports = { }, build: { files: { - "css-dist/yoast-components.min.css": "css/all.scss", - "css-dist/yoast-components-standalone.min.css": "css/standalone.scss", + "dist/css/yoast-components.min.css": "src/css/all.scss", + "dist/css/yoast-components-standalone.min.css": "src/css/standalone.scss", }, }, example: { diff --git a/packages/yoast-components/jest/setupTests.js b/packages/yoast-components/tools/jest/setupTests.js similarity index 100% rename from packages/yoast-components/jest/setupTests.js rename to packages/yoast-components/tools/jest/setupTests.js From 3fe2c9d0f8837e5114f94d1d78ca91094446841e Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Mon, 16 Mar 2020 17:03:50 +0100 Subject: [PATCH 06/29] Altered path names to grunt configuration locations for yoast-components package. --- packages/yoast-components/Gruntfile.js | 6 +++--- packages/yoast-components/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/yoast-components/Gruntfile.js b/packages/yoast-components/Gruntfile.js index 8302ed760c..fd78b7b7ab 100644 --- a/packages/yoast-components/Gruntfile.js +++ b/packages/yoast-components/Gruntfile.js @@ -6,15 +6,15 @@ module.exports = function( grunt ) { // Define project configuration const project = { paths: { - grunt: "grunt/", + grunt: "tools/grunt/", get config() { return this.grunt + "config/"; }, }, files: { components: [ - "**/*.js", - "*.js", + "src/**/*.js", + "src/*.js", "!node_modules/**", "!node_modules/*", ], diff --git a/packages/yoast-components/package.json b/packages/yoast-components/package.json index 1d03243967..7f416fd6f4 100644 --- a/packages/yoast-components/package.json +++ b/packages/yoast-components/package.json @@ -37,7 +37,7 @@ "collectCoverageFrom": [ "src/**/*.js", "!**/*.*Test.js", - "!grunt/**/*.js", + "!tools/grunt/**/*.js", "!*.js", "!app/**/*.js", "!src/a11y/examples/example.js", From b2d19467087e12575e091705b785aaaa97e97bd2 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Mon, 16 Mar 2020 17:07:33 +0100 Subject: [PATCH 07/29] Updated the folder structure for yoast-social-previews --- packages/yoast-social-previews/.gitignore | 1 + packages/yoast-social-previews/.istanbul.yml | 2 +- packages/yoast-social-previews/Gruntfile.js | 18 +++++++++--------- .../yoast-social-previews/example/example.js | 4 ++-- .../grunt/config/eslint.js | 3 --- packages/yoast-social-previews/package.json | 2 +- .../spec/fields/buttonSpec.js | 2 +- .../spec/fields/textAreaSpec.js | 2 +- .../spec/fields/textFieldSpec.js | 2 +- .../spec/helpers/bem/addModifierSpec.js | 2 +- .../spec/helpers/bem/addModifierToClassSpec.js | 2 +- .../spec/helpers/bem/removeModifierSpec.js | 2 +- .../{ => src}/css/editable-preview.scss | 0 .../{ => src}/css/image_placeholder.scss | 0 .../{ => src}/css/social_preview.scss | 6 +++--- .../yoast-social-previews/{ => src}/index.js | 0 .../{ => src}/js/element/imagePlaceholder.js | 0 .../{ => src}/js/element/input.js | 0 .../{ => src}/js/facebookPreview.js | 0 .../{ => src}/js/helpers/addClass.js | 0 .../{ => src}/js/helpers/bem/addModifier.js | 2 +- .../js/helpers/bem/addModifierToClass.js | 0 .../{ => src}/js/helpers/bem/removeModifier.js | 2 +- .../{ => src}/js/helpers/imageDisplayMode.js | 0 .../{ => src}/js/helpers/imageRatio.js | 0 .../{ => src}/js/helpers/minimizeHtml.js | 0 .../{ => src}/js/helpers/removeClass.js | 0 .../{ => src}/js/helpers/renderDescription.js | 0 .../{ => src}/js/inputs/button.js | 2 +- .../{ => src}/js/inputs/inputField.js | 0 .../{ => src}/js/inputs/textInput.js | 0 .../{ => src}/js/inputs/textarea.js | 0 .../{ => src}/js/preview/events.js | 0 .../{ => src}/js/templates.js | 2 +- .../{ => src}/js/twitterPreview.js | 0 .../{ => src}/templates/facebookAuthor.jst | 0 .../{ => src}/templates/facebookPreview.jst | 0 .../{ => src}/templates/fields/button.jst | 0 .../{ => src}/templates/fields/text.jst | 0 .../{ => src}/templates/fields/textarea.jst | 0 .../{ => src}/templates/imagePlaceholder.jst | 0 .../{ => src}/templates/twitterPreview.jst | 0 .../{ => tools}/grunt/config/aliases.yaml | 0 .../{ => tools}/grunt/config/browserify.js | 0 .../{ => tools}/grunt/config/copy.js | 0 .../tools/grunt/config/eslint.js | 3 +++ .../{ => tools}/grunt/config/lodash.js | 2 +- .../{ => tools}/grunt/config/po2json.js | 0 .../{ => tools}/grunt/config/postcss.js | 0 .../{ => tools}/grunt/config/sass.js | 2 +- .../{ => tools}/grunt/config/shell.js | 2 +- .../{ => tools}/grunt/config/uglify.js | 0 .../{ => tools}/grunt/config/watch.js | 0 53 files changed, 33 insertions(+), 32 deletions(-) delete mode 100644 packages/yoast-social-previews/grunt/config/eslint.js rename packages/yoast-social-previews/{ => src}/css/editable-preview.scss (100%) rename packages/yoast-social-previews/{ => src}/css/image_placeholder.scss (100%) rename packages/yoast-social-previews/{ => src}/css/social_preview.scss (97%) rename packages/yoast-social-previews/{ => src}/index.js (100%) rename packages/yoast-social-previews/{ => src}/js/element/imagePlaceholder.js (100%) rename packages/yoast-social-previews/{ => src}/js/element/input.js (100%) rename packages/yoast-social-previews/{ => src}/js/facebookPreview.js (100%) rename packages/yoast-social-previews/{ => src}/js/helpers/addClass.js (100%) rename packages/yoast-social-previews/{ => src}/js/helpers/bem/addModifier.js (93%) rename packages/yoast-social-previews/{ => src}/js/helpers/bem/addModifierToClass.js (100%) rename packages/yoast-social-previews/{ => src}/js/helpers/bem/removeModifier.js (92%) rename packages/yoast-social-previews/{ => src}/js/helpers/imageDisplayMode.js (100%) rename packages/yoast-social-previews/{ => src}/js/helpers/imageRatio.js (100%) rename packages/yoast-social-previews/{ => src}/js/helpers/minimizeHtml.js (100%) rename packages/yoast-social-previews/{ => src}/js/helpers/removeClass.js (100%) rename packages/yoast-social-previews/{ => src}/js/helpers/renderDescription.js (100%) rename packages/yoast-social-previews/{ => src}/js/inputs/button.js (96%) rename packages/yoast-social-previews/{ => src}/js/inputs/inputField.js (100%) rename packages/yoast-social-previews/{ => src}/js/inputs/textInput.js (100%) rename packages/yoast-social-previews/{ => src}/js/inputs/textarea.js (100%) rename packages/yoast-social-previews/{ => src}/js/preview/events.js (100%) rename packages/yoast-social-previews/{ => src}/js/templates.js (99%) rename packages/yoast-social-previews/{ => src}/js/twitterPreview.js (100%) rename packages/yoast-social-previews/{ => src}/templates/facebookAuthor.jst (100%) rename packages/yoast-social-previews/{ => src}/templates/facebookPreview.jst (100%) rename packages/yoast-social-previews/{ => src}/templates/fields/button.jst (100%) rename packages/yoast-social-previews/{ => src}/templates/fields/text.jst (100%) rename packages/yoast-social-previews/{ => src}/templates/fields/textarea.jst (100%) rename packages/yoast-social-previews/{ => src}/templates/imagePlaceholder.jst (100%) rename packages/yoast-social-previews/{ => src}/templates/twitterPreview.jst (100%) rename packages/yoast-social-previews/{ => tools}/grunt/config/aliases.yaml (100%) rename packages/yoast-social-previews/{ => tools}/grunt/config/browserify.js (100%) rename packages/yoast-social-previews/{ => tools}/grunt/config/copy.js (100%) create mode 100644 packages/yoast-social-previews/tools/grunt/config/eslint.js rename packages/yoast-social-previews/{ => tools}/grunt/config/lodash.js (87%) rename packages/yoast-social-previews/{ => tools}/grunt/config/po2json.js (100%) rename packages/yoast-social-previews/{ => tools}/grunt/config/postcss.js (100%) rename packages/yoast-social-previews/{ => tools}/grunt/config/sass.js (74%) rename packages/yoast-social-previews/{ => tools}/grunt/config/shell.js (91%) rename packages/yoast-social-previews/{ => tools}/grunt/config/uglify.js (100%) rename packages/yoast-social-previews/{ => tools}/grunt/config/watch.js (100%) diff --git a/packages/yoast-social-previews/.gitignore b/packages/yoast-social-previews/.gitignore index 6bdbe62b82..d05d7e5481 100644 --- a/packages/yoast-social-previews/.gitignore +++ b/packages/yoast-social-previews/.gitignore @@ -1,2 +1,3 @@ /node_modules/ /.idea/ +/dist/ diff --git a/packages/yoast-social-previews/.istanbul.yml b/packages/yoast-social-previews/.istanbul.yml index 9e2e3fc6de..194f33d68d 100644 --- a/packages/yoast-social-previews/.istanbul.yml +++ b/packages/yoast-social-previews/.istanbul.yml @@ -1,5 +1,5 @@ instrumentation: - root: js + root: src/js extensions: - .js include-all-sources: true diff --git a/packages/yoast-social-previews/Gruntfile.js b/packages/yoast-social-previews/Gruntfile.js index c053ba517f..6b3dfdcd9c 100644 --- a/packages/yoast-social-previews/Gruntfile.js +++ b/packages/yoast-social-previews/Gruntfile.js @@ -5,25 +5,25 @@ module.exports = function( grunt ) { // Define project configuration. var project = { paths: { - grunt: "grunt/", - js: "js/", - css: "css/", + grunt: "tools/grunt/", + js: "src/js/", + css: "src/css/", get config() { return this.grunt + "config/"; }, }, files: { js: [ - "js/**/*.js", - "grunt/config/*.js", - "!js/config/*.js", + "src/js/**/*.js", + "tools/grunt/config/*.js", + "!src/js/config/*.js", "<%= files.grunt %>", ], jsDontLint: [ - "!js/templates.js", + "!src/js/templates.js", ], - scss: "css/*.scss", - templates: "templates/**/*.jst", + scss: "src/css/*.scss", + templates: "src/templates/**/*.jst", jed: "node_modules/jed/jed.js", get config() { return project.paths.config + "*.js"; diff --git a/packages/yoast-social-previews/example/example.js b/packages/yoast-social-previews/example/example.js index 3416fb4892..996fb31db4 100644 --- a/packages/yoast-social-previews/example/example.js +++ b/packages/yoast-social-previews/example/example.js @@ -1,5 +1,5 @@ -var FacebookPreview = require( "../js/facebookPreview.js" ); -var TwitterPreview = require( "../js/twitterPreview.js" ); +var FacebookPreview = require( "../src/js/facebookPreview.js" ); +var TwitterPreview = require( "../src/js/twitterPreview.js" ); var facebookPreview = new FacebookPreview( { diff --git a/packages/yoast-social-previews/grunt/config/eslint.js b/packages/yoast-social-previews/grunt/config/eslint.js deleted file mode 100644 index 75eea70e4b..0000000000 --- a/packages/yoast-social-previews/grunt/config/eslint.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - target: [ "<%= files.js %>", "!js/templates.js" ], -}; diff --git a/packages/yoast-social-previews/package.json b/packages/yoast-social-previews/package.json index 945e88400d..0db597b865 100644 --- a/packages/yoast-social-previews/package.json +++ b/packages/yoast-social-previews/package.json @@ -3,7 +3,7 @@ "version": "1.8.1", "description": "", "private": true, - "main": "index.js", + "main": "src/index.js", "scripts": { "test": "istanbul test jasmine" }, diff --git a/packages/yoast-social-previews/spec/fields/buttonSpec.js b/packages/yoast-social-previews/spec/fields/buttonSpec.js index 5eb4d0436f..4147837e54 100644 --- a/packages/yoast-social-previews/spec/fields/buttonSpec.js +++ b/packages/yoast-social-previews/spec/fields/buttonSpec.js @@ -1,4 +1,4 @@ -var Button = require( "../../js/inputs/button" ); +var Button = require( "../../src/js/inputs/button" ); describe( 'a button', function() { it( 'should accept a value', function() { diff --git a/packages/yoast-social-previews/spec/fields/textAreaSpec.js b/packages/yoast-social-previews/spec/fields/textAreaSpec.js index 55e78fd91e..92fdefbcb8 100644 --- a/packages/yoast-social-previews/spec/fields/textAreaSpec.js +++ b/packages/yoast-social-previews/spec/fields/textAreaSpec.js @@ -1,4 +1,4 @@ -var TextArea = require( "../../js/inputs/textarea" ); +var TextArea = require( "../../src/js/inputs/textarea" ); describe( 'a text area', function() { diff --git a/packages/yoast-social-previews/spec/fields/textFieldSpec.js b/packages/yoast-social-previews/spec/fields/textFieldSpec.js index 5fea3a76f7..24a3c9b95d 100644 --- a/packages/yoast-social-previews/spec/fields/textFieldSpec.js +++ b/packages/yoast-social-previews/spec/fields/textFieldSpec.js @@ -1,4 +1,4 @@ -var TextField = require( "../../js/inputs/textInput" ); +var TextField = require( "../../src/js/inputs/textInput" ); describe( 'a text field', function() { diff --git a/packages/yoast-social-previews/spec/helpers/bem/addModifierSpec.js b/packages/yoast-social-previews/spec/helpers/bem/addModifierSpec.js index 46382d560e..1fad3f5550 100644 --- a/packages/yoast-social-previews/spec/helpers/bem/addModifierSpec.js +++ b/packages/yoast-social-previews/spec/helpers/bem/addModifierSpec.js @@ -1,4 +1,4 @@ -var addModifier = require( "../../../js/helpers/bem/addModifier" ); +var addModifier = require( "../../../src/js/helpers/bem/addModifier" ); describe( "addModifier", function() { var mockElement, mockParent; diff --git a/packages/yoast-social-previews/spec/helpers/bem/addModifierToClassSpec.js b/packages/yoast-social-previews/spec/helpers/bem/addModifierToClassSpec.js index 7af1a02905..40c61aa21c 100644 --- a/packages/yoast-social-previews/spec/helpers/bem/addModifierToClassSpec.js +++ b/packages/yoast-social-previews/spec/helpers/bem/addModifierToClassSpec.js @@ -1,4 +1,4 @@ -var addModifierToClass = require( "../../../js/helpers/bem/addModifierToClass" ); +var addModifierToClass = require( "../../../src/js/helpers/bem/addModifierToClass" ); describe( "addModifierToClass", function() { diff --git a/packages/yoast-social-previews/spec/helpers/bem/removeModifierSpec.js b/packages/yoast-social-previews/spec/helpers/bem/removeModifierSpec.js index 0f16d39b34..cea6aef74a 100644 --- a/packages/yoast-social-previews/spec/helpers/bem/removeModifierSpec.js +++ b/packages/yoast-social-previews/spec/helpers/bem/removeModifierSpec.js @@ -1,4 +1,4 @@ -var removeModifier = require( "../../../js/helpers/bem/removeModifier" ); +var removeModifier = require( "../../../src/js/helpers/bem/removeModifier" ); describe( "removeModifier", function() { var mockElement, mockParent; diff --git a/packages/yoast-social-previews/css/editable-preview.scss b/packages/yoast-social-previews/src/css/editable-preview.scss similarity index 100% rename from packages/yoast-social-previews/css/editable-preview.scss rename to packages/yoast-social-previews/src/css/editable-preview.scss diff --git a/packages/yoast-social-previews/css/image_placeholder.scss b/packages/yoast-social-previews/src/css/image_placeholder.scss similarity index 100% rename from packages/yoast-social-previews/css/image_placeholder.scss rename to packages/yoast-social-previews/src/css/image_placeholder.scss diff --git a/packages/yoast-social-previews/css/social_preview.scss b/packages/yoast-social-previews/src/css/social_preview.scss similarity index 97% rename from packages/yoast-social-previews/css/social_preview.scss rename to packages/yoast-social-previews/src/css/social_preview.scss index 26bf5ff297..34d56a88d5 100644 --- a/packages/yoast-social-previews/css/social_preview.scss +++ b/packages/yoast-social-previews/src/css/social_preview.scss @@ -1,6 +1,6 @@ -@import "../node_modules/sassdash/index"; -@import "../node_modules/yoastseo/css/snippet-editor"; -@import "../node_modules/yoastseo/css/mixins"; +@import "../../node_modules/sassdash/index"; +@import "../../node_modules/yoastseo/css/snippet-editor"; +@import "../../node_modules/yoastseo/css/mixins"; @import "image_placeholder"; @import "editable-preview"; diff --git a/packages/yoast-social-previews/index.js b/packages/yoast-social-previews/src/index.js similarity index 100% rename from packages/yoast-social-previews/index.js rename to packages/yoast-social-previews/src/index.js diff --git a/packages/yoast-social-previews/js/element/imagePlaceholder.js b/packages/yoast-social-previews/src/js/element/imagePlaceholder.js similarity index 100% rename from packages/yoast-social-previews/js/element/imagePlaceholder.js rename to packages/yoast-social-previews/src/js/element/imagePlaceholder.js diff --git a/packages/yoast-social-previews/js/element/input.js b/packages/yoast-social-previews/src/js/element/input.js similarity index 100% rename from packages/yoast-social-previews/js/element/input.js rename to packages/yoast-social-previews/src/js/element/input.js diff --git a/packages/yoast-social-previews/js/facebookPreview.js b/packages/yoast-social-previews/src/js/facebookPreview.js similarity index 100% rename from packages/yoast-social-previews/js/facebookPreview.js rename to packages/yoast-social-previews/src/js/facebookPreview.js diff --git a/packages/yoast-social-previews/js/helpers/addClass.js b/packages/yoast-social-previews/src/js/helpers/addClass.js similarity index 100% rename from packages/yoast-social-previews/js/helpers/addClass.js rename to packages/yoast-social-previews/src/js/helpers/addClass.js diff --git a/packages/yoast-social-previews/js/helpers/bem/addModifier.js b/packages/yoast-social-previews/src/js/helpers/bem/addModifier.js similarity index 93% rename from packages/yoast-social-previews/js/helpers/bem/addModifier.js rename to packages/yoast-social-previews/src/js/helpers/bem/addModifier.js index 15a727af30..7345b7cbfa 100644 --- a/packages/yoast-social-previews/js/helpers/bem/addModifier.js +++ b/packages/yoast-social-previews/src/js/helpers/bem/addModifier.js @@ -1,4 +1,4 @@ -var addClass = require( "./../addClass" ); +var addClass = require( "../addClass" ); var addModifierToClass = require( "./addModifierToClass" ); /** diff --git a/packages/yoast-social-previews/js/helpers/bem/addModifierToClass.js b/packages/yoast-social-previews/src/js/helpers/bem/addModifierToClass.js similarity index 100% rename from packages/yoast-social-previews/js/helpers/bem/addModifierToClass.js rename to packages/yoast-social-previews/src/js/helpers/bem/addModifierToClass.js diff --git a/packages/yoast-social-previews/js/helpers/bem/removeModifier.js b/packages/yoast-social-previews/src/js/helpers/bem/removeModifier.js similarity index 92% rename from packages/yoast-social-previews/js/helpers/bem/removeModifier.js rename to packages/yoast-social-previews/src/js/helpers/bem/removeModifier.js index e11b7f2ec9..7bee3794ed 100644 --- a/packages/yoast-social-previews/js/helpers/bem/removeModifier.js +++ b/packages/yoast-social-previews/src/js/helpers/bem/removeModifier.js @@ -1,4 +1,4 @@ -var removeClass = require( "./../removeClass" ); +var removeClass = require( "../removeClass" ); var addModifierToClass = require( "./addModifierToClass" ); /** diff --git a/packages/yoast-social-previews/js/helpers/imageDisplayMode.js b/packages/yoast-social-previews/src/js/helpers/imageDisplayMode.js similarity index 100% rename from packages/yoast-social-previews/js/helpers/imageDisplayMode.js rename to packages/yoast-social-previews/src/js/helpers/imageDisplayMode.js diff --git a/packages/yoast-social-previews/js/helpers/imageRatio.js b/packages/yoast-social-previews/src/js/helpers/imageRatio.js similarity index 100% rename from packages/yoast-social-previews/js/helpers/imageRatio.js rename to packages/yoast-social-previews/src/js/helpers/imageRatio.js diff --git a/packages/yoast-social-previews/js/helpers/minimizeHtml.js b/packages/yoast-social-previews/src/js/helpers/minimizeHtml.js similarity index 100% rename from packages/yoast-social-previews/js/helpers/minimizeHtml.js rename to packages/yoast-social-previews/src/js/helpers/minimizeHtml.js diff --git a/packages/yoast-social-previews/js/helpers/removeClass.js b/packages/yoast-social-previews/src/js/helpers/removeClass.js similarity index 100% rename from packages/yoast-social-previews/js/helpers/removeClass.js rename to packages/yoast-social-previews/src/js/helpers/removeClass.js diff --git a/packages/yoast-social-previews/js/helpers/renderDescription.js b/packages/yoast-social-previews/src/js/helpers/renderDescription.js similarity index 100% rename from packages/yoast-social-previews/js/helpers/renderDescription.js rename to packages/yoast-social-previews/src/js/helpers/renderDescription.js diff --git a/packages/yoast-social-previews/js/inputs/button.js b/packages/yoast-social-previews/src/js/inputs/button.js similarity index 96% rename from packages/yoast-social-previews/js/inputs/button.js rename to packages/yoast-social-previews/src/js/inputs/button.js index 8bd6e859e0..d08f4ea5fd 100644 --- a/packages/yoast-social-previews/js/inputs/button.js +++ b/packages/yoast-social-previews/src/js/inputs/button.js @@ -1,5 +1,5 @@ var defaults = require( "lodash/object/defaults" ); -var buttonTemplate = require( "../../js/templates" ).fields.button; +var buttonTemplate = require( "../templates" ).fields.button; var minimizeHtml = require( "../helpers/minimizeHtml" ); var defaultAttributes = { value: "", diff --git a/packages/yoast-social-previews/js/inputs/inputField.js b/packages/yoast-social-previews/src/js/inputs/inputField.js similarity index 100% rename from packages/yoast-social-previews/js/inputs/inputField.js rename to packages/yoast-social-previews/src/js/inputs/inputField.js diff --git a/packages/yoast-social-previews/js/inputs/textInput.js b/packages/yoast-social-previews/src/js/inputs/textInput.js similarity index 100% rename from packages/yoast-social-previews/js/inputs/textInput.js rename to packages/yoast-social-previews/src/js/inputs/textInput.js diff --git a/packages/yoast-social-previews/js/inputs/textarea.js b/packages/yoast-social-previews/src/js/inputs/textarea.js similarity index 100% rename from packages/yoast-social-previews/js/inputs/textarea.js rename to packages/yoast-social-previews/src/js/inputs/textarea.js diff --git a/packages/yoast-social-previews/js/preview/events.js b/packages/yoast-social-previews/src/js/preview/events.js similarity index 100% rename from packages/yoast-social-previews/js/preview/events.js rename to packages/yoast-social-previews/src/js/preview/events.js diff --git a/packages/yoast-social-previews/js/templates.js b/packages/yoast-social-previews/src/js/templates.js similarity index 99% rename from packages/yoast-social-previews/js/templates.js rename to packages/yoast-social-previews/src/js/templates.js index 7d2fc414d2..71560af4dd 100644 --- a/packages/yoast-social-previews/js/templates.js +++ b/packages/yoast-social-previews/src/js/templates.js @@ -15,7 +15,7 @@ var undefined; /** Used as the semantic version number. */ - var VERSION = '4.17.4'; + var VERSION = '4.17.5'; /** Used as references for various `Number` constants. */ var INFINITY = 1 / 0; diff --git a/packages/yoast-social-previews/js/twitterPreview.js b/packages/yoast-social-previews/src/js/twitterPreview.js similarity index 100% rename from packages/yoast-social-previews/js/twitterPreview.js rename to packages/yoast-social-previews/src/js/twitterPreview.js diff --git a/packages/yoast-social-previews/templates/facebookAuthor.jst b/packages/yoast-social-previews/src/templates/facebookAuthor.jst similarity index 100% rename from packages/yoast-social-previews/templates/facebookAuthor.jst rename to packages/yoast-social-previews/src/templates/facebookAuthor.jst diff --git a/packages/yoast-social-previews/templates/facebookPreview.jst b/packages/yoast-social-previews/src/templates/facebookPreview.jst similarity index 100% rename from packages/yoast-social-previews/templates/facebookPreview.jst rename to packages/yoast-social-previews/src/templates/facebookPreview.jst diff --git a/packages/yoast-social-previews/templates/fields/button.jst b/packages/yoast-social-previews/src/templates/fields/button.jst similarity index 100% rename from packages/yoast-social-previews/templates/fields/button.jst rename to packages/yoast-social-previews/src/templates/fields/button.jst diff --git a/packages/yoast-social-previews/templates/fields/text.jst b/packages/yoast-social-previews/src/templates/fields/text.jst similarity index 100% rename from packages/yoast-social-previews/templates/fields/text.jst rename to packages/yoast-social-previews/src/templates/fields/text.jst diff --git a/packages/yoast-social-previews/templates/fields/textarea.jst b/packages/yoast-social-previews/src/templates/fields/textarea.jst similarity index 100% rename from packages/yoast-social-previews/templates/fields/textarea.jst rename to packages/yoast-social-previews/src/templates/fields/textarea.jst diff --git a/packages/yoast-social-previews/templates/imagePlaceholder.jst b/packages/yoast-social-previews/src/templates/imagePlaceholder.jst similarity index 100% rename from packages/yoast-social-previews/templates/imagePlaceholder.jst rename to packages/yoast-social-previews/src/templates/imagePlaceholder.jst diff --git a/packages/yoast-social-previews/templates/twitterPreview.jst b/packages/yoast-social-previews/src/templates/twitterPreview.jst similarity index 100% rename from packages/yoast-social-previews/templates/twitterPreview.jst rename to packages/yoast-social-previews/src/templates/twitterPreview.jst diff --git a/packages/yoast-social-previews/grunt/config/aliases.yaml b/packages/yoast-social-previews/tools/grunt/config/aliases.yaml similarity index 100% rename from packages/yoast-social-previews/grunt/config/aliases.yaml rename to packages/yoast-social-previews/tools/grunt/config/aliases.yaml diff --git a/packages/yoast-social-previews/grunt/config/browserify.js b/packages/yoast-social-previews/tools/grunt/config/browserify.js similarity index 100% rename from packages/yoast-social-previews/grunt/config/browserify.js rename to packages/yoast-social-previews/tools/grunt/config/browserify.js diff --git a/packages/yoast-social-previews/grunt/config/copy.js b/packages/yoast-social-previews/tools/grunt/config/copy.js similarity index 100% rename from packages/yoast-social-previews/grunt/config/copy.js rename to packages/yoast-social-previews/tools/grunt/config/copy.js diff --git a/packages/yoast-social-previews/tools/grunt/config/eslint.js b/packages/yoast-social-previews/tools/grunt/config/eslint.js new file mode 100644 index 0000000000..449c2d158a --- /dev/null +++ b/packages/yoast-social-previews/tools/grunt/config/eslint.js @@ -0,0 +1,3 @@ +module.exports = { + target: [ "<%= files.js %>", "!src/js/templates.js" ], +}; diff --git a/packages/yoast-social-previews/grunt/config/lodash.js b/packages/yoast-social-previews/tools/grunt/config/lodash.js similarity index 87% rename from packages/yoast-social-previews/grunt/config/lodash.js rename to packages/yoast-social-previews/tools/grunt/config/lodash.js index 33348eada0..60c49df200 100644 --- a/packages/yoast-social-previews/grunt/config/lodash.js +++ b/packages/yoast-social-previews/tools/grunt/config/lodash.js @@ -1,7 +1,7 @@ // See https://github.com/lodash-archive/grunt-lodash module.exports = { templates: { - dest: "js/templates.js", + dest: "src/js/templates.js", options: { exports: [ "node" ], template: "<%= files.templates %>", diff --git a/packages/yoast-social-previews/grunt/config/po2json.js b/packages/yoast-social-previews/tools/grunt/config/po2json.js similarity index 100% rename from packages/yoast-social-previews/grunt/config/po2json.js rename to packages/yoast-social-previews/tools/grunt/config/po2json.js diff --git a/packages/yoast-social-previews/grunt/config/postcss.js b/packages/yoast-social-previews/tools/grunt/config/postcss.js similarity index 100% rename from packages/yoast-social-previews/grunt/config/postcss.js rename to packages/yoast-social-previews/tools/grunt/config/postcss.js diff --git a/packages/yoast-social-previews/grunt/config/sass.js b/packages/yoast-social-previews/tools/grunt/config/sass.js similarity index 74% rename from packages/yoast-social-previews/grunt/config/sass.js rename to packages/yoast-social-previews/tools/grunt/config/sass.js index c3fcfed2c9..71bdc3c826 100644 --- a/packages/yoast-social-previews/grunt/config/sass.js +++ b/packages/yoast-social-previews/tools/grunt/config/sass.js @@ -8,7 +8,7 @@ module.exports = { }, build: { files: { - "dist/yoast-social-preview.min.css": "css/social_preview.scss", + "dist/yoast-social-preview.min.css": "src/css/social_preview.scss", }, }, }; diff --git a/packages/yoast-social-previews/grunt/config/shell.js b/packages/yoast-social-previews/tools/grunt/config/shell.js similarity index 91% rename from packages/yoast-social-previews/grunt/config/shell.js rename to packages/yoast-social-previews/tools/grunt/config/shell.js index 400905339f..dac7f505a5 100644 --- a/packages/yoast-social-previews/grunt/config/shell.js +++ b/packages/yoast-social-previews/tools/grunt/config/shell.js @@ -7,7 +7,7 @@ module.exports = function( grunt ) { command: function() { var files; - files = [ "js/*.js", "js/config/*.js" ]; + files = [ "src/js/*.js", "src/js/config/*.js" ]; files = grunt.file.expand( files ); return "xgettext" + diff --git a/packages/yoast-social-previews/grunt/config/uglify.js b/packages/yoast-social-previews/tools/grunt/config/uglify.js similarity index 100% rename from packages/yoast-social-previews/grunt/config/uglify.js rename to packages/yoast-social-previews/tools/grunt/config/uglify.js diff --git a/packages/yoast-social-previews/grunt/config/watch.js b/packages/yoast-social-previews/tools/grunt/config/watch.js similarity index 100% rename from packages/yoast-social-previews/grunt/config/watch.js rename to packages/yoast-social-previews/tools/grunt/config/watch.js From b206e6d9030990a029959ca2dca7642a653377e4 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Tue, 17 Mar 2020 14:18:26 +0100 Subject: [PATCH 08/29] Updated the folder structure for yoastseo package --- packages/yoastseo/.gitignore | 2 + packages/yoastseo/Gruntfile.js | 4 +- packages/yoastseo/package.json | 2 +- packages/yoastseo/{ => src}/index.js | 38 +++++++++---------- .../{ => tools}/grunt/config/aliases.yaml | 0 .../{ => tools}/grunt/config/babel.js | 0 .../{ => tools}/grunt/config/browserify.js | 0 .../{ => tools}/grunt/config/clean.js | 0 .../yoastseo/{ => tools}/grunt/config/copy.js | 0 .../{ => tools}/grunt/config/eslint.js | 0 .../{ => tools}/grunt/config/exorcise.js | 0 .../{ => tools}/grunt/config/po2json.js | 0 .../{ => tools}/grunt/config/postcss.js | 0 .../yoastseo/{ => tools}/grunt/config/sass.js | 0 .../{ => tools}/grunt/config/shell.js | 0 .../{ => tools}/grunt/config/watch.js | 0 16 files changed, 24 insertions(+), 22 deletions(-) rename packages/yoastseo/{ => src}/index.js (50%) rename packages/yoastseo/{ => tools}/grunt/config/aliases.yaml (100%) rename packages/yoastseo/{ => tools}/grunt/config/babel.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/browserify.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/clean.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/copy.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/eslint.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/exorcise.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/po2json.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/postcss.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/sass.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/shell.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/watch.js (100%) diff --git a/packages/yoastseo/.gitignore b/packages/yoastseo/.gitignore index 9a3bbe2027..5c3f747ad6 100644 --- a/packages/yoastseo/.gitignore +++ b/packages/yoastseo/.gitignore @@ -5,6 +5,8 @@ node_modules/ out/ coverage/ .tscache/ +.idea/ +dist/ /examples/browserified/example-browserified.js /premium-configuration diff --git a/packages/yoastseo/Gruntfile.js b/packages/yoastseo/Gruntfile.js index f4da9510aa..be17fa8675 100644 --- a/packages/yoastseo/Gruntfile.js +++ b/packages/yoastseo/Gruntfile.js @@ -5,7 +5,7 @@ module.exports = function( grunt ) { // Define project configuration var project = { paths: { - grunt: "grunt/", + grunt: "tools/grunt/", js: "src/", css: "css/", /** @@ -23,7 +23,7 @@ module.exports = function( grunt ) { "grunt/config/*.js", "!src/config/*.js", "<%= files.grunt %>", - "!js", + "!src/js", ], jsDontLint: [ "!src/templates.js", diff --git a/packages/yoastseo/package.json b/packages/yoastseo/package.json index 92c87762c3..0dde3a0836 100644 --- a/packages/yoastseo/package.json +++ b/packages/yoastseo/package.json @@ -7,7 +7,7 @@ "SEO", "text analysis" ], - "main": "index.js", + "main": "src/index.js", "license": "GPL-3.0", "version": "1.70.0-rc.0", "repository": { diff --git a/packages/yoastseo/index.js b/packages/yoastseo/src/index.js similarity index 50% rename from packages/yoastseo/index.js rename to packages/yoastseo/src/index.js index 3b4cecd6ca..ae3a7fc8a0 100644 --- a/packages/yoastseo/index.js +++ b/packages/yoastseo/src/index.js @@ -1,23 +1,23 @@ -import { AnalysisWebWorker, AnalysisWorkerWrapper, createWorker } from "./src/worker"; -import * as assessments from "./src/assessments"; -import * as bundledPlugins from "./src/bundledPlugins"; -import * as helpers from "./src/helpers"; -import * as markers from "./src/markers"; -import * as string from "./src/stringProcessing"; -import * as interpreters from "./src/interpreters"; -import * as config from "./src/config"; +import { AnalysisWebWorker, AnalysisWorkerWrapper, createWorker } from "./worker"; +import * as assessments from "./assessments"; +import * as bundledPlugins from "./bundledPlugins"; +import * as helpers from "./helpers"; +import * as markers from "./markers"; +import * as string from "./stringProcessing"; +import * as interpreters from "./interpreters"; +import * as config from "./config"; -import App from "./src/app"; -import Assessor from "./src/assessor"; -import ContentAssessor from "./src/contentAssessor"; -import SeoAssessor from './src/seoAssessor'; -import TaxonomyAssessor from "./src/taxonomyAssessor"; -import Pluggable from "./src/pluggable"; -import Researcher from "./src/researcher"; -import SnippetPreview from "./src/snippetPreview"; -import Paper from "./src/values/Paper"; -import AssessmentResult from "./src/values/AssessmentResult"; -import Assessment from "./src/assessment"; +import App from "./app"; +import Assessor from "./assessor"; +import ContentAssessor from "./contentAssessor"; +import SeoAssessor from "./seoAssessor"; +import TaxonomyAssessor from "./taxonomyAssessor"; +import Pluggable from "./pluggable"; +import Researcher from "./researcher"; +import SnippetPreview from "./snippetPreview"; +import Paper from "./values/Paper"; +import AssessmentResult from "./values/AssessmentResult"; +import Assessment from "./assessment"; /* * Everything exported here is put on the `yoast.analysis` global in the plugin. diff --git a/packages/yoastseo/grunt/config/aliases.yaml b/packages/yoastseo/tools/grunt/config/aliases.yaml similarity index 100% rename from packages/yoastseo/grunt/config/aliases.yaml rename to packages/yoastseo/tools/grunt/config/aliases.yaml diff --git a/packages/yoastseo/grunt/config/babel.js b/packages/yoastseo/tools/grunt/config/babel.js similarity index 100% rename from packages/yoastseo/grunt/config/babel.js rename to packages/yoastseo/tools/grunt/config/babel.js diff --git a/packages/yoastseo/grunt/config/browserify.js b/packages/yoastseo/tools/grunt/config/browserify.js similarity index 100% rename from packages/yoastseo/grunt/config/browserify.js rename to packages/yoastseo/tools/grunt/config/browserify.js diff --git a/packages/yoastseo/grunt/config/clean.js b/packages/yoastseo/tools/grunt/config/clean.js similarity index 100% rename from packages/yoastseo/grunt/config/clean.js rename to packages/yoastseo/tools/grunt/config/clean.js diff --git a/packages/yoastseo/grunt/config/copy.js b/packages/yoastseo/tools/grunt/config/copy.js similarity index 100% rename from packages/yoastseo/grunt/config/copy.js rename to packages/yoastseo/tools/grunt/config/copy.js diff --git a/packages/yoastseo/grunt/config/eslint.js b/packages/yoastseo/tools/grunt/config/eslint.js similarity index 100% rename from packages/yoastseo/grunt/config/eslint.js rename to packages/yoastseo/tools/grunt/config/eslint.js diff --git a/packages/yoastseo/grunt/config/exorcise.js b/packages/yoastseo/tools/grunt/config/exorcise.js similarity index 100% rename from packages/yoastseo/grunt/config/exorcise.js rename to packages/yoastseo/tools/grunt/config/exorcise.js diff --git a/packages/yoastseo/grunt/config/po2json.js b/packages/yoastseo/tools/grunt/config/po2json.js similarity index 100% rename from packages/yoastseo/grunt/config/po2json.js rename to packages/yoastseo/tools/grunt/config/po2json.js diff --git a/packages/yoastseo/grunt/config/postcss.js b/packages/yoastseo/tools/grunt/config/postcss.js similarity index 100% rename from packages/yoastseo/grunt/config/postcss.js rename to packages/yoastseo/tools/grunt/config/postcss.js diff --git a/packages/yoastseo/grunt/config/sass.js b/packages/yoastseo/tools/grunt/config/sass.js similarity index 100% rename from packages/yoastseo/grunt/config/sass.js rename to packages/yoastseo/tools/grunt/config/sass.js diff --git a/packages/yoastseo/grunt/config/shell.js b/packages/yoastseo/tools/grunt/config/shell.js similarity index 100% rename from packages/yoastseo/grunt/config/shell.js rename to packages/yoastseo/tools/grunt/config/shell.js diff --git a/packages/yoastseo/grunt/config/watch.js b/packages/yoastseo/tools/grunt/config/watch.js similarity index 100% rename from packages/yoastseo/grunt/config/watch.js rename to packages/yoastseo/tools/grunt/config/watch.js From 467183b7859c242cb103fff280e1e557885d1a66 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Tue, 17 Mar 2020 14:20:28 +0100 Subject: [PATCH 09/29] Reverted placing CSS in src dir for yoast-components dir --- packages/yoast-components/{src => }/css/_mixins.scss | 0 packages/yoast-components/{src => }/css/accessibility.scss | 0 packages/yoast-components/{src => }/css/all.scss | 0 packages/yoast-components/{src => }/css/standalone.scss | 2 +- packages/yoast-components/tools/grunt/config/sass.js | 4 ++-- 5 files changed, 3 insertions(+), 3 deletions(-) rename packages/yoast-components/{src => }/css/_mixins.scss (100%) rename packages/yoast-components/{src => }/css/accessibility.scss (100%) rename packages/yoast-components/{src => }/css/all.scss (100%) rename packages/yoast-components/{src => }/css/standalone.scss (83%) diff --git a/packages/yoast-components/src/css/_mixins.scss b/packages/yoast-components/css/_mixins.scss similarity index 100% rename from packages/yoast-components/src/css/_mixins.scss rename to packages/yoast-components/css/_mixins.scss diff --git a/packages/yoast-components/src/css/accessibility.scss b/packages/yoast-components/css/accessibility.scss similarity index 100% rename from packages/yoast-components/src/css/accessibility.scss rename to packages/yoast-components/css/accessibility.scss diff --git a/packages/yoast-components/src/css/all.scss b/packages/yoast-components/css/all.scss similarity index 100% rename from packages/yoast-components/src/css/all.scss rename to packages/yoast-components/css/all.scss diff --git a/packages/yoast-components/src/css/standalone.scss b/packages/yoast-components/css/standalone.scss similarity index 83% rename from packages/yoast-components/src/css/standalone.scss rename to packages/yoast-components/css/standalone.scss index e7949e6f26..93581603ba 100644 --- a/packages/yoast-components/src/css/standalone.scss +++ b/packages/yoast-components/css/standalone.scss @@ -1,5 +1,5 @@ // Requires Sass Dash -@import "../../node_modules/sassdash/scss/sassdash"; +@import "../node_modules/sassdash/scss/sassdash"; @import "all"; body { diff --git a/packages/yoast-components/tools/grunt/config/sass.js b/packages/yoast-components/tools/grunt/config/sass.js index 285df58603..809b5da79d 100644 --- a/packages/yoast-components/tools/grunt/config/sass.js +++ b/packages/yoast-components/tools/grunt/config/sass.js @@ -8,8 +8,8 @@ module.exports = { }, build: { files: { - "dist/css/yoast-components.min.css": "src/css/all.scss", - "dist/css/yoast-components-standalone.min.css": "src/css/standalone.scss", + "dist/css/yoast-components.min.css": "css/all.scss", + "dist/css/yoast-components-standalone.min.css": "css/standalone.scss", }, }, example: { From 2f5c0333798c7a173a8839c08fc41d78d156f9f2 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Tue, 17 Mar 2020 14:23:11 +0100 Subject: [PATCH 10/29] Reverted placing CSS in src dir for yoast-social-previews package --- packages/yoast-social-previews/Gruntfile.js | 6 +- .../css/editable-preview.scss | 35 ++ .../css/image_placeholder.scss | 15 + .../css/social_preview.scss | 405 ++++++++++++++++++ .../templates/facebookAuthor.jst | 2 + .../templates/facebookPreview.jst | 35 ++ .../templates/fields/button.jst | 6 + .../templates/fields/text.jst | 13 + .../templates/fields/textarea.jst | 14 + .../templates/imagePlaceholder.jst | 1 + .../templates/twitterPreview.jst | 34 ++ .../tools/grunt/config/sass.js | 2 +- 12 files changed, 564 insertions(+), 4 deletions(-) create mode 100644 packages/yoast-social-previews/css/editable-preview.scss create mode 100644 packages/yoast-social-previews/css/image_placeholder.scss create mode 100644 packages/yoast-social-previews/css/social_preview.scss create mode 100644 packages/yoast-social-previews/templates/facebookAuthor.jst create mode 100644 packages/yoast-social-previews/templates/facebookPreview.jst create mode 100644 packages/yoast-social-previews/templates/fields/button.jst create mode 100644 packages/yoast-social-previews/templates/fields/text.jst create mode 100644 packages/yoast-social-previews/templates/fields/textarea.jst create mode 100644 packages/yoast-social-previews/templates/imagePlaceholder.jst create mode 100644 packages/yoast-social-previews/templates/twitterPreview.jst diff --git a/packages/yoast-social-previews/Gruntfile.js b/packages/yoast-social-previews/Gruntfile.js index 6b3dfdcd9c..76b780737b 100644 --- a/packages/yoast-social-previews/Gruntfile.js +++ b/packages/yoast-social-previews/Gruntfile.js @@ -7,7 +7,7 @@ module.exports = function( grunt ) { paths: { grunt: "tools/grunt/", js: "src/js/", - css: "src/css/", + css: "css/", get config() { return this.grunt + "config/"; }, @@ -22,8 +22,8 @@ module.exports = function( grunt ) { jsDontLint: [ "!src/js/templates.js", ], - scss: "src/css/*.scss", - templates: "src/templates/**/*.jst", + scss: "css/*.scss", + templates: "templates/**/*.jst", jed: "node_modules/jed/jed.js", get config() { return project.paths.config + "*.js"; diff --git a/packages/yoast-social-previews/css/editable-preview.scss b/packages/yoast-social-previews/css/editable-preview.scss new file mode 100644 index 0000000000..ceeaa44973 --- /dev/null +++ b/packages/yoast-social-previews/css/editable-preview.scss @@ -0,0 +1,35 @@ +.editable-preview { + background: #fff; + box-shadow: 0 1px 2px rgba(0, 0, 0, .2); + + *, + *:before, + *:after { + box-sizing: border-box; + } + + &__heading { + margin: 0 0 15px; + // Reset the top border that comes from the YoastSEO.js snippet editor. + border-top: 0; + } + + &__inner { + padding: 20px; + } + + &__container { + &--no-caret { + &, + &:hover { + &:before { + content: none; + } + } + } + } + + &__value { + overflow: hidden; + } +} diff --git a/packages/yoast-social-previews/css/image_placeholder.scss b/packages/yoast-social-previews/css/image_placeholder.scss new file mode 100644 index 0000000000..da0525f166 --- /dev/null +++ b/packages/yoast-social-previews/css/image_placeholder.scss @@ -0,0 +1,15 @@ +$color_placeholder: #F6C6CE; +$color_placeholder_error: #ff4e47; + +.social-image-placeholder { + height: 100%; + padding: 6em 0; + text-align: center; + background: $color_placeholder; + font-size: 1rem; + + &--error { + background: $color_placeholder_error; + color: white; + } +} diff --git a/packages/yoast-social-previews/css/social_preview.scss b/packages/yoast-social-previews/css/social_preview.scss new file mode 100644 index 0000000000..0c32c5f609 --- /dev/null +++ b/packages/yoast-social-previews/css/social_preview.scss @@ -0,0 +1,405 @@ +@import "../node_modules/sassdash/index"; +@import "../../../node_modules/yoastseo/css/snippet-editor"; +@import "../node_modules/yoastseo/css/mixins"; +@import "image_placeholder"; +@import "editable-preview"; + +$width_facebook: 470px; +$width_twitter: 506px; +$height_twitter: 506px; +$padding_preview: 20px; + +$width_facebook_image_small: 158px; +$height_facebook_image_small: 158px; + +$width_facebook_image_large: 470px; +$height_facebook_image_large: 246px; + +$width_facebook_image_portrait: 158px; +$height_facebook_image_portrait: 235px; + +$width_twitter_image_small: 120px; +$height_twitter_image_small: 120px; + +$width_twitter_image_large: 506px; +$height_twitter_image_large: 254px; + +$border_radius_twitter: .42857em; + +.social-preview__inner { + &--facebook { + box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .1) inset, 0 1px 1px rgba(0, 0, 0, .05); + + &:hover { + box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .15) inset, 0 1px 1px rgba(0, 0, 0, .05); + + .editable-preview__image--facebook:after { + border-color: rgba(0, 0, 0, .15); + } + } + + &-small, + &-portrait { + @include clearfix; + } + } + + &--twitter { + border-radius: $border_radius_twitter; + border: 1px solid #E1E8ED; + + &:hover { + border-color: #8899A6; + background: #F5F8FA; + } + + &:hover { + .editable-preview__image--twitter { + border-color: #8899A6; + } + } + + &-small { + @include clearfix; + } + } +} + +.editable-preview { + + &--facebook { + width: $width_facebook + 2 * $padding_preview; + } + + &--twitter { + width: $width_twitter + 2 * $padding_preview; + } + + &__inner { + overflow: hidden; + word-wrap: break-word; + + &--facebook { + width: $width_facebook + 2 * $padding_preview; + font-family: helvetica, arial, sans-serif; + font-size: 12px; + color: #141823; + line-height: 1.34; + } + + &--twitter { + width: $width_twitter + 2 * $padding_preview; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 14px; + color: #292F33; + line-height: 1.3em; + + } + } + + // Position of the caret icons in the Social Previews snippet title and description. + &__container { + &--facebook, + &--twitter { + &:hover, + & { + &:before { + left: -34px + } + } + } + } + + // Display the caret icons in the Social Previews editor. + .snippet-editor__caret-hook { + display: block; + width: 100%; + height: 0px; + position: relative; + + &--hover { + &:before { + @include svg-caret-before($color_caret_hover); + top: 0; // Override default top alignment. + } + } + + &--focus { + &:before { + @include svg-caret-before($color_caret_focus); + top: 0; // Override default top alignment. + } + } + } + + &__text-keeper { + padding: 10px 12px; + height: auto; + + &--facebook { + max-height: 470px; + font-size: 12px; + position: relative; + + &-small, + &-portrait { + float: left; + width: calc( 100% - #{$width_facebook_image_small} ); + + .snippet-editor__container { + &:hover, &--hover, &--focus { + &:before { + right: -32px; + left: inherit; + } + } + + &:hover, &--hover { + &:before { + background-image: url(svg-icon-caret-left($color_caret_hover)); + } + } + + &--focus { + &:before { + background-image: url(svg-icon-caret-left($color_caret)); + } + } + } + } + + &-portrait { + height: $height_facebook_image_portrait; + } + } + + &--twitter { + max-width: $width_twitter; + + &-small { + float: left; + width: calc( 100% - #{$width_twitter_image_small} ); + + .snippet-editor__container { + &:hover, &--hover, &--focus { + &:before { + right: -32px; + left: inherit; + } + } + + &:hover, &--hover { + &:before { + background-image: url(svg-icon-caret-left($color_caret_hover)); + } + } + + &--focus { + &:before { + background-image: url(svg-icon-caret-left($color_caret)); + } + } + } + } + } + } + + &__title { + &--facebook { + font-family: Georgia, 'lucida grande', tahoma, verdana, arial, sans-serif; + font-size: 18px; + font-weight: 500; + line-height: 22px; + margin-bottom: 5px; + max-height: 110px; + + a { + text-decoration: none; + color: #141823; + cursor: pointer; + } + } + + &--twitter { + max-height: 1.3em; + white-space: nowrap; + text-overflow: ellipsis; + font-size: 1.0em; + padding: 0 0 .15em; + font-weight:bold; + } + } + + &__description { + &--facebook { + line-height: 16px; + max-height: 80px; + font-size: 12px; + } + + &--twitter { + max-height: 2.6em; + margin-top: .32333em; + } + } + + &__image { + + &--facebook { + + background-size: cover; + background-position: center center; + + width: $width_facebook; + max-height: 470px; + position: relative; + line-height: 0; // Prevents extra margin under the image on windows + + img { + max-height: 100%; + max-width: 100%; + } + + &-small { + width: $width_facebook_image_small; + height: $height_facebook_image_small; + float: left; + } + + &-large { + width: $width_facebook_image_large; + height: $height_facebook_image_large; + } + + &-portrait { + width: $width_facebook_image_portrait; + height: $height_facebook_image_portrait; + float: left; + } + + &:after { + content: ' '; + position: absolute; + width: 100%; + top: 0; + left: 0; + right: 0; + bottom: 0; + border-right: 1px solid rgba(0, 0, 0, .1); + } + } + + &--twitter { + + background-size: cover; + background-position: top center; + + max-height: $height_twitter - 2; + line-height: 0; + border-bottom: 1px solid #E1E8ED; + + &, img { + max-width: $width_twitter - 2; + } + + img { + max-height: 100%; + border-radius: $border_radius_twitter $border_radius_twitter 0 0; + } + + &-placeholder { + background: url('./twitter-placeholder.svg') no-repeat center center; + } + + &-small { + background-color: #E1E8ED; + border-right: 1px solid #E1E8ED; + border-bottom: 0; + width: $width_twitter_image_small; + height: $height_twitter_image_small - 1px; // Reduce with 1 px because of overlapping the border. + float: left; + border-radius: $border_radius_twitter 0 0 $border_radius_twitter; + max-width: 100%; + + } + + &-large { + width: $width_twitter_image_large; + height: $height_twitter_image_large - 1px; // Reduce with 1 px because of overlapping the border. + } + } + } + + &__author { + &--facebook { + color: #3b5998; + cursor: pointer; + + &:hover { + text-decoration: underline; + } + } + } + + &__website { + &--facebook { + text-overflow: ellipsis; + white-space: nowrap; + font-size: 11px; + line-height: 11px; + padding-top: 9px; + position: relative; + text-transform: uppercase; + color: #9197a3; + + &-pipe { + padding-left: 5px; + padding-right: 5px; + } + + &-bottom { + position: absolute; + bottom: 16px; + } + } + + &--twitter { + color: #8899A6; + max-height: 1.3em; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + margin-top: .32333em; + } + } + + &__value { + &--facebook-title { + max-height: 110px; + } + + &--facebook-description { + max-height: 80px; + } + + &--twitter-description { + max-height: 2.6em; + } + } +} + +.social-image-placeholder { + &--facebook { + width: $width_facebook; + line-height: 1.4; + } + + &--twitter { + background: url( './twitter-placeholder.svg' ) no-repeat center center; + height: 100%; + padding: 0; + // Reduce width with 2 pixels because element overlaps the bordered container. + width: 100%; + border-radius: $border_radius_twitter 0 0 $border_radius_twitter; + } +} diff --git a/packages/yoast-social-previews/templates/facebookAuthor.jst b/packages/yoast-social-previews/templates/facebookAuthor.jst new file mode 100644 index 0000000000..dbc328d5db --- /dev/null +++ b/packages/yoast-social-previews/templates/facebookAuthor.jst @@ -0,0 +1,2 @@ + <%- authorBy %> + diff --git a/packages/yoast-social-previews/templates/facebookPreview.jst b/packages/yoast-social-previews/templates/facebookPreview.jst new file mode 100644 index 0000000000..b5ed5be9d4 --- /dev/null +++ b/packages/yoast-social-previews/templates/facebookPreview.jst @@ -0,0 +1,35 @@ + diff --git a/packages/yoast-social-previews/templates/fields/button.jst b/packages/yoast-social-previews/templates/fields/button.jst new file mode 100644 index 0000000000..e1a43dbcca --- /dev/null +++ b/packages/yoast-social-previews/templates/fields/button.jst @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/packages/yoast-social-previews/templates/fields/text.jst b/packages/yoast-social-previews/templates/fields/text.jst new file mode 100644 index 0000000000..bef7197925 --- /dev/null +++ b/packages/yoast-social-previews/templates/fields/text.jst @@ -0,0 +1,13 @@ + for="<%- id %>"<% } %><% if ( labelClassName ) { %> class="<%- labelClassName %>"<% } %>><% +if ( id ) { %><%- title %><% } else { %><%- title %><% } %> + id="<%- id %>__caret-hook"<% } %> + > + value="<%- value %>"<% } %> + <% if ( placeholder ) { %>placeholder="<%- placeholder %>"<% } %> + <% if ( className ) { %>class="<%- className %>"<% } %> + <% if ( id ) { %>id="<%- id %>"<% } %> + <% if ( name ) { %>name="<%- name %>"<% } %> + /> +<% if ( ! id ) { %><% } %> diff --git a/packages/yoast-social-previews/templates/fields/textarea.jst b/packages/yoast-social-previews/templates/fields/textarea.jst new file mode 100644 index 0000000000..aebe7237d8 --- /dev/null +++ b/packages/yoast-social-previews/templates/fields/textarea.jst @@ -0,0 +1,14 @@ + for="<%- id %>"<% } %><% if ( labelClassName ) { %> class="<%- labelClassName %>"<% } %>><% +if ( id ) { %><%- title %><% } else { %><%- title %><% } %> + id="<%- id %>__caret-hook"<% } %> + > + +<% if ( ! id ) { %><% } %> diff --git a/packages/yoast-social-previews/templates/imagePlaceholder.jst b/packages/yoast-social-previews/templates/imagePlaceholder.jst new file mode 100644 index 0000000000..c6279e9976 --- /dev/null +++ b/packages/yoast-social-previews/templates/imagePlaceholder.jst @@ -0,0 +1 @@ +
<%- placeholder %>
\ No newline at end of file diff --git a/packages/yoast-social-previews/templates/twitterPreview.jst b/packages/yoast-social-previews/templates/twitterPreview.jst new file mode 100644 index 0000000000..6da8d9c2eb --- /dev/null +++ b/packages/yoast-social-previews/templates/twitterPreview.jst @@ -0,0 +1,34 @@ + diff --git a/packages/yoast-social-previews/tools/grunt/config/sass.js b/packages/yoast-social-previews/tools/grunt/config/sass.js index 71bdc3c826..c3fcfed2c9 100644 --- a/packages/yoast-social-previews/tools/grunt/config/sass.js +++ b/packages/yoast-social-previews/tools/grunt/config/sass.js @@ -8,7 +8,7 @@ module.exports = { }, build: { files: { - "dist/yoast-social-preview.min.css": "src/css/social_preview.scss", + "dist/yoast-social-preview.min.css": "css/social_preview.scss", }, }, }; From cd5714e4b1bbaa8daa15d94528fb2614813bdd7e Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Tue, 17 Mar 2020 14:24:25 +0100 Subject: [PATCH 11/29] Added .idea folders to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2965be5cc4..b0fd29ccde 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ yarn-error.log coverage dependencies.json dependencies.md +/.idea/ From 4416b565be9114b23c3901fab5540378a21f26a2 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Tue, 17 Mar 2020 14:29:40 +0100 Subject: [PATCH 12/29] Removed duplicate templates dir from yoast-social-previews --- .../src/templates/facebookAuthor.jst | 2 -- .../src/templates/facebookPreview.jst | 35 ------------------- .../src/templates/fields/button.jst | 6 ---- .../src/templates/fields/text.jst | 13 ------- .../src/templates/fields/textarea.jst | 14 -------- .../src/templates/imagePlaceholder.jst | 1 - .../src/templates/twitterPreview.jst | 34 ------------------ 7 files changed, 105 deletions(-) delete mode 100644 packages/yoast-social-previews/src/templates/facebookAuthor.jst delete mode 100644 packages/yoast-social-previews/src/templates/facebookPreview.jst delete mode 100644 packages/yoast-social-previews/src/templates/fields/button.jst delete mode 100644 packages/yoast-social-previews/src/templates/fields/text.jst delete mode 100644 packages/yoast-social-previews/src/templates/fields/textarea.jst delete mode 100644 packages/yoast-social-previews/src/templates/imagePlaceholder.jst delete mode 100644 packages/yoast-social-previews/src/templates/twitterPreview.jst diff --git a/packages/yoast-social-previews/src/templates/facebookAuthor.jst b/packages/yoast-social-previews/src/templates/facebookAuthor.jst deleted file mode 100644 index dbc328d5db..0000000000 --- a/packages/yoast-social-previews/src/templates/facebookAuthor.jst +++ /dev/null @@ -1,2 +0,0 @@ - <%- authorBy %> - diff --git a/packages/yoast-social-previews/src/templates/facebookPreview.jst b/packages/yoast-social-previews/src/templates/facebookPreview.jst deleted file mode 100644 index b5ed5be9d4..0000000000 --- a/packages/yoast-social-previews/src/templates/facebookPreview.jst +++ /dev/null @@ -1,35 +0,0 @@ - diff --git a/packages/yoast-social-previews/src/templates/fields/button.jst b/packages/yoast-social-previews/src/templates/fields/button.jst deleted file mode 100644 index e1a43dbcca..0000000000 --- a/packages/yoast-social-previews/src/templates/fields/button.jst +++ /dev/null @@ -1,6 +0,0 @@ - \ No newline at end of file diff --git a/packages/yoast-social-previews/src/templates/fields/text.jst b/packages/yoast-social-previews/src/templates/fields/text.jst deleted file mode 100644 index bef7197925..0000000000 --- a/packages/yoast-social-previews/src/templates/fields/text.jst +++ /dev/null @@ -1,13 +0,0 @@ - for="<%- id %>"<% } %><% if ( labelClassName ) { %> class="<%- labelClassName %>"<% } %>><% -if ( id ) { %><%- title %><% } else { %><%- title %><% } %> - id="<%- id %>__caret-hook"<% } %> - > - value="<%- value %>"<% } %> - <% if ( placeholder ) { %>placeholder="<%- placeholder %>"<% } %> - <% if ( className ) { %>class="<%- className %>"<% } %> - <% if ( id ) { %>id="<%- id %>"<% } %> - <% if ( name ) { %>name="<%- name %>"<% } %> - /> -<% if ( ! id ) { %><% } %> diff --git a/packages/yoast-social-previews/src/templates/fields/textarea.jst b/packages/yoast-social-previews/src/templates/fields/textarea.jst deleted file mode 100644 index aebe7237d8..0000000000 --- a/packages/yoast-social-previews/src/templates/fields/textarea.jst +++ /dev/null @@ -1,14 +0,0 @@ - for="<%- id %>"<% } %><% if ( labelClassName ) { %> class="<%- labelClassName %>"<% } %>><% -if ( id ) { %><%- title %><% } else { %><%- title %><% } %> - id="<%- id %>__caret-hook"<% } %> - > - -<% if ( ! id ) { %><% } %> diff --git a/packages/yoast-social-previews/src/templates/imagePlaceholder.jst b/packages/yoast-social-previews/src/templates/imagePlaceholder.jst deleted file mode 100644 index c6279e9976..0000000000 --- a/packages/yoast-social-previews/src/templates/imagePlaceholder.jst +++ /dev/null @@ -1 +0,0 @@ -
<%- placeholder %>
\ No newline at end of file diff --git a/packages/yoast-social-previews/src/templates/twitterPreview.jst b/packages/yoast-social-previews/src/templates/twitterPreview.jst deleted file mode 100644 index 6da8d9c2eb..0000000000 --- a/packages/yoast-social-previews/src/templates/twitterPreview.jst +++ /dev/null @@ -1,34 +0,0 @@ - From c926189bbebf6885db9f2ab89e715534470008ee Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Tue, 17 Mar 2020 14:39:39 +0100 Subject: [PATCH 13/29] Removed duplicate css dir from yoast-social-previews and fixed faulty mapping --- .../css/social_preview.scss | 2 +- .../src/css/editable-preview.scss | 35 -- .../src/css/image_placeholder.scss | 15 - .../src/css/social_preview.scss | 405 ------------------ 4 files changed, 1 insertion(+), 456 deletions(-) delete mode 100644 packages/yoast-social-previews/src/css/editable-preview.scss delete mode 100644 packages/yoast-social-previews/src/css/image_placeholder.scss delete mode 100644 packages/yoast-social-previews/src/css/social_preview.scss diff --git a/packages/yoast-social-previews/css/social_preview.scss b/packages/yoast-social-previews/css/social_preview.scss index 0c32c5f609..26bf5ff297 100644 --- a/packages/yoast-social-previews/css/social_preview.scss +++ b/packages/yoast-social-previews/css/social_preview.scss @@ -1,5 +1,5 @@ @import "../node_modules/sassdash/index"; -@import "../../../node_modules/yoastseo/css/snippet-editor"; +@import "../node_modules/yoastseo/css/snippet-editor"; @import "../node_modules/yoastseo/css/mixins"; @import "image_placeholder"; @import "editable-preview"; diff --git a/packages/yoast-social-previews/src/css/editable-preview.scss b/packages/yoast-social-previews/src/css/editable-preview.scss deleted file mode 100644 index ceeaa44973..0000000000 --- a/packages/yoast-social-previews/src/css/editable-preview.scss +++ /dev/null @@ -1,35 +0,0 @@ -.editable-preview { - background: #fff; - box-shadow: 0 1px 2px rgba(0, 0, 0, .2); - - *, - *:before, - *:after { - box-sizing: border-box; - } - - &__heading { - margin: 0 0 15px; - // Reset the top border that comes from the YoastSEO.js snippet editor. - border-top: 0; - } - - &__inner { - padding: 20px; - } - - &__container { - &--no-caret { - &, - &:hover { - &:before { - content: none; - } - } - } - } - - &__value { - overflow: hidden; - } -} diff --git a/packages/yoast-social-previews/src/css/image_placeholder.scss b/packages/yoast-social-previews/src/css/image_placeholder.scss deleted file mode 100644 index da0525f166..0000000000 --- a/packages/yoast-social-previews/src/css/image_placeholder.scss +++ /dev/null @@ -1,15 +0,0 @@ -$color_placeholder: #F6C6CE; -$color_placeholder_error: #ff4e47; - -.social-image-placeholder { - height: 100%; - padding: 6em 0; - text-align: center; - background: $color_placeholder; - font-size: 1rem; - - &--error { - background: $color_placeholder_error; - color: white; - } -} diff --git a/packages/yoast-social-previews/src/css/social_preview.scss b/packages/yoast-social-previews/src/css/social_preview.scss deleted file mode 100644 index 34d56a88d5..0000000000 --- a/packages/yoast-social-previews/src/css/social_preview.scss +++ /dev/null @@ -1,405 +0,0 @@ -@import "../../node_modules/sassdash/index"; -@import "../../node_modules/yoastseo/css/snippet-editor"; -@import "../../node_modules/yoastseo/css/mixins"; -@import "image_placeholder"; -@import "editable-preview"; - -$width_facebook: 470px; -$width_twitter: 506px; -$height_twitter: 506px; -$padding_preview: 20px; - -$width_facebook_image_small: 158px; -$height_facebook_image_small: 158px; - -$width_facebook_image_large: 470px; -$height_facebook_image_large: 246px; - -$width_facebook_image_portrait: 158px; -$height_facebook_image_portrait: 235px; - -$width_twitter_image_small: 120px; -$height_twitter_image_small: 120px; - -$width_twitter_image_large: 506px; -$height_twitter_image_large: 254px; - -$border_radius_twitter: .42857em; - -.social-preview__inner { - &--facebook { - box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .1) inset, 0 1px 1px rgba(0, 0, 0, .05); - - &:hover { - box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .15) inset, 0 1px 1px rgba(0, 0, 0, .05); - - .editable-preview__image--facebook:after { - border-color: rgba(0, 0, 0, .15); - } - } - - &-small, - &-portrait { - @include clearfix; - } - } - - &--twitter { - border-radius: $border_radius_twitter; - border: 1px solid #E1E8ED; - - &:hover { - border-color: #8899A6; - background: #F5F8FA; - } - - &:hover { - .editable-preview__image--twitter { - border-color: #8899A6; - } - } - - &-small { - @include clearfix; - } - } -} - -.editable-preview { - - &--facebook { - width: $width_facebook + 2 * $padding_preview; - } - - &--twitter { - width: $width_twitter + 2 * $padding_preview; - } - - &__inner { - overflow: hidden; - word-wrap: break-word; - - &--facebook { - width: $width_facebook + 2 * $padding_preview; - font-family: helvetica, arial, sans-serif; - font-size: 12px; - color: #141823; - line-height: 1.34; - } - - &--twitter { - width: $width_twitter + 2 * $padding_preview; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 14px; - color: #292F33; - line-height: 1.3em; - - } - } - - // Position of the caret icons in the Social Previews snippet title and description. - &__container { - &--facebook, - &--twitter { - &:hover, - & { - &:before { - left: -34px - } - } - } - } - - // Display the caret icons in the Social Previews editor. - .snippet-editor__caret-hook { - display: block; - width: 100%; - height: 0px; - position: relative; - - &--hover { - &:before { - @include svg-caret-before($color_caret_hover); - top: 0; // Override default top alignment. - } - } - - &--focus { - &:before { - @include svg-caret-before($color_caret_focus); - top: 0; // Override default top alignment. - } - } - } - - &__text-keeper { - padding: 10px 12px; - height: auto; - - &--facebook { - max-height: 470px; - font-size: 12px; - position: relative; - - &-small, - &-portrait { - float: left; - width: calc( 100% - #{$width_facebook_image_small} ); - - .snippet-editor__container { - &:hover, &--hover, &--focus { - &:before { - right: -32px; - left: inherit; - } - } - - &:hover, &--hover { - &:before { - background-image: url(svg-icon-caret-left($color_caret_hover)); - } - } - - &--focus { - &:before { - background-image: url(svg-icon-caret-left($color_caret)); - } - } - } - } - - &-portrait { - height: $height_facebook_image_portrait; - } - } - - &--twitter { - max-width: $width_twitter; - - &-small { - float: left; - width: calc( 100% - #{$width_twitter_image_small} ); - - .snippet-editor__container { - &:hover, &--hover, &--focus { - &:before { - right: -32px; - left: inherit; - } - } - - &:hover, &--hover { - &:before { - background-image: url(svg-icon-caret-left($color_caret_hover)); - } - } - - &--focus { - &:before { - background-image: url(svg-icon-caret-left($color_caret)); - } - } - } - } - } - } - - &__title { - &--facebook { - font-family: Georgia, 'lucida grande', tahoma, verdana, arial, sans-serif; - font-size: 18px; - font-weight: 500; - line-height: 22px; - margin-bottom: 5px; - max-height: 110px; - - a { - text-decoration: none; - color: #141823; - cursor: pointer; - } - } - - &--twitter { - max-height: 1.3em; - white-space: nowrap; - text-overflow: ellipsis; - font-size: 1.0em; - padding: 0 0 .15em; - font-weight:bold; - } - } - - &__description { - &--facebook { - line-height: 16px; - max-height: 80px; - font-size: 12px; - } - - &--twitter { - max-height: 2.6em; - margin-top: .32333em; - } - } - - &__image { - - &--facebook { - - background-size: cover; - background-position: center center; - - width: $width_facebook; - max-height: 470px; - position: relative; - line-height: 0; // Prevents extra margin under the image on windows - - img { - max-height: 100%; - max-width: 100%; - } - - &-small { - width: $width_facebook_image_small; - height: $height_facebook_image_small; - float: left; - } - - &-large { - width: $width_facebook_image_large; - height: $height_facebook_image_large; - } - - &-portrait { - width: $width_facebook_image_portrait; - height: $height_facebook_image_portrait; - float: left; - } - - &:after { - content: ' '; - position: absolute; - width: 100%; - top: 0; - left: 0; - right: 0; - bottom: 0; - border-right: 1px solid rgba(0, 0, 0, .1); - } - } - - &--twitter { - - background-size: cover; - background-position: top center; - - max-height: $height_twitter - 2; - line-height: 0; - border-bottom: 1px solid #E1E8ED; - - &, img { - max-width: $width_twitter - 2; - } - - img { - max-height: 100%; - border-radius: $border_radius_twitter $border_radius_twitter 0 0; - } - - &-placeholder { - background: url('./twitter-placeholder.svg') no-repeat center center; - } - - &-small { - background-color: #E1E8ED; - border-right: 1px solid #E1E8ED; - border-bottom: 0; - width: $width_twitter_image_small; - height: $height_twitter_image_small - 1px; // Reduce with 1 px because of overlapping the border. - float: left; - border-radius: $border_radius_twitter 0 0 $border_radius_twitter; - max-width: 100%; - - } - - &-large { - width: $width_twitter_image_large; - height: $height_twitter_image_large - 1px; // Reduce with 1 px because of overlapping the border. - } - } - } - - &__author { - &--facebook { - color: #3b5998; - cursor: pointer; - - &:hover { - text-decoration: underline; - } - } - } - - &__website { - &--facebook { - text-overflow: ellipsis; - white-space: nowrap; - font-size: 11px; - line-height: 11px; - padding-top: 9px; - position: relative; - text-transform: uppercase; - color: #9197a3; - - &-pipe { - padding-left: 5px; - padding-right: 5px; - } - - &-bottom { - position: absolute; - bottom: 16px; - } - } - - &--twitter { - color: #8899A6; - max-height: 1.3em; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - margin-top: .32333em; - } - } - - &__value { - &--facebook-title { - max-height: 110px; - } - - &--facebook-description { - max-height: 80px; - } - - &--twitter-description { - max-height: 2.6em; - } - } -} - -.social-image-placeholder { - &--facebook { - width: $width_facebook; - line-height: 1.4; - } - - &--twitter { - background: url( './twitter-placeholder.svg' ) no-repeat center center; - height: 100%; - padding: 0; - // Reduce width with 2 pixels because element overlaps the bordered container. - width: 100%; - border-radius: $border_radius_twitter 0 0 $border_radius_twitter; - } -} From 139bd1d9cad1dd89a133f4267bba27fbf2daf1b1 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Mon, 16 Mar 2020 13:44:00 +0100 Subject: [PATCH 14/29] Updated package.json so Jest excludes dist and node_modules directories --- packages/analysis-report/package.json | 5 ++++- packages/browserslist-config/package.json | 5 ++++- packages/components/package.json | 5 ++++- packages/configuration-wizard/package.json | 3 +++ packages/feature-flag/package.json | 5 ++++- packages/helpers/package.json | 5 ++++- packages/search-metadata-previews/package.json | 5 ++++- packages/yoast-components/package.json | 3 +++ packages/yoastseo/package.json | 5 ++++- 9 files changed, 34 insertions(+), 7 deletions(-) diff --git a/packages/analysis-report/package.json b/packages/analysis-report/package.json index e66e7f6fbc..061071a6e2 100644 --- a/packages/analysis-report/package.json +++ b/packages/analysis-report/package.json @@ -51,7 +51,10 @@ "transformIgnorePatterns": [ "/node_modules/(?!yoastseo|lodash-es).+\\.js$" ], - "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js" + "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js", + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" + ] }, "publishConfig": { "access": "public" diff --git a/packages/browserslist-config/package.json b/packages/browserslist-config/package.json index 5860b4ec91..6e7f8becf7 100644 --- a/packages/browserslist-config/package.json +++ b/packages/browserslist-config/package.json @@ -25,7 +25,10 @@ }, "jest": { "testRegex": ".*Test.js$", - "testEnvironment": "node" + "testEnvironment": "node", + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" + ] }, "devDependencies": { "browserslist": "^4.7.3" diff --git a/packages/components/package.json b/packages/components/package.json index 6537bf607f..20e7ad0b46 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -19,7 +19,10 @@ "jest": { "testRegex": ".*Test.js$", "testURL": "http://localhost", - "setupTestFrameworkScriptFile": "/jest/setupTests.js" + "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js", + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" + ] }, "dependencies": { "@wordpress/a11y": "^1.1.3", diff --git a/packages/configuration-wizard/package.json b/packages/configuration-wizard/package.json index e0164442c3..aa3e4f4d33 100644 --- a/packages/configuration-wizard/package.json +++ b/packages/configuration-wizard/package.json @@ -61,6 +61,9 @@ }, "transformIgnorePatterns": [ "/node_modules/(?!yoastseo|lodash-es).+\\.js$" + ], + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" ] }, "publishConfig": { diff --git a/packages/feature-flag/package.json b/packages/feature-flag/package.json index a76b952907..84776da483 100644 --- a/packages/feature-flag/package.json +++ b/packages/feature-flag/package.json @@ -27,7 +27,10 @@ "transformIgnorePatterns": [ "/node_modules/(?!yoastseo|lodash-es).+\\.js$" ], - "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js" + "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js", + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" + ] }, "publishConfig": { "access": "public" diff --git a/packages/helpers/package.json b/packages/helpers/package.json index 2e0807150b..8b7a316ab8 100644 --- a/packages/helpers/package.json +++ b/packages/helpers/package.json @@ -28,7 +28,10 @@ "jest": { "testRegex": ".*Test.js$", "testEnvironment": "node", - "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js" + "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js", + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" + ] }, "devDependencies": { "@yoast/browserslist-config": "^1.2.1", diff --git a/packages/search-metadata-previews/package.json b/packages/search-metadata-previews/package.json index 12bde53080..e42615cd5a 100644 --- a/packages/search-metadata-previews/package.json +++ b/packages/search-metadata-previews/package.json @@ -55,7 +55,10 @@ "transformIgnorePatterns": [ "/node_modules/(?!yoastseo|lodash-es).+\\.js$" ], - "setupTestFrameworkScriptFile": "/tests/setupTests.js" + "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js", + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" + ] }, "publishConfig": { "access": "public" diff --git a/packages/yoast-components/package.json b/packages/yoast-components/package.json index e7ebcde39c..d1acfaf426 100644 --- a/packages/yoast-components/package.json +++ b/packages/yoast-components/package.json @@ -52,6 +52,9 @@ }, "transformIgnorePatterns": [ "/node_modules/(?!yoastseo|lodash-es).+\\.js$" + ], + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" ] }, "author": "Yoast", diff --git a/packages/yoastseo/package.json b/packages/yoastseo/package.json index 69618ab74e..89fbd7e359 100644 --- a/packages/yoastseo/package.json +++ b/packages/yoastseo/package.json @@ -115,7 +115,10 @@ "lines": 83, "statements": 83 } - } + }, + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" + ] }, "yoast": { "premiumConfiguration": "release-yoast-seo/13.4" From ff7a864d572e3fc40e934a0629a9dd49ddd6a696 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Mon, 16 Mar 2020 15:04:29 +0100 Subject: [PATCH 15/29] Ensured eslint package has a proper file structure --- packages/eslint/package.json | 2 +- packages/eslint/{ => src}/default.yml | 0 packages/eslint/{ => src}/index.js | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename packages/eslint/{ => src}/default.yml (100%) rename packages/eslint/{ => src}/index.js (100%) diff --git a/packages/eslint/package.json b/packages/eslint/package.json index 7821266b66..c41a9af247 100644 --- a/packages/eslint/package.json +++ b/packages/eslint/package.json @@ -7,7 +7,7 @@ "eslint", "eslintconfig" ], - "main": "index.js", + "main": "src/index.js", "repository": { "type": "git", "url": "https://github.com/Yoast/javascript.git", diff --git a/packages/eslint/default.yml b/packages/eslint/src/default.yml similarity index 100% rename from packages/eslint/default.yml rename to packages/eslint/src/default.yml diff --git a/packages/eslint/index.js b/packages/eslint/src/index.js similarity index 100% rename from packages/eslint/index.js rename to packages/eslint/src/index.js From c907f372c8f818a248be89abcf1695798a1cf6f5 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Mon, 16 Mar 2020 16:31:38 +0100 Subject: [PATCH 16/29] Moved setupTests to tools directory. --- .../search-metadata-previews/{tests => tools/jest}/setupTests.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/search-metadata-previews/{tests => tools/jest}/setupTests.js (100%) diff --git a/packages/search-metadata-previews/tests/setupTests.js b/packages/search-metadata-previews/tools/jest/setupTests.js similarity index 100% rename from packages/search-metadata-previews/tests/setupTests.js rename to packages/search-metadata-previews/tools/jest/setupTests.js From 89f498946f87500978f0d309cbdb1c1e282d6968 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Mon, 16 Mar 2020 16:42:06 +0100 Subject: [PATCH 17/29] Moved components setupTests file to tools directory --- packages/components/tools/jest/setupTests.js | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 packages/components/tools/jest/setupTests.js diff --git a/packages/components/tools/jest/setupTests.js b/packages/components/tools/jest/setupTests.js new file mode 100644 index 0000000000..ae2c5706e1 --- /dev/null +++ b/packages/components/tools/jest/setupTests.js @@ -0,0 +1,6 @@ +import "raf/polyfill"; +import "jest-styled-components"; +import Enzyme from "enzyme"; +import EnzymeAdapter from "enzyme-adapter-react-16"; + +Enzyme.configure( { adapter: new EnzymeAdapter() } ); From 5ea8d0b8c7762435adfd2814f45e1a756679b4b4 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Mon, 16 Mar 2020 16:59:22 +0100 Subject: [PATCH 18/29] Updated folder structure for the yoast-components package --- .../reducers/contentAnalysisReducer.js | 8 -------- .../css-dist/yoast-components-standalone.min.css | 1 - .../css-dist/yoast-components.min.css | 1 - packages/yoast-components/package.json | 14 +++++++------- .../{ => src}/a11y/examples/example.html | 0 .../{ => src}/a11y/examples/example.js | 0 .../{ => src}/composites/CoursesOverview/Card.js | 0 .../composites/CoursesOverview/CardBanner.js | 0 .../composites/CoursesOverview/CardDetails.js | 0 .../composites/LinkSuggestions/LinkSuggestion.js | 0 .../composites/LinkSuggestions/LinkSuggestions.js | 0 .../ContentAnalysis/actions/contentAnalysis.js | 0 .../actions/tests/contentAnalysisTest.js | 0 .../ContentAnalysis/components/AnalysisList.js | 0 .../ContentAnalysis/components/AnalysisResult.js | 0 .../ContentAnalysis/components/ContentAnalysis.js | 0 .../composites/Plugin/ContentAnalysis/index.js | 0 .../contentAnalysis/keywordResultsReducer.js | 0 .../contentAnalysis/readabilityResultsReducer.js | 0 .../reducers/contentAnalysisReducer.js | 8 ++++++++ .../reducers/tests/contentAnalysisReducerTest.js | 2 +- .../reducers/tests/keywordResultsReducerTest.js | 0 .../tests/readabilityResultsReducerTest.js | 0 .../components/CornerstoneToggle.js | 0 .../tests/CornerstoneToggleTest.js | 0 .../__snapshots__/CornerstoneToggleTest.js.snap | 0 .../composites/Plugin/DashboardWidget/index.js | 0 .../Plugin/Shared/components/ButtonSection.js | 0 .../Plugin/Shared/components/Collapsible.js | 0 .../Plugin/Shared/components/KeywordInput.js | 0 .../Plugin/Shared/tests/KeywordInputTest.js | 0 .../tests/__snapshots__/KeywordInputTest.js.snap | 0 .../Facebook/components/FacebookImage.js | 0 .../Facebook/components/FacebookPreview.js | 0 .../Facebook/components/FacebookSiteName.js | 0 .../helpers/determineFacebookImageProperties.js | 0 .../Facebook/tests/FacebookImageTest.js | 0 .../Facebook/tests/FacebookPreviewTest.js | 0 .../Facebook/tests/FacebookSiteNameTest.js | 0 .../tests/__snapshots__/FacebookImageTest.js.snap | 0 .../__snapshots__/FacebookPreviewTest.js.snap | 0 .../__snapshots__/FacebookSiteNameTest.js.snap | 0 .../tests/determineFacebookImagePropertiesTest.js | 0 .../tests/testHelpers/delayComponentSnapshot.js | 0 .../{ => src}/config/defaults.json | 0 .../yoast-components/{ => src}/css/_mixins.scss | 0 .../{ => src}/css/accessibility.scss | 0 packages/yoast-components/{ => src}/css/all.scss | 0 .../yoast-components/{ => src}/css/standalone.scss | 4 ++-- packages/yoast-components/{ => src}/forms/index.js | 0 packages/yoast-components/{ => src}/index.js | 0 .../{ => src}/redux/actions/insights.js | 0 .../{ => src}/redux/actions/linkSuggestions.js | 0 .../{ => src}/redux/actions/tests/insightsTest.js | 0 .../redux/actions/tests/linkSuggestionsTest.js | 0 .../{ => src}/redux/reducers/index.js | 0 .../{ => src}/redux/reducers/insights.js | 0 .../{ => src}/redux/reducers/linkSuggestions.js | 0 .../{ => src}/redux/reducers/prominentWords.js | 0 .../{ => src}/redux/reducers/tests/indexTest.js | 0 .../{ => src}/redux/reducers/tests/insightsTest.js | 0 .../redux/reducers/tests/linkSuggestionsTest.js | 0 .../redux/reducers/tests/prominentWordsTest.js | 0 .../{ => src}/style-guide/index.js | 0 .../{ => src}/utils/buildStructuredUrl.js | 0 packages/yoast-components/{ => src}/utils/i18n.js | 0 packages/yoast-components/{ => src}/utils/index.js | 0 .../yoast-components/{ => src}/utils/reactUtils.js | 0 .../utils/tests/buildStructuredUrlTest.js | 0 .../{jest => tests}/__mocks__/@wordpress/i18n.js | 0 .../{jest => tests}/__mocks__/fileMock.js | 0 .../{ => tools}/grunt/config/aliases.yaml | 0 .../{ => tools}/grunt/config/copy.js | 2 +- .../{ => tools}/grunt/config/postcss.js | 2 +- .../{ => tools}/grunt/config/sass.js | 4 ++-- .../{ => tools}/jest/setupTests.js | 0 76 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer.js delete mode 100644 packages/yoast-components/css-dist/yoast-components-standalone.min.css delete mode 100644 packages/yoast-components/css-dist/yoast-components.min.css rename packages/yoast-components/{ => src}/a11y/examples/example.html (100%) rename packages/yoast-components/{ => src}/a11y/examples/example.js (100%) rename packages/yoast-components/{ => src}/composites/CoursesOverview/Card.js (100%) rename packages/yoast-components/{ => src}/composites/CoursesOverview/CardBanner.js (100%) rename packages/yoast-components/{ => src}/composites/CoursesOverview/CardDetails.js (100%) rename packages/yoast-components/{ => src}/composites/LinkSuggestions/LinkSuggestion.js (100%) rename packages/yoast-components/{ => src}/composites/LinkSuggestions/LinkSuggestions.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/actions/contentAnalysis.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/actions/tests/contentAnalysisTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/components/AnalysisList.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/components/AnalysisResult.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/components/ContentAnalysis.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/index.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/keywordResultsReducer.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/readabilityResultsReducer.js (100%) create mode 100644 packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer.js rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/reducers/tests/contentAnalysisReducerTest.js (91%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/reducers/tests/keywordResultsReducerTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/ContentAnalysis/reducers/tests/readabilityResultsReducerTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/CornerstoneContent/components/CornerstoneToggle.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/CornerstoneContent/tests/CornerstoneToggleTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/CornerstoneContent/tests/__snapshots__/CornerstoneToggleTest.js.snap (100%) rename packages/yoast-components/{ => src}/composites/Plugin/DashboardWidget/index.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/Shared/components/ButtonSection.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/Shared/components/Collapsible.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/Shared/components/KeywordInput.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/Shared/tests/KeywordInputTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/Shared/tests/__snapshots__/KeywordInputTest.js.snap (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/components/FacebookImage.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/components/FacebookPreview.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/components/FacebookSiteName.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/helpers/determineFacebookImageProperties.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/tests/FacebookImageTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/tests/FacebookPreviewTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/tests/FacebookSiteNameTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookImageTest.js.snap (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookPreviewTest.js.snap (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookSiteNameTest.js.snap (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/tests/determineFacebookImagePropertiesTest.js (100%) rename packages/yoast-components/{ => src}/composites/Plugin/SocialPreviews/Facebook/tests/testHelpers/delayComponentSnapshot.js (100%) rename packages/yoast-components/{ => src}/config/defaults.json (100%) rename packages/yoast-components/{ => src}/css/_mixins.scss (100%) rename packages/yoast-components/{ => src}/css/accessibility.scss (100%) rename packages/yoast-components/{ => src}/css/all.scss (100%) rename packages/yoast-components/{ => src}/css/standalone.scss (79%) rename packages/yoast-components/{ => src}/forms/index.js (100%) rename packages/yoast-components/{ => src}/index.js (100%) rename packages/yoast-components/{ => src}/redux/actions/insights.js (100%) rename packages/yoast-components/{ => src}/redux/actions/linkSuggestions.js (100%) rename packages/yoast-components/{ => src}/redux/actions/tests/insightsTest.js (100%) rename packages/yoast-components/{ => src}/redux/actions/tests/linkSuggestionsTest.js (100%) rename packages/yoast-components/{ => src}/redux/reducers/index.js (100%) rename packages/yoast-components/{ => src}/redux/reducers/insights.js (100%) rename packages/yoast-components/{ => src}/redux/reducers/linkSuggestions.js (100%) rename packages/yoast-components/{ => src}/redux/reducers/prominentWords.js (100%) rename packages/yoast-components/{ => src}/redux/reducers/tests/indexTest.js (100%) rename packages/yoast-components/{ => src}/redux/reducers/tests/insightsTest.js (100%) rename packages/yoast-components/{ => src}/redux/reducers/tests/linkSuggestionsTest.js (100%) rename packages/yoast-components/{ => src}/redux/reducers/tests/prominentWordsTest.js (100%) rename packages/yoast-components/{ => src}/style-guide/index.js (100%) rename packages/yoast-components/{ => src}/utils/buildStructuredUrl.js (100%) rename packages/yoast-components/{ => src}/utils/i18n.js (100%) rename packages/yoast-components/{ => src}/utils/index.js (100%) rename packages/yoast-components/{ => src}/utils/reactUtils.js (100%) rename packages/yoast-components/{ => src}/utils/tests/buildStructuredUrlTest.js (100%) rename packages/yoast-components/{jest => tests}/__mocks__/@wordpress/i18n.js (100%) rename packages/yoast-components/{jest => tests}/__mocks__/fileMock.js (100%) rename packages/yoast-components/{ => tools}/grunt/config/aliases.yaml (100%) rename packages/yoast-components/{ => tools}/grunt/config/copy.js (92%) rename packages/yoast-components/{ => tools}/grunt/config/postcss.js (83%) rename packages/yoast-components/{ => tools}/grunt/config/sass.js (69%) rename packages/yoast-components/{ => tools}/jest/setupTests.js (100%) diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer.js b/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer.js deleted file mode 100644 index 650a8130bb..0000000000 --- a/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer.js +++ /dev/null @@ -1,8 +0,0 @@ -import { readabilityResultsReducer } from "../reducers/contentAnalysis/readabilityResultsReducer"; -import { keywordResultsReducer } from "../reducers/contentAnalysis/keywordResultsReducer"; -import { combineReducers } from "redux"; - -export default combineReducers( { - seo: keywordResultsReducer, - readability: readabilityResultsReducer, -} ); diff --git a/packages/yoast-components/css-dist/yoast-components-standalone.min.css b/packages/yoast-components/css-dist/yoast-components-standalone.min.css deleted file mode 100644 index 00a194db59..0000000000 --- a/packages/yoast-components/css-dist/yoast-components-standalone.min.css +++ /dev/null @@ -1 +0,0 @@ -.screen-reader-text{position:absolute !important;clip:rect(1px, 1px, 1px, 1px);clip-path:inset(50%);width:1px;height:1px;border:0;padding:0;overflow:hidden;word-wrap:normal !important}body{background:#f1f1f1;font-family:arial, sans-serif;line-height:1.375}.yoast-search-result-editor{width:640px;margin:0 auto;font-family:Arial, sans-serif} diff --git a/packages/yoast-components/css-dist/yoast-components.min.css b/packages/yoast-components/css-dist/yoast-components.min.css deleted file mode 100644 index c7d3ead9a5..0000000000 --- a/packages/yoast-components/css-dist/yoast-components.min.css +++ /dev/null @@ -1 +0,0 @@ -.screen-reader-text{position:absolute !important;clip:rect(1px, 1px, 1px, 1px);-webkit-clip-path:inset(50%);clip-path:inset(50%);width:1px;height:1px;border:0;padding:0;overflow:hidden;word-wrap:normal !important} diff --git a/packages/yoast-components/package.json b/packages/yoast-components/package.json index d1acfaf426..e6eb3cbe60 100644 --- a/packages/yoast-components/package.json +++ b/packages/yoast-components/package.json @@ -8,7 +8,7 @@ "url": "https://github.com/Yoast/javascript.git", "directory": "packages/yoast-components" }, - "main": "index.js", + "main": "src/index.js", "scripts": { "start": "echo 'The yoast-components demo app has been moved to javascript/apps/components (https://github.com/Yoast/javascript/tree/develop/apps/components). Please run yarn start there.'", "test": "jest", @@ -18,8 +18,8 @@ "jest": { "testURL": "http://localhost", "moduleNameMapper": { - "\\.(jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "/jest/__mocks__/fileMock.js", - "\\.(css|less)$": "/jest/__mocks__/styleMock.js" + "\\.(jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "/tests/__mocks__/fileMock.js", + "\\.(css|less)$": "/tests/__mocks__/styleMock.js" }, "unmockedModulePathPatterns": [ "react", @@ -33,15 +33,15 @@ ], "testRegex": ".*Test.js$", "coverageDirectory": "coverage", - "setupTestFrameworkScriptFile": "/jest/setupTests.js", + "setupTestFrameworkScriptFile": "/tools/jest/setupTests.js", "collectCoverageFrom": [ - "**/*.js", + "src/**/*.js", "!**/*.*Test.js", "!grunt/**/*.js", "!*.js", "!app/**/*.js", - "!a11y/examples/example.js", - "!utils/helpers/*.js", + "!src/a11y/examples/example.js", + "!src/utils/helpers/*.js", "!coverage/**/*.js" ], "snapshotSerializers": [ diff --git a/packages/yoast-components/a11y/examples/example.html b/packages/yoast-components/src/a11y/examples/example.html similarity index 100% rename from packages/yoast-components/a11y/examples/example.html rename to packages/yoast-components/src/a11y/examples/example.html diff --git a/packages/yoast-components/a11y/examples/example.js b/packages/yoast-components/src/a11y/examples/example.js similarity index 100% rename from packages/yoast-components/a11y/examples/example.js rename to packages/yoast-components/src/a11y/examples/example.js diff --git a/packages/yoast-components/composites/CoursesOverview/Card.js b/packages/yoast-components/src/composites/CoursesOverview/Card.js similarity index 100% rename from packages/yoast-components/composites/CoursesOverview/Card.js rename to packages/yoast-components/src/composites/CoursesOverview/Card.js diff --git a/packages/yoast-components/composites/CoursesOverview/CardBanner.js b/packages/yoast-components/src/composites/CoursesOverview/CardBanner.js similarity index 100% rename from packages/yoast-components/composites/CoursesOverview/CardBanner.js rename to packages/yoast-components/src/composites/CoursesOverview/CardBanner.js diff --git a/packages/yoast-components/composites/CoursesOverview/CardDetails.js b/packages/yoast-components/src/composites/CoursesOverview/CardDetails.js similarity index 100% rename from packages/yoast-components/composites/CoursesOverview/CardDetails.js rename to packages/yoast-components/src/composites/CoursesOverview/CardDetails.js diff --git a/packages/yoast-components/composites/LinkSuggestions/LinkSuggestion.js b/packages/yoast-components/src/composites/LinkSuggestions/LinkSuggestion.js similarity index 100% rename from packages/yoast-components/composites/LinkSuggestions/LinkSuggestion.js rename to packages/yoast-components/src/composites/LinkSuggestions/LinkSuggestion.js diff --git a/packages/yoast-components/composites/LinkSuggestions/LinkSuggestions.js b/packages/yoast-components/src/composites/LinkSuggestions/LinkSuggestions.js similarity index 100% rename from packages/yoast-components/composites/LinkSuggestions/LinkSuggestions.js rename to packages/yoast-components/src/composites/LinkSuggestions/LinkSuggestions.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/actions/contentAnalysis.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/actions/contentAnalysis.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/actions/contentAnalysis.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/actions/contentAnalysis.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/actions/tests/contentAnalysisTest.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/actions/tests/contentAnalysisTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/actions/tests/contentAnalysisTest.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/actions/tests/contentAnalysisTest.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/components/AnalysisList.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/components/AnalysisList.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/components/AnalysisList.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/components/AnalysisList.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/components/AnalysisResult.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/components/AnalysisResult.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/components/AnalysisResult.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/components/AnalysisResult.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/components/ContentAnalysis.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/components/ContentAnalysis.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/components/ContentAnalysis.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/components/ContentAnalysis.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/index.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/index.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/index.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/index.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/keywordResultsReducer.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/keywordResultsReducer.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/keywordResultsReducer.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/keywordResultsReducer.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/readabilityResultsReducer.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/readabilityResultsReducer.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/readabilityResultsReducer.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysis/readabilityResultsReducer.js diff --git a/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer.js new file mode 100644 index 0000000000..d59327e463 --- /dev/null +++ b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer.js @@ -0,0 +1,8 @@ +import { readabilityResultsReducer } from "./contentAnalysis/readabilityResultsReducer"; +import { keywordResultsReducer } from "./contentAnalysis/keywordResultsReducer"; +import { combineReducers } from "redux"; + +export default combineReducers( { + seo: keywordResultsReducer, + readability: readabilityResultsReducer, +} ); diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/tests/contentAnalysisReducerTest.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/tests/contentAnalysisReducerTest.js similarity index 91% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/tests/contentAnalysisReducerTest.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/tests/contentAnalysisReducerTest.js index 2c71d9f915..9b7d780ccb 100644 --- a/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/tests/contentAnalysisReducerTest.js +++ b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/tests/contentAnalysisReducerTest.js @@ -1,5 +1,5 @@ import { UPDATE_SEO_RESULT } from "../../actions/contentAnalysis"; -import contentAnalysisReducer from "../../reducers/contentAnalysisReducer"; +import contentAnalysisReducer from "../contentAnalysisReducer"; jest.mock( "../../reducers/contentAnalysis/readabilityResultsReducer", () => { return { diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/tests/keywordResultsReducerTest.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/tests/keywordResultsReducerTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/tests/keywordResultsReducerTest.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/tests/keywordResultsReducerTest.js diff --git a/packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/tests/readabilityResultsReducerTest.js b/packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/tests/readabilityResultsReducerTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/tests/readabilityResultsReducerTest.js rename to packages/yoast-components/src/composites/Plugin/ContentAnalysis/reducers/tests/readabilityResultsReducerTest.js diff --git a/packages/yoast-components/composites/Plugin/CornerstoneContent/components/CornerstoneToggle.js b/packages/yoast-components/src/composites/Plugin/CornerstoneContent/components/CornerstoneToggle.js similarity index 100% rename from packages/yoast-components/composites/Plugin/CornerstoneContent/components/CornerstoneToggle.js rename to packages/yoast-components/src/composites/Plugin/CornerstoneContent/components/CornerstoneToggle.js diff --git a/packages/yoast-components/composites/Plugin/CornerstoneContent/tests/CornerstoneToggleTest.js b/packages/yoast-components/src/composites/Plugin/CornerstoneContent/tests/CornerstoneToggleTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/CornerstoneContent/tests/CornerstoneToggleTest.js rename to packages/yoast-components/src/composites/Plugin/CornerstoneContent/tests/CornerstoneToggleTest.js diff --git a/packages/yoast-components/composites/Plugin/CornerstoneContent/tests/__snapshots__/CornerstoneToggleTest.js.snap b/packages/yoast-components/src/composites/Plugin/CornerstoneContent/tests/__snapshots__/CornerstoneToggleTest.js.snap similarity index 100% rename from packages/yoast-components/composites/Plugin/CornerstoneContent/tests/__snapshots__/CornerstoneToggleTest.js.snap rename to packages/yoast-components/src/composites/Plugin/CornerstoneContent/tests/__snapshots__/CornerstoneToggleTest.js.snap diff --git a/packages/yoast-components/composites/Plugin/DashboardWidget/index.js b/packages/yoast-components/src/composites/Plugin/DashboardWidget/index.js similarity index 100% rename from packages/yoast-components/composites/Plugin/DashboardWidget/index.js rename to packages/yoast-components/src/composites/Plugin/DashboardWidget/index.js diff --git a/packages/yoast-components/composites/Plugin/Shared/components/ButtonSection.js b/packages/yoast-components/src/composites/Plugin/Shared/components/ButtonSection.js similarity index 100% rename from packages/yoast-components/composites/Plugin/Shared/components/ButtonSection.js rename to packages/yoast-components/src/composites/Plugin/Shared/components/ButtonSection.js diff --git a/packages/yoast-components/composites/Plugin/Shared/components/Collapsible.js b/packages/yoast-components/src/composites/Plugin/Shared/components/Collapsible.js similarity index 100% rename from packages/yoast-components/composites/Plugin/Shared/components/Collapsible.js rename to packages/yoast-components/src/composites/Plugin/Shared/components/Collapsible.js diff --git a/packages/yoast-components/composites/Plugin/Shared/components/KeywordInput.js b/packages/yoast-components/src/composites/Plugin/Shared/components/KeywordInput.js similarity index 100% rename from packages/yoast-components/composites/Plugin/Shared/components/KeywordInput.js rename to packages/yoast-components/src/composites/Plugin/Shared/components/KeywordInput.js diff --git a/packages/yoast-components/composites/Plugin/Shared/tests/KeywordInputTest.js b/packages/yoast-components/src/composites/Plugin/Shared/tests/KeywordInputTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/Shared/tests/KeywordInputTest.js rename to packages/yoast-components/src/composites/Plugin/Shared/tests/KeywordInputTest.js diff --git a/packages/yoast-components/composites/Plugin/Shared/tests/__snapshots__/KeywordInputTest.js.snap b/packages/yoast-components/src/composites/Plugin/Shared/tests/__snapshots__/KeywordInputTest.js.snap similarity index 100% rename from packages/yoast-components/composites/Plugin/Shared/tests/__snapshots__/KeywordInputTest.js.snap rename to packages/yoast-components/src/composites/Plugin/Shared/tests/__snapshots__/KeywordInputTest.js.snap diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/components/FacebookImage.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/components/FacebookImage.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/components/FacebookImage.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/components/FacebookImage.js diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/components/FacebookPreview.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/components/FacebookPreview.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/components/FacebookPreview.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/components/FacebookPreview.js diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/components/FacebookSiteName.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/components/FacebookSiteName.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/components/FacebookSiteName.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/components/FacebookSiteName.js diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/helpers/determineFacebookImageProperties.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/helpers/determineFacebookImageProperties.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/helpers/determineFacebookImageProperties.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/helpers/determineFacebookImageProperties.js diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/FacebookImageTest.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/FacebookImageTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/FacebookImageTest.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/FacebookImageTest.js diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/FacebookPreviewTest.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/FacebookPreviewTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/FacebookPreviewTest.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/FacebookPreviewTest.js diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/FacebookSiteNameTest.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/FacebookSiteNameTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/FacebookSiteNameTest.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/FacebookSiteNameTest.js diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookImageTest.js.snap b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookImageTest.js.snap similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookImageTest.js.snap rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookImageTest.js.snap diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookPreviewTest.js.snap b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookPreviewTest.js.snap similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookPreviewTest.js.snap rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookPreviewTest.js.snap diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookSiteNameTest.js.snap b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookSiteNameTest.js.snap similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookSiteNameTest.js.snap rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/__snapshots__/FacebookSiteNameTest.js.snap diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/determineFacebookImagePropertiesTest.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/determineFacebookImagePropertiesTest.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/determineFacebookImagePropertiesTest.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/determineFacebookImagePropertiesTest.js diff --git a/packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/testHelpers/delayComponentSnapshot.js b/packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/testHelpers/delayComponentSnapshot.js similarity index 100% rename from packages/yoast-components/composites/Plugin/SocialPreviews/Facebook/tests/testHelpers/delayComponentSnapshot.js rename to packages/yoast-components/src/composites/Plugin/SocialPreviews/Facebook/tests/testHelpers/delayComponentSnapshot.js diff --git a/packages/yoast-components/config/defaults.json b/packages/yoast-components/src/config/defaults.json similarity index 100% rename from packages/yoast-components/config/defaults.json rename to packages/yoast-components/src/config/defaults.json diff --git a/packages/yoast-components/css/_mixins.scss b/packages/yoast-components/src/css/_mixins.scss similarity index 100% rename from packages/yoast-components/css/_mixins.scss rename to packages/yoast-components/src/css/_mixins.scss diff --git a/packages/yoast-components/css/accessibility.scss b/packages/yoast-components/src/css/accessibility.scss similarity index 100% rename from packages/yoast-components/css/accessibility.scss rename to packages/yoast-components/src/css/accessibility.scss diff --git a/packages/yoast-components/css/all.scss b/packages/yoast-components/src/css/all.scss similarity index 100% rename from packages/yoast-components/css/all.scss rename to packages/yoast-components/src/css/all.scss diff --git a/packages/yoast-components/css/standalone.scss b/packages/yoast-components/src/css/standalone.scss similarity index 79% rename from packages/yoast-components/css/standalone.scss rename to packages/yoast-components/src/css/standalone.scss index 11a67c1e7b..e7949e6f26 100644 --- a/packages/yoast-components/css/standalone.scss +++ b/packages/yoast-components/src/css/standalone.scss @@ -1,6 +1,6 @@ // Requires Sass Dash -@import "../node_modules/sassdash/scss/sassdash"; -@import "./all"; +@import "../../node_modules/sassdash/scss/sassdash"; +@import "all"; body { background: #f1f1f1; diff --git a/packages/yoast-components/forms/index.js b/packages/yoast-components/src/forms/index.js similarity index 100% rename from packages/yoast-components/forms/index.js rename to packages/yoast-components/src/forms/index.js diff --git a/packages/yoast-components/index.js b/packages/yoast-components/src/index.js similarity index 100% rename from packages/yoast-components/index.js rename to packages/yoast-components/src/index.js diff --git a/packages/yoast-components/redux/actions/insights.js b/packages/yoast-components/src/redux/actions/insights.js similarity index 100% rename from packages/yoast-components/redux/actions/insights.js rename to packages/yoast-components/src/redux/actions/insights.js diff --git a/packages/yoast-components/redux/actions/linkSuggestions.js b/packages/yoast-components/src/redux/actions/linkSuggestions.js similarity index 100% rename from packages/yoast-components/redux/actions/linkSuggestions.js rename to packages/yoast-components/src/redux/actions/linkSuggestions.js diff --git a/packages/yoast-components/redux/actions/tests/insightsTest.js b/packages/yoast-components/src/redux/actions/tests/insightsTest.js similarity index 100% rename from packages/yoast-components/redux/actions/tests/insightsTest.js rename to packages/yoast-components/src/redux/actions/tests/insightsTest.js diff --git a/packages/yoast-components/redux/actions/tests/linkSuggestionsTest.js b/packages/yoast-components/src/redux/actions/tests/linkSuggestionsTest.js similarity index 100% rename from packages/yoast-components/redux/actions/tests/linkSuggestionsTest.js rename to packages/yoast-components/src/redux/actions/tests/linkSuggestionsTest.js diff --git a/packages/yoast-components/redux/reducers/index.js b/packages/yoast-components/src/redux/reducers/index.js similarity index 100% rename from packages/yoast-components/redux/reducers/index.js rename to packages/yoast-components/src/redux/reducers/index.js diff --git a/packages/yoast-components/redux/reducers/insights.js b/packages/yoast-components/src/redux/reducers/insights.js similarity index 100% rename from packages/yoast-components/redux/reducers/insights.js rename to packages/yoast-components/src/redux/reducers/insights.js diff --git a/packages/yoast-components/redux/reducers/linkSuggestions.js b/packages/yoast-components/src/redux/reducers/linkSuggestions.js similarity index 100% rename from packages/yoast-components/redux/reducers/linkSuggestions.js rename to packages/yoast-components/src/redux/reducers/linkSuggestions.js diff --git a/packages/yoast-components/redux/reducers/prominentWords.js b/packages/yoast-components/src/redux/reducers/prominentWords.js similarity index 100% rename from packages/yoast-components/redux/reducers/prominentWords.js rename to packages/yoast-components/src/redux/reducers/prominentWords.js diff --git a/packages/yoast-components/redux/reducers/tests/indexTest.js b/packages/yoast-components/src/redux/reducers/tests/indexTest.js similarity index 100% rename from packages/yoast-components/redux/reducers/tests/indexTest.js rename to packages/yoast-components/src/redux/reducers/tests/indexTest.js diff --git a/packages/yoast-components/redux/reducers/tests/insightsTest.js b/packages/yoast-components/src/redux/reducers/tests/insightsTest.js similarity index 100% rename from packages/yoast-components/redux/reducers/tests/insightsTest.js rename to packages/yoast-components/src/redux/reducers/tests/insightsTest.js diff --git a/packages/yoast-components/redux/reducers/tests/linkSuggestionsTest.js b/packages/yoast-components/src/redux/reducers/tests/linkSuggestionsTest.js similarity index 100% rename from packages/yoast-components/redux/reducers/tests/linkSuggestionsTest.js rename to packages/yoast-components/src/redux/reducers/tests/linkSuggestionsTest.js diff --git a/packages/yoast-components/redux/reducers/tests/prominentWordsTest.js b/packages/yoast-components/src/redux/reducers/tests/prominentWordsTest.js similarity index 100% rename from packages/yoast-components/redux/reducers/tests/prominentWordsTest.js rename to packages/yoast-components/src/redux/reducers/tests/prominentWordsTest.js diff --git a/packages/yoast-components/style-guide/index.js b/packages/yoast-components/src/style-guide/index.js similarity index 100% rename from packages/yoast-components/style-guide/index.js rename to packages/yoast-components/src/style-guide/index.js diff --git a/packages/yoast-components/utils/buildStructuredUrl.js b/packages/yoast-components/src/utils/buildStructuredUrl.js similarity index 100% rename from packages/yoast-components/utils/buildStructuredUrl.js rename to packages/yoast-components/src/utils/buildStructuredUrl.js diff --git a/packages/yoast-components/utils/i18n.js b/packages/yoast-components/src/utils/i18n.js similarity index 100% rename from packages/yoast-components/utils/i18n.js rename to packages/yoast-components/src/utils/i18n.js diff --git a/packages/yoast-components/utils/index.js b/packages/yoast-components/src/utils/index.js similarity index 100% rename from packages/yoast-components/utils/index.js rename to packages/yoast-components/src/utils/index.js diff --git a/packages/yoast-components/utils/reactUtils.js b/packages/yoast-components/src/utils/reactUtils.js similarity index 100% rename from packages/yoast-components/utils/reactUtils.js rename to packages/yoast-components/src/utils/reactUtils.js diff --git a/packages/yoast-components/utils/tests/buildStructuredUrlTest.js b/packages/yoast-components/src/utils/tests/buildStructuredUrlTest.js similarity index 100% rename from packages/yoast-components/utils/tests/buildStructuredUrlTest.js rename to packages/yoast-components/src/utils/tests/buildStructuredUrlTest.js diff --git a/packages/yoast-components/jest/__mocks__/@wordpress/i18n.js b/packages/yoast-components/tests/__mocks__/@wordpress/i18n.js similarity index 100% rename from packages/yoast-components/jest/__mocks__/@wordpress/i18n.js rename to packages/yoast-components/tests/__mocks__/@wordpress/i18n.js diff --git a/packages/yoast-components/jest/__mocks__/fileMock.js b/packages/yoast-components/tests/__mocks__/fileMock.js similarity index 100% rename from packages/yoast-components/jest/__mocks__/fileMock.js rename to packages/yoast-components/tests/__mocks__/fileMock.js diff --git a/packages/yoast-components/grunt/config/aliases.yaml b/packages/yoast-components/tools/grunt/config/aliases.yaml similarity index 100% rename from packages/yoast-components/grunt/config/aliases.yaml rename to packages/yoast-components/tools/grunt/config/aliases.yaml diff --git a/packages/yoast-components/grunt/config/copy.js b/packages/yoast-components/tools/grunt/config/copy.js similarity index 92% rename from packages/yoast-components/grunt/config/copy.js rename to packages/yoast-components/tools/grunt/config/copy.js index 223c08b38b..b57d933466 100644 --- a/packages/yoast-components/grunt/config/copy.js +++ b/packages/yoast-components/tools/grunt/config/copy.js @@ -4,7 +4,7 @@ module.exports = { files: [ { src: [ ".babelrc", - "**/*", + "src/**/*", "!dist/**/*", "!node_modules/**/*", ], diff --git a/packages/yoast-components/grunt/config/postcss.js b/packages/yoast-components/tools/grunt/config/postcss.js similarity index 83% rename from packages/yoast-components/grunt/config/postcss.js rename to packages/yoast-components/tools/grunt/config/postcss.js index 2a4b504233..59ea83c4e2 100644 --- a/packages/yoast-components/grunt/config/postcss.js +++ b/packages/yoast-components/tools/grunt/config/postcss.js @@ -8,6 +8,6 @@ module.exports = { ], }, build: { - src: "css-dist/yoast-components.min.css", + src: "dist/css/yoast-components.min.css", }, }; diff --git a/packages/yoast-components/grunt/config/sass.js b/packages/yoast-components/tools/grunt/config/sass.js similarity index 69% rename from packages/yoast-components/grunt/config/sass.js rename to packages/yoast-components/tools/grunt/config/sass.js index 8434a26a3d..285df58603 100644 --- a/packages/yoast-components/grunt/config/sass.js +++ b/packages/yoast-components/tools/grunt/config/sass.js @@ -8,8 +8,8 @@ module.exports = { }, build: { files: { - "css-dist/yoast-components.min.css": "css/all.scss", - "css-dist/yoast-components-standalone.min.css": "css/standalone.scss", + "dist/css/yoast-components.min.css": "src/css/all.scss", + "dist/css/yoast-components-standalone.min.css": "src/css/standalone.scss", }, }, example: { diff --git a/packages/yoast-components/jest/setupTests.js b/packages/yoast-components/tools/jest/setupTests.js similarity index 100% rename from packages/yoast-components/jest/setupTests.js rename to packages/yoast-components/tools/jest/setupTests.js From e80c9ccc160d0ff1b7d6ee8843816f9becd36a4c Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Mon, 16 Mar 2020 17:03:50 +0100 Subject: [PATCH 19/29] Altered path names to grunt configuration locations for yoast-components package. --- packages/yoast-components/Gruntfile.js | 6 +++--- packages/yoast-components/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/yoast-components/Gruntfile.js b/packages/yoast-components/Gruntfile.js index 8302ed760c..fd78b7b7ab 100644 --- a/packages/yoast-components/Gruntfile.js +++ b/packages/yoast-components/Gruntfile.js @@ -6,15 +6,15 @@ module.exports = function( grunt ) { // Define project configuration const project = { paths: { - grunt: "grunt/", + grunt: "tools/grunt/", get config() { return this.grunt + "config/"; }, }, files: { components: [ - "**/*.js", - "*.js", + "src/**/*.js", + "src/*.js", "!node_modules/**", "!node_modules/*", ], diff --git a/packages/yoast-components/package.json b/packages/yoast-components/package.json index e6eb3cbe60..035a31516f 100644 --- a/packages/yoast-components/package.json +++ b/packages/yoast-components/package.json @@ -37,7 +37,7 @@ "collectCoverageFrom": [ "src/**/*.js", "!**/*.*Test.js", - "!grunt/**/*.js", + "!tools/grunt/**/*.js", "!*.js", "!app/**/*.js", "!src/a11y/examples/example.js", From f5459414cf93b90e6018aa9e0dedf74139a045b0 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Mon, 16 Mar 2020 17:07:33 +0100 Subject: [PATCH 20/29] Updated the folder structure for yoast-social-previews --- packages/yoast-social-previews/.gitignore | 1 + packages/yoast-social-previews/.istanbul.yml | 2 +- packages/yoast-social-previews/Gruntfile.js | 18 +++++++++--------- .../yoast-social-previews/example/example.js | 4 ++-- .../grunt/config/eslint.js | 3 --- packages/yoast-social-previews/package.json | 2 +- .../spec/fields/buttonSpec.js | 2 +- .../spec/fields/textAreaSpec.js | 2 +- .../spec/fields/textFieldSpec.js | 2 +- .../spec/helpers/bem/addModifierSpec.js | 2 +- .../spec/helpers/bem/addModifierToClassSpec.js | 2 +- .../spec/helpers/bem/removeModifierSpec.js | 2 +- .../{ => src}/css/editable-preview.scss | 0 .../{ => src}/css/image_placeholder.scss | 0 .../{ => src}/css/social_preview.scss | 6 +++--- .../yoast-social-previews/{ => src}/index.js | 0 .../{ => src}/js/element/imagePlaceholder.js | 0 .../{ => src}/js/element/input.js | 0 .../{ => src}/js/facebookPreview.js | 0 .../{ => src}/js/helpers/addClass.js | 0 .../{ => src}/js/helpers/bem/addModifier.js | 2 +- .../js/helpers/bem/addModifierToClass.js | 0 .../{ => src}/js/helpers/bem/removeModifier.js | 2 +- .../{ => src}/js/helpers/imageDisplayMode.js | 0 .../{ => src}/js/helpers/imageRatio.js | 0 .../{ => src}/js/helpers/minimizeHtml.js | 0 .../{ => src}/js/helpers/removeClass.js | 0 .../{ => src}/js/helpers/renderDescription.js | 0 .../{ => src}/js/inputs/button.js | 2 +- .../{ => src}/js/inputs/inputField.js | 0 .../{ => src}/js/inputs/textInput.js | 0 .../{ => src}/js/inputs/textarea.js | 0 .../{ => src}/js/preview/events.js | 0 .../{ => src}/js/templates.js | 2 +- .../{ => src}/js/twitterPreview.js | 0 .../{ => src}/templates/facebookAuthor.jst | 0 .../{ => src}/templates/facebookPreview.jst | 0 .../{ => src}/templates/fields/button.jst | 0 .../{ => src}/templates/fields/text.jst | 0 .../{ => src}/templates/fields/textarea.jst | 0 .../{ => src}/templates/imagePlaceholder.jst | 0 .../{ => src}/templates/twitterPreview.jst | 0 .../{ => tools}/grunt/config/aliases.yaml | 0 .../{ => tools}/grunt/config/browserify.js | 0 .../{ => tools}/grunt/config/copy.js | 0 .../tools/grunt/config/eslint.js | 3 +++ .../{ => tools}/grunt/config/lodash.js | 2 +- .../{ => tools}/grunt/config/po2json.js | 0 .../{ => tools}/grunt/config/postcss.js | 0 .../{ => tools}/grunt/config/sass.js | 2 +- .../{ => tools}/grunt/config/shell.js | 2 +- .../{ => tools}/grunt/config/uglify.js | 0 .../{ => tools}/grunt/config/watch.js | 0 53 files changed, 33 insertions(+), 32 deletions(-) delete mode 100644 packages/yoast-social-previews/grunt/config/eslint.js rename packages/yoast-social-previews/{ => src}/css/editable-preview.scss (100%) rename packages/yoast-social-previews/{ => src}/css/image_placeholder.scss (100%) rename packages/yoast-social-previews/{ => src}/css/social_preview.scss (97%) rename packages/yoast-social-previews/{ => src}/index.js (100%) rename packages/yoast-social-previews/{ => src}/js/element/imagePlaceholder.js (100%) rename packages/yoast-social-previews/{ => src}/js/element/input.js (100%) rename packages/yoast-social-previews/{ => src}/js/facebookPreview.js (100%) rename packages/yoast-social-previews/{ => src}/js/helpers/addClass.js (100%) rename packages/yoast-social-previews/{ => src}/js/helpers/bem/addModifier.js (93%) rename packages/yoast-social-previews/{ => src}/js/helpers/bem/addModifierToClass.js (100%) rename packages/yoast-social-previews/{ => src}/js/helpers/bem/removeModifier.js (92%) rename packages/yoast-social-previews/{ => src}/js/helpers/imageDisplayMode.js (100%) rename packages/yoast-social-previews/{ => src}/js/helpers/imageRatio.js (100%) rename packages/yoast-social-previews/{ => src}/js/helpers/minimizeHtml.js (100%) rename packages/yoast-social-previews/{ => src}/js/helpers/removeClass.js (100%) rename packages/yoast-social-previews/{ => src}/js/helpers/renderDescription.js (100%) rename packages/yoast-social-previews/{ => src}/js/inputs/button.js (96%) rename packages/yoast-social-previews/{ => src}/js/inputs/inputField.js (100%) rename packages/yoast-social-previews/{ => src}/js/inputs/textInput.js (100%) rename packages/yoast-social-previews/{ => src}/js/inputs/textarea.js (100%) rename packages/yoast-social-previews/{ => src}/js/preview/events.js (100%) rename packages/yoast-social-previews/{ => src}/js/templates.js (99%) rename packages/yoast-social-previews/{ => src}/js/twitterPreview.js (100%) rename packages/yoast-social-previews/{ => src}/templates/facebookAuthor.jst (100%) rename packages/yoast-social-previews/{ => src}/templates/facebookPreview.jst (100%) rename packages/yoast-social-previews/{ => src}/templates/fields/button.jst (100%) rename packages/yoast-social-previews/{ => src}/templates/fields/text.jst (100%) rename packages/yoast-social-previews/{ => src}/templates/fields/textarea.jst (100%) rename packages/yoast-social-previews/{ => src}/templates/imagePlaceholder.jst (100%) rename packages/yoast-social-previews/{ => src}/templates/twitterPreview.jst (100%) rename packages/yoast-social-previews/{ => tools}/grunt/config/aliases.yaml (100%) rename packages/yoast-social-previews/{ => tools}/grunt/config/browserify.js (100%) rename packages/yoast-social-previews/{ => tools}/grunt/config/copy.js (100%) create mode 100644 packages/yoast-social-previews/tools/grunt/config/eslint.js rename packages/yoast-social-previews/{ => tools}/grunt/config/lodash.js (87%) rename packages/yoast-social-previews/{ => tools}/grunt/config/po2json.js (100%) rename packages/yoast-social-previews/{ => tools}/grunt/config/postcss.js (100%) rename packages/yoast-social-previews/{ => tools}/grunt/config/sass.js (74%) rename packages/yoast-social-previews/{ => tools}/grunt/config/shell.js (91%) rename packages/yoast-social-previews/{ => tools}/grunt/config/uglify.js (100%) rename packages/yoast-social-previews/{ => tools}/grunt/config/watch.js (100%) diff --git a/packages/yoast-social-previews/.gitignore b/packages/yoast-social-previews/.gitignore index 6bdbe62b82..d05d7e5481 100644 --- a/packages/yoast-social-previews/.gitignore +++ b/packages/yoast-social-previews/.gitignore @@ -1,2 +1,3 @@ /node_modules/ /.idea/ +/dist/ diff --git a/packages/yoast-social-previews/.istanbul.yml b/packages/yoast-social-previews/.istanbul.yml index 9e2e3fc6de..194f33d68d 100644 --- a/packages/yoast-social-previews/.istanbul.yml +++ b/packages/yoast-social-previews/.istanbul.yml @@ -1,5 +1,5 @@ instrumentation: - root: js + root: src/js extensions: - .js include-all-sources: true diff --git a/packages/yoast-social-previews/Gruntfile.js b/packages/yoast-social-previews/Gruntfile.js index c053ba517f..6b3dfdcd9c 100644 --- a/packages/yoast-social-previews/Gruntfile.js +++ b/packages/yoast-social-previews/Gruntfile.js @@ -5,25 +5,25 @@ module.exports = function( grunt ) { // Define project configuration. var project = { paths: { - grunt: "grunt/", - js: "js/", - css: "css/", + grunt: "tools/grunt/", + js: "src/js/", + css: "src/css/", get config() { return this.grunt + "config/"; }, }, files: { js: [ - "js/**/*.js", - "grunt/config/*.js", - "!js/config/*.js", + "src/js/**/*.js", + "tools/grunt/config/*.js", + "!src/js/config/*.js", "<%= files.grunt %>", ], jsDontLint: [ - "!js/templates.js", + "!src/js/templates.js", ], - scss: "css/*.scss", - templates: "templates/**/*.jst", + scss: "src/css/*.scss", + templates: "src/templates/**/*.jst", jed: "node_modules/jed/jed.js", get config() { return project.paths.config + "*.js"; diff --git a/packages/yoast-social-previews/example/example.js b/packages/yoast-social-previews/example/example.js index 3416fb4892..996fb31db4 100644 --- a/packages/yoast-social-previews/example/example.js +++ b/packages/yoast-social-previews/example/example.js @@ -1,5 +1,5 @@ -var FacebookPreview = require( "../js/facebookPreview.js" ); -var TwitterPreview = require( "../js/twitterPreview.js" ); +var FacebookPreview = require( "../src/js/facebookPreview.js" ); +var TwitterPreview = require( "../src/js/twitterPreview.js" ); var facebookPreview = new FacebookPreview( { diff --git a/packages/yoast-social-previews/grunt/config/eslint.js b/packages/yoast-social-previews/grunt/config/eslint.js deleted file mode 100644 index 75eea70e4b..0000000000 --- a/packages/yoast-social-previews/grunt/config/eslint.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - target: [ "<%= files.js %>", "!js/templates.js" ], -}; diff --git a/packages/yoast-social-previews/package.json b/packages/yoast-social-previews/package.json index 945e88400d..0db597b865 100644 --- a/packages/yoast-social-previews/package.json +++ b/packages/yoast-social-previews/package.json @@ -3,7 +3,7 @@ "version": "1.8.1", "description": "", "private": true, - "main": "index.js", + "main": "src/index.js", "scripts": { "test": "istanbul test jasmine" }, diff --git a/packages/yoast-social-previews/spec/fields/buttonSpec.js b/packages/yoast-social-previews/spec/fields/buttonSpec.js index 5eb4d0436f..4147837e54 100644 --- a/packages/yoast-social-previews/spec/fields/buttonSpec.js +++ b/packages/yoast-social-previews/spec/fields/buttonSpec.js @@ -1,4 +1,4 @@ -var Button = require( "../../js/inputs/button" ); +var Button = require( "../../src/js/inputs/button" ); describe( 'a button', function() { it( 'should accept a value', function() { diff --git a/packages/yoast-social-previews/spec/fields/textAreaSpec.js b/packages/yoast-social-previews/spec/fields/textAreaSpec.js index 55e78fd91e..92fdefbcb8 100644 --- a/packages/yoast-social-previews/spec/fields/textAreaSpec.js +++ b/packages/yoast-social-previews/spec/fields/textAreaSpec.js @@ -1,4 +1,4 @@ -var TextArea = require( "../../js/inputs/textarea" ); +var TextArea = require( "../../src/js/inputs/textarea" ); describe( 'a text area', function() { diff --git a/packages/yoast-social-previews/spec/fields/textFieldSpec.js b/packages/yoast-social-previews/spec/fields/textFieldSpec.js index 5fea3a76f7..24a3c9b95d 100644 --- a/packages/yoast-social-previews/spec/fields/textFieldSpec.js +++ b/packages/yoast-social-previews/spec/fields/textFieldSpec.js @@ -1,4 +1,4 @@ -var TextField = require( "../../js/inputs/textInput" ); +var TextField = require( "../../src/js/inputs/textInput" ); describe( 'a text field', function() { diff --git a/packages/yoast-social-previews/spec/helpers/bem/addModifierSpec.js b/packages/yoast-social-previews/spec/helpers/bem/addModifierSpec.js index 46382d560e..1fad3f5550 100644 --- a/packages/yoast-social-previews/spec/helpers/bem/addModifierSpec.js +++ b/packages/yoast-social-previews/spec/helpers/bem/addModifierSpec.js @@ -1,4 +1,4 @@ -var addModifier = require( "../../../js/helpers/bem/addModifier" ); +var addModifier = require( "../../../src/js/helpers/bem/addModifier" ); describe( "addModifier", function() { var mockElement, mockParent; diff --git a/packages/yoast-social-previews/spec/helpers/bem/addModifierToClassSpec.js b/packages/yoast-social-previews/spec/helpers/bem/addModifierToClassSpec.js index 7af1a02905..40c61aa21c 100644 --- a/packages/yoast-social-previews/spec/helpers/bem/addModifierToClassSpec.js +++ b/packages/yoast-social-previews/spec/helpers/bem/addModifierToClassSpec.js @@ -1,4 +1,4 @@ -var addModifierToClass = require( "../../../js/helpers/bem/addModifierToClass" ); +var addModifierToClass = require( "../../../src/js/helpers/bem/addModifierToClass" ); describe( "addModifierToClass", function() { diff --git a/packages/yoast-social-previews/spec/helpers/bem/removeModifierSpec.js b/packages/yoast-social-previews/spec/helpers/bem/removeModifierSpec.js index 0f16d39b34..cea6aef74a 100644 --- a/packages/yoast-social-previews/spec/helpers/bem/removeModifierSpec.js +++ b/packages/yoast-social-previews/spec/helpers/bem/removeModifierSpec.js @@ -1,4 +1,4 @@ -var removeModifier = require( "../../../js/helpers/bem/removeModifier" ); +var removeModifier = require( "../../../src/js/helpers/bem/removeModifier" ); describe( "removeModifier", function() { var mockElement, mockParent; diff --git a/packages/yoast-social-previews/css/editable-preview.scss b/packages/yoast-social-previews/src/css/editable-preview.scss similarity index 100% rename from packages/yoast-social-previews/css/editable-preview.scss rename to packages/yoast-social-previews/src/css/editable-preview.scss diff --git a/packages/yoast-social-previews/css/image_placeholder.scss b/packages/yoast-social-previews/src/css/image_placeholder.scss similarity index 100% rename from packages/yoast-social-previews/css/image_placeholder.scss rename to packages/yoast-social-previews/src/css/image_placeholder.scss diff --git a/packages/yoast-social-previews/css/social_preview.scss b/packages/yoast-social-previews/src/css/social_preview.scss similarity index 97% rename from packages/yoast-social-previews/css/social_preview.scss rename to packages/yoast-social-previews/src/css/social_preview.scss index 26bf5ff297..34d56a88d5 100644 --- a/packages/yoast-social-previews/css/social_preview.scss +++ b/packages/yoast-social-previews/src/css/social_preview.scss @@ -1,6 +1,6 @@ -@import "../node_modules/sassdash/index"; -@import "../node_modules/yoastseo/css/snippet-editor"; -@import "../node_modules/yoastseo/css/mixins"; +@import "../../node_modules/sassdash/index"; +@import "../../node_modules/yoastseo/css/snippet-editor"; +@import "../../node_modules/yoastseo/css/mixins"; @import "image_placeholder"; @import "editable-preview"; diff --git a/packages/yoast-social-previews/index.js b/packages/yoast-social-previews/src/index.js similarity index 100% rename from packages/yoast-social-previews/index.js rename to packages/yoast-social-previews/src/index.js diff --git a/packages/yoast-social-previews/js/element/imagePlaceholder.js b/packages/yoast-social-previews/src/js/element/imagePlaceholder.js similarity index 100% rename from packages/yoast-social-previews/js/element/imagePlaceholder.js rename to packages/yoast-social-previews/src/js/element/imagePlaceholder.js diff --git a/packages/yoast-social-previews/js/element/input.js b/packages/yoast-social-previews/src/js/element/input.js similarity index 100% rename from packages/yoast-social-previews/js/element/input.js rename to packages/yoast-social-previews/src/js/element/input.js diff --git a/packages/yoast-social-previews/js/facebookPreview.js b/packages/yoast-social-previews/src/js/facebookPreview.js similarity index 100% rename from packages/yoast-social-previews/js/facebookPreview.js rename to packages/yoast-social-previews/src/js/facebookPreview.js diff --git a/packages/yoast-social-previews/js/helpers/addClass.js b/packages/yoast-social-previews/src/js/helpers/addClass.js similarity index 100% rename from packages/yoast-social-previews/js/helpers/addClass.js rename to packages/yoast-social-previews/src/js/helpers/addClass.js diff --git a/packages/yoast-social-previews/js/helpers/bem/addModifier.js b/packages/yoast-social-previews/src/js/helpers/bem/addModifier.js similarity index 93% rename from packages/yoast-social-previews/js/helpers/bem/addModifier.js rename to packages/yoast-social-previews/src/js/helpers/bem/addModifier.js index 15a727af30..7345b7cbfa 100644 --- a/packages/yoast-social-previews/js/helpers/bem/addModifier.js +++ b/packages/yoast-social-previews/src/js/helpers/bem/addModifier.js @@ -1,4 +1,4 @@ -var addClass = require( "./../addClass" ); +var addClass = require( "../addClass" ); var addModifierToClass = require( "./addModifierToClass" ); /** diff --git a/packages/yoast-social-previews/js/helpers/bem/addModifierToClass.js b/packages/yoast-social-previews/src/js/helpers/bem/addModifierToClass.js similarity index 100% rename from packages/yoast-social-previews/js/helpers/bem/addModifierToClass.js rename to packages/yoast-social-previews/src/js/helpers/bem/addModifierToClass.js diff --git a/packages/yoast-social-previews/js/helpers/bem/removeModifier.js b/packages/yoast-social-previews/src/js/helpers/bem/removeModifier.js similarity index 92% rename from packages/yoast-social-previews/js/helpers/bem/removeModifier.js rename to packages/yoast-social-previews/src/js/helpers/bem/removeModifier.js index e11b7f2ec9..7bee3794ed 100644 --- a/packages/yoast-social-previews/js/helpers/bem/removeModifier.js +++ b/packages/yoast-social-previews/src/js/helpers/bem/removeModifier.js @@ -1,4 +1,4 @@ -var removeClass = require( "./../removeClass" ); +var removeClass = require( "../removeClass" ); var addModifierToClass = require( "./addModifierToClass" ); /** diff --git a/packages/yoast-social-previews/js/helpers/imageDisplayMode.js b/packages/yoast-social-previews/src/js/helpers/imageDisplayMode.js similarity index 100% rename from packages/yoast-social-previews/js/helpers/imageDisplayMode.js rename to packages/yoast-social-previews/src/js/helpers/imageDisplayMode.js diff --git a/packages/yoast-social-previews/js/helpers/imageRatio.js b/packages/yoast-social-previews/src/js/helpers/imageRatio.js similarity index 100% rename from packages/yoast-social-previews/js/helpers/imageRatio.js rename to packages/yoast-social-previews/src/js/helpers/imageRatio.js diff --git a/packages/yoast-social-previews/js/helpers/minimizeHtml.js b/packages/yoast-social-previews/src/js/helpers/minimizeHtml.js similarity index 100% rename from packages/yoast-social-previews/js/helpers/minimizeHtml.js rename to packages/yoast-social-previews/src/js/helpers/minimizeHtml.js diff --git a/packages/yoast-social-previews/js/helpers/removeClass.js b/packages/yoast-social-previews/src/js/helpers/removeClass.js similarity index 100% rename from packages/yoast-social-previews/js/helpers/removeClass.js rename to packages/yoast-social-previews/src/js/helpers/removeClass.js diff --git a/packages/yoast-social-previews/js/helpers/renderDescription.js b/packages/yoast-social-previews/src/js/helpers/renderDescription.js similarity index 100% rename from packages/yoast-social-previews/js/helpers/renderDescription.js rename to packages/yoast-social-previews/src/js/helpers/renderDescription.js diff --git a/packages/yoast-social-previews/js/inputs/button.js b/packages/yoast-social-previews/src/js/inputs/button.js similarity index 96% rename from packages/yoast-social-previews/js/inputs/button.js rename to packages/yoast-social-previews/src/js/inputs/button.js index 8bd6e859e0..d08f4ea5fd 100644 --- a/packages/yoast-social-previews/js/inputs/button.js +++ b/packages/yoast-social-previews/src/js/inputs/button.js @@ -1,5 +1,5 @@ var defaults = require( "lodash/object/defaults" ); -var buttonTemplate = require( "../../js/templates" ).fields.button; +var buttonTemplate = require( "../templates" ).fields.button; var minimizeHtml = require( "../helpers/minimizeHtml" ); var defaultAttributes = { value: "", diff --git a/packages/yoast-social-previews/js/inputs/inputField.js b/packages/yoast-social-previews/src/js/inputs/inputField.js similarity index 100% rename from packages/yoast-social-previews/js/inputs/inputField.js rename to packages/yoast-social-previews/src/js/inputs/inputField.js diff --git a/packages/yoast-social-previews/js/inputs/textInput.js b/packages/yoast-social-previews/src/js/inputs/textInput.js similarity index 100% rename from packages/yoast-social-previews/js/inputs/textInput.js rename to packages/yoast-social-previews/src/js/inputs/textInput.js diff --git a/packages/yoast-social-previews/js/inputs/textarea.js b/packages/yoast-social-previews/src/js/inputs/textarea.js similarity index 100% rename from packages/yoast-social-previews/js/inputs/textarea.js rename to packages/yoast-social-previews/src/js/inputs/textarea.js diff --git a/packages/yoast-social-previews/js/preview/events.js b/packages/yoast-social-previews/src/js/preview/events.js similarity index 100% rename from packages/yoast-social-previews/js/preview/events.js rename to packages/yoast-social-previews/src/js/preview/events.js diff --git a/packages/yoast-social-previews/js/templates.js b/packages/yoast-social-previews/src/js/templates.js similarity index 99% rename from packages/yoast-social-previews/js/templates.js rename to packages/yoast-social-previews/src/js/templates.js index 7d2fc414d2..71560af4dd 100644 --- a/packages/yoast-social-previews/js/templates.js +++ b/packages/yoast-social-previews/src/js/templates.js @@ -15,7 +15,7 @@ var undefined; /** Used as the semantic version number. */ - var VERSION = '4.17.4'; + var VERSION = '4.17.5'; /** Used as references for various `Number` constants. */ var INFINITY = 1 / 0; diff --git a/packages/yoast-social-previews/js/twitterPreview.js b/packages/yoast-social-previews/src/js/twitterPreview.js similarity index 100% rename from packages/yoast-social-previews/js/twitterPreview.js rename to packages/yoast-social-previews/src/js/twitterPreview.js diff --git a/packages/yoast-social-previews/templates/facebookAuthor.jst b/packages/yoast-social-previews/src/templates/facebookAuthor.jst similarity index 100% rename from packages/yoast-social-previews/templates/facebookAuthor.jst rename to packages/yoast-social-previews/src/templates/facebookAuthor.jst diff --git a/packages/yoast-social-previews/templates/facebookPreview.jst b/packages/yoast-social-previews/src/templates/facebookPreview.jst similarity index 100% rename from packages/yoast-social-previews/templates/facebookPreview.jst rename to packages/yoast-social-previews/src/templates/facebookPreview.jst diff --git a/packages/yoast-social-previews/templates/fields/button.jst b/packages/yoast-social-previews/src/templates/fields/button.jst similarity index 100% rename from packages/yoast-social-previews/templates/fields/button.jst rename to packages/yoast-social-previews/src/templates/fields/button.jst diff --git a/packages/yoast-social-previews/templates/fields/text.jst b/packages/yoast-social-previews/src/templates/fields/text.jst similarity index 100% rename from packages/yoast-social-previews/templates/fields/text.jst rename to packages/yoast-social-previews/src/templates/fields/text.jst diff --git a/packages/yoast-social-previews/templates/fields/textarea.jst b/packages/yoast-social-previews/src/templates/fields/textarea.jst similarity index 100% rename from packages/yoast-social-previews/templates/fields/textarea.jst rename to packages/yoast-social-previews/src/templates/fields/textarea.jst diff --git a/packages/yoast-social-previews/templates/imagePlaceholder.jst b/packages/yoast-social-previews/src/templates/imagePlaceholder.jst similarity index 100% rename from packages/yoast-social-previews/templates/imagePlaceholder.jst rename to packages/yoast-social-previews/src/templates/imagePlaceholder.jst diff --git a/packages/yoast-social-previews/templates/twitterPreview.jst b/packages/yoast-social-previews/src/templates/twitterPreview.jst similarity index 100% rename from packages/yoast-social-previews/templates/twitterPreview.jst rename to packages/yoast-social-previews/src/templates/twitterPreview.jst diff --git a/packages/yoast-social-previews/grunt/config/aliases.yaml b/packages/yoast-social-previews/tools/grunt/config/aliases.yaml similarity index 100% rename from packages/yoast-social-previews/grunt/config/aliases.yaml rename to packages/yoast-social-previews/tools/grunt/config/aliases.yaml diff --git a/packages/yoast-social-previews/grunt/config/browserify.js b/packages/yoast-social-previews/tools/grunt/config/browserify.js similarity index 100% rename from packages/yoast-social-previews/grunt/config/browserify.js rename to packages/yoast-social-previews/tools/grunt/config/browserify.js diff --git a/packages/yoast-social-previews/grunt/config/copy.js b/packages/yoast-social-previews/tools/grunt/config/copy.js similarity index 100% rename from packages/yoast-social-previews/grunt/config/copy.js rename to packages/yoast-social-previews/tools/grunt/config/copy.js diff --git a/packages/yoast-social-previews/tools/grunt/config/eslint.js b/packages/yoast-social-previews/tools/grunt/config/eslint.js new file mode 100644 index 0000000000..449c2d158a --- /dev/null +++ b/packages/yoast-social-previews/tools/grunt/config/eslint.js @@ -0,0 +1,3 @@ +module.exports = { + target: [ "<%= files.js %>", "!src/js/templates.js" ], +}; diff --git a/packages/yoast-social-previews/grunt/config/lodash.js b/packages/yoast-social-previews/tools/grunt/config/lodash.js similarity index 87% rename from packages/yoast-social-previews/grunt/config/lodash.js rename to packages/yoast-social-previews/tools/grunt/config/lodash.js index 33348eada0..60c49df200 100644 --- a/packages/yoast-social-previews/grunt/config/lodash.js +++ b/packages/yoast-social-previews/tools/grunt/config/lodash.js @@ -1,7 +1,7 @@ // See https://github.com/lodash-archive/grunt-lodash module.exports = { templates: { - dest: "js/templates.js", + dest: "src/js/templates.js", options: { exports: [ "node" ], template: "<%= files.templates %>", diff --git a/packages/yoast-social-previews/grunt/config/po2json.js b/packages/yoast-social-previews/tools/grunt/config/po2json.js similarity index 100% rename from packages/yoast-social-previews/grunt/config/po2json.js rename to packages/yoast-social-previews/tools/grunt/config/po2json.js diff --git a/packages/yoast-social-previews/grunt/config/postcss.js b/packages/yoast-social-previews/tools/grunt/config/postcss.js similarity index 100% rename from packages/yoast-social-previews/grunt/config/postcss.js rename to packages/yoast-social-previews/tools/grunt/config/postcss.js diff --git a/packages/yoast-social-previews/grunt/config/sass.js b/packages/yoast-social-previews/tools/grunt/config/sass.js similarity index 74% rename from packages/yoast-social-previews/grunt/config/sass.js rename to packages/yoast-social-previews/tools/grunt/config/sass.js index c3fcfed2c9..71bdc3c826 100644 --- a/packages/yoast-social-previews/grunt/config/sass.js +++ b/packages/yoast-social-previews/tools/grunt/config/sass.js @@ -8,7 +8,7 @@ module.exports = { }, build: { files: { - "dist/yoast-social-preview.min.css": "css/social_preview.scss", + "dist/yoast-social-preview.min.css": "src/css/social_preview.scss", }, }, }; diff --git a/packages/yoast-social-previews/grunt/config/shell.js b/packages/yoast-social-previews/tools/grunt/config/shell.js similarity index 91% rename from packages/yoast-social-previews/grunt/config/shell.js rename to packages/yoast-social-previews/tools/grunt/config/shell.js index 400905339f..dac7f505a5 100644 --- a/packages/yoast-social-previews/grunt/config/shell.js +++ b/packages/yoast-social-previews/tools/grunt/config/shell.js @@ -7,7 +7,7 @@ module.exports = function( grunt ) { command: function() { var files; - files = [ "js/*.js", "js/config/*.js" ]; + files = [ "src/js/*.js", "src/js/config/*.js" ]; files = grunt.file.expand( files ); return "xgettext" + diff --git a/packages/yoast-social-previews/grunt/config/uglify.js b/packages/yoast-social-previews/tools/grunt/config/uglify.js similarity index 100% rename from packages/yoast-social-previews/grunt/config/uglify.js rename to packages/yoast-social-previews/tools/grunt/config/uglify.js diff --git a/packages/yoast-social-previews/grunt/config/watch.js b/packages/yoast-social-previews/tools/grunt/config/watch.js similarity index 100% rename from packages/yoast-social-previews/grunt/config/watch.js rename to packages/yoast-social-previews/tools/grunt/config/watch.js From 0f86b942001a34362eb279acc96a97f1a7d529c9 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Tue, 17 Mar 2020 14:18:26 +0100 Subject: [PATCH 21/29] Updated the folder structure for yoastseo package --- packages/yoastseo/.gitignore | 2 + packages/yoastseo/Gruntfile.js | 4 +- packages/yoastseo/package.json | 2 +- packages/yoastseo/{ => src}/index.js | 38 +++++++++---------- .../{ => tools}/grunt/config/aliases.yaml | 0 .../{ => tools}/grunt/config/babel.js | 0 .../{ => tools}/grunt/config/browserify.js | 0 .../{ => tools}/grunt/config/clean.js | 0 .../yoastseo/{ => tools}/grunt/config/copy.js | 0 .../{ => tools}/grunt/config/eslint.js | 0 .../{ => tools}/grunt/config/exorcise.js | 0 .../{ => tools}/grunt/config/po2json.js | 0 .../{ => tools}/grunt/config/postcss.js | 0 .../yoastseo/{ => tools}/grunt/config/sass.js | 0 .../{ => tools}/grunt/config/shell.js | 0 .../{ => tools}/grunt/config/watch.js | 0 16 files changed, 24 insertions(+), 22 deletions(-) rename packages/yoastseo/{ => src}/index.js (50%) rename packages/yoastseo/{ => tools}/grunt/config/aliases.yaml (100%) rename packages/yoastseo/{ => tools}/grunt/config/babel.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/browserify.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/clean.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/copy.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/eslint.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/exorcise.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/po2json.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/postcss.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/sass.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/shell.js (100%) rename packages/yoastseo/{ => tools}/grunt/config/watch.js (100%) diff --git a/packages/yoastseo/.gitignore b/packages/yoastseo/.gitignore index 9a3bbe2027..5c3f747ad6 100644 --- a/packages/yoastseo/.gitignore +++ b/packages/yoastseo/.gitignore @@ -5,6 +5,8 @@ node_modules/ out/ coverage/ .tscache/ +.idea/ +dist/ /examples/browserified/example-browserified.js /premium-configuration diff --git a/packages/yoastseo/Gruntfile.js b/packages/yoastseo/Gruntfile.js index f4da9510aa..be17fa8675 100644 --- a/packages/yoastseo/Gruntfile.js +++ b/packages/yoastseo/Gruntfile.js @@ -5,7 +5,7 @@ module.exports = function( grunt ) { // Define project configuration var project = { paths: { - grunt: "grunt/", + grunt: "tools/grunt/", js: "src/", css: "css/", /** @@ -23,7 +23,7 @@ module.exports = function( grunt ) { "grunt/config/*.js", "!src/config/*.js", "<%= files.grunt %>", - "!js", + "!src/js", ], jsDontLint: [ "!src/templates.js", diff --git a/packages/yoastseo/package.json b/packages/yoastseo/package.json index 89fbd7e359..b776e6fddf 100644 --- a/packages/yoastseo/package.json +++ b/packages/yoastseo/package.json @@ -7,7 +7,7 @@ "SEO", "text analysis" ], - "main": "index.js", + "main": "src/index.js", "license": "GPL-3.0", "version": "1.71.0-rc.0", "repository": { diff --git a/packages/yoastseo/index.js b/packages/yoastseo/src/index.js similarity index 50% rename from packages/yoastseo/index.js rename to packages/yoastseo/src/index.js index 3b4cecd6ca..ae3a7fc8a0 100644 --- a/packages/yoastseo/index.js +++ b/packages/yoastseo/src/index.js @@ -1,23 +1,23 @@ -import { AnalysisWebWorker, AnalysisWorkerWrapper, createWorker } from "./src/worker"; -import * as assessments from "./src/assessments"; -import * as bundledPlugins from "./src/bundledPlugins"; -import * as helpers from "./src/helpers"; -import * as markers from "./src/markers"; -import * as string from "./src/stringProcessing"; -import * as interpreters from "./src/interpreters"; -import * as config from "./src/config"; +import { AnalysisWebWorker, AnalysisWorkerWrapper, createWorker } from "./worker"; +import * as assessments from "./assessments"; +import * as bundledPlugins from "./bundledPlugins"; +import * as helpers from "./helpers"; +import * as markers from "./markers"; +import * as string from "./stringProcessing"; +import * as interpreters from "./interpreters"; +import * as config from "./config"; -import App from "./src/app"; -import Assessor from "./src/assessor"; -import ContentAssessor from "./src/contentAssessor"; -import SeoAssessor from './src/seoAssessor'; -import TaxonomyAssessor from "./src/taxonomyAssessor"; -import Pluggable from "./src/pluggable"; -import Researcher from "./src/researcher"; -import SnippetPreview from "./src/snippetPreview"; -import Paper from "./src/values/Paper"; -import AssessmentResult from "./src/values/AssessmentResult"; -import Assessment from "./src/assessment"; +import App from "./app"; +import Assessor from "./assessor"; +import ContentAssessor from "./contentAssessor"; +import SeoAssessor from "./seoAssessor"; +import TaxonomyAssessor from "./taxonomyAssessor"; +import Pluggable from "./pluggable"; +import Researcher from "./researcher"; +import SnippetPreview from "./snippetPreview"; +import Paper from "./values/Paper"; +import AssessmentResult from "./values/AssessmentResult"; +import Assessment from "./assessment"; /* * Everything exported here is put on the `yoast.analysis` global in the plugin. diff --git a/packages/yoastseo/grunt/config/aliases.yaml b/packages/yoastseo/tools/grunt/config/aliases.yaml similarity index 100% rename from packages/yoastseo/grunt/config/aliases.yaml rename to packages/yoastseo/tools/grunt/config/aliases.yaml diff --git a/packages/yoastseo/grunt/config/babel.js b/packages/yoastseo/tools/grunt/config/babel.js similarity index 100% rename from packages/yoastseo/grunt/config/babel.js rename to packages/yoastseo/tools/grunt/config/babel.js diff --git a/packages/yoastseo/grunt/config/browserify.js b/packages/yoastseo/tools/grunt/config/browserify.js similarity index 100% rename from packages/yoastseo/grunt/config/browserify.js rename to packages/yoastseo/tools/grunt/config/browserify.js diff --git a/packages/yoastseo/grunt/config/clean.js b/packages/yoastseo/tools/grunt/config/clean.js similarity index 100% rename from packages/yoastseo/grunt/config/clean.js rename to packages/yoastseo/tools/grunt/config/clean.js diff --git a/packages/yoastseo/grunt/config/copy.js b/packages/yoastseo/tools/grunt/config/copy.js similarity index 100% rename from packages/yoastseo/grunt/config/copy.js rename to packages/yoastseo/tools/grunt/config/copy.js diff --git a/packages/yoastseo/grunt/config/eslint.js b/packages/yoastseo/tools/grunt/config/eslint.js similarity index 100% rename from packages/yoastseo/grunt/config/eslint.js rename to packages/yoastseo/tools/grunt/config/eslint.js diff --git a/packages/yoastseo/grunt/config/exorcise.js b/packages/yoastseo/tools/grunt/config/exorcise.js similarity index 100% rename from packages/yoastseo/grunt/config/exorcise.js rename to packages/yoastseo/tools/grunt/config/exorcise.js diff --git a/packages/yoastseo/grunt/config/po2json.js b/packages/yoastseo/tools/grunt/config/po2json.js similarity index 100% rename from packages/yoastseo/grunt/config/po2json.js rename to packages/yoastseo/tools/grunt/config/po2json.js diff --git a/packages/yoastseo/grunt/config/postcss.js b/packages/yoastseo/tools/grunt/config/postcss.js similarity index 100% rename from packages/yoastseo/grunt/config/postcss.js rename to packages/yoastseo/tools/grunt/config/postcss.js diff --git a/packages/yoastseo/grunt/config/sass.js b/packages/yoastseo/tools/grunt/config/sass.js similarity index 100% rename from packages/yoastseo/grunt/config/sass.js rename to packages/yoastseo/tools/grunt/config/sass.js diff --git a/packages/yoastseo/grunt/config/shell.js b/packages/yoastseo/tools/grunt/config/shell.js similarity index 100% rename from packages/yoastseo/grunt/config/shell.js rename to packages/yoastseo/tools/grunt/config/shell.js diff --git a/packages/yoastseo/grunt/config/watch.js b/packages/yoastseo/tools/grunt/config/watch.js similarity index 100% rename from packages/yoastseo/grunt/config/watch.js rename to packages/yoastseo/tools/grunt/config/watch.js From 716d1ca3d02a2a406fa8ea57dba12a7439cb3528 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Tue, 17 Mar 2020 14:20:28 +0100 Subject: [PATCH 22/29] Reverted placing CSS in src dir for yoast-components dir --- packages/yoast-components/{src => }/css/_mixins.scss | 0 packages/yoast-components/{src => }/css/accessibility.scss | 0 packages/yoast-components/{src => }/css/all.scss | 0 packages/yoast-components/{src => }/css/standalone.scss | 2 +- packages/yoast-components/tools/grunt/config/sass.js | 4 ++-- 5 files changed, 3 insertions(+), 3 deletions(-) rename packages/yoast-components/{src => }/css/_mixins.scss (100%) rename packages/yoast-components/{src => }/css/accessibility.scss (100%) rename packages/yoast-components/{src => }/css/all.scss (100%) rename packages/yoast-components/{src => }/css/standalone.scss (83%) diff --git a/packages/yoast-components/src/css/_mixins.scss b/packages/yoast-components/css/_mixins.scss similarity index 100% rename from packages/yoast-components/src/css/_mixins.scss rename to packages/yoast-components/css/_mixins.scss diff --git a/packages/yoast-components/src/css/accessibility.scss b/packages/yoast-components/css/accessibility.scss similarity index 100% rename from packages/yoast-components/src/css/accessibility.scss rename to packages/yoast-components/css/accessibility.scss diff --git a/packages/yoast-components/src/css/all.scss b/packages/yoast-components/css/all.scss similarity index 100% rename from packages/yoast-components/src/css/all.scss rename to packages/yoast-components/css/all.scss diff --git a/packages/yoast-components/src/css/standalone.scss b/packages/yoast-components/css/standalone.scss similarity index 83% rename from packages/yoast-components/src/css/standalone.scss rename to packages/yoast-components/css/standalone.scss index e7949e6f26..93581603ba 100644 --- a/packages/yoast-components/src/css/standalone.scss +++ b/packages/yoast-components/css/standalone.scss @@ -1,5 +1,5 @@ // Requires Sass Dash -@import "../../node_modules/sassdash/scss/sassdash"; +@import "../node_modules/sassdash/scss/sassdash"; @import "all"; body { diff --git a/packages/yoast-components/tools/grunt/config/sass.js b/packages/yoast-components/tools/grunt/config/sass.js index 285df58603..809b5da79d 100644 --- a/packages/yoast-components/tools/grunt/config/sass.js +++ b/packages/yoast-components/tools/grunt/config/sass.js @@ -8,8 +8,8 @@ module.exports = { }, build: { files: { - "dist/css/yoast-components.min.css": "src/css/all.scss", - "dist/css/yoast-components-standalone.min.css": "src/css/standalone.scss", + "dist/css/yoast-components.min.css": "css/all.scss", + "dist/css/yoast-components-standalone.min.css": "css/standalone.scss", }, }, example: { From 165c073dda186eb29f61092cf9827afd9fdca55f Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Tue, 17 Mar 2020 14:23:11 +0100 Subject: [PATCH 23/29] Reverted placing CSS in src dir for yoast-social-previews package --- packages/yoast-social-previews/Gruntfile.js | 6 +- .../css/editable-preview.scss | 35 ++ .../css/image_placeholder.scss | 15 + .../css/social_preview.scss | 405 ++++++++++++++++++ .../templates/facebookAuthor.jst | 2 + .../templates/facebookPreview.jst | 35 ++ .../templates/fields/button.jst | 6 + .../templates/fields/text.jst | 13 + .../templates/fields/textarea.jst | 14 + .../templates/imagePlaceholder.jst | 1 + .../templates/twitterPreview.jst | 34 ++ .../tools/grunt/config/sass.js | 2 +- 12 files changed, 564 insertions(+), 4 deletions(-) create mode 100644 packages/yoast-social-previews/css/editable-preview.scss create mode 100644 packages/yoast-social-previews/css/image_placeholder.scss create mode 100644 packages/yoast-social-previews/css/social_preview.scss create mode 100644 packages/yoast-social-previews/templates/facebookAuthor.jst create mode 100644 packages/yoast-social-previews/templates/facebookPreview.jst create mode 100644 packages/yoast-social-previews/templates/fields/button.jst create mode 100644 packages/yoast-social-previews/templates/fields/text.jst create mode 100644 packages/yoast-social-previews/templates/fields/textarea.jst create mode 100644 packages/yoast-social-previews/templates/imagePlaceholder.jst create mode 100644 packages/yoast-social-previews/templates/twitterPreview.jst diff --git a/packages/yoast-social-previews/Gruntfile.js b/packages/yoast-social-previews/Gruntfile.js index 6b3dfdcd9c..76b780737b 100644 --- a/packages/yoast-social-previews/Gruntfile.js +++ b/packages/yoast-social-previews/Gruntfile.js @@ -7,7 +7,7 @@ module.exports = function( grunt ) { paths: { grunt: "tools/grunt/", js: "src/js/", - css: "src/css/", + css: "css/", get config() { return this.grunt + "config/"; }, @@ -22,8 +22,8 @@ module.exports = function( grunt ) { jsDontLint: [ "!src/js/templates.js", ], - scss: "src/css/*.scss", - templates: "src/templates/**/*.jst", + scss: "css/*.scss", + templates: "templates/**/*.jst", jed: "node_modules/jed/jed.js", get config() { return project.paths.config + "*.js"; diff --git a/packages/yoast-social-previews/css/editable-preview.scss b/packages/yoast-social-previews/css/editable-preview.scss new file mode 100644 index 0000000000..ceeaa44973 --- /dev/null +++ b/packages/yoast-social-previews/css/editable-preview.scss @@ -0,0 +1,35 @@ +.editable-preview { + background: #fff; + box-shadow: 0 1px 2px rgba(0, 0, 0, .2); + + *, + *:before, + *:after { + box-sizing: border-box; + } + + &__heading { + margin: 0 0 15px; + // Reset the top border that comes from the YoastSEO.js snippet editor. + border-top: 0; + } + + &__inner { + padding: 20px; + } + + &__container { + &--no-caret { + &, + &:hover { + &:before { + content: none; + } + } + } + } + + &__value { + overflow: hidden; + } +} diff --git a/packages/yoast-social-previews/css/image_placeholder.scss b/packages/yoast-social-previews/css/image_placeholder.scss new file mode 100644 index 0000000000..da0525f166 --- /dev/null +++ b/packages/yoast-social-previews/css/image_placeholder.scss @@ -0,0 +1,15 @@ +$color_placeholder: #F6C6CE; +$color_placeholder_error: #ff4e47; + +.social-image-placeholder { + height: 100%; + padding: 6em 0; + text-align: center; + background: $color_placeholder; + font-size: 1rem; + + &--error { + background: $color_placeholder_error; + color: white; + } +} diff --git a/packages/yoast-social-previews/css/social_preview.scss b/packages/yoast-social-previews/css/social_preview.scss new file mode 100644 index 0000000000..0c32c5f609 --- /dev/null +++ b/packages/yoast-social-previews/css/social_preview.scss @@ -0,0 +1,405 @@ +@import "../node_modules/sassdash/index"; +@import "../../../node_modules/yoastseo/css/snippet-editor"; +@import "../node_modules/yoastseo/css/mixins"; +@import "image_placeholder"; +@import "editable-preview"; + +$width_facebook: 470px; +$width_twitter: 506px; +$height_twitter: 506px; +$padding_preview: 20px; + +$width_facebook_image_small: 158px; +$height_facebook_image_small: 158px; + +$width_facebook_image_large: 470px; +$height_facebook_image_large: 246px; + +$width_facebook_image_portrait: 158px; +$height_facebook_image_portrait: 235px; + +$width_twitter_image_small: 120px; +$height_twitter_image_small: 120px; + +$width_twitter_image_large: 506px; +$height_twitter_image_large: 254px; + +$border_radius_twitter: .42857em; + +.social-preview__inner { + &--facebook { + box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .1) inset, 0 1px 1px rgba(0, 0, 0, .05); + + &:hover { + box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .15) inset, 0 1px 1px rgba(0, 0, 0, .05); + + .editable-preview__image--facebook:after { + border-color: rgba(0, 0, 0, .15); + } + } + + &-small, + &-portrait { + @include clearfix; + } + } + + &--twitter { + border-radius: $border_radius_twitter; + border: 1px solid #E1E8ED; + + &:hover { + border-color: #8899A6; + background: #F5F8FA; + } + + &:hover { + .editable-preview__image--twitter { + border-color: #8899A6; + } + } + + &-small { + @include clearfix; + } + } +} + +.editable-preview { + + &--facebook { + width: $width_facebook + 2 * $padding_preview; + } + + &--twitter { + width: $width_twitter + 2 * $padding_preview; + } + + &__inner { + overflow: hidden; + word-wrap: break-word; + + &--facebook { + width: $width_facebook + 2 * $padding_preview; + font-family: helvetica, arial, sans-serif; + font-size: 12px; + color: #141823; + line-height: 1.34; + } + + &--twitter { + width: $width_twitter + 2 * $padding_preview; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 14px; + color: #292F33; + line-height: 1.3em; + + } + } + + // Position of the caret icons in the Social Previews snippet title and description. + &__container { + &--facebook, + &--twitter { + &:hover, + & { + &:before { + left: -34px + } + } + } + } + + // Display the caret icons in the Social Previews editor. + .snippet-editor__caret-hook { + display: block; + width: 100%; + height: 0px; + position: relative; + + &--hover { + &:before { + @include svg-caret-before($color_caret_hover); + top: 0; // Override default top alignment. + } + } + + &--focus { + &:before { + @include svg-caret-before($color_caret_focus); + top: 0; // Override default top alignment. + } + } + } + + &__text-keeper { + padding: 10px 12px; + height: auto; + + &--facebook { + max-height: 470px; + font-size: 12px; + position: relative; + + &-small, + &-portrait { + float: left; + width: calc( 100% - #{$width_facebook_image_small} ); + + .snippet-editor__container { + &:hover, &--hover, &--focus { + &:before { + right: -32px; + left: inherit; + } + } + + &:hover, &--hover { + &:before { + background-image: url(svg-icon-caret-left($color_caret_hover)); + } + } + + &--focus { + &:before { + background-image: url(svg-icon-caret-left($color_caret)); + } + } + } + } + + &-portrait { + height: $height_facebook_image_portrait; + } + } + + &--twitter { + max-width: $width_twitter; + + &-small { + float: left; + width: calc( 100% - #{$width_twitter_image_small} ); + + .snippet-editor__container { + &:hover, &--hover, &--focus { + &:before { + right: -32px; + left: inherit; + } + } + + &:hover, &--hover { + &:before { + background-image: url(svg-icon-caret-left($color_caret_hover)); + } + } + + &--focus { + &:before { + background-image: url(svg-icon-caret-left($color_caret)); + } + } + } + } + } + } + + &__title { + &--facebook { + font-family: Georgia, 'lucida grande', tahoma, verdana, arial, sans-serif; + font-size: 18px; + font-weight: 500; + line-height: 22px; + margin-bottom: 5px; + max-height: 110px; + + a { + text-decoration: none; + color: #141823; + cursor: pointer; + } + } + + &--twitter { + max-height: 1.3em; + white-space: nowrap; + text-overflow: ellipsis; + font-size: 1.0em; + padding: 0 0 .15em; + font-weight:bold; + } + } + + &__description { + &--facebook { + line-height: 16px; + max-height: 80px; + font-size: 12px; + } + + &--twitter { + max-height: 2.6em; + margin-top: .32333em; + } + } + + &__image { + + &--facebook { + + background-size: cover; + background-position: center center; + + width: $width_facebook; + max-height: 470px; + position: relative; + line-height: 0; // Prevents extra margin under the image on windows + + img { + max-height: 100%; + max-width: 100%; + } + + &-small { + width: $width_facebook_image_small; + height: $height_facebook_image_small; + float: left; + } + + &-large { + width: $width_facebook_image_large; + height: $height_facebook_image_large; + } + + &-portrait { + width: $width_facebook_image_portrait; + height: $height_facebook_image_portrait; + float: left; + } + + &:after { + content: ' '; + position: absolute; + width: 100%; + top: 0; + left: 0; + right: 0; + bottom: 0; + border-right: 1px solid rgba(0, 0, 0, .1); + } + } + + &--twitter { + + background-size: cover; + background-position: top center; + + max-height: $height_twitter - 2; + line-height: 0; + border-bottom: 1px solid #E1E8ED; + + &, img { + max-width: $width_twitter - 2; + } + + img { + max-height: 100%; + border-radius: $border_radius_twitter $border_radius_twitter 0 0; + } + + &-placeholder { + background: url('./twitter-placeholder.svg') no-repeat center center; + } + + &-small { + background-color: #E1E8ED; + border-right: 1px solid #E1E8ED; + border-bottom: 0; + width: $width_twitter_image_small; + height: $height_twitter_image_small - 1px; // Reduce with 1 px because of overlapping the border. + float: left; + border-radius: $border_radius_twitter 0 0 $border_radius_twitter; + max-width: 100%; + + } + + &-large { + width: $width_twitter_image_large; + height: $height_twitter_image_large - 1px; // Reduce with 1 px because of overlapping the border. + } + } + } + + &__author { + &--facebook { + color: #3b5998; + cursor: pointer; + + &:hover { + text-decoration: underline; + } + } + } + + &__website { + &--facebook { + text-overflow: ellipsis; + white-space: nowrap; + font-size: 11px; + line-height: 11px; + padding-top: 9px; + position: relative; + text-transform: uppercase; + color: #9197a3; + + &-pipe { + padding-left: 5px; + padding-right: 5px; + } + + &-bottom { + position: absolute; + bottom: 16px; + } + } + + &--twitter { + color: #8899A6; + max-height: 1.3em; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + margin-top: .32333em; + } + } + + &__value { + &--facebook-title { + max-height: 110px; + } + + &--facebook-description { + max-height: 80px; + } + + &--twitter-description { + max-height: 2.6em; + } + } +} + +.social-image-placeholder { + &--facebook { + width: $width_facebook; + line-height: 1.4; + } + + &--twitter { + background: url( './twitter-placeholder.svg' ) no-repeat center center; + height: 100%; + padding: 0; + // Reduce width with 2 pixels because element overlaps the bordered container. + width: 100%; + border-radius: $border_radius_twitter 0 0 $border_radius_twitter; + } +} diff --git a/packages/yoast-social-previews/templates/facebookAuthor.jst b/packages/yoast-social-previews/templates/facebookAuthor.jst new file mode 100644 index 0000000000..dbc328d5db --- /dev/null +++ b/packages/yoast-social-previews/templates/facebookAuthor.jst @@ -0,0 +1,2 @@ + <%- authorBy %> + diff --git a/packages/yoast-social-previews/templates/facebookPreview.jst b/packages/yoast-social-previews/templates/facebookPreview.jst new file mode 100644 index 0000000000..b5ed5be9d4 --- /dev/null +++ b/packages/yoast-social-previews/templates/facebookPreview.jst @@ -0,0 +1,35 @@ + diff --git a/packages/yoast-social-previews/templates/fields/button.jst b/packages/yoast-social-previews/templates/fields/button.jst new file mode 100644 index 0000000000..e1a43dbcca --- /dev/null +++ b/packages/yoast-social-previews/templates/fields/button.jst @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/packages/yoast-social-previews/templates/fields/text.jst b/packages/yoast-social-previews/templates/fields/text.jst new file mode 100644 index 0000000000..bef7197925 --- /dev/null +++ b/packages/yoast-social-previews/templates/fields/text.jst @@ -0,0 +1,13 @@ + for="<%- id %>"<% } %><% if ( labelClassName ) { %> class="<%- labelClassName %>"<% } %>><% +if ( id ) { %><%- title %><% } else { %><%- title %><% } %> + id="<%- id %>__caret-hook"<% } %> + > + value="<%- value %>"<% } %> + <% if ( placeholder ) { %>placeholder="<%- placeholder %>"<% } %> + <% if ( className ) { %>class="<%- className %>"<% } %> + <% if ( id ) { %>id="<%- id %>"<% } %> + <% if ( name ) { %>name="<%- name %>"<% } %> + /> +<% if ( ! id ) { %><% } %> diff --git a/packages/yoast-social-previews/templates/fields/textarea.jst b/packages/yoast-social-previews/templates/fields/textarea.jst new file mode 100644 index 0000000000..aebe7237d8 --- /dev/null +++ b/packages/yoast-social-previews/templates/fields/textarea.jst @@ -0,0 +1,14 @@ + for="<%- id %>"<% } %><% if ( labelClassName ) { %> class="<%- labelClassName %>"<% } %>><% +if ( id ) { %><%- title %><% } else { %><%- title %><% } %> + id="<%- id %>__caret-hook"<% } %> + > + +<% if ( ! id ) { %><% } %> diff --git a/packages/yoast-social-previews/templates/imagePlaceholder.jst b/packages/yoast-social-previews/templates/imagePlaceholder.jst new file mode 100644 index 0000000000..c6279e9976 --- /dev/null +++ b/packages/yoast-social-previews/templates/imagePlaceholder.jst @@ -0,0 +1 @@ +
<%- placeholder %>
\ No newline at end of file diff --git a/packages/yoast-social-previews/templates/twitterPreview.jst b/packages/yoast-social-previews/templates/twitterPreview.jst new file mode 100644 index 0000000000..6da8d9c2eb --- /dev/null +++ b/packages/yoast-social-previews/templates/twitterPreview.jst @@ -0,0 +1,34 @@ + diff --git a/packages/yoast-social-previews/tools/grunt/config/sass.js b/packages/yoast-social-previews/tools/grunt/config/sass.js index 71bdc3c826..c3fcfed2c9 100644 --- a/packages/yoast-social-previews/tools/grunt/config/sass.js +++ b/packages/yoast-social-previews/tools/grunt/config/sass.js @@ -8,7 +8,7 @@ module.exports = { }, build: { files: { - "dist/yoast-social-preview.min.css": "src/css/social_preview.scss", + "dist/yoast-social-preview.min.css": "css/social_preview.scss", }, }, }; From 53db2a16f7301463f6a01eaa4de6c680294011bd Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Tue, 17 Mar 2020 14:24:25 +0100 Subject: [PATCH 24/29] Added .idea folders to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2965be5cc4..b0fd29ccde 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ yarn-error.log coverage dependencies.json dependencies.md +/.idea/ From 2d8375322d24cc4cc07bf451960f509d0a3a5d87 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Tue, 17 Mar 2020 14:29:40 +0100 Subject: [PATCH 25/29] Removed duplicate templates dir from yoast-social-previews --- .../src/templates/facebookAuthor.jst | 2 -- .../src/templates/facebookPreview.jst | 35 ------------------- .../src/templates/fields/button.jst | 6 ---- .../src/templates/fields/text.jst | 13 ------- .../src/templates/fields/textarea.jst | 14 -------- .../src/templates/imagePlaceholder.jst | 1 - .../src/templates/twitterPreview.jst | 34 ------------------ 7 files changed, 105 deletions(-) delete mode 100644 packages/yoast-social-previews/src/templates/facebookAuthor.jst delete mode 100644 packages/yoast-social-previews/src/templates/facebookPreview.jst delete mode 100644 packages/yoast-social-previews/src/templates/fields/button.jst delete mode 100644 packages/yoast-social-previews/src/templates/fields/text.jst delete mode 100644 packages/yoast-social-previews/src/templates/fields/textarea.jst delete mode 100644 packages/yoast-social-previews/src/templates/imagePlaceholder.jst delete mode 100644 packages/yoast-social-previews/src/templates/twitterPreview.jst diff --git a/packages/yoast-social-previews/src/templates/facebookAuthor.jst b/packages/yoast-social-previews/src/templates/facebookAuthor.jst deleted file mode 100644 index dbc328d5db..0000000000 --- a/packages/yoast-social-previews/src/templates/facebookAuthor.jst +++ /dev/null @@ -1,2 +0,0 @@ - <%- authorBy %> - diff --git a/packages/yoast-social-previews/src/templates/facebookPreview.jst b/packages/yoast-social-previews/src/templates/facebookPreview.jst deleted file mode 100644 index b5ed5be9d4..0000000000 --- a/packages/yoast-social-previews/src/templates/facebookPreview.jst +++ /dev/null @@ -1,35 +0,0 @@ - diff --git a/packages/yoast-social-previews/src/templates/fields/button.jst b/packages/yoast-social-previews/src/templates/fields/button.jst deleted file mode 100644 index e1a43dbcca..0000000000 --- a/packages/yoast-social-previews/src/templates/fields/button.jst +++ /dev/null @@ -1,6 +0,0 @@ - \ No newline at end of file diff --git a/packages/yoast-social-previews/src/templates/fields/text.jst b/packages/yoast-social-previews/src/templates/fields/text.jst deleted file mode 100644 index bef7197925..0000000000 --- a/packages/yoast-social-previews/src/templates/fields/text.jst +++ /dev/null @@ -1,13 +0,0 @@ - for="<%- id %>"<% } %><% if ( labelClassName ) { %> class="<%- labelClassName %>"<% } %>><% -if ( id ) { %><%- title %><% } else { %><%- title %><% } %> - id="<%- id %>__caret-hook"<% } %> - > - value="<%- value %>"<% } %> - <% if ( placeholder ) { %>placeholder="<%- placeholder %>"<% } %> - <% if ( className ) { %>class="<%- className %>"<% } %> - <% if ( id ) { %>id="<%- id %>"<% } %> - <% if ( name ) { %>name="<%- name %>"<% } %> - /> -<% if ( ! id ) { %><% } %> diff --git a/packages/yoast-social-previews/src/templates/fields/textarea.jst b/packages/yoast-social-previews/src/templates/fields/textarea.jst deleted file mode 100644 index aebe7237d8..0000000000 --- a/packages/yoast-social-previews/src/templates/fields/textarea.jst +++ /dev/null @@ -1,14 +0,0 @@ - for="<%- id %>"<% } %><% if ( labelClassName ) { %> class="<%- labelClassName %>"<% } %>><% -if ( id ) { %><%- title %><% } else { %><%- title %><% } %> - id="<%- id %>__caret-hook"<% } %> - > - -<% if ( ! id ) { %><% } %> diff --git a/packages/yoast-social-previews/src/templates/imagePlaceholder.jst b/packages/yoast-social-previews/src/templates/imagePlaceholder.jst deleted file mode 100644 index c6279e9976..0000000000 --- a/packages/yoast-social-previews/src/templates/imagePlaceholder.jst +++ /dev/null @@ -1 +0,0 @@ -
<%- placeholder %>
\ No newline at end of file diff --git a/packages/yoast-social-previews/src/templates/twitterPreview.jst b/packages/yoast-social-previews/src/templates/twitterPreview.jst deleted file mode 100644 index 6da8d9c2eb..0000000000 --- a/packages/yoast-social-previews/src/templates/twitterPreview.jst +++ /dev/null @@ -1,34 +0,0 @@ - From 21e7ba2c9a43853d9ecb79d2992ca90812f13bc2 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Tue, 17 Mar 2020 14:39:39 +0100 Subject: [PATCH 26/29] Removed duplicate css dir from yoast-social-previews and fixed faulty mapping --- .../css/social_preview.scss | 2 +- .../src/css/editable-preview.scss | 35 -- .../src/css/image_placeholder.scss | 15 - .../src/css/social_preview.scss | 405 ------------------ 4 files changed, 1 insertion(+), 456 deletions(-) delete mode 100644 packages/yoast-social-previews/src/css/editable-preview.scss delete mode 100644 packages/yoast-social-previews/src/css/image_placeholder.scss delete mode 100644 packages/yoast-social-previews/src/css/social_preview.scss diff --git a/packages/yoast-social-previews/css/social_preview.scss b/packages/yoast-social-previews/css/social_preview.scss index 0c32c5f609..26bf5ff297 100644 --- a/packages/yoast-social-previews/css/social_preview.scss +++ b/packages/yoast-social-previews/css/social_preview.scss @@ -1,5 +1,5 @@ @import "../node_modules/sassdash/index"; -@import "../../../node_modules/yoastseo/css/snippet-editor"; +@import "../node_modules/yoastseo/css/snippet-editor"; @import "../node_modules/yoastseo/css/mixins"; @import "image_placeholder"; @import "editable-preview"; diff --git a/packages/yoast-social-previews/src/css/editable-preview.scss b/packages/yoast-social-previews/src/css/editable-preview.scss deleted file mode 100644 index ceeaa44973..0000000000 --- a/packages/yoast-social-previews/src/css/editable-preview.scss +++ /dev/null @@ -1,35 +0,0 @@ -.editable-preview { - background: #fff; - box-shadow: 0 1px 2px rgba(0, 0, 0, .2); - - *, - *:before, - *:after { - box-sizing: border-box; - } - - &__heading { - margin: 0 0 15px; - // Reset the top border that comes from the YoastSEO.js snippet editor. - border-top: 0; - } - - &__inner { - padding: 20px; - } - - &__container { - &--no-caret { - &, - &:hover { - &:before { - content: none; - } - } - } - } - - &__value { - overflow: hidden; - } -} diff --git a/packages/yoast-social-previews/src/css/image_placeholder.scss b/packages/yoast-social-previews/src/css/image_placeholder.scss deleted file mode 100644 index da0525f166..0000000000 --- a/packages/yoast-social-previews/src/css/image_placeholder.scss +++ /dev/null @@ -1,15 +0,0 @@ -$color_placeholder: #F6C6CE; -$color_placeholder_error: #ff4e47; - -.social-image-placeholder { - height: 100%; - padding: 6em 0; - text-align: center; - background: $color_placeholder; - font-size: 1rem; - - &--error { - background: $color_placeholder_error; - color: white; - } -} diff --git a/packages/yoast-social-previews/src/css/social_preview.scss b/packages/yoast-social-previews/src/css/social_preview.scss deleted file mode 100644 index 34d56a88d5..0000000000 --- a/packages/yoast-social-previews/src/css/social_preview.scss +++ /dev/null @@ -1,405 +0,0 @@ -@import "../../node_modules/sassdash/index"; -@import "../../node_modules/yoastseo/css/snippet-editor"; -@import "../../node_modules/yoastseo/css/mixins"; -@import "image_placeholder"; -@import "editable-preview"; - -$width_facebook: 470px; -$width_twitter: 506px; -$height_twitter: 506px; -$padding_preview: 20px; - -$width_facebook_image_small: 158px; -$height_facebook_image_small: 158px; - -$width_facebook_image_large: 470px; -$height_facebook_image_large: 246px; - -$width_facebook_image_portrait: 158px; -$height_facebook_image_portrait: 235px; - -$width_twitter_image_small: 120px; -$height_twitter_image_small: 120px; - -$width_twitter_image_large: 506px; -$height_twitter_image_large: 254px; - -$border_radius_twitter: .42857em; - -.social-preview__inner { - &--facebook { - box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .1) inset, 0 1px 1px rgba(0, 0, 0, .05); - - &:hover { - box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .15) inset, 0 1px 1px rgba(0, 0, 0, .05); - - .editable-preview__image--facebook:after { - border-color: rgba(0, 0, 0, .15); - } - } - - &-small, - &-portrait { - @include clearfix; - } - } - - &--twitter { - border-radius: $border_radius_twitter; - border: 1px solid #E1E8ED; - - &:hover { - border-color: #8899A6; - background: #F5F8FA; - } - - &:hover { - .editable-preview__image--twitter { - border-color: #8899A6; - } - } - - &-small { - @include clearfix; - } - } -} - -.editable-preview { - - &--facebook { - width: $width_facebook + 2 * $padding_preview; - } - - &--twitter { - width: $width_twitter + 2 * $padding_preview; - } - - &__inner { - overflow: hidden; - word-wrap: break-word; - - &--facebook { - width: $width_facebook + 2 * $padding_preview; - font-family: helvetica, arial, sans-serif; - font-size: 12px; - color: #141823; - line-height: 1.34; - } - - &--twitter { - width: $width_twitter + 2 * $padding_preview; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 14px; - color: #292F33; - line-height: 1.3em; - - } - } - - // Position of the caret icons in the Social Previews snippet title and description. - &__container { - &--facebook, - &--twitter { - &:hover, - & { - &:before { - left: -34px - } - } - } - } - - // Display the caret icons in the Social Previews editor. - .snippet-editor__caret-hook { - display: block; - width: 100%; - height: 0px; - position: relative; - - &--hover { - &:before { - @include svg-caret-before($color_caret_hover); - top: 0; // Override default top alignment. - } - } - - &--focus { - &:before { - @include svg-caret-before($color_caret_focus); - top: 0; // Override default top alignment. - } - } - } - - &__text-keeper { - padding: 10px 12px; - height: auto; - - &--facebook { - max-height: 470px; - font-size: 12px; - position: relative; - - &-small, - &-portrait { - float: left; - width: calc( 100% - #{$width_facebook_image_small} ); - - .snippet-editor__container { - &:hover, &--hover, &--focus { - &:before { - right: -32px; - left: inherit; - } - } - - &:hover, &--hover { - &:before { - background-image: url(svg-icon-caret-left($color_caret_hover)); - } - } - - &--focus { - &:before { - background-image: url(svg-icon-caret-left($color_caret)); - } - } - } - } - - &-portrait { - height: $height_facebook_image_portrait; - } - } - - &--twitter { - max-width: $width_twitter; - - &-small { - float: left; - width: calc( 100% - #{$width_twitter_image_small} ); - - .snippet-editor__container { - &:hover, &--hover, &--focus { - &:before { - right: -32px; - left: inherit; - } - } - - &:hover, &--hover { - &:before { - background-image: url(svg-icon-caret-left($color_caret_hover)); - } - } - - &--focus { - &:before { - background-image: url(svg-icon-caret-left($color_caret)); - } - } - } - } - } - } - - &__title { - &--facebook { - font-family: Georgia, 'lucida grande', tahoma, verdana, arial, sans-serif; - font-size: 18px; - font-weight: 500; - line-height: 22px; - margin-bottom: 5px; - max-height: 110px; - - a { - text-decoration: none; - color: #141823; - cursor: pointer; - } - } - - &--twitter { - max-height: 1.3em; - white-space: nowrap; - text-overflow: ellipsis; - font-size: 1.0em; - padding: 0 0 .15em; - font-weight:bold; - } - } - - &__description { - &--facebook { - line-height: 16px; - max-height: 80px; - font-size: 12px; - } - - &--twitter { - max-height: 2.6em; - margin-top: .32333em; - } - } - - &__image { - - &--facebook { - - background-size: cover; - background-position: center center; - - width: $width_facebook; - max-height: 470px; - position: relative; - line-height: 0; // Prevents extra margin under the image on windows - - img { - max-height: 100%; - max-width: 100%; - } - - &-small { - width: $width_facebook_image_small; - height: $height_facebook_image_small; - float: left; - } - - &-large { - width: $width_facebook_image_large; - height: $height_facebook_image_large; - } - - &-portrait { - width: $width_facebook_image_portrait; - height: $height_facebook_image_portrait; - float: left; - } - - &:after { - content: ' '; - position: absolute; - width: 100%; - top: 0; - left: 0; - right: 0; - bottom: 0; - border-right: 1px solid rgba(0, 0, 0, .1); - } - } - - &--twitter { - - background-size: cover; - background-position: top center; - - max-height: $height_twitter - 2; - line-height: 0; - border-bottom: 1px solid #E1E8ED; - - &, img { - max-width: $width_twitter - 2; - } - - img { - max-height: 100%; - border-radius: $border_radius_twitter $border_radius_twitter 0 0; - } - - &-placeholder { - background: url('./twitter-placeholder.svg') no-repeat center center; - } - - &-small { - background-color: #E1E8ED; - border-right: 1px solid #E1E8ED; - border-bottom: 0; - width: $width_twitter_image_small; - height: $height_twitter_image_small - 1px; // Reduce with 1 px because of overlapping the border. - float: left; - border-radius: $border_radius_twitter 0 0 $border_radius_twitter; - max-width: 100%; - - } - - &-large { - width: $width_twitter_image_large; - height: $height_twitter_image_large - 1px; // Reduce with 1 px because of overlapping the border. - } - } - } - - &__author { - &--facebook { - color: #3b5998; - cursor: pointer; - - &:hover { - text-decoration: underline; - } - } - } - - &__website { - &--facebook { - text-overflow: ellipsis; - white-space: nowrap; - font-size: 11px; - line-height: 11px; - padding-top: 9px; - position: relative; - text-transform: uppercase; - color: #9197a3; - - &-pipe { - padding-left: 5px; - padding-right: 5px; - } - - &-bottom { - position: absolute; - bottom: 16px; - } - } - - &--twitter { - color: #8899A6; - max-height: 1.3em; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - margin-top: .32333em; - } - } - - &__value { - &--facebook-title { - max-height: 110px; - } - - &--facebook-description { - max-height: 80px; - } - - &--twitter-description { - max-height: 2.6em; - } - } -} - -.social-image-placeholder { - &--facebook { - width: $width_facebook; - line-height: 1.4; - } - - &--twitter { - background: url( './twitter-placeholder.svg' ) no-repeat center center; - height: 100%; - padding: 0; - // Reduce width with 2 pixels because element overlaps the bordered container. - width: 100%; - border-radius: $border_radius_twitter 0 0 $border_radius_twitter; - } -} From dccbf8eb92833866acd0c02cf356144f44f0eb0c Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Tue, 17 Mar 2020 15:43:52 +0100 Subject: [PATCH 27/29] Fixed faulty path in Gruntfile --- packages/yoastseo/Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/yoastseo/Gruntfile.js b/packages/yoastseo/Gruntfile.js index be17fa8675..e0ab845c6a 100644 --- a/packages/yoastseo/Gruntfile.js +++ b/packages/yoastseo/Gruntfile.js @@ -20,7 +20,7 @@ module.exports = function( grunt ) { files: { js: [ "src/**/*.js", - "grunt/config/*.js", + "tools/grunt/config/*.js", "!src/config/*.js", "<%= files.grunt %>", "!src/js", From 0cef625ab53873aad933a87e19f93c44934bf511 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Tue, 17 Mar 2020 16:01:27 +0100 Subject: [PATCH 28/29] Fixed faulty pathnames --- apps/components/ContentAnalysisWrapper.js | 2 +- apps/components/FacebookPreviewExample.js | 2 +- apps/components/reducers/index.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/components/ContentAnalysisWrapper.js b/apps/components/ContentAnalysisWrapper.js index 47de04bebb..5728106ed8 100644 --- a/apps/components/ContentAnalysisWrapper.js +++ b/apps/components/ContentAnalysisWrapper.js @@ -1,7 +1,7 @@ import React from "react"; import ExamplesContainer from "./ExamplesContainer"; -import ContentAnalysis from "yoast-components/composites/Plugin/ContentAnalysis/components/ContentAnalysis"; +import ContentAnalysis from "yoast-components/src/composites/Plugin/ContentAnalysis/components/ContentAnalysis"; import LanguageNoticeWrapper from "./LanguageNoticeWrapper.js"; /** diff --git a/apps/components/FacebookPreviewExample.js b/apps/components/FacebookPreviewExample.js index 242a598eaa..63ac449bda 100644 --- a/apps/components/FacebookPreviewExample.js +++ b/apps/components/FacebookPreviewExample.js @@ -1,7 +1,7 @@ import React from "react"; import ExamplesContainer from "./ExamplesContainer"; -import FacebookPreview from "yoast-components/composites/Plugin/SocialPreviews/Facebook/components/FacebookPreview"; +import FacebookPreview from "yoast-components/src/composites/Plugin/SocialPreviews/Facebook/components/FacebookPreview"; /** * Returns the FacebookPreview examples. diff --git a/apps/components/reducers/index.js b/apps/components/reducers/index.js index f8ec1d51d4..5600c30995 100644 --- a/apps/components/reducers/index.js +++ b/apps/components/reducers/index.js @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; -import contentAnalysis from "yoast-components/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer"; +import contentAnalysis from "yoast-components/src/composites/Plugin/ContentAnalysis/reducers/contentAnalysisReducer"; export default combineReducers( { contentAnalysis, From 12572d9278ce5a9536223108427e65916981f661 Mon Sep 17 00:00:00 2001 From: Jimmy Comack Date: Tue, 17 Mar 2020 16:23:40 +0100 Subject: [PATCH 29/29] Removed old setupTests file from components package --- packages/components/jest/setupTests.js | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 packages/components/jest/setupTests.js diff --git a/packages/components/jest/setupTests.js b/packages/components/jest/setupTests.js deleted file mode 100644 index ae2c5706e1..0000000000 --- a/packages/components/jest/setupTests.js +++ /dev/null @@ -1,6 +0,0 @@ -import "raf/polyfill"; -import "jest-styled-components"; -import Enzyme from "enzyme"; -import EnzymeAdapter from "enzyme-adapter-react-16"; - -Enzyme.configure( { adapter: new EnzymeAdapter() } );