Restructure packages

.gitignore

@@ -5,3 +5,4 @@ yarn-error.log
 coverage
 dependencies.json
 dependencies.md
+/.idea/

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";
 
 /**

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.

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,

packages/analysis-report/package.json

@@ -51,7 +51,10 @@
     "transformIgnorePatterns": [
       "/node_modules/(?!yoastseo|lodash-es).+\\.js$"
     ],
-    "setupTestFrameworkScriptFile": "<rootDir>/tools/jest/setupTests.js"
+    "setupTestFrameworkScriptFile": "<rootDir>/tools/jest/setupTests.js",
+    "modulePathIgnorePatterns": [
+      "<rootDir>[/\\\\](dist|node_modules)[/\\\\]"
+    ]
   },
   "publishConfig": {
     "access": "public"

packages/browserslist-config/package.json

@@ -25,7 +25,10 @@
 	},
 	"jest": {
 		"testRegex": ".*Test.js$",
-		"testEnvironment": "node"
+		"testEnvironment": "node",
+		"modulePathIgnorePatterns": [
+			"<rootDir>[/\\\\](dist|node_modules)[/\\\\]"
+		]
 	},
 	"devDependencies": {
 		"browserslist": "^4.7.3"

packages/components/package.json

@@ -19,7 +19,10 @@
   "jest": {
     "testRegex": ".*Test.js$",
     "testURL": "http://localhost",
-    "setupTestFrameworkScriptFile": "<rootDir>/jest/setupTests.js"
+    "setupTestFrameworkScriptFile": "<rootDir>/tools/jest/setupTests.js",
+    "modulePathIgnorePatterns": [
+      "<rootDir>[/\\\\](dist|node_modules)[/\\\\]"
+    ]
   },
   "dependencies": {
     "@wordpress/a11y": "^1.1.3",

packages/configuration-wizard/package.json

@@ -61,6 +61,9 @@
     },
     "transformIgnorePatterns": [
       "/node_modules/(?!yoastseo|lodash-es).+\\.js$"
+    ],
+    "modulePathIgnorePatterns": [
+      "<rootDir>[/\\\\](dist|node_modules)[/\\\\]"
     ]
   },
   "publishConfig": {

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",

packages/feature-flag/package.json

@@ -27,7 +27,10 @@
     "transformIgnorePatterns": [
       "/node_modules/(?!yoastseo|lodash-es).+\\.js$"
     ],
-    "setupTestFrameworkScriptFile": "<rootDir>/tools/jest/setupTests.js"
+    "setupTestFrameworkScriptFile": "<rootDir>/tools/jest/setupTests.js",
+    "modulePathIgnorePatterns": [
+      "<rootDir>[/\\\\](dist|node_modules)[/\\\\]"
+    ]
   },
   "publishConfig": {
     "access": "public"

packages/helpers/package.json

@@ -28,7 +28,10 @@
   "jest": {
     "testRegex": ".*Test.js$",
     "testEnvironment": "node",
-    "setupTestFrameworkScriptFile": "<rootDir>/tools/jest/setupTests.js"
+    "setupTestFrameworkScriptFile": "<rootDir>/tools/jest/setupTests.js",
+    "modulePathIgnorePatterns": [
+      "<rootDir>[/\\\\](dist|node_modules)[/\\\\]"
+    ]
   },
   "devDependencies": {
     "@yoast/browserslist-config": "^1.2.1",

packages/search-metadata-previews/package.json

@@ -55,7 +55,10 @@
     "transformIgnorePatterns": [
       "/node_modules/(?!yoastseo|lodash-es).+\\.js$"
     ],
-    "setupTestFrameworkScriptFile": "<rootDir>/tests/setupTests.js"
+    "setupTestFrameworkScriptFile": "<rootDir>/tools/jest/setupTests.js",
+    "modulePathIgnorePatterns": [
+      "<rootDir>[/\\\\](dist|node_modules)[/\\\\]"
+    ]
   },
   "publishConfig": {
     "access": "public"

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/*",
 			],

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;

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)$": "<rootDir>/jest/__mocks__/fileMock.js",
-      "\\.(css|less)$": "<rootDir>/jest/__mocks__/styleMock.js"
+      "\\.(jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/tests/__mocks__/fileMock.js",
+      "\\.(css|less)$": "<rootDir>/tests/__mocks__/styleMock.js"
     },
     "unmockedModulePathPatterns": [
       "react",
@@ -33,15 +33,15 @@
     ],
     "testRegex": ".*Test.js$",
     "coverageDirectory": "coverage",
-    "setupTestFrameworkScriptFile": "<rootDir>/jest/setupTests.js",
+    "setupTestFrameworkScriptFile": "<rootDir>/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": [
+      "<rootDir>[/\\\\](dist|node_modules)[/\\\\]"
     ]
   },
   "author": "Yoast",

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,
+} );

packages/yoast-components/composites/Plugin/ContentAnalysis/reducers/tests/contentAnalysisReducerTest.js → 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 {

packages/yoast-components/grunt/config/copy.js → packages/yoast-components/tools/grunt/config/copy.js

@@ -4,7 +4,7 @@ module.exports = {
 		files: [ {
 			src: [
 				".babelrc",
-				"**/*",
+				"src/**/*",
 				"!dist/**/*",
 				"!node_modules/**/*",
 			],

packages/yoast-components/grunt/config/postcss.js → 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",
 	},
 };

packages/yoast-components/grunt/config/sass.js → 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: {

packages/yoast-social-previews/.gitignore

@@ -1,2 +1,3 @@
 /node_modules/
 /.idea/
+/dist/

packages/yoast-social-previews/.istanbul.yml

@@ -1,5 +1,5 @@
 instrumentation:
-    root: js
+    root: src/js
     extensions:
         - .js
     include-all-sources: true

packages/yoast-social-previews/Gruntfile.js

@@ -5,22 +5,22 @@ 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/";
 			},
 		},
 		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",

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(
 	{

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"
   },

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() {

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() {
 

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() {
 

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;

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() {
 

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;

packages/yoast-social-previews/js/helpers/bem/addModifier.js → 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" );
 
 /**

packages/yoast-social-previews/js/helpers/bem/removeModifier.js → 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" );
 
 /**

packages/yoast-social-previews/js/inputs/button.js → 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: "",

packages/yoast-social-previews/js/templates.js → 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;

packages/yoast-social-previews/tools/grunt/config/eslint.js

@@ -0,0 +1,3 @@
+module.exports = {
+	target: [ "<%= files.js %>", "!src/js/templates.js" ],
+};

packages/yoast-social-previews/grunt/config/lodash.js → 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 %>",