Skip to content
This repository was archived by the owner on Oct 4, 2022. It is now read-only.

Commit 9f42efa

Browse files
igorschoesterigorschoester
committed
Merge branch 'release/15.2'
2 parents c3321fc + db9177e commit 9f42efa

73 files changed

Lines changed: 61993 additions & 462 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ overrides:
3030
react/jsx-no-bind: 1
3131
react/no-access-state-in-setstate: 1
3232
require-jsdoc: 1
33+
- files:
34+
- "packages/replacement-variable-editor/**/*.js"
35+
rules:
36+
react/jsx-no-bind: 1
37+
react/require-default-props: 1
3338
- files:
3439
- "packages/search-metadata-previews/**/*.js"
3540
rules:

‎apps/components/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@yoast/example-component-app",
3-
"version": "1.0.74",
3+
"version": "1.0.75-rc.0",
44
"description": "This app demonstrates the possibilites of our components",
55
"main": "index.js",
66
"author": "Yoast",
@@ -12,11 +12,11 @@
1212
},
1313
"dependencies": {
1414
"@wordpress/i18n": "1.2.3",
15-
"@yoast/analysis-report": "^1.12.0",
16-
"@yoast/components": "^2.10.0",
17-
"@yoast/configuration-wizard": "^2.12.0",
18-
"@yoast/helpers": "^0.13.0",
19-
"@yoast/search-metadata-previews": "^2.12.0",
15+
"@yoast/analysis-report": "^1.13.0-rc.0",
16+
"@yoast/components": "^2.11.0-rc.0",
17+
"@yoast/configuration-wizard": "^2.13.0-rc.0",
18+
"@yoast/helpers": "^0.14.0-rc.0",
19+
"@yoast/search-metadata-previews": "^2.13.0-rc.0",
2020
"@yoast/style-guide": "^0.13.0",
2121
"babel-polyfill": "^6.23.0",
2222
"lodash": "4.17.11",
@@ -27,7 +27,7 @@
2727
"redux-devtools-dock-monitor": "^1.1.3",
2828
"redux-devtools-log-monitor": "^1.4.0",
2929
"styled-components": "^4.3.2",
30-
"yoastseo": "^1.83.0"
30+
"yoastseo": "^1.84.0-rc.0"
3131
},
3232
"devDependencies": {
3333
"@babel/preset-env": "^7.3.4",
@@ -49,7 +49,7 @@
4949
"webpack": "4.19.1",
5050
"webpack-cli": "^2.1.3",
5151
"webpack-dev-server": "3.1.14",
52-
"yoast-components": "^5.12.0"
52+
"yoast-components": "^5.13.0-rc.0"
5353
},
5454
"peerDependencies": {
5555
"material-ui": "^0.18.6",

‎apps/content-analysis/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@yoast/content-analysis-app",
3-
"version": "0.1.70",
3+
"version": "0.1.71-rc.0",
44
"private": true,
55
"dependencies": {
66
"@babel/core": "7.7.4",
77
"@svgr/webpack": "4.3.3",
88
"@wordpress/i18n": "^3.1.1",
9-
"@yoast/analysis-report": "^1.12.0",
10-
"@yoast/components": "^2.10.0",
9+
"@yoast/analysis-report": "^1.13.0-rc.0",
10+
"@yoast/components": "^2.11.0-rc.0",
1111
"@yoast/style-guide": "^0.13.0",
1212
"babel-core": "7.0.0-bridge.0",
1313
"babel-eslint": "10.0.3",
@@ -70,7 +70,7 @@
7070
"webpack-manifest-plugin": "2.2.0",
7171
"workbox-webpack-plugin": "4.3.1",
7272
"worker-loader": "^2.0.0",
73-
"yoastseo": "^1.83.0"
73+
"yoastseo": "^1.84.0-rc.0"
7474
},
7575
"scripts": {
7676
"start": "node scripts/start.js",

‎apps/content-analysis/src/utils/getMorphologyData.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ let morphologyData = null;
66
* @returns {Object} The morphology data, or an empty object if not available.
77
*/
88
function loadLocalMorphologyData() {
9-
let data, dataDe, dataNL, dataES, dataFR, dataRU, dataIT, dataPT, dataID, dataPL, dataAR = {};
9+
let data, dataDe, dataNL, dataES, dataFR, dataRU, dataIT, dataPT, dataID, dataPL, dataAR, dataSV = {};
1010
try {
1111
// Disabling global require to be able to fail.
1212
// eslint-disable-next-line global-require
@@ -31,10 +31,12 @@ function loadLocalMorphologyData() {
3131
dataPL = require( "../../../../packages/yoastseo/premium-configuration/data/morphologyData-pl-v9.json" );
3232
// eslint-disable-next-line global-require
3333
dataAR = require( "../../../../packages/yoastseo/premium-configuration/data/morphologyData-ar-v9.json" );
34+
// eslint-disable-next-line global-require
35+
dataSV = require( "../../../../packages/yoastseo/premium-configuration/data/morphologyData-sv-v1.json" );
3436
} catch ( error ) {
3537
// Falling back to empty data.
3638
}
37-
return merge( data, dataDe, dataNL, dataES, dataFR, dataRU, dataIT, dataPT, dataID, dataPL, dataAR );
39+
return merge( data, dataDe, dataNL, dataES, dataFR, dataRU, dataIT, dataPT, dataID, dataPL, dataAR, dataSV );
3840
}
3941

4042
/**

‎packages/analysis-report/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@yoast/analysis-report",
3-
"version": "1.12.0",
3+
"version": "1.13.0-rc.0",
44
"main": "src/index.js",
55
"repository": {
66
"type": "git",
@@ -17,8 +17,8 @@
1717
"private": false,
1818
"dependencies": {
1919
"@wordpress/i18n": "^1.1.0",
20-
"@yoast/components": "^2.10.0",
21-
"@yoast/helpers": "^0.13.0",
20+
"@yoast/components": "^2.11.0-rc.0",
21+
"@yoast/helpers": "^0.14.0-rc.0",
2222
"@yoast/style-guide": "^0.13.0",
2323
"lodash": "^4.17.11",
2424
"prop-types": "^15.6.0",

‎packages/components/CHANGELOG.MD‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. Releases wi
44

55
We follow [Semantic Versioning](http://semver.org/).
66

7+
## 2.11.0 October 26th, 2020
8+
### Bugfixes
9+
* Fixes a bug where the Select's onOptionFocus would not be called.
10+
* Fixes a bug where the Edit variant of the NewButton had a misaligned icon.
11+
* Fixes a bug where the new Button component could not be imported via the package index.
12+
713
## 2.10.0 October 13th, 2020
814
### Enhancements
915
* Adds SingleSelect component, which is based on the MultiSelect implementation.

‎packages/components/package.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@yoast/components",
3-
"version": "2.10.0",
3+
"version": "2.11.0-rc.0",
44
"description": "Yoast Components",
55
"main": "src/index.js",
66
"private": false,
@@ -19,6 +19,12 @@
1919
"jest": {
2020
"testRegex": ".*Test.js$",
2121
"testURL": "http://localhost",
22+
"transform": {
23+
"^.+\\.jsx?$": "babel-jest"
24+
},
25+
"transformIgnorePatterns": [
26+
"/node_modules/(?!yoastseo|lodash-es).+\\.js$"
27+
],
2228
"setupTestFrameworkScriptFile": "<rootDir>/jest/setupTests.js",
2329
"moduleNameMapper": {
2430
"\\.css$": "<rootDir>/jest/CSSStub.js"
@@ -27,7 +33,7 @@
2733
"dependencies": {
2834
"@wordpress/a11y": "^1.1.3",
2935
"@wordpress/i18n": "^1.2.3",
30-
"@yoast/helpers": "^0.13.0",
36+
"@yoast/helpers": "^0.14.0-rc.0",
3137
"@yoast/style-guide": "^0.13.0",
3238
"interpolate-components": "^1.1.1",
3339
"lodash": "^4.17.11",

‎packages/components/src/base/colors.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
--yoast-color-dark: #303030;
1414
--yoast-color-sale: #fec228;
1515
--yoast-color-sale-darker: #feb601;
16-
--yoast-color-border: rgba(0,0,0, 0.2);
16+
--yoast-color-border: rgba(0, 0, 0, 0.2);
1717
--yoast-color-label: #303030;
1818
--yoast-color-label-help: #707070;
1919
--yoast-color-active: #6EA029;

‎packages/components/src/button/buttons.css‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
.yoast .yoast-button--secondary {
6666
color: var(--yoast-color-dark);
6767
background-color: var(--yoast-color-secondary);
68+
box-shadow: inset 0 -2px 0 rgba(0, 0, 0, 0.1);
6869
}
6970

7071
.yoast .yoast-button--secondary:visited {
@@ -116,6 +117,11 @@
116117
margin-right: 8px;
117118
}
118119

120+
html[dir=rtl] .yoast .yoast-button--edit {
121+
margin-right: 0;
122+
margin-left: 8px;
123+
}
124+
119125
html[dir=rtl] .yoast .yoast-button--buy {
120126
flex-direction: row-reverse;
121127
}
@@ -171,4 +177,4 @@ html[dir=rtl] .yoast .yoast-button--buy {
171177
.yoast-close svg {
172178
width: 10px;
173179
}
174-
}
180+
}

‎packages/components/src/field-group/field-group.css‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,34 @@
1616
font-size: var(--yoast-font-size-default);
1717
}
1818

19+
.yoast-field-group__title.yoast-field-group__title--light {
20+
font-weight: var(--yoast-font-weight-default);
21+
}
22+
1923
.yoast-field-group .field-group-description {
2024
margin: 0;
2125
}
26+
27+
.yoast-field-group__inline {
28+
display: flex;
29+
align-items: center;
30+
}
31+
32+
.yoast-field-group__inline .yoast-field-group__inputfield {
33+
margin-right: 8px;
34+
}
35+
36+
.yoast-field-group__inline .yoast-button {
37+
flex-shrink: 0;
38+
}
39+
40+
@media screen and (max-width: 782px) {
41+
.yoast-field-group__inline {
42+
display: block;
43+
}
44+
45+
.yoast-field-group__inline .yoast-field-group__inputfield {
46+
margin-right: 0;
47+
margin-bottom: 8px;
48+
}
49+
}

0 commit comments

Comments
 (0)