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

Commit a1f1213

Browse files
author
Igor
committed
Merge branch 'release/14.0'
2 parents c07349f + f1dab60 commit a1f1213

File tree

45 files changed

+944
-30
lines changed

Some content is hidden

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

45 files changed

+944
-30
lines changed

apps/components/App.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import FacebookPreviewExample from "./FacebookPreviewExample";
1818
import LinkSuggestionsWrapper from "./LinkSuggestionsExample";
1919
import WordOccurrencesWrapper from "./WordOccurrencesWrapper";
2020
import MultiStepProgressWrapper from "./MultiStepProgressWrapper";
21+
import ReactifiedComponentsWrapper from "./ReactifiedComponentsWrapper";
2122

2223
// Setup empty translations to prevent Jed error.
2324
setLocaleData( { "": {} }, "yoast-components" );
@@ -103,6 +104,11 @@ const components = [
103104
name: "Multi step progress",
104105
component: <MultiStepProgressWrapper />,
105106
},
107+
{
108+
id: "reactified-components",
109+
name: "Reactified components",
110+
component: <ReactifiedComponentsWrapper />,
111+
},
106112
];
107113

108114
const LanguageDirectionContainer = styled.div`
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
import React from "react";
2+
import TextInput from "@yoast/components/src/inputs/TextInput";
3+
import TextArea from "@yoast/components/src/inputs/TextArea";
4+
import RadioButtonGroup from "@yoast/components/src/radiobutton/RadioButtonGroup";
5+
6+
const ReactifiedComponentsWrapper = () => {
7+
return (
8+
<div className="yoast">
9+
<TextInput
10+
label="This is the input label"
11+
value="This is the input value"
12+
type="text"
13+
/>
14+
<TextInput
15+
label="This input has a description"
16+
description="Great description!"
17+
type="text"
18+
placeholder="The best placeholder ev4h"
19+
/>
20+
<TextInput
21+
label="This is a number input"
22+
description="The minimum number is 3 and the maximum is 6 (if you use arrow keys)."
23+
type="number"
24+
min={ 3 }
25+
max={ 6 }
26+
/>
27+
<TextInput
28+
label="This is a email input without description where the help links to google.com"
29+
type="email"
30+
linkTo="https://www.google.com"
31+
/>
32+
<TextInput
33+
label="This is a password input"
34+
type="password"
35+
linkTo="https://www.google.com"
36+
/>
37+
<TextArea
38+
label="This is a textarea"
39+
placeholder="Ugly placeholder"
40+
value="Wow, what happens now??"
41+
description="The greatest textarea ever!!1!"
42+
/>
43+
<RadioButtonGroup
44+
onChange={ console.log }
45+
options={ [
46+
{
47+
value: "hey-value",
48+
label: "Hey there!",
49+
},
50+
{
51+
value: "hi-value",
52+
label: "Hi there!",
53+
}
54+
] }
55+
label="Horizontal radiobutton group"
56+
groupName="group1"
57+
selected="hi"
58+
/>
59+
<RadioButtonGroup
60+
onChange={ console.log }
61+
options={ [
62+
{
63+
value: "haha-value",
64+
label: "Haha, that's funny!",
65+
},
66+
{
67+
value: "hoho-value",
68+
label: "Hohoho, I'm santa!",
69+
}
70+
] }
71+
label="Vertical radiobutton group"
72+
vertical={ true }
73+
groupName="group2"
74+
/>
75+
</div>
76+
);
77+
};
78+
export default ReactifiedComponentsWrapper;

apps/components/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@yoast/example-component-app",
3-
"version": "1.0.62",
3+
"version": "1.0.63-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.1.0",
16-
"@yoast/components": "^1.1.0",
17-
"@yoast/configuration-wizard": "^2.1.0",
15+
"@yoast/analysis-report": "^1.2.0-rc.0",
16+
"@yoast/components": "^2.0.0-rc.0",
17+
"@yoast/configuration-wizard": "^2.2.0-rc.0",
1818
"@yoast/helpers": "^0.11.1",
19-
"@yoast/search-metadata-previews": "^2.1.0",
19+
"@yoast/search-metadata-previews": "^2.2.0-rc.0",
2020
"@yoast/style-guide": "^0.11.1",
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.72.0"
30+
"yoastseo": "^1.73.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.1.0"
52+
"yoast-components": "^5.2.0-rc.0"
5353
},
5454
"peerDependencies": {
5555
"material-ui": "^0.18.6",

apps/components/tests/__snapshots__/appTest.js.snap

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,13 @@ exports[`App renders without problems 1`] = `
129129
>
130130
Multi step progress
131131
</button>
132+
<button
133+
onClick={[Function]}
134+
style={Object {}}
135+
type="button"
136+
>
137+
Reactified components
138+
</button>
132139
<p
133140
style={
134141
Object {

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.58",
3+
"version": "0.1.59-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.1.0",
10-
"@yoast/components": "^1.1.0",
9+
"@yoast/analysis-report": "^1.2.0-rc.0",
10+
"@yoast/components": "^2.0.0-rc.0",
1111
"@yoast/style-guide": "^0.11.1",
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.72.0"
73+
"yoastseo": "^1.73.0-rc.0"
7474
},
7575
"scripts": {
7676
"start": "node scripts/start.js",

packages/analysis-report/CHANGELOG.MD

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ This changelog is according to [Keep a Changelog](http://keepachangelog.com).
55
All notable changes to this project will be documented in this file. Releases without a changelog entry contain only minor changes that are irrelevant for users of this library.
66
We follow [Semantic Versioning](http://semver.org/).
77

8+
## 1.2.0 April 23rd, 2020
9+
### Other
10+
* Adds a CSS test stub.
11+
812
## 0.12.0 January 6th, 2020
913
### Other
1014
* Drops IE11 support through configuring Babel to use the preset environment with the own list of supported browsers specified.

packages/analysis-report/package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@yoast/analysis-report",
3-
"version": "1.1.0",
3+
"version": "1.2.0-rc.0",
44
"main": "src/index.js",
55
"repository": {
66
"type": "git",
@@ -17,7 +17,7 @@
1717
"private": false,
1818
"dependencies": {
1919
"@wordpress/i18n": "^1.1.0",
20-
"@yoast/components": "^1.1.0",
20+
"@yoast/components": "^2.0.0-rc.0",
2121
"@yoast/helpers": "^0.11.1",
2222
"@yoast/style-guide": "^0.11.1",
2323
"lodash": "^4.17.11",
@@ -51,7 +51,10 @@
5151
"transformIgnorePatterns": [
5252
"/node_modules/(?!yoastseo|lodash-es).+\\.js$"
5353
],
54-
"setupTestFrameworkScriptFile": "<rootDir>/tools/jest/setupTests.js"
54+
"setupTestFrameworkScriptFile": "<rootDir>/tools/jest/setupTests.js",
55+
"moduleNameMapper": {
56+
"\\.css$": "<rootDir>/tools/jest/CSSStub.js"
57+
}
5558
},
5659
"publishConfig": {
5760
"access": "public"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = {};

packages/components/CHANGELOG.MD

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

77
We follow [Semantic Versioning](http://semver.org/).
88

9+
## 2.0.0 April 23rd, 2020
10+
### Added
11+
* Adds CSS through JavaScript imports for button, checkbox, data-model, field-group, inputs, modal, radiobutton, select and toggle.
12+
* Adds GenerateId, FieldGroup, TextArea and TextInput components.
13+
* Adds a CSS test stub.
14+
15+
## 1.0.0 April 14th, 2020
16+
### Added
17+
* Adds CSS through JavaScript imports for button, checkbox, data-model, field-group, inputs, modal, radiobutton, select and toggle.
18+
* Adds GenerateId, FieldGroup, TextArea and TextInput components.
19+
920
## 0.14.0 March 30th, 2020
1021
### Added
1122
* Adds CSS and HTML used in the upcoming redesign of the components for borders, colors, icons, buttons, checkbox, data-model, inputs, modal, radio button, select and toggle.

packages/components/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
## Requirements
2+
Because we are importing CSS in our JavaScript, your JavaScript bundler needs to be able to interpret CSS.
3+
4+
Therefore, you will need to use a css-loader in your bundler in order to use this package.
5+
6+
E.g. in Webpack: https://webpack.js.org/loaders/css-loader/

0 commit comments

Comments
 (0)