Skip to content

Commit d939feb

Browse files
committed
Merge branch 'dev'
2 parents 89495b5 + 514b9fa commit d939feb

File tree

38 files changed

+1868
-148
lines changed

38 files changed

+1868
-148
lines changed

.changeset/config.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"$schema": "https://unpkg.com/@changesets/config@0.3.0/schema.json",
3+
"changelog": [
4+
"@changesets/changelog-github",
5+
{ "repo": "frontity/frontity" }
6+
],
7+
"commit": false,
8+
"linked": [],
9+
"access": "public",
10+
"baseBranch": "dev"
11+
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ node_modules
66
dist
77
build
88
analyze
9+
.env

README.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,19 @@
1919

2020
---
2121

22-
> **Frontity v1 is now available**. Frontity allows you to create a WordPress theme based on React JS. Please **test it out** and let us know how it goes! Your feedback is extremely valuable in this early phase. Bug reports will be also highly appreciated.
22+
> Frontity is a free and open source framework to develop WordPress themes based on ReactJS. To learn more about the framework, its basic concepts and how they work together, check out our docs:
2323
>
24-
> <div align="center"><a href="https://docs.frontity.org/getting-started?utm_source=github-readme&utm_medium=get-started-link"><strong>GET STARTED!</strong></a></div>
25-
> <br />
24+
> - [About Frontity framework](https://docs.frontity.org/#about-frontity-framework)
25+
> - [Learning Frontity guide](https://docs.frontity.org/learning-frontity)
26+
>
27+
> If you can't wait to see what Frontity can do, head over to our [Quick Start Guide](https://docs.frontity.org/getting-started/quick-start-guide) to get up and running! Once you try it out, please [let us know](https://community.frontity.org/) how it goes! We'd love to learn more about your experience and how Frontity can help your project(s). Bug reports will be also highly appreciated.
2628
>
27-
> Frontity will continue to be tested and improved during the next months, and new features will be added progressively.
29+
> Frontity will continue to be improved during the next months, and new features will be added progressively.
2830
>
29-
> #### Do you want to receive the latest framework updates and news? [Subscribe to our newsletter](https://frontity.org/#newsletter)!
31+
> Feel free to [subscribe to our newsletter](https://frontity.org/#newsletter) to **get notified of the latest framework updates and news**.
32+
>
33+
> <div align="center"><a href="https://docs.frontity.org/getting-started?utm_source=github-readme&utm_medium=get-started-link"><strong>GET STARTED!</strong></a></div>
34+
> <br />
3035
3136
---
3237

@@ -99,7 +104,7 @@ React is a JavaScript library. In order to generate HTML for the visitors or Goo
99104
100105
**Frontity** is prepared to be hosted either in a regular Node.js server or in **serverless** services like [AWS Lambda](https://aws.amazon.com/lambda), [Now](https://zeit.co/now), [Netlify](https://www.netlify.com/), [Google Functions](https://cloud.google.com/functions/) and so on. That makes it super cheap and infinitely scalable.
101106

102-
Oh, and by the way, **Frontity is extensible**. Right now we have extensions like _Disqus comments, OneSignal notifications, Adsense, Doubleclick, SmartAds, Google Analytics, Google Tag Manager, Custom CSS or Custom HTML_. This means, Frontity Themes won't have to reinvent the wheel and include the same functionalities over and over.
107+
Oh, and by the way, **Frontity is extensible**. It allows you to easily add new features to your theme via extensions and NPM packages without having to create them from scratch. Right now, we are working on extensions like _Disqus comments, OneSignal notifications, Adsense, Doubleclick, SmartAds, Google Analytics, Google Tag Manager, Custom CSS or Custom HTML_. This means, Frontity Themes won't have to reinvent the wheel and include the same functionalities over and over.
103108

104109
---
105110

e2e/integration/loadable.spec.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
describe("Loadable", () => {
2+
beforeEach(() => {
3+
cy.visit("http://localhost:3001?name=loadable");
4+
});
5+
6+
it("should be able to render elements from dynamic components", () => {
7+
cy.get("[data-test-id='dynamic-div']").should(
8+
"have.text",
9+
"I am the Dynamic1 component"
10+
);
11+
cy.get("[data-test-id='dynamic2-div']").should(
12+
"have.text",
13+
"I am the Dynamic2 component"
14+
);
15+
});
16+
17+
it("should be able to use javascript from dynamic components", () => {
18+
cy.get("[data-test-id='toggle-div']").should("have.text", "OFF");
19+
cy.get("[data-test-id='toggle-button").click();
20+
cy.get("[data-test-id='toggle-div']").should("have.text", "ON");
21+
});
22+
});

e2e/packages/emotion/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "emotion",
2+
"name": "e2e-emotion",
33
"version": "1.0.1",
44
"private": true,
55
"description": "Package to do e2e testing of Frontity's internal Emotion library",

e2e/packages/fonts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "fonts",
2+
"name": "e2e-fonts",
33
"version": "1.0.1",
44
"private": true,
55
"description": "Package to do e2e testing for fonts",

e2e/packages/head/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "head",
2+
"name": "e2e-head",
33
"version": "1.0.4",
44
"private": true,
55
"description": "Package to do e2e testing of Frontity's Head component",

e2e/packages/image/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"name": "image",
2+
"name": "e2e-image",
33
"version": "1.0.3",
44
"private": true,
55
"description": "Package to do e2e testing of Frontity's Image component",
66
"dependencies": {
77
"@frontity/components": "^1.1.14",
8-
"frontity": "1.3.0"
8+
"frontity": "1.4.2"
99
}
1010
}

e2e/packages/loadable/package.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"name": "e2e-loadable",
3+
"version": "1.0.0",
4+
"private": true,
5+
"description": "Package to do e2e testing of Frontity's loadable utility",
6+
"dependencies": {
7+
"frontity": "^1.4.2"
8+
}
9+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import React from "react";
2+
import Static from "../static";
3+
4+
const Dynamic2: React.FC = () => {
5+
return (
6+
<>
7+
<div data-test-id="dynamic2-div">I am the Dynamic2 component</div>
8+
<Static />
9+
</>
10+
);
11+
};
12+
13+
export default Dynamic2;

0 commit comments

Comments
 (0)