Revert "feat: Add support for base_url and secure_base_url" (#453)

This reverts commit cc3ca08.
bigcommerce · Apr 3, 2019 · 74d1122 · 74d1122 · jeremysimmons · May 9, 2019
1 parent 3437bc0
commit 74d1122
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/server/plugins/renderer/renderer.module.js b/server/plugins/renderer/renderer.module.js
@@ -392,9 +392,6 @@ internals.getPencilResponse = function (data, request, response, configuration)
  data.context.settings.theme_config_id = Utils.int2uuid(request.app.themeConfig.variationIndex + 1);
  data.context.settings.theme_session_id = null;
  data.context.settings.maintenance = {secure_path: `http://localhost:${internals.options.stencilEditorPort}`};
- data.context.settings.base_url = `http://${request.info.host}`;
- // intentionally not secure, stencil-cli doesn't have an ssl-bound port
- data.context.settings.secure_base_url = `http://${request.info.host}`;
 
  return new Responses.PencilResponse({
  template_file: internals.getTemplatePath(request.path, data),

diff --git a/server/plugins/renderer/responses/pencil-response.js b/server/plugins/renderer/responses/pencil-response.js
@@ -76,6 +76,14 @@ internals.makeDecorator = function (request, context) {
  var regex,
  debugBar;
 
+ if (context.settings) {
+ regex = new RegExp(internals.escapeRegex(context.settings.base_url), 'g');
+ content = content.replace(regex, '');
+
+ regex = new RegExp(internals.escapeRegex(context.settings.secure_base_url), 'g');
+ content = content.replace(regex, '');
+ }
+
  if (request.query.debug === 'bar') {
  debugBar = '<pre style="background-color:#EEE; word-wrap:break-word;">';
  debugBar += internals.escapeHtml(JSON.stringify(context, null, 2)) + '</pre>';