Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

experimental: support for Server Side Rendering (#921)

Guilherme Oenning95adeeadb2cb
diff --git a/.github/workflows/fider.yml b/.github/workflows/fider.yml
index bdc3e7101..fe21ed29a 100644
--- a/.github/workflows/fider.yml
+++ b/.github/workflows/fider.yml
@@ -13,7 +13,7 @@ jobs:
name: test-ui
runs-on: ubuntu-latest
container:
- image: getfider/githubci:0.0.4
+ image: getfider/githubci:0.0.5
steps:
- name: checkout code
@@ -26,7 +26,7 @@ jobs:
name: test-server
runs-on: ubuntu-latest
container:
- image: getfider/githubci:0.0.4
+ image: getfider/githubci:0.0.5
services:
minio:
@@ -49,6 +49,7 @@ jobs:
steps:
- name: checkout code
uses: actions/checkout@v1
+ - run: npm ci # required for esbuild
- run: mage lint:server
- name: mage test:server
run: |
@@ -63,7 +64,7 @@ jobs:
runs-on: ubuntu-latest
needs: [test-server, test-ui]
container:
- image: getfider/githubci:0.0.4
+ image: getfider/githubci:0.0.5
steps:
- name: checkout code
diff --git a/.gitignore b/.gitignore
index 284ccef04..b7717b6bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ logs/
fider
fider.exe
+ssr.js
.env
npm-debug.log
diff --git a/Dockerfile b/Dockerfile
index 461103da6..470cb6d7d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,18 @@
# Build Step
-FROM getfider/githubci:0.0.4 AS builder
+FROM getfider/githubci:0.0.5 AS builder
RUN mkdir /app
WORKDIR /app
COPY . .
RUN npm ci
-RUN node -v
-RUN npm -v
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 mage build
+RUN GOOS=linux GOARCH=amd64 mage build
# Runtime Step
-FROM alpine:3.10
-RUN apk update && apk add ca-certificates
+FROM debian:buster-slim
+
+RUN apt-get update
+RUN apt-get install -y ca-certificates
RUN mkdir /app
WORKDIR /app
@@ -23,6 +23,7 @@ COPY --from=builder /app/views /app/views
COPY --from=builder /app/dist /app/dist
COPY --from=builder /app/LICENSE /app
COPY --from=builder /app/robots.txt /app
+COPY --from=builder /app/ssr.js /app
COPY --from=builder /app/fider /app
EXPOSE 3000
diff --git a/app/handlers/common_test.go b/app/handlers/common_test.go
index 16398f7bc..52f197169 100644
--- a/app/handlers/common_test.go
+++ b/app/handlers/common_test.go
@@ -71,6 +71,7 @@ Disallow: /admin/
Disallow: /oauth/
Disallow: /terms
Disallow: /privacy
+Disallow: /-/ui
Sitemap: https://demo.test.fider.io/sitemap.xml`)
}
diff --git a/app/pkg/env/env.go b/app/pkg/env/env.go
index b777db800..d2ca91723 100644
--- a/app/pkg/env/env.go
+++ b/app/pkg/env/env.go
@@ -26,7 +26,8 @@ type config struct {
Rendergun struct {
URL string `env:"RENDERGUN_URL"`
}
- Database struct {
+ Experimental_SSR_SEO bool `env:"EXPERIMENTAL_SSR_SEO,default=false"`
+ Database struct {
URL string `env:"DATABASE_URL,required"`
MaxIdleConns int `env:"DATABASE_MAX_IDLE_CONNS,default=2,strict"`
MaxOpenConns int `env:"DATABASE_MAX_OPEN_CONNS,default=4,strict"`
diff --git a/app/pkg/web/react.go b/app/pkg/web/react.go
new file mode 100644
index 000000000..c5080f5f8
--- /dev/null
+++ b/app/pkg/web/react.go
@@ -0,0 +1,55 @@
+package web
+
+import (
+ "encoding/json"
+ "fmt"
+ "net/url"
+ "os"
+
+ "github.com/getfider/fider/app/pkg/env"
+ "github.com/getfider/fider/app/pkg/errors"
+ "rogchap.com/v8go"
+)
+
+type ReactRenderer struct {
+ scriptPath string
+ scriptContent []byte
+ ctx *v8go.Context
+}
+
+func NewReactRenderer(scriptPath string) *ReactRenderer {
+ bytes, _ := os.ReadFile(env.Path(scriptPath))
+ isolate, err := v8go.NewIsolate()
+ if err != nil {
+ return &ReactRenderer{scriptPath: scriptPath}
+ }
+
+ v8ctx, _ := v8go.NewContext(isolate)
+ _, err = v8ctx.RunScript(string(bytes), scriptPath)
+ if err != nil {
+ return &ReactRenderer{scriptPath: scriptPath}
+ }
+
+ return &ReactRenderer{ctx: v8ctx, scriptPath: scriptPath, scriptContent: bytes}
+}
+
+func (r *ReactRenderer) Render(u *url.URL, props Map) (string, error) {
+ if len(r.scriptContent) == 0 {
+ return "", nil
+ }
+
+ jsonArg, err := json.Marshal(props)
+ if err != nil {
+ return "", errors.Wrap(err, "failed to marshal props")
+ }
+
+ val, err := r.ctx.RunScript(`ssrRender("`+u.String()+`", "`+u.Path+`", `+string(jsonArg)+`)`, r.scriptPath)
+ if err != nil {
+ if jsErr, ok := err.(*v8go.JSError); ok {
+ err = fmt.Errorf("%v", jsErr.StackTrace)
+ }
+ return "", errors.Wrap(err, "failed to execute ssrRender")
+ }
+
+ return val.String(), nil
+}
diff --git a/app/pkg/web/react_test.go b/app/pkg/web/react_test.go
new file mode 100644
index 000000000..f6306da05
--- /dev/null
+++ b/app/pkg/web/react_test.go
@@ -0,0 +1,39 @@
+package web_test
+
+import (
+ "net/url"
+ "testing"
+
+ "github.com/getfider/fider/app/models"
+ . "github.com/getfider/fider/app/pkg/assert"
+ "github.com/getfider/fider/app/pkg/web"
+)
+
+func TestReactRenderer_FileNotFound(t *testing.T) {
+ RegisterT(t)
+
+ r := web.NewReactRenderer("unknown.js")
+ u, _ := url.Parse("https://github.com")
+ html, err := r.Render(u, web.Map{})
+ Expect(html).Equals("")
+ Expect(err).IsNil()
+}
+
+func TestReactRenderer_RenderEmptyHomeHTML(t *testing.T) {
+ RegisterT(t)
+
+ r := web.NewReactRenderer("ssr.js")
+ u, _ := url.Parse("https://demo.test.fider.io")
+ html, err := r.Render(u, web.Map{
+ "tenant": &models.Tenant{},
+ "settings": web.Map{},
+ "props": web.Map{
+ "posts": make([]web.Map, 0),
+ "tags": make([]web.Map, 0),
+ "countPerStatus": web.Map{},
+ },
+ })
+ Expect(html).Equals(`<div id="c-header"><div class="c-env-info">Env: | Compiler: | Version: | BuildTime: N/A |TenantID: 0 | </div><div class="c-menu"><div class="container"><a href="/" class="c-menu-item-title"><span></span></a><div class="c-menu-item-signin"><span>Sign in</span></div></div></div></div><div id="p-home" class="page container"><div class="row"><div class="l-welcome-col col-md-4"><div class="markdown-body welcome-message"><p>We&#39;d love to hear what you&#39;re thinking about. </p>
+<p>What can we do better? This is the place for you to vote, discuss and share ideas.</p></div><form autoComplete="off" class="c-form"><div class="c-form-field"><div class="c-form-field-wrapper"><input type="text" id="input-title" tabindex="-1" maxLength="100" value="" placeholder="Enter your suggestion here..."/></div></div></form></div><div class="l-posts-col col-md-8"><div class="l-lonely center"><p><svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 352 512" class="icon" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path d="M176 80c-52.94 0-96 43.06-96 96 0 8.84 7.16 16 16 16s16-7.16 16-16c0-35.3 28.72-64 64-64 8.84 0 16-7.16 16-16s-7.16-16-16-16zM96.06 459.17c0 3.15.93 6.22 2.68 8.84l24.51 36.84c2.97 4.46 7.97 7.14 13.32 7.14h78.85c5.36 0 10.36-2.68 13.32-7.14l24.51-36.84c1.74-2.62 2.67-5.7 2.68-8.84l.05-43.18H96.02l.04 43.18zM176 0C73.72 0 0 82.97 0 176c0 44.37 16.45 84.85 43.56 115.78 16.64 18.99 42.74 58.8 52.42 92.16v.06h48v-.12c-.01-4.77-.72-9.51-2.15-14.07-5.59-17.81-22.82-64.77-62.17-109.67-20.54-23.43-31.52-53.15-31.61-84.14-.2-73.64 59.67-128 127.95-128 70.58 0 128 57.42 128 128 0 30.97-11.24 60.85-31.65 84.14-39.11 44.61-56.42 91.47-62.1 109.46a47.507 47.507 0 0 0-2.22 14.3v.1h48v-.05c9.68-33.37 35.78-73.18 52.42-92.16C335.55 260.85 352 220.37 352 176 352 78.8 273.2 0 176 0z"></path></svg></p><p>It&#x27;s lonely out here. Start by sharing a suggestion!</p></div></div></div></div><div id="c-footer"><div class="container"><a class="l-powered" target="_blank" href="https://getfider.com/"><img src="https://getfider.com/images/logo-100x100.png" alt="Fider"/><span>Powered by Fider</span></a></div></div>`)
+ Expect(err).IsNil()
+}
diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.go
index 1ef067c82..bb03f200d 100644
--- a/app/pkg/web/renderer.go
+++ b/app/pkg/web/renderer.go
@@ -13,6 +13,7 @@ import (
"github.com/getfider/fider/app/models/query"
"github.com/getfider/fider/app/pkg/bus"
+ "github.com/getfider/fider/app/pkg/log"
"io/ioutil"
@@ -60,14 +61,16 @@ type Renderer struct {
assets *clientAssets
chunkedAssets map[string]*clientAssets
mutex sync.RWMutex
+ reactRenderer *ReactRenderer
}
// NewRenderer creates a new Renderer
func NewRenderer(settings *models.SystemSettings) *Renderer {
return &Renderer{
- templates: make(map[string]*template.Template),
- settings: settings,
- mutex: sync.RWMutex{},
+ templates: make(map[string]*template.Template),
+ settings: settings,
+ mutex: sync.RWMutex{},
+ reactRenderer: NewReactRenderer("ssr.js"),
}
}
@@ -149,7 +152,7 @@ func getClientAssets(assets []distAsset) *clientAssets {
}
//Render a template based on parameters
-func (r *Renderer) Render(w io.Writer, statusCode int, name string, props Props, ctx *Context) {
+func (r *Renderer) Render(w io.Writer, statusCode int, templateName string, props Props, ctx *Context) {
var err error
if r.assets == nil || env.IsDevelopment() {
@@ -158,13 +161,11 @@ func (r *Renderer) Render(w io.Writer, statusCode int, name string, props Props,
}
}
- tmpl, ok := r.templates[name]
- if !ok || env.IsDevelopment() {
- tmpl = r.add(name)
- }
-
public := make(Map)
private := make(Map)
+ if props.Data == nil {
+ props.Data = make(Map)
+ }
tenant := ctx.Tenant()
tenantName := "Fider"
@@ -246,11 +247,30 @@ func (r *Renderer) Render(w io.Writer, statusCode int, name string, props Props,
}
}
+ // Only index.html template uses React, other templates are already SSR
+ if env.Config.Experimental_SSR_SEO && ctx.Request.IsCrawler() && templateName == "index.html" {
+ html, err := r.reactRenderer.Render(ctx.Request.URL, public)
+ if err != nil {
+ log.Errorf(ctx, "Failed to render react page: @{Error}", dto.Props{
+ "Error": err.Error(),
+ })
+ }
+ if html != "" {
+ templateName = "ssr.html"
+ props.Data["html"] = template.HTML(html)
+ }
+ }
+
+ tmpl, ok := r.templates[templateName]
+ if !ok || env.IsDevelopment() {
+ tmpl = r.add(templateName)
+ }
+
err = tmpl.Execute(w, Map{
"public": public,
"private": private,
})
if err != nil {
- panic(errors.Wrap(err, "failed to execute template %s", name))
+ panic(errors.Wrap(err, "failed to execute template %s", templateName))
}
}
diff --git a/app/pkg/web/renderer_test.go b/app/pkg/web/renderer_test.go
index 5b7114b6b..502527798 100644
--- a/app/pkg/web/renderer_test.go
+++ b/app/pkg/web/renderer_test.go
@@ -85,7 +85,7 @@ func TestRenderer_WithCanonicalURL(t *testing.T) {
compareRendererResponse(buf, "/app/pkg/web/testdata/canonical.html", ctx)
}
-func TestRenderer_Props(t *testing.T) {
+func TestRenderer_Home(t *testing.T) {
RegisterT(t)
bus.AddHandler(func(ctx context.Context, q *query.ListActiveOAuthProviders) error {
@@ -99,16 +99,40 @@ func TestRenderer_Props(t *testing.T) {
Title: "My Page Title",
Description: "My Page Description",
Data: web.Map{
- "number": 2,
- "array": []string{"1", "2"},
- "object": web.Map{
- "key1": "value1",
- "key2": "value2",
- },
+ "posts": make([]web.Map, 0),
+ "tags": make([]web.Map, 0),
+ "countPerStatus": web.Map{},
+ },
+ }, ctx)
+
+ compareRendererResponse(buf, "/app/pkg/web/testdata/home.html", ctx)
+}
+
+func TestRenderer_Home_SSR(t *testing.T) {
+ RegisterT(t)
+
+ env.Config.Experimental_SSR_SEO = true
+ bus.AddHandler(func(ctx context.Context, q *query.ListActiveOAuthProviders) error {
+ return nil
+ })
+
+ buf := new(bytes.Buffer)
+ ctx := newGetContext("https://demo.test.fider.io:3000/", map[string]string{
+ "User-Agent": "Googlebot",
+ })
+ ctx.SetTenant(&models.Tenant{})
+ renderer := web.NewRenderer(&models.SystemSettings{})
+ renderer.Render(buf, http.StatusOK, "index.html", web.Props{
+ Title: "My Page Title",
+ Description: "My Page Description",
+ Data: web.Map{
+ "posts": make([]web.Map, 0),
+ "tags": make([]web.Map, 0),
+ "countPerStatus": web.Map{},
},
}, ctx)
- compareRendererResponse(buf, "/app/pkg/web/testdata/props.html", ctx)
+ compareRendererResponse(buf, "/app/pkg/web/testdata/home_ssr.html", ctx)
}
func TestRenderer_AuthenticatedUser(t *testing.T) {
diff --git a/app/pkg/web/testdata/basic.html b/app/pkg/web/testdata/basic.html
index dd5fa6984..15d2f9ef0 100755
--- a/app/pkg/web/testdata/basic.html
+++ b/app/pkg/web/testdata/basic.html
@@ -9,11 +9,13 @@
<link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/favicon?size=180&bg=white" sizes="180x180" type="image/png">
-
- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />
+
+ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />
+
+
<title>Fider</title>
<meta name="description" content="" />
<meta property="og:title" content="Fider" />
@@ -23,13 +25,15 @@
<meta property="og:image" content="https://getfider.com/images/logo-100x100.png">
</head>
<body>
- <noscript class="container">
- <div class="c-segment">
- <h2>Please enable JavaScript</h2>
- <p>This website relies on JavaScript-based technologies and services.</p>
- <p>Please enable JavaScript and then reload the page.</p>
- </div>
- </noscript>
+
+<noscript class="container">
+ <div class="c-segment">
+ <h2>Please enable JavaScript</h2>
+ <p>This website relies on JavaScript-based technologies and services.</p>
+ <p>Please enable JavaScript and then reload the page.</p>
+ </div>
+</noscript>
+
@@ -37,16 +41,16 @@
<script id="server-data" type="application/json">
- {"contextID":"CONTEXT_ID","props":null,"settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"tenant":null,"title":"Fider"}
+ {"contextID":"CONTEXT_ID","props":{},"settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"tenant":null,"title":"Fider"}
</script>
-
- <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>
-
- <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>
-
+
+ <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>
+
+ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>
+
diff --git a/app/pkg/web/testdata/canonical.html b/app/pkg/web/testdata/canonical.html
index 175552dc0..496678d57 100755
--- a/app/pkg/web/testdata/canonical.html
+++ b/app/pkg/web/testdata/canonical.html
@@ -8,14 +8,16 @@
<link rel="icon" href="https://demo.test.fider.io:3000/favicon?size=192" sizes="192x192" type="image/png">
<link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/favicon?size=180&bg=white" sizes="180x180" type="image/png">
- <link rel="canonical" href="http://feedback.demo.org" />
+ <link rel="canonical" href="http://feedback.demo.org" />
-
- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />
+
+ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />
+
+
<title>Fider</title>
<meta name="description" content="" />
<meta property="og:title" content="Fider" />
@@ -25,13 +27,15 @@
<meta property="og:image" content="https://getfider.com/images/logo-100x100.png">
</head>
<body>
- <noscript class="container">
- <div class="c-segment">
- <h2>Please enable JavaScript</h2>
- <p>This website relies on JavaScript-based technologies and services.</p>
- <p>Please enable JavaScript and then reload the page.</p>
- </div>
- </noscript>
+
+<noscript class="container">
+ <div class="c-segment">
+ <h2>Please enable JavaScript</h2>
+ <p>This website relies on JavaScript-based technologies and services.</p>
+ <p>Please enable JavaScript and then reload the page.</p>
+ </div>
+</noscript>
+
@@ -39,16 +43,16 @@
<script id="server-data" type="application/json">
- {"contextID":"CONTEXT_ID","props":null,"settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"tenant":null,"title":"Fider"}
+ {"contextID":"CONTEXT_ID","props":{},"settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"tenant":null,"title":"Fider"}
</script>
-
- <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>
-
- <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>
-
+
+ <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>
+
+ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>
+
diff --git a/app/pkg/web/testdata/chunk.html b/app/pkg/web/testdata/chunk.html
index ad1035af7..e3ec60d2c 100644
--- a/app/pkg/web/testdata/chunk.html
+++ b/app/pkg/web/testdata/chunk.html
@@ -9,8 +9,9 @@
<link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/favicon?size=180&bg=white" sizes="180x180" type="image/png">
-
- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />
+
+ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />
+
@@ -21,6 +22,7 @@
<link rel="preload" href="https://demo.test.fider.io:3000/assets/js/Test.page.js" as="script" />
+
<title>Fider</title>
<meta name="description" content="" />
<meta property="og:title" content="Fider" />
@@ -30,13 +32,15 @@
<meta property="og:image" content="https://getfider.com/images/logo-100x100.png">
</head>
<body>
- <noscript class="container">
- <div class="c-segment">
- <h2>Please enable JavaScript</h2>
- <p>This website relies on JavaScript-based technologies and services.</p>
- <p>Please enable JavaScript and then reload the page.</p>
- </div>
- </noscript>
+
+<noscript class="container">
+ <div class="c-segment">
+ <h2>Please enable JavaScript</h2>
+ <p>This website relies on JavaScript-based technologies and services.</p>
+ <p>Please enable JavaScript and then reload the page.</p>
+ </div>
+</noscript>
+
@@ -44,16 +48,16 @@
<script id="server-data" type="application/json">
- {"contextID":"CONTEXT_ID","props":null,"settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"tenant":null,"title":"Fider"}
+ {"contextID":"CONTEXT_ID","props":{},"settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"tenant":null,"title":"Fider"}
</script>
-
- <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>
-
- <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>
-
+
+ <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>
+
+ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>
+
diff --git a/app/pkg/web/testdata/props.html b/app/pkg/web/testdata/home.html
similarity index 56%
rename from app/pkg/web/testdata/props.html
rename to app/pkg/web/testdata/home.html
index 1c850da44..236dc3eec 100755
--- a/app/pkg/web/testdata/props.html
+++ b/app/pkg/web/testdata/home.html
@@ -9,11 +9,13 @@
<link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/favicon?size=180&bg=white" sizes="180x180" type="image/png">
-
- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />
+
+ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />
+
+
<title>My Page Title · Fider</title>
<meta name="description" content="My Page Description" />
<meta property="og:title" content="My Page Title · Fider" />
@@ -23,13 +25,15 @@
<meta property="og:image" content="https://getfider.com/images/logo-100x100.png">
</head>
<body>
- <noscript class="container">
- <div class="c-segment">
- <h2>Please enable JavaScript</h2>
- <p>This website relies on JavaScript-based technologies and services.</p>
- <p>Please enable JavaScript and then reload the page.</p>
- </div>
- </noscript>
+
+<noscript class="container">
+ <div class="c-segment">
+ <h2>Please enable JavaScript</h2>
+ <p>This website relies on JavaScript-based technologies and services.</p>
+ <p>Please enable JavaScript and then reload the page.</p>
+ </div>
+</noscript>
+
@@ -37,16 +41,16 @@
<script id="server-data" type="application/json">
- {"contextID":"CONTEXT_ID","description":"My Page Description","props":{"array":["1","2"],"number":2,"object":{"key1":"value1","key2":"value2"}},"settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"tenant":null,"title":"My Page Title · Fider"}
+ {"contextID":"CONTEXT_ID","description":"My Page Description","props":{"countPerStatus":{},"posts":[],"tags":[]},"settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"tenant":null,"title":"My Page Title · Fider"}
</script>
-
- <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>
-
- <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>
-
+
+ <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>
+
+ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>
+
diff --git a/app/pkg/web/testdata/home_ssr.html b/app/pkg/web/testdata/home_ssr.html
new file mode 100755
index 000000000..be3daec47
--- /dev/null
+++ b/app/pkg/web/testdata/home_ssr.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+ <link rel="icon" href="https://demo.test.fider.io:3000/favicon?size=64" sizes="64x64" type="image/png">
+ <link rel="icon" href="https://demo.test.fider.io:3000/favicon?size=192" sizes="192x192" type="image/png">
+ <link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/favicon?size=180&bg=white" sizes="180x180" type="image/png">
+
+
+
+ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />
+
+
+
+
+
+ <title>My Page Title · </title>
+ <meta name="description" content="My Page Description" />
+ <meta property="og:title" content="My Page Title · " />
+ <meta property="og:description" content="My Page Description" />
+ <meta property="og:type" content="website" />
+ <meta property="og:url" content="https://demo.test.fider.io:3000/" />
+ <meta property="og:image" content="https://getfider.com/images/logo-100x100.png">
+</head>
+<body>
+
+
+
+
+
+<div id="root"><div id="c-header"><div class="c-env-info">Env: | Compiler: | Version: | BuildTime: N/A |TenantID: 0 | </div><div class="c-menu"><div class="container"><a href="/" class="c-menu-item-title"><span></span></a><div class="c-menu-item-signin"><span>Sign in</span></div></div></div></div><div id="p-home" class="page container"><div class="row"><div class="l-welcome-col col-md-4"><div class="markdown-body welcome-message"><p>We&#39;d love to hear what you&#39;re thinking about. </p>
+<p>What can we do better? This is the place for you to vote, discuss and share ideas.</p></div><form autoComplete="off" class="c-form"><div class="c-form-field"><div class="c-form-field-wrapper"><input type="text" id="input-title" tabindex="-1" maxLength="100" value="" placeholder="Enter your suggestion here..."/></div></div></form></div><div class="l-posts-col col-md-8"><div class="l-lonely center"><p><svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 352 512" class="icon" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path d="M176 80c-52.94 0-96 43.06-96 96 0 8.84 7.16 16 16 16s16-7.16 16-16c0-35.3 28.72-64 64-64 8.84 0 16-7.16 16-16s-7.16-16-16-16zM96.06 459.17c0 3.15.93 6.22 2.68 8.84l24.51 36.84c2.97 4.46 7.97 7.14 13.32 7.14h78.85c5.36 0 10.36-2.68 13.32-7.14l24.51-36.84c1.74-2.62 2.67-5.7 2.68-8.84l.05-43.18H96.02l.04 43.18zM176 0C73.72 0 0 82.97 0 176c0 44.37 16.45 84.85 43.56 115.78 16.64 18.99 42.74 58.8 52.42 92.16v.06h48v-.12c-.01-4.77-.72-9.51-2.15-14.07-5.59-17.81-22.82-64.77-62.17-109.67-20.54-23.43-31.52-53.15-31.61-84.14-.2-73.64 59.67-128 127.95-128 70.58 0 128 57.42 128 128 0 30.97-11.24 60.85-31.65 84.14-39.11 44.61-56.42 91.47-62.1 109.46a47.507 47.507 0 0 0-2.22 14.3v.1h48v-.05c9.68-33.37 35.78-73.18 52.42-92.16C335.55 260.85 352 220.37 352 176 352 78.8 273.2 0 176 0z"></path></svg></p><p>It&#x27;s lonely out here. Start by sharing a suggestion!</p></div></div></div></div><div id="c-footer"><div class="container"><a class="l-powered" target="_blank" href="https://getfider.com/"><img src="https://getfider.com/images/logo-100x100.png" alt="Fider"/><span>Powered by Fider</span></a></div></div></div>
+
+
+ <script id="server-data" type="application/json">
+
+ </script>
+
+
+
+
+</body>
+</html>
diff --git a/app/pkg/web/testdata/oauth.html b/app/pkg/web/testdata/oauth.html
index 85710d90e..ceacdbc4a 100755
--- a/app/pkg/web/testdata/oauth.html
+++ b/app/pkg/web/testdata/oauth.html
@@ -9,11 +9,13 @@
<link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/favicon?size=180&bg=white" sizes="180x180" type="image/png">
-
- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />
+
+ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />
+
+
<title>Fider</title>
<meta name="description" content="" />
<meta property="og:title" content="Fider" />
@@ -23,13 +25,15 @@
<meta property="og:image" content="https://getfider.com/images/logo-100x100.png">
</head>
<body>
- <noscript class="container">
- <div class="c-segment">
- <h2>Please enable JavaScript</h2>
- <p>This website relies on JavaScript-based technologies and services.</p>
- <p>Please enable JavaScript and then reload the page.</p>
- </div>
- </noscript>
+
+<noscript class="container">
+ <div class="c-segment">
+ <h2>Please enable JavaScript</h2>
+ <p>This website relies on JavaScript-based technologies and services.</p>
+ <p>Please enable JavaScript and then reload the page.</p>
+ </div>
+</noscript>
+
@@ -37,16 +41,16 @@
<script id="server-data" type="application/json">
- {"contextID":"CONTEXT_ID","props":null,"settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[{"provider":"google","displayName":"Google","clientID":"1234","url":"https://demo.test.fider.io:3000/oauth/google","callbackURL":"https://demo.test.fider.io:3000/oauth/google/callback","logoBlobKey":"google.png","isCustomProvider":false,"isEnabled":true}],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"tenant":null,"title":"Fider"}
+ {"contextID":"CONTEXT_ID","props":{},"settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[{"provider":"google","displayName":"Google","clientID":"1234","url":"https://demo.test.fider.io:3000/oauth/google","callbackURL":"https://demo.test.fider.io:3000/oauth/google/callback","logoBlobKey":"google.png","isCustomProvider":false,"isEnabled":true}],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"tenant":null,"title":"Fider"}
</script>
-
- <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>
-
- <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>
-
+
+ <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>
+
+ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>
+
diff --git a/app/pkg/web/testdata/tenant.html b/app/pkg/web/testdata/tenant.html
index 30aedb21b..f7565fe39 100755
--- a/app/pkg/web/testdata/tenant.html
+++ b/app/pkg/web/testdata/tenant.html
@@ -9,11 +9,13 @@
<link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/favicon?size=180&bg=white" sizes="180x180" type="image/png">
-
- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />
+
+ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />
+
+
<title>Game of Thrones</title>
<meta name="description" content="" />
<meta property="og:title" content="Game of Thrones" />
@@ -23,13 +25,15 @@
<meta property="og:image" content="https://getfider.com/images/logo-100x100.png">
</head>
<body>
- <noscript class="container">
- <div class="c-segment">
- <h2>Please enable JavaScript</h2>
- <p>This website relies on JavaScript-based technologies and services.</p>
- <p>Please enable JavaScript and then reload the page.</p>
- </div>
- </noscript>
+
+<noscript class="container">
+ <div class="c-segment">
+ <h2>Please enable JavaScript</h2>
+ <p>This website relies on JavaScript-based technologies and services.</p>
+ <p>Please enable JavaScript and then reload the page.</p>
+ </div>
+</noscript>
+
@@ -37,16 +41,16 @@
<script id="server-data" type="application/json">
- {"contextID":"CONTEXT_ID","props":null,"settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"tenant":{"id":0,"name":"Game of Thrones","subdomain":"","invitation":"","welcomeMessage":"","cname":"","status":0,"isPrivate":false,"logoBlobKey":""},"title":"Game of Thrones"}
+ {"contextID":"CONTEXT_ID","props":{},"settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"tenant":{"id":0,"name":"Game of Thrones","subdomain":"","invitation":"","welcomeMessage":"","cname":"","status":0,"isPrivate":false,"logoBlobKey":""},"title":"Game of Thrones"}
</script>
-
- <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>
-
- <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>
-
+
+ <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>
+
+ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>
+
diff --git a/app/pkg/web/testdata/user.html b/app/pkg/web/testdata/user.html
index 36040225c..7c2a7265a 100755
--- a/app/pkg/web/testdata/user.html
+++ b/app/pkg/web/testdata/user.html
@@ -9,11 +9,13 @@
<link rel="apple-touch-icon" href="https://demo.test.fider.io:3000/favicon?size=180&bg=white" sizes="180x180" type="image/png">
-
- <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />
+
+ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />
+
+
<title>My Page Title · Fider</title>
<meta name="description" content="My Page Description" />
<meta property="og:title" content="My Page Title · Fider" />
@@ -23,13 +25,15 @@
<meta property="og:image" content="https://getfider.com/images/logo-100x100.png">
</head>
<body>
- <noscript class="container">
- <div class="c-segment">
- <h2>Please enable JavaScript</h2>
- <p>This website relies on JavaScript-based technologies and services.</p>
- <p>Please enable JavaScript and then reload the page.</p>
- </div>
- </noscript>
+
+<noscript class="container">
+ <div class="c-segment">
+ <h2>Please enable JavaScript</h2>
+ <p>This website relies on JavaScript-based technologies and services.</p>
+ <p>Please enable JavaScript and then reload the page.</p>
+ </div>
+</noscript>
+
@@ -37,16 +41,16 @@
<script id="server-data" type="application/json">
- {"contextID":"CONTEXT_ID","description":"My Page Description","props":null,"settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"tenant":null,"title":"My Page Title · Fider","user":{"avatarBlobKey":"","avatarType":"gravatar","avatarURL":"https://demo.test.fider.io:3000/avatars/gravatar/5/Jon%20Snow","email":"[email protected]","id":5,"isAdministrator":true,"isCollaborator":true,"name":"Jon Snow","role":"administrator","status":"active"}}
+ {"contextID":"CONTEXT_ID","description":"My Page Description","props":{},"settings":{"baseURL":"https://demo.test.fider.io:3000","buildTime":"","compiler":"","domain":"","environment":"","globalAssetsURL":"https://demo.test.fider.io:3000","googleAnalytics":"","hasLegal":false,"mode":"","oauth":[],"tenantAssetsURL":"https://demo.test.fider.io:3000","version":""},"tenant":null,"title":"My Page Title · Fider","user":{"avatarBlobKey":"","avatarType":"gravatar","avatarURL":"https://demo.test.fider.io:3000/avatars/gravatar/5/Jon%20Snow","email":"[email protected]","id":5,"isAdministrator":true,"isCollaborator":true,"name":"Jon Snow","role":"administrator","status":"active"}}
</script>
-
- <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>
-
- <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>
-
+
+ <script src="https://demo.test.fider.io:3000/assets/js/file1.js" crossorigin="anonymous"></script>
+
+ <script src="https://demo.test.fider.io:3000/assets/js/file2.js" crossorigin="anonymous"></script>
+
diff --git a/esbuild-shim.js b/esbuild-shim.js
new file mode 100644
index 000000000..3369f910b
--- /dev/null
+++ b/esbuild-shim.js
@@ -0,0 +1,23 @@
+const global = (1, eval)('this');
+global.global = global;
+global.globalThis = global;
+global.frames = global;
+global.self = global;
+
+const document = {
+ documentElement: {},
+ getElementById: () => undefined
+}
+
+const window = {
+ document,
+ location: {
+ href: ''
+ }
+}
+
+const navigator = {}
+
+global.navigator = navigator;
+global.window = window;
+global.document = document;
\ No newline at end of file
diff --git a/esbuild.config.js b/esbuild.config.js
new file mode 100644
index 000000000..ed9a37689
--- /dev/null
+++ b/esbuild.config.js
@@ -0,0 +1,17 @@
+let emptyCSS = {
+ name: 'empty-css-imports',
+ setup(build) {
+ build.onLoad({ filter: /\.(css|scss)$/ }, () => ({ contents: '' }))
+ },
+}
+
+require('esbuild').build({
+ entryPoints: ['./public/ssr.tsx'],
+ bundle: true,
+ define: {
+ "process.env.NODE_ENV": `"${process.env.NODE_ENV || 'development'}"`
+ },
+ inject: ['./esbuild-shim.js'],
+ outfile: 'ssr.js',
+ plugins: [emptyCSS],
+}).catch(() => process.exit(1))
diff --git a/go.mod b/go.mod
index 023728317..94e2b9b27 100644
--- a/go.mod
+++ b/go.mod
@@ -22,4 +22,5 @@ require (
github.com/russross/blackfriday v1.6.0
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93
+ rogchap.com/v8go v0.5.1
)
diff --git a/go.sum b/go.sum
index 53bd5e6fc..88cbe6941 100644
--- a/go.sum
+++ b/go.sum
@@ -892,6 +892,8 @@ mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphD
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 h1:HT3e4Krq+IE44tiN36RvVEb6tvqeIdtsVSsxmNPqlFU=
mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7/go.mod h1:hBpJkZE8H/sb+VRFvw2+rBpHNsTBcvSpk61hr8mzXZE=
+rogchap.com/v8go v0.5.1 h1:yx7uQC2ezAHthCHLHl4NuH3eprVLBtNl6Utm/ELjZ+w=
+rogchap.com/v8go v0.5.1/go.mod h1:IitZnaOtWSJadY/7qinKHIEHpxsilMWyLQ+Efdo4n4I=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/magefile.go b/magefile.go
index 776d5c3aa..2ce265fdb 100644
--- a/magefile.go
+++ b/magefile.go
@@ -83,7 +83,12 @@ func (Watch) Server() error {
type Build mg.Namespace
func (Build) All() {
- mg.Deps(Build.Server, Build.UI)
+ mg.Deps(Build.Server, Build.UI, Build.SSR)
+}
+
+func (Build) SSR() error {
+ env := map[string]string{"NODE_ENV": "production"}
+ return sh.RunWith(env, "node", "esbuild.config.js")
}
func (Build) Server() error {
@@ -114,7 +119,7 @@ func (Test) Coverage() error {
}
func (Test) Server() error {
- mg.Deps(Build.Server)
+ mg.Deps(Build.Server, Build.SSR)
sh.Run("godotenv", "-f", ".test.env", "./"+exeName, "migrate")
return sh.Run("godotenv", "-f", ".test.env", "go", "test", "./...", "-race")
}
diff --git a/package-lock.json b/package-lock.json
index af47c3f0c..70615f04a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,7 +7,7 @@
"": {
"version": "0.0.0",
"dependencies": {
- "dompurify": "2.2.6",
+ "dompurify": "2.2.7",
"marked": "2.0.1",
"react": "17.0.1",
"react-dom": "17.0.1",
@@ -31,6 +31,7 @@
"css-loader": "5.1.1",
"dotenv": "8.2.0",
"enzyme": "3.11.0",
+ "esbuild": "0.9.5",
"file-loader": "6.2.0",
"fork-ts-checker-webpack-plugin": "6.1.1",
"jest": "26.6.3",
@@ -2929,9 +2930,9 @@
}
},
"node_modules/dompurify": {
- "version": "2.2.6",
- "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.6.tgz",
- "integrity": "sha512-7b7ZArhhH0SP6W2R9cqK6RjaU82FZ2UPM7RO8qN1b1wyvC/NY1FNWcX1Pu00fFOAnzEORtwXe4bPaClg6pUybQ=="
+ "version": "2.2.7",
+ "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.7.tgz",
+ "integrity": "sha512-jdtDffdGNY+C76jvodNTu9jt5yYj59vuTUyx+wXdzcSwAGTYZDAQkQ7Iwx9zcGrA4ixC1syU4H3RZROqRxokxg=="
},
"node_modules/domutils": {
"version": "2.4.4",
@@ -3240,6 +3241,16 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/esbuild": {
+ "version": "0.9.5",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.9.5.tgz",
+ "integrity": "sha512-ZBOtZX9HxgSdwkAroVifEUgylWqbOjqbu1i1ohRvhoaYt6aj81dxbizODx419gwDAupqut44ehFVwUq7WRN/OA==",
+ "dev": true,
+ "hasInstallScript": true,
+ "bin": {
+ "esbuild": "bin/esbuild"
+ }
+ },
"node_modules/escalade": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -13228,9 +13239,9 @@
}
},
"dompurify": {
- "version": "2.2.6",
- "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.6.tgz",
- "integrity": "sha512-7b7ZArhhH0SP6W2R9cqK6RjaU82FZ2UPM7RO8qN1b1wyvC/NY1FNWcX1Pu00fFOAnzEORtwXe4bPaClg6pUybQ=="
+ "version": "2.2.7",
+ "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.7.tgz",
+ "integrity": "sha512-jdtDffdGNY+C76jvodNTu9jt5yYj59vuTUyx+wXdzcSwAGTYZDAQkQ7Iwx9zcGrA4ixC1syU4H3RZROqRxokxg=="
},
"domutils": {
"version": "2.4.4",
@@ -13475,6 +13486,12 @@
"is-symbol": "^1.0.2"
}
},
+ "esbuild": {
+ "version": "0.9.5",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.9.5.tgz",
+ "integrity": "sha512-ZBOtZX9HxgSdwkAroVifEUgylWqbOjqbu1i1ohRvhoaYt6aj81dxbizODx419gwDAupqut44ehFVwUq7WRN/OA==",
+ "dev": true
+ },
"escalade": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
diff --git a/package.json b/package.json
index 89053a867..cbe8e28cc 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"repository": "https://github.com/getfider/fider",
"private": true,
"dependencies": {
- "dompurify": "2.2.6",
+ "dompurify": "2.2.7",
"marked": "2.0.1",
"react": "17.0.1",
"react-dom": "17.0.1",
@@ -28,6 +28,7 @@
"css-loader": "5.1.1",
"dotenv": "8.2.0",
"enzyme": "3.11.0",
+ "esbuild": "0.9.5",
"file-loader": "6.2.0",
"fork-ts-checker-webpack-plugin": "6.1.1",
"jest": "26.6.3",
diff --git a/public/components/common/Modal.tsx b/public/components/common/Modal.tsx
index fc9624004..0cafa7504 100644
--- a/public/components/common/Modal.tsx
+++ b/public/components/common/Modal.tsx
@@ -18,7 +18,7 @@ interface ModalFooterProps {
children?: React.ReactNode;
}
-const ModalWindow: React.StatelessComponent<ModalWindowProps> = (props) => {
+const ModalWindow: React.FunctionComponent<ModalWindowProps> = (props) => {
const root = useRef<HTMLElement>(document.getElementById("root-modal"));
useEffect(() => {
diff --git a/public/components/common/SocialSignInButton.tsx b/public/components/common/SocialSignInButton.tsx
index 6726c513d..70d55acf4 100644
--- a/public/components/common/SocialSignInButton.tsx
+++ b/public/components/common/SocialSignInButton.tsx
@@ -14,7 +14,7 @@ interface SocialSignInButtonProps {
}
export const SocialSignInButton = (props: SocialSignInButtonProps) => {
- const redirectTo = props.redirectTo || location.href;
+ const redirectTo = props.redirectTo || window.location.href;
const href = props.option.url ? `${props.option.url}?redirect=${redirectTo}` : undefined;
const className = classSet({
"m-social": true,
diff --git a/public/index.tsx b/public/index.tsx
index 8748a7017..39f479e95 100644
--- a/public/index.tsx
+++ b/public/index.tsx
@@ -5,6 +5,7 @@ import { Header, Footer, Loader } from "@fider/components/common";
import { ErrorBoundary } from "@fider/components";
import { classSet, Fider, FiderContext, actions } from "@fider/services";
import { IconContext } from "react-icons";
+import "@fider/assets/styles/index.scss";
const Loading = () => (
<div className="page">
@@ -12,8 +13,6 @@ const Loading = () => (
</div>
);
-import "@fider/assets/styles/index.scss";
-
const logProductionError = (err: Error) => {
if (Fider.isProduction()) {
console.error(err); // tslint:disable-line
diff --git a/public/router.tsx b/public/router.tsx
index 8ed4bf1f5..b2b450b69 100644
--- a/public/router.tsx
+++ b/public/router.tsx
@@ -6,14 +6,14 @@ interface PageConfiguration {
showHeader: boolean;
}
-const route = (path: string, component: any, showHeader: boolean = true): PageConfiguration => {
+export const route = (path: string, component: any, showHeader: boolean = true): PageConfiguration => {
path = path.replace("/", "/").replace(":number", "\\d+").replace(":string", ".+").replace("*", "/?.*");
const regex = new RegExp(`^${path}$`);
return { regex, component, showHeader };
};
-const pathRegex = [
+const defaultRoutes = [
route("", Pages.AsyncHomePage),
route("/posts/:number*", Pages.AsyncShowPostPage),
route("/admin/members", Pages.AsyncManageMembersPage),
@@ -34,11 +34,11 @@ const pathRegex = [
route("/-/ui", Pages.AsyncUIToolkitPage),
];
-export const resolveRootComponent = (path: string): PageConfiguration => {
+export const resolveRootComponent = (path: string, routes: PageConfiguration[] = defaultRoutes): PageConfiguration => {
if (path.length > 0 && path.charAt(path.length - 1) === "/") {
path = path.substring(0, path.length - 1);
}
- for (const entry of pathRegex) {
+ for (const entry of routes) {
if (entry && entry.regex.test(path)) {
return entry;
}
diff --git a/public/services/fider.ts b/public/services/fider.ts
index 3d53f4b39..0619a3faa 100644
--- a/public/services/fider.ts
+++ b/public/services/fider.ts
@@ -39,7 +39,13 @@ export class FiderImpl {
private pSettings!: SystemSettings;
private pSession!: FiderSession;
- public initialize = (): FiderImpl => {
+ public initialize = (initData?: any): FiderImpl => {
+ if (initData) {
+ this.pSettings = initData.settings;
+ this.pSession = new FiderSession(initData);
+ return this;
+ }
+
const el = document.getElementById("server-data");
const data = el ? JSON.parse(el.textContent || el.innerText) : {};
this.pSettings = data.settings;
diff --git a/public/services/markdown.spec.ts b/public/services/markdown.spec.ts
index 9e7dbc401..3f9e75b35 100644
--- a/public/services/markdown.spec.ts
+++ b/public/services/markdown.spec.ts
@@ -21,6 +21,11 @@ const testCases = [
expectedFull: "<p>Hello &lt;b&gt;Beautiful&lt;/b&gt; World</p>",
expectedSimple: "<p>Hello &lt;b&gt;Beautiful&lt;/b&gt; World</p>",
},
+ {
+ input: `[Uh oh...]("onerror="alert('XSS'))`,
+ expectedFull: '<p><a target="_blank" rel="noopener" href="">Uh oh...</a></p>',
+ expectedSimple: '<p><a target="_blank" rel="noopener" href="">Uh oh...</a></p>',
+ },
{
input: "~~Option 3~~",
expectedFull: "<p><del>Option 3</del></p>",
diff --git a/public/services/markdown.ts b/public/services/markdown.ts
index c3e5557a4..53221b91d 100644
--- a/public/services/markdown.ts
+++ b/public/services/markdown.ts
@@ -9,9 +9,14 @@ marked.setOptions({
breaks: true,
});
-DOMPurify.setConfig({
- ADD_ATTR: ["target"],
-});
+if (DOMPurify.isSupported) {
+ DOMPurify.setConfig({
+ USE_PROFILES: {
+ html: true,
+ },
+ ADD_ATTR: ["target"],
+ });
+}
const link = (href: string, title: string, text: string) => {
const titleAttr = title ? ` title=${title}` : "";
@@ -32,7 +37,7 @@ const entities: { [key: string]: string } = {
};
const encodeHTML = (s: string) => s.replace(/[<>]/g, (tag) => entities[tag] || tag);
-const sanitize = (input: string) => DOMPurify.sanitize(input);
+const sanitize = (input: string) => (DOMPurify.isSupported ? DOMPurify.sanitize(input) : input);
export const full = (input: string): string => {
return sanitize(marked(encodeHTML(input), { renderer: fullRenderer }).trim());
diff --git a/public/ssr.tsx b/public/ssr.tsx
new file mode 100644
index 000000000..560bfc756
--- /dev/null
+++ b/public/ssr.tsx
@@ -0,0 +1,34 @@
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { Fider, FiderContext } from "./services/fider";
+import { IconContext } from "react-icons";
+import { Footer, Header } from "./components";
+import { resolveRootComponent, route } from "./router";
+
+import HomePage from "./pages/Home/Home.page";
+import ShowPostPage from "./pages/ShowPost/ShowPost.page";
+import SignInPage from "./pages/SignIn/SignIn.page";
+import SignUpPage from "./pages/SignUp/SignUp.page";
+import UIToolkitPage from "./pages/UI/UIToolkit.page";
+
+// Only public routes should be here
+// Routes behind authentication are not crawled
+const routes = [route("", HomePage), route("/posts/:number*", ShowPostPage), route("/signin", SignInPage, false), route("/signup", SignUpPage, false), route("/-/ui", UIToolkitPage)];
+
+function ssrRender(url: string, pathname: string, args: any) {
+ const fider = Fider.initialize({ ...args });
+ const config = resolveRootComponent(pathname, routes);
+ window.location.href = url;
+
+ return renderToStaticMarkup(
+ <FiderContext.Provider value={fider}>
+ <IconContext.Provider value={{ className: "icon" }}>
+ {config.showHeader && <Header />}
+ {React.createElement(config.component, args.props)}
+ {config.showHeader && <Footer />}
+ </IconContext.Provider>
+ </FiderContext.Provider>
+ );
+}
+
+(globalThis as any).ssrRender = ssrRender;
diff --git a/robots.txt b/robots.txt
index 7bf367e67..7c1412ff5 100644
--- a/robots.txt
+++ b/robots.txt
@@ -4,4 +4,5 @@ Disallow: /api/v1/
Disallow: /admin/
Disallow: /oauth/
Disallow: /terms
-Disallow: /privacy
\ No newline at end of file
+Disallow: /privacy
+Disallow: /-/ui
\ No newline at end of file
diff --git a/views/base.html b/views/base.html
index b5205bd0d..00bb604b4 100644
--- a/views/base.html
+++ b/views/base.html
@@ -8,21 +8,14 @@
<link rel="icon" href="{{ .private.favicon }}?size=192" sizes="192x192" type="image/png">
<link rel="apple-touch-icon" href="{{ .private.favicon }}?size=180&bg=white" sizes="180x180" type="image/png">
{{ if .private.canonicalURL }}
- <link rel="canonical" href="{{ .private.canonicalURL }}" />
+ <link rel="canonical" href="{{ .private.canonicalURL }}" />
{{ end }}
{{ if .private.assets }}
- {{range .private.assets.CSS}}
- <link rel="stylesheet" href="{{ $.public.settings.globalAssetsURL }}{{ . }}" />
- {{end}}
- {{end}}
- {{ if .private.chunkAssets }}
- {{range .private.chunkAssets.CSS}}
- <link rel="preload" href="{{ $.public.settings.globalAssetsURL }}{{ . }}" as="style" />
- {{end}}
- {{range .private.chunkAssets.JS}}
- <link rel="preload" href="{{ $.public.settings.globalAssetsURL }}{{ . }}" as="script" />
+ {{range .private.assets.CSS}}
+ <link rel="stylesheet" href="{{ $.public.settings.globalAssetsURL }}{{ . }}" />
{{end}}
{{end}}
+ {{block "head" .}}{{end}}
<title>{{ .public.title }}</title>
<meta name="description" content="{{ .public.description }}" />
<meta property="og:title" content="{{ .public.title }}" />
@@ -32,13 +25,7 @@
<meta property="og:image" content="{{ .private.logo }}">
</head>
<body>
- <noscript class="container">
- <div class="c-segment">
- <h2>Please enable JavaScript</h2>
- <p>This website relies on JavaScript-based technologies and services.</p>
- <p>Please enable JavaScript and then reload the page.</p>
- </div>
- </noscript>
+ {{block "noscript" .}}{{end}}
{{ if ne .public.settings.googleAnalytics "" }}
<script type="text/javascript" nonce="{{ .public.contextID }}">
diff --git a/views/index.html b/views/index.html
index 50b0a941d..c255a5e98 100644
--- a/views/index.html
+++ b/views/index.html
@@ -1,13 +1,34 @@
-// Print all variables that does not start with _ (95)
-// Compressed to avoid whitespace being printed
+{{define "head"}}
+ {{ if .private.chunkAssets }}
+ {{range .private.chunkAssets.CSS}}
+ <link rel="preload" href="{{ $.public.settings.globalAssetsURL }}{{ . }}" as="style" />
+ {{end}}
+ {{range .private.chunkAssets.JS}}
+ <link rel="preload" href="{{ $.public.settings.globalAssetsURL }}{{ . }}" as="script" />
+ {{end}}
+ {{end}}
+{{end}}
+
+{{define "noscript"}}
+<noscript class="container">
+ <div class="c-segment">
+ <h2>Please enable JavaScript</h2>
+ <p>This website relies on JavaScript-based technologies and services.</p>
+ <p>Please enable JavaScript and then reload the page.</p>
+ </div>
+</noscript>
+{{end}}
+
{{define "server-data"}}
{{ .public }}
{{ end }}
+
{{define "content"}}<div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>{{end}}
+
{{define "end-of-body"}}
{{ if .private.assets }}
- {{range .private.assets.JS}}
- <script src="{{ $.public.settings.globalAssetsURL }}{{ . }}" crossorigin="anonymous"></script>
- {{end}}
+ {{range .private.assets.JS}}
+ <script src="{{ $.public.settings.globalAssetsURL }}{{ . }}" crossorigin="anonymous"></script>
+ {{end}}
{{end}}
{{end}}
\ No newline at end of file
diff --git a/views/ssr.html b/views/ssr.html
new file mode 100644
index 000000000..e13a4c694
--- /dev/null
+++ b/views/ssr.html
@@ -0,0 +1,14 @@
+{{define "head"}}
+ {{ if .private.chunkAssets }}
+ {{range .private.chunkAssets.CSS}}
+ <link rel="stylesheet" href="{{ $.public.settings.globalAssetsURL }}{{ . }}" />
+ {{end}}
+ {{end}}
+{{end}}
+{{define "server-data"}}{{end}}
+
+{{define "content"}}
+<div id="root">{{ .public.props.html }}</div>
+{{end}}
+
+{{define "end-of-body"}}{{end}}
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index 6d061a8f5..c3bd47716 100755
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -88,6 +88,11 @@ module.exports = {
name: "common",
test: /[\\/]public[\\/](components|services|models)[\\/]/,
},
+ markdown: {
+ chunks: 'all',
+ name: 'markdown',
+ test: /dompurify|marked/
+ },
vendor: {
chunks: 'all',
name: 'vendor',