Niedzielski has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371093 )

Change subject: Chore: Move compiled static assets to dist/public
......................................................................


Chore: Move compiled static assets to dist/public

Before they would be put in dist/client making it confusing when
comparing them with src/client.

When adding server code compiling it will be clearer in dist/ what comes
from where.

Change-Id: I4feb32f5b34f3c0e39e46f9142c461121def9d13
---
M src/server/index.js
M webpack.config.js
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Niedzielski: Verified; Looks good to me, approved



diff --git a/src/server/index.js b/src/server/index.js
index 048c975..04ec4b8 100644
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -1,11 +1,11 @@
 const express = require("express");
 const page = require("./templates/page");
-const assets = require("../../dist/client/assets-manifest.json");
+const assets = require("../../dist/public/assets-manifest.json");
 
 const { PORT = 3000 } = process.env;
 const server = express();
 
-server.use(express.static("dist/client"));
+server.use(express.static("dist/public"));
 
 server.get("/", (req, res) => {
   res.status(200).send(page({ body: "Hello World!", assets }));
diff --git a/webpack.config.js b/webpack.config.js
index 80e9b38..8e83a38 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -7,7 +7,7 @@
 const isProd = process.env.NODE_ENV === "production";
 const paths = {
   client: {
-    output: path.resolve("./dist/client/")
+    output: path.resolve("./dist/public/")
   }
 };
 

-- 
To view, visit https://gerrit.wikimedia.org/r/371093
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4feb32f5b34f3c0e39e46f9142c461121def9d13
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Jhernandez <jhernan...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to