deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-13 11:12:22 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1979 from thelounge/astorije/index

Browse source 
Do not statically serve the index template prior to rendering it
This commit is contained in:
Jérémie Astori 2018-01-30 19:21:07 -05:00 committed by GitHub
parent bc05ca1c63 33d82287be
commit dcdc1d150f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.npmignore
View file

@ -11,6 +11,7 @@
client/**
!client/js/libs/handlebars/ircmessageparser/findLinks.js
!client/js/libs/handlebars/ircmessageparser/cleanIrcMessage.js
!client/index.html.tpl
public/js/bundle.vendor.js.map
coverage/

0
client/index.html → client/index.html.tpl
View file

2
src/server.js
View file

@ -251,7 +251,7 @@ function index(req, res, next) {
res.setHeader("Content-Security-Policy", policies.join("; "));
res.setHeader("Referrer-Policy", "no-referrer");
return fs.readFile(path.join(__dirname, "..", "public", "index.html"), "utf-8", (err, file) => {
return fs.readFile(path.join(__dirname, "..", "client", "index.html.tpl"), "utf-8", (err, file) => {
if (err) {
throw err;
}

5
test/tests/build.js
View file

@ -12,8 +12,9 @@ describe("public folder", function() {
expect(fs.existsSync(path.join(publicFolder, "fonts", "fontawesome-webfont.woff2"))).to.be.true;
});
it("index.html is copied", function() {
expect(fs.existsSync(path.join(publicFolder, "index.html"))).to.be.true;
it("index HTML file is not copied", function() {
expect(fs.existsSync(path.join(publicFolder, "index.html"))).to.be.false;
expect(fs.existsSync(path.join(publicFolder, "index.html.tpl"))).to.be.false;
});
it("javascript files are built", function() {

3
webpack.config.js
View file

@ -70,9 +70,10 @@ const config = {
from: "./client/js/loading-error-handlers.js",
to: "js/[name].[ext]",
},
{ // TODO: Build index.html with handlebars
{
from: "./client/*",
to: "[name].[ext]",
ignore: "index.html.tpl",
},
{
from: "./client/audio/*",