nodejs12: move BASE_URL to misc/ and use it in frame-tree/print

haraldschilly · haraldschilly · commit c04a4c501d3a · 2020-05-21T11:15:17.000Z
diff --git a/src/smc-webapp/frame-editors/frame-tree/print.ts b/src/smc-webapp/frame-editors/frame-tree/print.ts
@@ -14,7 +14,7 @@ import { HTML } from "smc-webapp/r_misc";
 //import ReactDOMServer from "react-dom/server";
 const ReactDOMServer = require("react-dom/server");
 import { React, Redux, redux } from "../../app-framework";
-const misc_page = require("../../misc_page");
+import { BASE_URL } from "../../misc/base-url";
 import { resource_links_string } from "smc-webapp/misc/resource-links";
 
 let BLOCKED: boolean | undefined = undefined;
@@ -106,8 +106,7 @@ function write_content(w, opts: PrintOptions): void {
 }
 
 function html_with_deps(html: string, title: string): string {
-  const BASE_URL = misc_page.BASE_URL;
-  const links = resource_links_string(BASE_URL)
+  const links = resource_links_string(BASE_URL);
   return `\
 <html lang="en">
     <head>
diff --git a/src/smc-webapp/misc/base-url.ts b/src/smc-webapp/misc/base-url.ts
@@ -0,0 +1,14 @@
+/*
+ *  This file is part of CoCalc: Copyright © 2020 Sagemath, Inc.
+ *  License: AGPLv3 s.t. "Commons Clause" – see LICENSE.md for details
+ */
+
+import { DOMAIN_NAME } from "../../smc-util/theme";
+import { join } from "path";
+
+export const APP_BASE_URL =
+  window != null && window.app_base_url != null ? window.app_base_url : "";
+
+const BASE_PATH = join(window.location.hostname, APP_BASE_URL);
+export const BASE_URL =
+  window != null ? `${window.location.protocol}//${BASE_PATH}` : DOMAIN_NAME;
diff --git a/src/smc-webapp/misc_page.coffee b/src/smc-webapp/misc_page.coffee
@@ -61,9 +61,9 @@ exports.is_enter       = (e) -> e.which is 13 and not e.shiftKey
 exports.is_ctrl_enter  = (e) -> e.which is 13 and e.ctrlKey
 exports.is_escape      = (e) -> e.which is 27
 
-{join} = require('path')
-exports.APP_BASE_URL = window?.app_base_url ? ''
-exports.BASE_URL = if window? then "#{window.location.protocol}//#{join(window.location.hostname, window.app_base_url ? '')}" else theme.DOMAIN_NAME
+base_url_lib = require("./misc/base-url")
+exports.APP_BASE_URL = exports.APP_BASE_URL
+exports.BASE_URL = exports.BASE_URL
 
 local_diff = exports.local_diff = (before, after) ->
     # Return object
