wip: attempt to fix base url issue, closes jekyll#471

lexoyo · Apr 15, 2019 · 1f9f477 · 1f9f477
1 parent bc053b3
commit 1f9f477
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 18 deletions.
diff --git a/lib/jekyll-admin/static_server.rb b/lib/jekyll-admin/static_server.rb
@@ -6,7 +6,7 @@ class StaticServer < Sinatra::Base
 
     # Allow `/admin` and `/admin/`, and `/admin/*` to serve `/public/dist/index.html`
     get "/*" do
-      send_file index_path
+      File.read(index_path).gsub(/%baseurl%/, JekyllAdmin.site.config["baseurl"])
     end
 
     # Provide a descriptive error message in dev. if frontend is not build

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
@@ -18,8 +18,8 @@ def start_up_webrick(opts, destination)
         end
 
         def jekyll_admin_monkey_patch(server)
-          server.mount "/admin", Rack::Handler::WEBrick, JekyllAdmin::StaticServer
-          server.mount "/_api",  Rack::Handler::WEBrick, JekyllAdmin::Server
+          server.mount JekyllAdmin.site.config["baseurl"] + "/admin", Rack::Handler::WEBrick, JekyllAdmin::StaticServer
+          server.mount JekyllAdmin.site.config["baseurl"] + "/_api",  Rack::Handler::WEBrick, JekyllAdmin::Server
           Jekyll.logger.info "JekyllAdmin mode:", ENV["RACK_ENV"] || "production"
         end
       end

diff --git a/script/test-server b/script/test-server
@@ -5,4 +5,4 @@ set -e
 script/branding
 
 cd ./spec/fixtures/site || exit
-RACK_ENV=development bundle exec jekyll serve --verbose --watch
+RACK_ENV=development bundle exec jekyll serve --verbose --watch -H 192.168.122.1 --port 3000
diff --git a/spec/fixtures/site/_config.yml b/spec/fixtures/site/_config.yml
@@ -1,5 +1,7 @@
 title: Your awesome title
 
+baseurl: /example
+
 # Load the admin interface.
 plugins:
   - jekyll-admin

diff --git a/src/constants/api.js b/src/constants/api.js
@@ -1,7 +1,9 @@
 export const API =
   process.env.NODE_ENV === 'production'
-    ? '/_api'
-    : 'http://localhost:4000/_api';
+    ? `${window.location.pathname.split('/admin')[0]}/_api`
+    : `http://localhost:4000${
+        window.location.pathname.split('/admin')[0]
+      }/_api`;
 
 export const getConfigurationUrl = () => `${API}/configuration`;
 export const putConfigurationUrl = () => `${API}/configuration`;

diff --git a/src/constants/index.js b/src/constants/index.js
@@ -1,2 +1,11 @@
 export const VERSION = 'v0.8.1';
-export const ADMIN_PREFIX = '/admin';
+export const ADMIN_PREFIX = getPrefix();
+
+function getPrefix() {
+  // TODO:
+  // * 1 line does not compile (export const ADMIN_PREFIX = ...)
+  // * window is not defined during tests, see why and test with baseurl
+  return typeof window != 'undefined'
+    ? `${window.location.pathname.split('/admin')[0]}/admin`
+    : '/admin';
+}
diff --git a/src/index.html b/src/index.html
@@ -4,10 +4,10 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Jekyll Admin</title>
-    <link rel="shortcut icon" href="/admin/favicon.ico">
+    <link rel="shortcut icon" href="%baseurl%/admin/favicon.ico">
   </head>
   <body>
     <div id="root"></div>
-    <script src="/admin/bundle.js"></script>
+    <script src="%baseurl%/admin/bundle.js"></script>
   </body>
 </html>
diff --git a/tools/buildHtml.js b/tools/buildHtml.js
@@ -2,7 +2,7 @@
 /* eslint-disable no-console */
 
 import fs from 'fs';
-import {chalkSuccess, chalkError} from './chalkConfig';
+import { chalkSuccess, chalkError } from './chalkConfig';
 import cheerio from 'cheerio';
 
 fs.readFile('src/index.html', 'utf8', (readError, markup) => {
@@ -13,16 +13,23 @@ fs.readFile('src/index.html', 'utf8', (readError, markup) => {
   const $ = cheerio.load(markup);
 
   // since a separate spreadsheet is only utilized for the production build, need to dynamically add this here.
-  $('head').append('<link rel="stylesheet" href="/admin/styles.css">');
+  $('head').append('<link rel="stylesheet" href="%baseurl%/admin/styles.css">');
 
-  fs.writeFile('lib/jekyll-admin/public/index.html', $.html(), 'utf8', (writeError) => {
-    if (writeError) {
-      return console.log(chalkError(writeError));
-    }
-    console.log(chalkSuccess('index.html written to /lib/jekyll-admin/public/'));
+  fs.writeFile(
+    'lib/jekyll-admin/public/index.html',
+    $.html(),
+    'utf8',
+    writeError => {
+      if (writeError) {
+        return console.log(chalkError(writeError));
+      }
+      console.log(
+        chalkSuccess('index.html written to /lib/jekyll-admin/public/')
+      );
 
-    return writeError;
-  });
+      return writeError;
+    }
+  );
 
   return readError;
 });