Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

refactoring: compile vendor packages into a separate bundle (#413)

Guilherme Oenningc7339343171b
diff --git a/app/cmd/routes.go b/app/cmd/routes.go
index 827e947bf..9322229fa 100644
--- a/app/cmd/routes.go
+++ b/app/cmd/routes.go
@@ -19,6 +19,7 @@ func routes(r *web.Engine) *web.Engine {
assets := r.Group()
{
+ assets.Use(middlewares.CORS())
assets.Use(middlewares.ClientCache(365 * 24 * time.Hour))
assets.Static("/favicon.ico", "favicon.ico")
assets.Static("/assets/*filepath", "dist")
diff --git a/app/middlewares/cors.go b/app/middlewares/cors.go
new file mode 100644
index 000000000..dd39d93fc
--- /dev/null
+++ b/app/middlewares/cors.go
@@ -0,0 +1,16 @@
+package middlewares
+
+import (
+ "github.com/getfider/fider/app/pkg/web"
+)
+
+// CORS adds Cross-Origin Resource Sharing response headers
+func CORS() web.MiddlewareFunc {
+ return func(next web.HandlerFunc) web.HandlerFunc {
+ return func(c web.Context) error {
+ c.Response.Header().Set("Access-Control-Allow-Origin", "*")
+ c.Response.Header().Set("Access-Control-Allow-Methods", "GET")
+ return next(c)
+ }
+ }
+}
diff --git a/app/middlewares/cors_test.go b/app/middlewares/cors_test.go
new file mode 100644
index 000000000..aececf5c3
--- /dev/null
+++ b/app/middlewares/cors_test.go
@@ -0,0 +1,27 @@
+package middlewares_test
+
+import (
+ "net/http"
+ "testing"
+
+ "github.com/getfider/fider/app/middlewares"
+ . "github.com/getfider/fider/app/pkg/assert"
+ "github.com/getfider/fider/app/pkg/mock"
+ "github.com/getfider/fider/app/pkg/web"
+)
+
+func TestCORS(t *testing.T) {
+ RegisterT(t)
+
+ server, _ := mock.NewServer()
+ server.Use(middlewares.CORS())
+ handler := func(c web.Context) error {
+ return c.NoContent(http.StatusOK)
+ }
+
+ status, response := server.Execute(handler)
+
+ Expect(status).Equals(http.StatusOK)
+ Expect(response.Header().Get("Access-Control-Allow-Origin")).Equals("*")
+ Expect(response.Header().Get("Access-Control-Allow-Methods")).Equals("GET")
+}
diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.go
index 247e7738d..f26de970d 100644
--- a/app/pkg/web/renderer.go
+++ b/app/pkg/web/renderer.go
@@ -28,11 +28,12 @@ var templateFunctions = template.FuncMap{
//Renderer is the default HTML Render
type Renderer struct {
- templates map[string]*template.Template
- logger log.Logger
- settings *models.SystemSettings
- jsBundle string
- cssBundle string
+ templates map[string]*template.Template
+ logger log.Logger
+ settings *models.SystemSettings
+ jsBundle string
+ vendorBundle string
+ cssBundle string
}
// NewRenderer creates a new Renderer
@@ -51,8 +52,9 @@ func NewRenderer(settings *models.SystemSettings, logger log.Logger) *Renderer {
r.add("410.html")
r.add("500.html")
- r.jsBundle = r.getBundle("/dist/js")
- r.cssBundle = r.getBundle("/dist/css")
+ r.jsBundle = r.getBundle("/dist/js", "main")
+ r.vendorBundle = r.getBundle("/dist/js", "vendor")
+ r.cssBundle = r.getBundle("/dist/css", "main")
return r
}
@@ -70,15 +72,20 @@ func (r *Renderer) add(name string) *template.Template {
return tpl
}
-func (r *Renderer) getBundle(folder string) string {
+func (r *Renderer) getBundle(folder, prefix string) string {
files, _ := ioutil.ReadDir(env.Path(folder))
if len(files) > 0 {
- return files[0].Name()
+ for _, file := range files {
+ fileName := file.Name()
+ if strings.HasPrefix(fileName, prefix) {
+ return fileName
+ }
+ }
}
// Panic if bundle is not available in production mode
if env.IsProduction() {
- panic(fmt.Sprintf("Bundle not found: %s.", folder))
+ panic(fmt.Sprintf("Bundle not found: %s/%s.", folder, prefix))
}
return ""
@@ -93,8 +100,9 @@ func (r *Renderer) Render(w io.Writer, name string, props Props, ctx *Context) {
if env.IsDevelopment() {
tmpl = r.add(name)
- r.jsBundle = r.getBundle("/dist/js")
- r.cssBundle = r.getBundle("/dist/css")
+ r.jsBundle = r.getBundle("/dist/js", "main")
+ r.vendorBundle = r.getBundle("/dist/js", "vendor")
+ r.cssBundle = r.getBundle("/dist/css", "main")
}
m := props.Data
@@ -119,8 +127,9 @@ func (r *Renderer) Render(w io.Writer, name string, props Props, ctx *Context) {
m["__Description"] = fmt.Sprintf("%.150s", description)
}
- m["__JavaScriptBundle"] = r.jsBundle
- m["__StyleBundle"] = r.cssBundle
+ m["__VendorBundle"] = "/assets/js/" + r.vendorBundle
+ m["__JavaScriptBundle"] = "/assets/js/" + r.jsBundle
+ m["__StyleBundle"] = "/assets/css/" + r.cssBundle
m["__ContextID"] = ctx.ContextID()
if ctx.Tenant() != nil && ctx.Tenant().LogoID > 0 {
m["__logo"] = fmt.Sprintf("%s/logo/200/%d", ctx.BaseURL(), ctx.Tenant().LogoID)
diff --git a/views/base.html b/views/base.html
index a73231295..3381014c4 100644
--- a/views/base.html
+++ b/views/base.html
@@ -4,7 +4,7 @@
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<link rel="icon" type="image/x-icon" href="{{ .__favicon }}">
- <link rel="stylesheet" href="/assets/css/{{ .__StyleBundle }}" />
+ <link rel="stylesheet" href="{{ .__StyleBundle }}" />
<title>{{ .__Title }}</title>
<meta name="description" content="{{ .__Description }}" />
<meta property="og:title" content="{{ .__Title }}" />
@@ -43,7 +43,8 @@
{{template "content" .}}
<script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=default,fetch"></script>
- <script src="/assets/js/{{ .__JavaScriptBundle }}"></script>
+ <script src="{{ .__VendorBundle }}"></script>
+ <script src="{{ .__JavaScriptBundle }}"></script>
<script type="text/javascript" nonce="{{ .__ContextID }}">
{{template "javascript" .}}
</script>
diff --git a/webpack.config.js b/webpack.config.js
index 3f626ac6a..935f5c4ec 100755
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -5,60 +5,75 @@ const publicFolder = path.resolve(__dirname, "public");
const isProduction = process.env.NODE_ENV === "production";
const plugins = [
- new MiniCssExtractPlugin({
- filename: "css/[name].[hash].css",
- chunkFilename: "css/[name].[hash].css"
- })
+ new MiniCssExtractPlugin({
+ filename: "css/[name].[hash].css",
+ chunkFilename: "css/[name].[hash].css"
+ })
];
if (!isProduction) {
- const CleanObsoleteChunks = require("webpack-clean-obsolete-chunks");
- plugins.push(new CleanObsoleteChunks());
+ const CleanObsoleteChunks = require("webpack-clean-obsolete-chunks");
+ plugins.push(new CleanObsoleteChunks());
}
module.exports = {
- mode: process.env.NODE_ENV || "development",
- entry: "./public/index.tsx",
- output: {
- path: __dirname + "/dist",
- filename: "js/bundle.[chunkhash].js",
- publicPath: "/assets/",
- },
- devtool: "source-map",
- resolve: {
- extensions: [".ts", ".tsx", ".js"],
- alias: {
- "@fider": publicFolder
- }
- },
- module: {
- rules: [
- {
- test: /\.(css|scss)$/,
- use: [
- MiniCssExtractPlugin.loader,
- "css-loader",
- "sass-loader"
- ]
- },
- {
- test: /\.(ts|tsx)$/,
- include: publicFolder,
- use: "ts-loader",
- },
- {
- test: /\.(eot|svg|ttf|woff|woff2)$/,
- use: "file-loader?name=fonts/[name].[hash].[ext]"
- },
- {
- test: /\.(png|gif|jpg|jpeg)$/,
- use: "file-loader?name=images/[name].[hash].[ext]"
- }
+ mode: process.env.NODE_ENV || "development",
+ entry: {
+ main: "./public/index.tsx",
+ vendor: [ "react", "react-dom", "semantic-ui-react" ]
+ },
+ output: {
+ path: __dirname + "/dist",
+ filename: "js/[name].[chunkhash].js",
+ publicPath: "/assets/",
+ },
+ devtool: "source-map",
+ resolve: {
+ extensions: [".ts", ".tsx", ".js"],
+ alias: {
+ "@fider": publicFolder
+ }
+ },
+ module: {
+ rules: [
+ {
+ test: /\.(css|scss)$/,
+ use: [
+ MiniCssExtractPlugin.loader,
+ "css-loader",
+ "sass-loader"
]
- },
- plugins,
- stats: {
- children: false,
- modules: false,
+ },
+ {
+ test: /\.(ts|tsx)$/,
+ include: publicFolder,
+ use: "ts-loader",
+ },
+ {
+ test: /\.(eot|svg|ttf|woff|woff2)$/,
+ use: "file-loader?name=fonts/[name].[hash].[ext]"
+ },
+ {
+ test: /\.(png|gif|jpg|jpeg)$/,
+ use: "file-loader?name=images/[name].[hash].[ext]"
+ }
+ ]
+ },
+ optimization: {
+ splitChunks: {
+ cacheGroups: {
+ vendor: {
+ chunks: 'initial',
+ name: 'vendor',
+ test: 'vendor',
+ enforce: true
+ },
+ }
}
+ },
+ plugins,
+ stats: {
+ children: false,
+ modules: false,
+ }
};
\ No newline at end of file