fix(*): set public path dynamically to fetch from cdn (#80)

ellie-app · Feb 2, 2019 · e311b93 · e311b93
1 parent c8b6990
commit e311b93
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 11 deletions.
diff --git a/assets/src/Ellie/Constants.js b/assets/src/Ellie/Constants.js
@@ -0,0 +1,5 @@
+export default {
+  publicPath: () => {
+    return document.head.querySelector("meta[name='public_path']").content;
+  }
+};
diff --git a/assets/src/Pages/Editor/index.js b/assets/src/Pages/Editor/index.js
@@ -23,12 +23,15 @@ import EllieUiCopyText from "../../Ellie/Ui/CopyText";
 import EllieUiSplitPane from "../../Ellie/Ui/SplitPane";
 import EllieUiCodeEditor from "../../Ellie/Ui/CodeEditor";
 import EllieUiOutput from "../../Ellie/Ui/Output";
+import EllieConstants from "../../Ellie/Constants";
 import "../../Ellie/Ui/CodeEditor.css";
 import "./Views/Setup.css";
 import "./Main.css";
 import Main from "./Main";
 import { Elm } from "./Main.elm";
 
+__webpack_public_path__ = EllieConstants.publicPath();
+
 document.addEventListener("DOMContentLoaded", () => {
   let flags = {};
   flags = Main.flags(flags);

diff --git a/assets/src/Pages/Embed/index.js b/assets/src/Pages/Embed/index.js
@@ -1,13 +1,16 @@
 import EllieUiIcon from "../../Ellie/Ui/Icon";
 import EllieUiCodeEditor from "../../Ellie/Ui/CodeEditor";
 import EllieUiOutput from "../../Ellie/Ui/Output";
+import EllieConstants from "../../Ellie/Constants";
 import NetworkAbsintheSocket from "../../Network/Absinthe/Socket";
 import EffectProgram from "../../Effect/Program";
 import PagesEmbedMain from "./Main";
 import "../../Ellie/Ui/CodeEditor.css";
 import "../../Ellie/Ui/Logo.css";
 import { Elm } from "./Main.elm";
 
+__webpack_public_path__ = EllieConstants.publicPath();
+
 document.addEventListener("DOMContentLoaded", () => {
   let flags = {};
 

diff --git a/assets/webpack.dev.config.js b/assets/webpack.dev.config.js
@@ -21,9 +21,9 @@ module.exports = {
   },
 
   output: {
-    path: path.resolve(__dirname, "../priv/static"),
-    publicPath: "http://localhost:8080/assets/",
-    filename: "[name].js"
+    path: path.resolve(__dirname + "/../priv/static"),
+    filename: "[name].js",
+    publicPath: "http://localhost:8080/assets/"
   },
 
   module: {

diff --git a/lib/ellie_web/endpoint.ex b/lib/ellie_web/endpoint.ex
@@ -13,14 +13,12 @@ defmodule EllieWeb.Endpoint do
     plug(Phoenix.CodeReloader)
   end
 
-  if Application.get_env(:ellie, :env) == :prod do
-    plug(Plug.Static,
-      at: "/assets",
-      from: :ellie,
-      gzip: true,
-      headers: %{"Service-Worker-Allowed" => "/", "Access-Control-Allow-Origin" => "*"}
-    )
-  end
+  plug(Plug.Static,
+    at: "/assets",
+    from: :ellie,
+    gzip: true,
+    headers: %{"Service-Worker-Allowed" => "/", "Access-Control-Allow-Origin" => "*"}
+  )
 
   plug(Plug.Logger)
 

diff --git a/lib/ellie_web/templates/page/editor.html.eex b/lib/ellie_web/templates/page/editor.html.eex
@@ -2,6 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
+    <meta name="public_path" content="<%= static_url(@conn, "/assets/") %>" />
     <link rel="icon" href="<%= static_url(@conn, "/assets/images/favicon.ico") %>" />
     <link rel="alternate" type="application/json+oembed" href="<%= oembed_url(@conn) %>" />
     <%= render("polyfills.html") %>

diff --git a/lib/ellie_web/templates/page/embed.html.eex b/lib/ellie_web/templates/page/embed.html.eex
@@ -2,6 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
+    <meta name="public_path" content="<%= static_url(@conn, "/assets/") %>" />
     <link rel="icon" href="<%= static_url(@conn, "/assets/images/favicon.ico") %>" />
     <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1" />
     <%= render("polyfills.html") %>