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/ 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, 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/components/jest/setupTests.js b/packages/components/tools/jest/setupTests.js similarity index 100% rename from packages/components/jest/setupTests.js rename to packages/components/tools/jest/setupTests.js 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/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 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/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 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/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/css/standalone.scss b/packages/yoast-components/css/standalone.scss index 11a67c1e7b..93581603ba 100644 --- a/packages/yoast-components/css/standalone.scss +++ b/packages/yoast-components/css/standalone.scss @@ -1,6 +1,6 @@ // Requires Sass Dash @import "../node_modules/sassdash/scss/sassdash"; -@import "./all"; +@import "all"; body { background: #f1f1f1; diff --git a/packages/yoast-components/package.json b/packages/yoast-components/package.json index e7ebcde39c..035a31516f 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", + "!tools/grunt/**/*.js", "!*.js", "!app/**/*.js", - "!a11y/examples/example.js", - "!utils/helpers/*.js", + "!src/a11y/examples/example.js", + "!src/utils/helpers/*.js", "!coverage/**/*.js" ], "snapshotSerializers": [ @@ -52,6 +52,9 @@ }, "transformIgnorePatterns": [ "/node_modules/(?!yoastseo|lodash-es).+\\.js$" + ], + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" ] }, "author": "Yoast", 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/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 73% rename from packages/yoast-components/grunt/config/sass.js rename to packages/yoast-components/tools/grunt/config/sass.js index 8434a26a3d..809b5da79d 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": "css/all.scss", + "dist/css/yoast-components-standalone.min.css": "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 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..76b780737b 100644 --- a/packages/yoast-social-previews/Gruntfile.js +++ b/packages/yoast-social-previews/Gruntfile.js @@ -5,8 +5,8 @@ module.exports = function( grunt ) { // Define project configuration. var project = { paths: { - grunt: "grunt/", - js: "js/", + grunt: "tools/grunt/", + js: "src/js/", css: "css/", get config() { return this.grunt + "config/"; @@ -14,13 +14,13 @@ module.exports = function( grunt ) { }, 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", 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/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/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 100% rename from packages/yoast-social-previews/grunt/config/sass.js rename to packages/yoast-social-previews/tools/grunt/config/sass.js 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 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..e0ab845c6a 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/", /** @@ -20,10 +20,10 @@ module.exports = function( grunt ) { files: { js: [ "src/**/*.js", - "grunt/config/*.js", + "tools/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 69618ab74e..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": { @@ -115,7 +115,10 @@ "lines": 83, "statements": 83 } - } + }, + "modulePathIgnorePatterns": [ + "[/\\\\](dist|node_modules)[/\\\\]" + ] }, "yoast": { "premiumConfiguration": "release-yoast-seo/13.4" 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