From d3043c0ab04313399ced02729cbe5103460103ad Mon Sep 17 00:00:00 2001 From: igoradamenko Date: Sat, 14 Apr 2018 21:41:51 +0300 Subject: [PATCH] replace BASE_URL by REMARK_URL in runtime --- start.sh | 4 ++++ web/app/common/constants.js | 2 +- web/counter.ejs | 3 ++- web/index.ejs | 3 ++- web/last-comments.ejs | 3 ++- web/webpack.config.js | 6 ------ 6 files changed, 11 insertions(+), 10 deletions(-) mode change 100644 => 100755 start.sh diff --git a/start.sh b/start.sh old mode 100644 new mode 100755 index d602fc11..b30eac91 --- a/start.sh +++ b/start.sh @@ -2,5 +2,9 @@ echo "prepare environment" +# replace base url by REMARK_URL +sed -i "s|BASE_URL:\"[^\"]*\"|BASE_URL:\"${REMARK_URL}\"|g" /srv/web/*.js +sed -i "s|var baseurl = '[^']*';|var baseurl = '${REMARK_URL}';|g" /srv/web/*.html + echo "start remark42 server" /sbin/su-exec umputun /srv/remark server diff --git a/web/app/common/constants.js b/web/app/common/constants.js index c8a65b56..873f893e 100644 --- a/web/app/common/constants.js +++ b/web/app/common/constants.js @@ -1,4 +1,4 @@ -const BASE_URL = process.env.BASE_URL; +const BASE_URL = '/'; const API_BASE = '/api/v1'; const NODE_ID = 'remark42'; const COUNTER_NODE_CLASSNAME = 'remark42__counter'; diff --git a/web/counter.ejs b/web/counter.ejs index a92aba7d..dbf185e9 100644 --- a/web/counter.ejs +++ b/web/counter.ejs @@ -44,7 +44,8 @@ (function() { var d = document, s = d.createElement('script'); - s.src = '<%= htmlWebpackPlugin.options.baseUrl %>/web/counter.js'; + var baseurl = ''; + s.src = baseurl + '/web/counter.js'; s.type = 'text/javascript'; (d.head || d.body).appendChild(s); })(); diff --git a/web/index.ejs b/web/index.ejs index da76f8c4..d060900e 100644 --- a/web/index.ejs +++ b/web/index.ejs @@ -30,7 +30,8 @@ (function() { var d = document, s = d.createElement('script'); - s.src = '<%= htmlWebpackPlugin.options.baseUrl %>/web/embed.js'; + var baseurl = ''; + s.src = baseurl + '/web/embed.js'; s.type = 'text/javascript'; (d.head || d.body).appendChild(s); })(); diff --git a/web/last-comments.ejs b/web/last-comments.ejs index d7722969..5b5c7929 100644 --- a/web/last-comments.ejs +++ b/web/last-comments.ejs @@ -29,7 +29,8 @@ (function() { var d = document, s = d.createElement('script'); - s.src = '<%= htmlWebpackPlugin.options.baseUrl %>/web/last-comments.js'; + var baseurl = ''; + s.src = baseurl + '/web/last-comments.js'; s.type = 'text/javascript'; (d.head || d.body).appendChild(s); })(); diff --git a/web/webpack.config.js b/web/webpack.config.js index ea1d62d0..ad6c0c14 100644 --- a/web/webpack.config.js +++ b/web/webpack.config.js @@ -11,11 +11,9 @@ const Define = webpack.DefinePlugin; const { NODE_ID } = require('./app/common/constants'); const publicFolder = path.resolve(__dirname, 'public'); const env = process.env.NODE_ENV || 'dev'; -const url = process.env.REMARK_URL || 'https://demo.remark42.com'; // let's log some env variables because we can console.log(`NODE_ENV = ${env}`); -console.log(`REMARK_URL = ${url}`); const commonStyleLoaders = [ 'css-loader', @@ -102,27 +100,23 @@ module.exports = { }), new Define({ 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV), - 'process.env.BASE_URL': JSON.stringify(url), }), // TODO: we should add it only on demo serv new Html({ template: path.resolve(__dirname, 'index.ejs'), inject: false, - baseUrl: url, }), // TODO: we should add it only on demo serv new Html({ template: path.resolve(__dirname, 'counter.ejs'), filename: 'counter.html', inject: false, - baseUrl: url, }), // TODO: we should add it only on demo serv new Html({ template: path.resolve(__dirname, 'last-comments.ejs'), filename: 'last-comments.html', inject: false, - baseUrl: url, }), ...(env === 'production' ? [] : [new Html({ template: path.resolve(__dirname, 'dev.ejs'),