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

Commit 114119e

Browse files
atimmeratimmer
committed
Merge branch 'master' into develop
2 parents 97fa9e2 + 1aaf068 commit 114119e

31 files changed

Lines changed: 3535 additions & 21126 deletions

File tree

packages/yoast-components/.babelrc renamed to .babelrc

File renamed without changes.

‎.travis.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
language: node_js
2+
3+
node_js:
4+
- lts/*
5+
- node
6+
matrix:
7+
allow_failures:
8+
- node_js: node
9+
cache:
10+
yarn: true
11+
directories:
12+
- node_modules
13+
- packages/yoast-components/node_modules
14+
- packages/yoastseo/node_modules
15+
- $HOME/.yarn
16+
17+
before_install:
18+
- export PATH=$HOME/.yarn/bin:$PATH
19+
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.13.0
20+
- echo -e "machine github.com\n login $CI_GITHUB_USER_TOKEN" > ~/.netrc
21+
22+
install:
23+
- yarn --ignore-optional
24+
- yarn install-ci
25+
26+
script:
27+
- yarn lint
28+
- yarn test -- -- --coverage
29+
30+
#after_success:
31+
#- yarn global add codeclimate-test-reporter
32+
#- codeclimate-test-reporter < coverage/lcov.info
33+
34+
#notifications:
35+
# slack:
36+
# secure: W3StABr+AdcdQawTObK4nbsnn5nLrTTtZfVpD/GEN6gvSOQcykbGEC5+ceYg0jn5b4StDyCiTo5blEsrpVICFpYKc44+ogah+qaGRUfVRS/rpOvn4AueXTWn4JxhZzuxqKMiTmyW+MQG0uYM7sk7Q5S+15jj6ilkj4QATaBVNbY=
37+
38+
#deploy:
39+
# provider: npm
40+
# email: webmaster@yoast.com
41+
# api_key:
42+
# secure: zQGIEY373GvvXJav2qaeJ39qeFfz33/mZa4+VqvSBp+M68/VKdGukGd/oVqOsiKVX8+zqjjIsCnWY1LQ1sWjS2W5XAMQGC278lJj/YvKMAHcdVFqr1sE7C4CWY9JVQZy3YN/cfSwkSiu1ntIJQYsNJc8yBZgMP/1mu3auROlr//W6orT8H0ToVRJbfXIstmeDbrmEgU2fNEr+6Y6KADROUoQZcoFkxgSF/Pm2TU7gmHb4DuJO7aBw15Che/OSKCKG7kFobAl3Sw60BB3Caa4RWCFMFfA7GOlWtm6q6jVqBFb/rxmdYY0hpyidmcKFj6tAaHoh27kx8zzf8bRy9+ICtZuTFruHY9YKsALvRvKKprwM8nYE/T4mzSCOlRiCMWPo1AyNqtF1nGDVQOKQOCH5qsAC2dFgQJKfy8x+DPj+tPsV3aevq+VhgF0Rek1LqyQLsKZv5xFAvil9rU3We3R2foJDqMgZwf5QVI0ZlOAIQSh5zORMoKAPKxAOVcODiNEiOkOZrj1A4CLX33V0e3td5qBSltGzlZQEbryvy8yFB4rBqE+1TpcCnu29rYcdVB8X78mz/uuQJG+VMfHTmYXD1vRZbgEzACaOsZR7eKZGi5BmfVMVnkqjM2vR24xCPOB2Laj/889PWJZPtL9D5mD0lsG7ln36honrk3aI+fYBjM=
43+
# on:
44+
# tags: true
45+
# repo: Yoast/yoast-components

‎README.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
1-
# javascript
1+
# JavaScript
2+
23
Monorepo for all the JavaScript within Yoast
4+
5+
## Useful commands
6+
7+
* `yarn link`, will run linting for all packages.
8+
* `yarn test`, will run tests for all packages.
9+
* `yarn link-all`, will run `yarn link` for all packages.
10+
* `yarn unlink-all`, will run `yarn unlink` for all paackages.

‎package.json‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,21 @@
44
"devDependencies": {
55
"lerna": "^3.13.1"
66
},
7-
"workspaces": [
8-
"packages/*"
9-
]
7+
"workspaces": {
8+
"packages": [
9+
"packages/*"
10+
],
11+
"nohoist": [
12+
"**/grunt-*",
13+
"**/eslint*"
14+
]
15+
},
16+
"scripts": {
17+
"lint": "lerna run lint",
18+
"test": "lerna run test --stream",
19+
"install-ci": "lerna run install-ci",
20+
"link-all": "lerna exec yarn link",
21+
"unlink-all": "lerna exec yarn unlink",
22+
"transfer-branch": "./transfer-branch.sh"
23+
}
1024
}

‎packages/yoast-components/.travis.yml‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎packages/yoast-components/composites/AlgoliaSearch/tests/__snapshots__/AlgoliaSearcherTest.js.snap‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,32 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`the AlgoliaSearcher component with headingText matches the snapshot 1`] = `
4+
.c5 {
5+
color: #fff;
6+
background: #64a60a;
7+
min-width: 152px;
8+
text-shadow: 0 0 2px #000;
9+
overflow: visible;
10+
cursor: pointer;
11+
}
12+
13+
.c5::-moz-focus-inner {
14+
border-width: 0;
15+
}
16+
17+
.c5 span {
18+
display: inherit;
19+
-webkit-align-items: inherit;
20+
-webkit-box-align: inherit;
21+
-ms-flex-align: inherit;
22+
align-items: inherit;
23+
-webkit-box-pack: inherit;
24+
-webkit-justify-content: inherit;
25+
-ms-flex-pack: inherit;
26+
justify-content: inherit;
27+
width: 100%;
28+
}
29+
430
.c4 {
531
display: -webkit-inline-box;
632
display: -webkit-inline-flex;
@@ -43,32 +69,6 @@ exports[`the AlgoliaSearcher component with headingText matches the snapshot 1`]
4369
box-shadow: none;
4470
}
4571
46-
.c5 {
47-
color: #fff;
48-
background: #64a60a;
49-
min-width: 152px;
50-
text-shadow: 0 0 2px #000;
51-
overflow: visible;
52-
cursor: pointer;
53-
}
54-
55-
.c5::-moz-focus-inner {
56-
border-width: 0;
57-
}
58-
59-
.c5 span {
60-
display: inherit;
61-
-webkit-align-items: inherit;
62-
-webkit-box-align: inherit;
63-
-ms-flex-align: inherit;
64-
align-items: inherit;
65-
-webkit-box-pack: inherit;
66-
-webkit-justify-content: inherit;
67-
-ms-flex-pack: inherit;
68-
justify-content: inherit;
69-
width: 100%;
70-
}
71-
7272
.c1 form {
7373
display: -webkit-box;
7474
display: -webkit-flex;
@@ -163,7 +163,7 @@ exports[`the AlgoliaSearcher component with headingText matches the snapshot 1`]
163163
/>
164164
<button
165165
aria-expanded={undefined}
166-
className="c4 YoastButton-hNXTAd c5"
166+
className="c4 c5"
167167
onClick={undefined}
168168
type="submit"
169169
>

‎packages/yoast-components/composites/AlgoliaSearch/tests/__snapshots__/SearchBarTest.js.snap‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,32 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`the SearchBar component with headingText matches the snapshot 1`] = `
4+
.c4 {
5+
color: #fff;
6+
background: #64a60a;
7+
min-width: 152px;
8+
text-shadow: 0 0 2px #000;
9+
overflow: visible;
10+
cursor: pointer;
11+
}
12+
13+
.c4::-moz-focus-inner {
14+
border-width: 0;
15+
}
16+
17+
.c4 span {
18+
display: inherit;
19+
-webkit-align-items: inherit;
20+
-webkit-box-align: inherit;
21+
-ms-flex-align: inherit;
22+
align-items: inherit;
23+
-webkit-box-pack: inherit;
24+
-webkit-justify-content: inherit;
25+
-ms-flex-pack: inherit;
26+
justify-content: inherit;
27+
width: 100%;
28+
}
29+
430
.c3 {
531
display: -webkit-inline-box;
632
display: -webkit-inline-flex;
@@ -43,32 +69,6 @@ exports[`the SearchBar component with headingText matches the snapshot 1`] = `
4369
box-shadow: none;
4470
}
4571
46-
.c4 {
47-
color: #fff;
48-
background: #64a60a;
49-
min-width: 152px;
50-
text-shadow: 0 0 2px #000;
51-
overflow: visible;
52-
cursor: pointer;
53-
}
54-
55-
.c4::-moz-focus-inner {
56-
border-width: 0;
57-
}
58-
59-
.c4 span {
60-
display: inherit;
61-
-webkit-align-items: inherit;
62-
-webkit-box-align: inherit;
63-
-ms-flex-align: inherit;
64-
align-items: inherit;
65-
-webkit-box-pack: inherit;
66-
-webkit-justify-content: inherit;
67-
-ms-flex-pack: inherit;
68-
justify-content: inherit;
69-
width: 100%;
70-
}
71-
7272
.c0 form {
7373
display: -webkit-box;
7474
display: -webkit-flex;
@@ -155,7 +155,7 @@ exports[`the SearchBar component with headingText matches the snapshot 1`] = `
155155
/>
156156
<button
157157
aria-expanded={undefined}
158-
className="c3 YoastButton-hNXTAd c4"
158+
className="c3 c4"
159159
onClick={undefined}
160160
type="submit"
161161
>
@@ -168,6 +168,32 @@ exports[`the SearchBar component with headingText matches the snapshot 1`] = `
168168
`;
169169

170170
exports[`the SearchBar component without headingText matches the snapshot 1`] = `
171+
.c4 {
172+
color: #fff;
173+
background: #64a60a;
174+
min-width: 152px;
175+
text-shadow: 0 0 2px #000;
176+
overflow: visible;
177+
cursor: pointer;
178+
}
179+
180+
.c4::-moz-focus-inner {
181+
border-width: 0;
182+
}
183+
184+
.c4 span {
185+
display: inherit;
186+
-webkit-align-items: inherit;
187+
-webkit-box-align: inherit;
188+
-ms-flex-align: inherit;
189+
align-items: inherit;
190+
-webkit-box-pack: inherit;
191+
-webkit-justify-content: inherit;
192+
-ms-flex-pack: inherit;
193+
justify-content: inherit;
194+
width: 100%;
195+
}
196+
171197
.c3 {
172198
display: -webkit-inline-box;
173199
display: -webkit-inline-flex;
@@ -210,32 +236,6 @@ exports[`the SearchBar component without headingText matches the snapshot 1`] =
210236
box-shadow: none;
211237
}
212238
213-
.c4 {
214-
color: #fff;
215-
background: #64a60a;
216-
min-width: 152px;
217-
text-shadow: 0 0 2px #000;
218-
overflow: visible;
219-
cursor: pointer;
220-
}
221-
222-
.c4::-moz-focus-inner {
223-
border-width: 0;
224-
}
225-
226-
.c4 span {
227-
display: inherit;
228-
-webkit-align-items: inherit;
229-
-webkit-box-align: inherit;
230-
-ms-flex-align: inherit;
231-
align-items: inherit;
232-
-webkit-box-pack: inherit;
233-
-webkit-justify-content: inherit;
234-
-ms-flex-pack: inherit;
235-
justify-content: inherit;
236-
width: 100%;
237-
}
238-
239239
.c0 form {
240240
display: -webkit-box;
241241
display: -webkit-flex;
@@ -322,7 +322,7 @@ exports[`the SearchBar component without headingText matches the snapshot 1`] =
322322
/>
323323
<button
324324
aria-expanded={undefined}
325-
className="c3 YoastButton-hNXTAd c4"
325+
className="c3 c4"
326326
onClick={undefined}
327327
type="submit"
328328
>

0 commit comments

Comments
 (0)