Open platform to collect and prioritize feedback
enhancement: Add Webpack Chunk Names and Fix CSS Warnings (#619)
Cooper Filby6d499d4e0a6b
diff --git a/app/cmd/routes.go b/app/cmd/routes.goindex 549f12133..5b67ba709 100644--- a/app/cmd/routes.go+++ b/app/cmd/routes.go@@ -70,7 +70,7 @@ func routes(r *web.Engine) *web.Engine {})}- r.Get("/-/ui", handlers.Page("UI Toolkit", "A preview of Fider UI elements"))+ r.Get("/-/ui", handlers.Page("UI Toolkit", "A preview of Fider UI elements", "UIToolkit.page"))r.Get("/signup/verify", handlers.VerifySignUpKey())r.Get("/signout", handlers.SignOut())r.Get("/oauth/:provider/token", handlers.OAuthToken())@@ -129,8 +129,8 @@ func routes(r *web.Engine) *web.Engine {ui.Get("/admin", handlers.GeneralSettingsPage())ui.Get("/admin/advanced", handlers.AdvancedSettingsPage())- ui.Get("/admin/privacy", handlers.Page("Privacy · Site Settings", ""))- ui.Get("/admin/invitations", handlers.Page("Invitations · Site Settings", ""))+ ui.Get("/admin/privacy", handlers.Page("Privacy · Site Settings", "", "PrivacySettings.page"))+ ui.Get("/admin/invitations", handlers.Page("Invitations · Site Settings", "", "Invitations.page"))ui.Get("/admin/members", handlers.ManageMembers())ui.Get("/admin/tags", handlers.ManageTags())ui.Get("/admin/authentication", handlers.ManageAuthentication())@@ -139,7 +139,7 @@ func routes(r *web.Engine) *web.Engine {//From this step, only Administrators are allowedui.Use(middlewares.IsAuthorized(models.RoleAdministrator))- ui.Get("/admin/export", handlers.Page("Export · Site Settings", ""))+ ui.Get("/admin/export", handlers.Page("Export · Site Settings", "", "Export.page"))ui.Get("/admin/export/posts.csv", handlers.ExportPostsToCSV())ui.Post("/_api/admin/settings/general", handlers.UpdateSettings())ui.Post("/_api/admin/settings/advanced", handlers.UpdateAdvancedSettings())diff --git a/app/handlers/admin.go b/app/handlers/admin.goindex 945f52b22..fbf8f2739 100644--- a/app/handlers/admin.go+++ b/app/handlers/admin.go@@ -15,7 +15,8 @@ func GeneralSettingsPage() web.HandlerFunc {}return c.Page(web.Props{- Title: "General · Site Settings",+ Title: "General · Site Settings",+ ChunkName: "GeneralSettings.page",Data: web.Map{"publicIP": publicIP,},@@ -27,7 +28,8 @@ func GeneralSettingsPage() web.HandlerFunc {func AdvancedSettingsPage() web.HandlerFunc {return func(c web.Context) error {return c.Page(web.Props{- Title: "Advanced · Site Settings",+ Title: "Advanced · Site Settings",+ ChunkName: "AdvancedSettings.page",Data: web.Map{"customCSS": c.Tenant().CustomCSS,},@@ -95,7 +97,8 @@ func ManageMembers() web.HandlerFunc {}return c.Page(web.Props{- Title: "Manage Members · Site Settings",+ Title: "Manage Members · Site Settings",+ ChunkName: "ManageMembers.page",Data: web.Map{"users": users,},@@ -112,7 +115,8 @@ func ManageAuthentication() web.HandlerFunc {}return c.Page(web.Props{- Title: "Authentication · Site Settings",+ Title: "Authentication · Site Settings",+ ChunkName: "ManageAuthentication.page",Data: web.Map{"providers": providers,},diff --git a/app/handlers/common.go b/app/handlers/common.goindex d58e85233..fb18fe307 100644--- a/app/handlers/common.go+++ b/app/handlers/common.go@@ -80,11 +80,12 @@ func RobotsTXT() web.HandlerFunc {}//Page returns a page without properties-func Page(title, description string) web.HandlerFunc {+func Page(title, description, chunkName string) web.HandlerFunc {return func(c web.Context) error {return c.Page(web.Props{Title: title,Description: description,+ ChunkName: chunkName,})}}diff --git a/app/handlers/common_test.go b/app/handlers/common_test.goindex b314cff9e..37542a736 100644--- a/app/handlers/common_test.go+++ b/app/handlers/common_test.go@@ -25,7 +25,7 @@ func TestPageHandler(t *testing.T) {server, _ := mock.NewServer()code, _ := server.- Execute(handlers.Page("The Title", "The Description"))+ Execute(handlers.Page("The Title", "The Description", "TheChunk.Page"))Expect(code).Equals(http.StatusOK)}diff --git a/app/handlers/notification.go b/app/handlers/notification.goindex a6e8ee1b1..80aaf2bc5 100644--- a/app/handlers/notification.go+++ b/app/handlers/notification.go@@ -27,7 +27,8 @@ func Notifications() web.HandlerFunc {}return c.Page(web.Props{- Title: "Notifications",+ Title: "Notifications",+ ChunkName: "MyNotifications.page",Data: web.Map{"notifications": notifications,},diff --git a/app/handlers/oauth.go b/app/handlers/oauth.goindex 2819dad96..359a14308 100644--- a/app/handlers/oauth.go+++ b/app/handlers/oauth.go@@ -33,7 +33,8 @@ func OAuthEcho() web.HandlerFunc {body, err := c.Services().OAuth.GetRawProfile(provider, code)if err != nil {return c.Page(web.Props{- Title: "OAuth Test Page",+ Title: "OAuth Test Page",+ ChunkName: "OAuthEcho.page",Data: web.Map{"err": errors.Cause(err).Error(),},@@ -43,7 +44,8 @@ func OAuthEcho() web.HandlerFunc {profile, _ := c.Services().OAuth.ParseRawProfile(provider, body)return c.Page(web.Props{- Title: "OAuth Test Page",+ Title: "OAuth Test Page",+ ChunkName: "OAuthEcho.page",Data: web.Map{"body": body,"profile": profile,diff --git a/app/handlers/post.go b/app/handlers/post.goindex 4e6800aaa..a51ec1f25 100644--- a/app/handlers/post.go+++ b/app/handlers/post.go@@ -40,6 +40,7 @@ func Index() web.HandlerFunc {return c.Page(web.Props{Description: description,+ ChunkName: "Home.page",Data: web.Map{"posts": posts,"tags": tags,@@ -86,6 +87,7 @@ func PostDetails() web.HandlerFunc {return c.Page(web.Props{Title: post.Title,Description: markdown.PlainText(post.Description),+ ChunkName: "ShowPost.page",Data: web.Map{"comments": comments,"subscribed": subscribed,diff --git a/app/handlers/settings.go b/app/handlers/settings.goindex a20f90980..b8a8a8119 100644--- a/app/handlers/settings.go+++ b/app/handlers/settings.go@@ -63,7 +63,8 @@ func UserSettings() web.HandlerFunc {}return c.Page(web.Props{- Title: "Settings",+ Title: "Settings",+ ChunkName: "MySettings.page",Data: web.Map{"userSettings": settings,},diff --git a/app/handlers/signin.go b/app/handlers/signin.goindex cbdc79239..9848345e9 100644--- a/app/handlers/signin.go+++ b/app/handlers/signin.go@@ -21,7 +21,8 @@ func SignInPage() web.HandlerFunc {}return c.Page(web.Props{- Title: "Sign in",+ Title: "Sign in",+ ChunkName: "SignIn.page",})}}diff --git a/app/handlers/signup.go b/app/handlers/signup.goindex 94621f256..f5668c48b 100644--- a/app/handlers/signup.go+++ b/app/handlers/signup.go@@ -116,6 +116,7 @@ func SignUp() web.HandlerFunc {return c.Page(web.Props{Title: "Sign up",Description: "Sign up for Fider and let your customers share, vote and discuss on suggestions they have to make your product even better.",+ ChunkName: "SignUp.page",})}}diff --git a/app/handlers/tag.go b/app/handlers/tag.goindex 551bbad94..d03e92c06 100644--- a/app/handlers/tag.go+++ b/app/handlers/tag.go@@ -13,7 +13,8 @@ func ManageTags() web.HandlerFunc {}return c.Page(web.Props{- Title: "Manage Tags · Site Settings",+ Title: "Manage Tags · Site Settings",+ ChunkName: "ManageTags.page",Data: web.Map{"tags": tags,},diff --git a/app/pkg/web/context.go b/app/pkg/web/context.goindex 5ceecc135..d46041d00 100644--- a/app/pkg/web/context.go+++ b/app/pkg/web/context.go@@ -33,6 +33,7 @@ type StringMap map[string]stringtype Props struct {Title stringDescription string+ ChunkName stringData Map}diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.goindex 990c8a413..cebb014eb 100644--- a/app/pkg/web/renderer.go+++ b/app/pkg/web/renderer.go@@ -36,11 +36,12 @@ type clientAssets struct {//Renderer is the default HTML Rendertype Renderer struct {- templates map[string]*template.Template- logger log.Logger- settings *models.SystemSettings- assets *clientAssets- mutex sync.RWMutex+ templates map[string]*template.Template+ logger log.Logger+ settings *models.SystemSettings+ assets *clientAssets+ chunkedAssets map[string]*clientAssets+ mutex sync.RWMutex}// NewRenderer creates a new Renderer@@ -80,6 +81,9 @@ func (r *Renderer) loadAssets() error {Assets []string `json:"assets"`} `json:"main"`} `json:"entrypoints"`+ ChunkGroups map[string]struct {+ Assets []string `json:"assets"`+ } `json:"namedChunkGroups"`}assetsFilePath := "/dist/assets.json"@@ -106,20 +110,36 @@ func (r *Renderer) loadAssets() error {JS: make([]string, 0),}- for _, asset := range file.Entrypoints.Main.Assets {+ r.assets = getClientAssets(file.Entrypoints.Main.Assets)+ r.chunkedAssets = make(map[string]*clientAssets)++ for chunkName, chunkGroup := range file.ChunkGroups {+ r.chunkedAssets[chunkName] = getClientAssets(chunkGroup.Assets)+ }++ return nil+}++func getClientAssets(assets []string) *clientAssets {+ clientAssets := &clientAssets{+ CSS: make([]string, 0),+ JS: make([]string, 0),+ }++ for _, asset := range assets {if strings.HasSuffix(asset, ".map") {continue}assetURL := "/assets/" + assetif strings.HasSuffix(asset, ".css") {- r.assets.CSS = append(r.assets.CSS, assetURL)+ clientAssets.CSS = append(clientAssets.CSS, assetURL)} else if strings.HasSuffix(asset, ".js") {- r.assets.JS = append(r.assets.JS, assetURL)+ clientAssets.JS = append(clientAssets.JS, assetURL)}}- return nil+ return clientAssets}//Render a template based on parameters@@ -157,6 +177,10 @@ func (r *Renderer) Render(w io.Writer, name string, props Props, ctx *Context) {m["__description"] = fmt.Sprintf("%.150s", description)}+ if props.ChunkName != "" {+ m["__chunkAssets"] = r.chunkedAssets[props.ChunkName]+ }+m["__assets"] = r.assetsm["__logo"] = ctx.LogoURL()m["__favicon"] = ctx.FaviconURL()diff --git a/app/pkg/web/renderer_test.go b/app/pkg/web/renderer_test.goindex a4ec0bb79..4210d3cdc 100644--- a/app/pkg/web/renderer_test.go+++ b/app/pkg/web/renderer_test.go@@ -29,6 +29,16 @@ func TestRenderer_Basic(t *testing.T) {compareRendererResponse(buf, "/app/pkg/web/testdata/basic.html", ctx)}+func TestRenderer_WithChunkPreload(t *testing.T) {+ RegisterT(t)++ buf := new(bytes.Buffer)+ ctx := newGetContext("https://demo.test.fider.io:3000/", nil)+ renderer := web.NewRenderer(&models.SystemSettings{}, noop.NewLogger())+ renderer.Render(buf, "index.html", web.Props{ChunkName: "Test.page"}, ctx)+ compareRendererResponse(buf, "/app/pkg/web/testdata/chunk.html", ctx)+}+func TestRenderer_Tenant(t *testing.T) {RegisterT(t)diff --git a/app/pkg/web/testdata/assets.json b/app/pkg/web/testdata/assets.jsonindex 365496e2f..f35c01ff1 100644--- a/app/pkg/web/testdata/assets.json+++ b/app/pkg/web/testdata/assets.json@@ -11,5 +11,15 @@"js/file2.js.map"]}+ },+ "namedChunkGroups": {+ "Test.page": {+ "assets": [+ "css/Test.page.css",+ "css/Test.page.css.map",+ "js/Test.page.js",+ "js/Test.page.js.map"+ ]+ }}}\ No newline at end of filediff --git a/app/pkg/web/testdata/basic.html b/app/pkg/web/testdata/basic.htmlindex 97f3ab440..107baa71c 100755--- a/app/pkg/web/testdata/basic.html+++ b/app/pkg/web/testdata/basic.html@@ -10,6 +10,7 @@<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" />diff --git a/app/pkg/web/testdata/chunk.html b/app/pkg/web/testdata/chunk.htmlnew file mode 100644index 000000000..0af8183bf--- /dev/null+++ b/app/pkg/web/testdata/chunk.html@@ -0,0 +1,59 @@+<!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" type="image/x-icon" href="https://demo.test.fider.io:3000/favicon.ico">+++ <link rel="stylesheet" href="https://demo.test.fider.io:3000/assets/css/file1.css" />+++++ <link rel="preload" href="https://demo.test.fider.io:3000/assets/css/Test.page.css" as="style" />+++ <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" />+ <meta property="og:description" content="" />+ <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>+ <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>++++ <div id="root"></div><div id="root-modal"></div><div id="root-toastify"></div>++ <script id="server-data" type="application/json">++ {"__assets":{"CSS":["/assets/css/file1.css"],"JS":["/assets/js/file1.js","/assets/js/file2.js"]},"__chunkAssets":{"CSS":["/assets/css/Test.page.css"],"JS":["/assets/js/Test.page.js"]},"__contextID":"CONTEXT_ID","__currentURL":"https://demo.test.fider.io:3000/","__favicon":"https://demo.test.fider.io:3000/favicon.ico","__logo":"https://getfider.com/images/logo-100x100.png","__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"}++ </script>+ <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=default,fetch" 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>++++</body>+</html>diff --git a/app/pkg/web/testdata/props.html b/app/pkg/web/testdata/props.htmlindex 9605892c5..0e46ccdc3 100755--- a/app/pkg/web/testdata/props.html+++ b/app/pkg/web/testdata/props.html@@ -10,6 +10,7 @@<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" />diff --git a/app/pkg/web/testdata/tenant.html b/app/pkg/web/testdata/tenant.htmlindex 4759eddea..d856f28bf 100755--- a/app/pkg/web/testdata/tenant.html+++ b/app/pkg/web/testdata/tenant.html@@ -10,6 +10,7 @@<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" />diff --git a/app/pkg/web/testdata/user.html b/app/pkg/web/testdata/user.htmlindex a21abedd6..7b35de5ad 100755--- a/app/pkg/web/testdata/user.html+++ b/app/pkg/web/testdata/user.html@@ -10,6 +10,7 @@<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" />diff --git a/package-lock.json b/package-lock.jsonindex b23261e90..72604ff99 100644--- a/package-lock.json+++ b/package-lock.json@@ -453,7 +453,7 @@},"ansi-escapes": {"version": "3.1.0",- "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz","integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==","dev": true},@@ -550,7 +550,7 @@},"array-equal": {"version": "1.0.0",- "resolved": "http://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",+ "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz","integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=","dev": true},@@ -641,7 +641,7 @@},"util": {"version": "0.10.3",- "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",+ "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz","integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=","dev": true,"requires": {@@ -791,7 +791,7 @@"dependencies": {"jsesc": {"version": "1.3.0",- "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz","integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=","dev": true},@@ -834,7 +834,7 @@},"babel-plugin-istanbul": {"version": "4.1.6",- "resolved": "http://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz",+ "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz","integrity": "sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==","dev": true,"requires": {@@ -852,7 +852,7 @@},"babel-plugin-syntax-object-rest-spread": {"version": "6.13.0",- "resolved": "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",+ "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz","integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=","dev": true},@@ -1173,7 +1173,7 @@},"browserify-aes": {"version": "1.2.0",- "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",+ "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz","integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==","dev": true,"requires": {@@ -1210,7 +1210,7 @@},"browserify-rsa": {"version": "4.0.1",- "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",+ "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz","integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=","dev": true,"requires": {@@ -1262,7 +1262,7 @@},"buffer": {"version": "4.9.1",- "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz","integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=","dev": true,"requires": {@@ -1362,7 +1362,7 @@},"camelcase-keys": {"version": "2.1.0",- "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz","integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=","dev": true,"requires": {@@ -1395,7 +1395,7 @@},"chalk": {"version": "1.1.3",- "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz","integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=","dev": true,"requires": {@@ -1771,7 +1771,7 @@},"create-hash": {"version": "1.2.0",- "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",+ "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz","integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==","dev": true,"requires": {@@ -1784,7 +1784,7 @@},"create-hmac": {"version": "1.1.7",- "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",+ "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz","integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==","dev": true,"requires": {@@ -1848,7 +1848,7 @@},"css-select": {"version": "1.2.0",- "resolved": "http://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",+ "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz","integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=","dev": true,"requires": {@@ -2121,7 +2121,7 @@},"diffie-hellman": {"version": "5.0.3",- "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",+ "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz","integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==","dev": true,"requires": {@@ -2156,7 +2156,7 @@"dependencies": {"domelementtype": {"version": "1.1.3",- "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz","integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=","dev": true}@@ -2422,7 +2422,7 @@},"es6-promisify": {"version": "5.0.0",- "resolved": "http://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",+ "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz","integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=","dev": true,"requires": {@@ -2525,7 +2525,7 @@},"events": {"version": "1.1.1",- "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz",+ "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz","integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=","dev": true},@@ -2830,7 +2830,7 @@},"fast-deep-equal": {"version": "1.1.0",- "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz","integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=","dev": true},@@ -3824,7 +3824,7 @@},"get-stream": {"version": "3.0.0",- "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz","integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=","dev": true},@@ -4381,7 +4381,7 @@},"is-builtin-module": {"version": "1.0.0",- "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",+ "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz","integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=","dev": true,"requires": {@@ -5233,7 +5233,7 @@},"jest-get-type": {"version": "22.4.3",- "resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz",+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz","integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==","dev": true},@@ -6090,7 +6090,7 @@},"jsesc": {"version": "0.5.0",- "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz","integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=","dev": true},@@ -6120,7 +6120,7 @@},"json5": {"version": "0.5.1",- "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz",+ "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz","integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=","dev": true},@@ -6187,7 +6187,7 @@},"load-json-file": {"version": "1.1.0",- "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",+ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz","integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=","dev": true,"requires": {@@ -6441,7 +6441,7 @@},"meow": {"version": "3.7.0",- "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",+ "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz","integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=","dev": true,"requires": {@@ -6459,7 +6459,7 @@"dependencies": {"minimist": {"version": "1.2.0",- "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz","integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=","dev": true}@@ -6601,7 +6601,7 @@},"minimist": {"version": "0.0.8",- "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz","integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=","dev": true},@@ -6664,7 +6664,7 @@},"mkdirp": {"version": "0.5.1",- "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz","integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=","dev": true,"requires": {@@ -6781,7 +6781,7 @@"dependencies": {"semver": {"version": "5.3.0",- "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz","integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=","dev": true}@@ -7178,7 +7178,7 @@},"os-homedir": {"version": "1.0.2",- "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",+ "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz","integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=","dev": true},@@ -7195,7 +7195,7 @@},"os-tmpdir": {"version": "1.0.2",- "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",+ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz","integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=","dev": true},@@ -7293,7 +7293,7 @@},"parse-asn1": {"version": "5.1.1",- "resolved": "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",+ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz","integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==","dev": true,"requires": {@@ -7380,7 +7380,7 @@},"path-is-absolute": {"version": "1.0.1",- "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz","integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=","dev": true},@@ -8147,7 +8147,7 @@},"regjsgen": {"version": "0.2.0",- "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",+ "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz","integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=","dev": true},@@ -8335,7 +8335,7 @@},"safe-regex": {"version": "1.1.0",- "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",+ "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz","integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=","dev": true,"requires": {@@ -8367,7 +8367,7 @@"dependencies": {"minimist": {"version": "1.2.0",- "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz","integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=","dev": true}@@ -8413,7 +8413,7 @@},"os-locale": {"version": "1.4.0",- "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz","integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=","dev": true,"requires": {@@ -8661,7 +8661,7 @@},"sha.js": {"version": "2.4.11",- "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",+ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz","integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==","dev": true,"requires": {@@ -9028,7 +9028,7 @@},"stream-browserify": {"version": "2.0.1",- "resolved": "http://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",+ "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz","integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=","dev": true,"requires": {@@ -9175,7 +9175,7 @@},"strip-ansi": {"version": "3.0.1",- "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz","integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=","dev": true,"requires": {@@ -9193,7 +9193,7 @@},"strip-eof": {"version": "1.0.0",- "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",+ "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz","integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=","dev": true},@@ -9226,7 +9226,7 @@},"tar": {"version": "2.2.1",- "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz",+ "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz","integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=","dev": true,"requires": {@@ -10033,7 +10033,7 @@"dependencies": {"minimist": {"version": "1.2.0",- "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz","integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=","dev": true}@@ -10490,7 +10490,7 @@},"wrap-ansi": {"version": "2.1.0",- "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz","integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=","dev": true,"requires": {@@ -10578,7 +10578,7 @@},"yargs": {"version": "11.1.0",- "resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz","integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==","dev": true,"requires": {diff --git a/public/AsyncPages.tsx b/public/AsyncPages.tsxindex f2d46287f..0a5ee6e02 100644--- a/public/AsyncPages.tsx+++ b/public/AsyncPages.tsx@@ -23,40 +23,87 @@ const retry = (fn: LazyImport, retriesLeft = MAX_RETRIES): Promise<{ default: Coconst load = (fn: LazyImport) => lazy(() => retry(() => fn()));-export const AsyncHomePage = load(() => import("@fider/pages/Home/Home.page"));+export const AsyncHomePage = load(() =>+ import(/* webpackChunkName: "Home.page" */+ "@fider/pages/Home/Home.page")+);-export const AsyncShowPostPage = load(() => import("@fider/pages/ShowPost/ShowPost.page"));+export const AsyncShowPostPage = load(() =>+ import(/* webpackChunkName: "ShowPost.page" */+ "@fider/pages/ShowPost/ShowPost.page")+);-export const AsyncManageMembersPage = load(() => import("@fider/pages/Administration/pages/ManageMembers.page"));+export const AsyncManageMembersPage = load(() =>+ import(/* webpackChunkName: "ManageMembers.page" */+ "@fider/pages/Administration/pages/ManageMembers.page")+);-export const AsyncManageTagsPage = load(() => import("@fider/pages/Administration/pages/ManageTags.page"));+export const AsyncManageTagsPage = load(() =>+ import(/* webpackChunkName: "ManageTags.page" */+ "@fider/pages/Administration/pages/ManageTags.page")+);-export const AsyncPrivacySettingsPage = load(() => import("@fider/pages/Administration/pages/PrivacySettings.page"));+export const AsyncPrivacySettingsPage = load(() =>+ import(/* webpackChunkName: "PrivacySettings.page" */+ "@fider/pages/Administration/pages/PrivacySettings.page")+);-export const AsyncExportPage = load(() => import("@fider/pages/Administration/pages/Export.page"));+export const AsyncExportPage = load(() =>+ import(/* webpackChunkName: "Export.page" */+ "@fider/pages/Administration/pages/Export.page")+);-export const AsyncInvitationsPage = load(() => import("@fider/pages/Administration/pages/Invitations.page"));+export const AsyncInvitationsPage = load(() =>+ import(/* webpackChunkName: "Invitations.page" */+ "@fider/pages/Administration/pages/Invitations.page")+);export const AsyncManageAuthenticationPage = load(() =>- import("@fider/pages/Administration/pages/ManageAuthentication.page")+ import(/* webpackChunkName: "ManageAuthentication.page" */+ "@fider/pages/Administration/pages/ManageAuthentication.page"));-export const AsyncAdvancedSettingsPage = load(() => import("@fider/pages/Administration/pages/AdvancedSettings.page"));+export const AsyncAdvancedSettingsPage = load(() =>+ import(/* webpackChunkName: "AdvancedSettings.page" */+ "@fider/pages/Administration/pages/AdvancedSettings.page")+);-export const AsyncGeneralSettingsPage = load(() => import("@fider/pages/Administration/pages/GeneralSettings.page"));+export const AsyncGeneralSettingsPage = load(() =>+ import(/* webpackChunkName: "GeneralSettings.page" */+ "@fider/pages/Administration/pages/GeneralSettings.page")+);-export const AsyncSignInPage = load(() => import("@fider/pages/SignIn/SignIn.page"));+export const AsyncSignInPage = load(() =>+ import(/* webpackChunkName: "SignIn.page" */+ "@fider/pages/SignIn/SignIn.page")+);-export const AsyncSignUpPage = load(() => import("@fider/pages/SignUp/SignUp.page"));+export const AsyncSignUpPage = load(() =>+ import(/* webpackChunkName: "SignUp.page" */+ "@fider/pages/SignUp/SignUp.page")+);export const AsyncCompleteSignInProfilePage = load(() =>- import("@fider/pages/CompleteSignInProfile/CompleteSignInProfile.page")+ import(/* webpackChunkName: "CompleteSignInProfile.page" */+ "@fider/pages/CompleteSignInProfile/CompleteSignInProfile.page"));-export const AsyncMyNotificationsPage = load(() => import("@fider/pages/MyNotifications/MyNotifications.page"));+export const AsyncMyNotificationsPage = load(() =>+ import(/* webpackChunkName: "MyNotifications.page" */+ "@fider/pages/MyNotifications/MyNotifications.page")+);-export const AsyncMySettingsPage = load(() => import("@fider/pages/MySettings/MySettings.page"));+export const AsyncMySettingsPage = load(() =>+ import(/* webpackChunkName: "MySettings.page" */+ "@fider/pages/MySettings/MySettings.page")+);-export const AsyncOAuthEchoPage = load(() => import("@fider/pages/OAuthEcho/OAuthEcho.page"));+export const AsyncOAuthEchoPage = load(() =>+ import(/* webpackChunkName: "OAuthEcho.page" */+ "@fider/pages/OAuthEcho/OAuthEcho.page")+);-export const AsyncUIToolkitPage = load(() => import("@fider/pages/UI/UIToolkit.page"));+export const AsyncUIToolkitPage = load(() =>+ import(/* webpackChunkName: "UIToolkit.page" */+ "@fider/pages/UI/UIToolkit.page")+);diff --git a/public/pages/Administration/pages/ManageAuthentication.page.tsx b/public/pages/Administration/pages/ManageAuthentication.page.tsxindex 18c3709cc..f30233b8b 100644--- a/public/pages/Administration/pages/ManageAuthentication.page.tsx+++ b/public/pages/Administration/pages/ManageAuthentication.page.tsx@@ -1,5 +1,3 @@-import "./ManageAuthentication.page.scss";-import React from "react";import { Segment, List, ListItem, Button, Heading, OAuthProviderLogo } from "@fider/components";@@ -9,6 +7,8 @@ import { actions, notify, Fider } from "@fider/services";import { FaEdit, FaPlay, FaSignInAlt } from "react-icons/fa";import { AdminBasePage } from "../components/AdminBasePage";+import "./ManageAuthentication.page.scss";+interface ManageAuthenticationPageProps {providers: OAuthProviderOption[];}diff --git a/views/base.html b/views/base.htmlindex 5d73e43d6..0fd04ecd0 100644--- a/views/base.html+++ b/views/base.html@@ -10,6 +10,14 @@<link rel="stylesheet" href="{{ $.__settings.globalAssetsURL }}{{ . }}" />{{end}}{{end}}+ {{ if .__chunkAssets }}+ {{range .__chunkAssets.CSS}}+ <link rel="preload" href="{{ $.__settings.globalAssetsURL }}{{ . }}" as="style" />+ {{end}}+ {{range .__chunkAssets.JS}}+ <link rel="preload" href="{{ $.__settings.globalAssetsURL }}{{ . }}" as="script" />+ {{end}}+ {{end}}<title>{{ .__title }}</title><meta name="description" content="{{ .__description }}" /><meta property="og:title" content="{{ .__title }}" />diff --git a/webpack.config.js b/webpack.config.jsindex 013da8163..21a83b11f 100755--- a/webpack.config.js+++ b/webpack.config.js@@ -22,7 +22,7 @@ const plugins = [children: false,chunks: false,entrypoints: true,- chunkGroups: false,+ chunkGroups: true,modules: false}})