Merge remote-tracking branch 'origin/release/15.4'

Author: igorschoester

README.md

@@ -60,7 +60,7 @@ This monorepo includes apps for testing purposes. These apps are not published.
 The following commands can be executed from the javascript project root:
 
 * `yarn install`, will install all dependencies for all packages.
-* `yarn lint`, will run linting for all pacwhichkages.
+* `yarn lint`, will run linting for all packages.
 * `yarn test`, will run tests for all packages.
 * `yarn link-all`, will run `yarn link` for all packages.
 * `yarn unlink-all`, will run `yarn unlink` for all packages.

apps/components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yoast/example-component-app",
-  "version": "1.0.78",
+  "version": "1.0.79-rc.2",
   "description": "This app demonstrates the possibilites of our components",
   "main": "index.js",
   "author": "Yoast",
@@ -14,9 +14,9 @@
     "@wordpress/i18n": "1.2.3",
     "@yoast/analysis-report": "^1.13.0",
     "@yoast/components": "^2.11.0",
-    "@yoast/configuration-wizard": "^2.13.0",
+    "@yoast/configuration-wizard": "^2.14.0-rc.1",
     "@yoast/helpers": "^0.14.0",
-    "@yoast/search-metadata-previews": "^2.14.1",
+    "@yoast/search-metadata-previews": "^2.15.0-rc.2",
     "@yoast/style-guide": "^0.13.0",
     "babel-polyfill": "^6.23.0",
     "lodash": "4.17.11",
@@ -27,7 +27,7 @@
     "redux-devtools-dock-monitor": "^1.1.3",
     "redux-devtools-log-monitor": "^1.4.0",
     "styled-components": "^4.3.2",
-    "yoastseo": "^1.85.1"
+    "yoastseo": "^1.86.0-rc.2"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.3.4",
@@ -49,7 +49,7 @@
     "webpack": "4.19.1",
     "webpack-cli": "^2.1.3",
     "webpack-dev-server": "3.1.14",
-    "yoast-components": "^5.14.1"
+    "yoast-components": "^5.15.0-rc.2"
   },
   "peerDependencies": {
     "material-ui": "^0.18.6",

apps/content-analysis/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@yoast/content-analysis-app",
-	"version": "0.1.73",
+	"version": "0.1.74-rc.2",
 	"private": true,
 	"dependencies": {
 		"@babel/core": "7.7.4",
@@ -71,7 +71,7 @@
 		"webpack-manifest-plugin": "2.2.0",
 		"workbox-webpack-plugin": "4.3.1",
 		"worker-loader": "^2.0.0",
-		"yoastseo": "^1.85.1"
+		"yoastseo": "^1.86.0-rc.2"
 	},
 	"scripts": {
 		"start": "node scripts/start.js",

lerna.json

@@ -2,5 +2,8 @@
   "npmClient": "yarn",
   "useWorkspaces": true,
   "version": "independent",
-  "includeMergedTags": true
+  "includeMergedTags": true,
+  "ignoreChanges": [
+    "packages/schema-blocks/**"
+  ]
 }

package.json

@@ -34,8 +34,5 @@
     "lerna-publish": "lerna publish --contents dist --yes from-git",
     "lerna-publish-rc": "lerna publish --contents dist --dist-tag rc --yes from-git --loglevel=verbose",
     "list-deps": "node ./scripts/list-dependencies.js"
-  },
-  "dependencies": {
-    "benchmark.js": "^2.0.0"
   }
 }

packages/configuration-wizard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yoast/configuration-wizard",
-  "version": "2.13.0",
+  "version": "2.14.0-rc.1",
   "description": "Package for our configuration wizard",
   "main": "src/index.js",
   "repository": {
@@ -40,8 +40,9 @@
     "enzyme-to-json": "3.3.5",
     "jest": "^22.4.3",
     "jest-styled-components": "^5.0.1",
-    "react": "16.12.0",
-    "react-dom": "16.12.0",
+    "material-ui": "^0.18.6",
+    "react": "^16.13.0",
+    "react-dom": "^16.13.0",
     "react-test-renderer": "^16.8.4"
   },
   "peerDependencies": {

packages/replacement-variable-editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yoast/replacement-variable-editor",
-  "version": "1.7.1",
+  "version": "1.8.0-rc.2",
   "private": false,
   "main": "src/index.js",
   "repository": {
@@ -45,6 +45,6 @@
     "lodash": "^4.17.11",
     "prop-types": "^15.7.2",
     "styled-components": "^4.4.1",
-    "yoastseo": "^1.85.1"
+    "yoastseo": "^1.86.0-rc.2"
   }
 }

packages/schema-blocks/.eslintrc

@@ -0,0 +1,82 @@
+{
+    "extends": [
+        "yoast",
+        "plugin:@typescript-eslint/recommended"
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": 2019,
+        "sourceType": "module"
+    },
+    "plugins": [
+        "@typescript-eslint"
+    ],
+    "env": {
+        "jest": true
+    },
+    "rules": {
+        "new-cap": 0,
+        "complexity": [
+            2,
+            10
+        ],
+        "@typescript-eslint/no-parameter-properties": [
+            2,
+            {
+                "allows": [
+                    "protected readonly",
+                    "private readonly"
+                ]
+            }
+        ],
+        "@typescript-eslint/explicit-function-return-type": 0,
+        "@typescript-eslint/no-use-before-define": [
+            "error",
+            {
+                "functions": false
+            }
+        ],
+        "no-constant-condition": [
+            "error",
+            {
+                "checkLoops": false
+            }
+        ],
+        "max-statements": [
+            2,
+            33
+        ],
+        // Normal no-unused-vars doesn't work for TypeScript
+        "no-unused-vars": "off",
+        "@typescript-eslint/no-unused-vars": "error",
+        // Duplicate class members are overloads and are allowed in TypeScript
+        "no-dupe-class-members": "off",
+        // Normal indent doesn't work for TypeScript
+        "indent": "off",
+        "@typescript-eslint/indent": [
+            2,
+            "tab",
+            {
+                "SwitchCase": 1
+            }
+        ],
+        // Allow space before async arrow function
+        "space-before-function-paren": [
+            "error",
+            {
+                "anonymous": "never",
+                "named": "never",
+                "asyncArrow": "always"
+            }
+        ],
+        // Types are already defined by TypeScript, no need in JSDoc.
+        "valid-jsdoc": [
+            "error",
+            {
+                "requireReturn": false,
+                "requireReturnType": false,
+                "requireParamType": false
+            }
+        ]
+    }
+}

packages/schema-blocks/.gitignore

@@ -0,0 +1 @@
+build

packages/schema-blocks/.npmignore

@@ -0,0 +1 @@
+src/