From 60f554f2fad11e4f7eefa43828de906c2a87985f Mon Sep 17 00:00:00 2001
From: sattellite <null@sattellite.me>
Date: Mon, 9 Nov 2020 16:46:55 +0300
Subject: [PATCH] Simplified definition of REMARK_URL to templates in webpack
 config

---
 frontend/comments.ejs      |  2 +-
 frontend/counter.ejs       |  2 +-
 frontend/index.ejs         |  2 +-
 frontend/last-comments.ejs |  2 +-
 frontend/webpack.config.js | 16 ++++------------
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/frontend/comments.ejs b/frontend/comments.ejs
index b7cdc7b9..50af6a97 100644
--- a/frontend/comments.ejs
+++ b/frontend/comments.ejs
@@ -68,7 +68,7 @@
 
         var remark_config = {
           site_id: query.site_id,
-          host: '<%= REMARK_URL %>' ,
+          host: '<%= htmlWebpackPlugin.options.remarkUrl %>',
           url: query.url
         };
 
diff --git a/frontend/counter.ejs b/frontend/counter.ejs
index 831a2180..70234b83 100644
--- a/frontend/counter.ejs
+++ b/frontend/counter.ejs
@@ -39,7 +39,7 @@
   <script>
     var remark_config = {
       site_id: 'remark',
-      host: '<%= REMARK_URL %>',
+      host: '<%= htmlWebpackPlugin.options.remarkUrl %>',
       url: 'https://remark42.com/demo/',
       components: ['counter']
     };
diff --git a/frontend/index.ejs b/frontend/index.ejs
index 60ed1c41..03cfbdbe 100644
--- a/frontend/index.ejs
+++ b/frontend/index.ejs
@@ -123,7 +123,7 @@
 
       var remark_config = {
         site_id: 'remark',
-        host: '<%= REMARK_URL %>',
+        host: '<%= htmlWebpackPlugin.options.remarkUrl %>',
         url: 'https://remark42.com/demo/',
         components: ['embed', 'counter'],
         // __colors__: {
diff --git a/frontend/last-comments.ejs b/frontend/last-comments.ejs
index 8c277831..ef2a20a1 100644
--- a/frontend/last-comments.ejs
+++ b/frontend/last-comments.ejs
@@ -25,7 +25,7 @@
     <script>
       var remark_config = {
         site_id: 'remark',
-        host: '<%= REMARK_URL %>',
+        host: '<%= htmlWebpackPlugin.options.remarkUrl %>',
         components: ['last-comments']
       };
 
diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js
index 1a16f8a7..fa418a8e 100644
--- a/frontend/webpack.config.js
+++ b/frontend/webpack.config.js
@@ -180,33 +180,25 @@ module.exports = () => ({
     new Html({
       template: path.resolve(__dirname, 'index.ejs'),
       inject: false,
-      templateParameters: {
-        REMARK_URL: remarkUrl,
-      },
+      remarkUrl,
     }),
     new Html({
       template: path.resolve(__dirname, 'counter.ejs'),
       filename: 'counter.html',
       inject: false,
-      templateParameters: {
-        REMARK_URL: remarkUrl,
-      },
+      remarkUrl,
     }),
     new Html({
       template: path.resolve(__dirname, 'last-comments.ejs'),
       filename: 'last-comments.html',
       inject: false,
-      templateParameters: {
-        REMARK_URL: remarkUrl,
-      },
+      remarkUrl,
     }),
     new Html({
       template: path.resolve(__dirname, 'comments.ejs'),
       filename: 'comments.html',
       inject: false,
-      templateParameters: {
-        REMARK_URL: remarkUrl,
-      },
+      remarkUrl,
     }),
     new MiniCssExtractPlugin({
       filename: '[name].css',