Fix up some static assets issues

webpro · Mar 31, 2018 · 38306fb · 38306fb
1 parent 47a5df1
commit 38306fb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/lib/options.js b/lib/options.js
@@ -85,7 +85,6 @@ function getSlideOptions(yamlOptions, extraOptions) {
     config.local,
     config.defaults
   );
-  options.themeUrl = (options.base + options.themeUrl).replace(/^\.http/, 'http');
   return options;
 }
 
@@ -94,7 +93,7 @@ function parseOptions(options) {
     options.base = '.';
   }
   if (options.theme) {
-    options.themeUrl = parseTheme(options.theme);
+    options.themeUrl = parseTheme(options);
   }
   if (options.highlightTheme) {
     options.highlightThemeUrl = '/css/highlight/' + options.highlightTheme + '.css';
@@ -129,15 +128,16 @@ function parsePreprocessor(preprocessor) {
   return preprocessor ? require(preprocessor) : defaults.preprocessorFn;
 }
 
-function parseTheme(theme) {
+function parseTheme(options) {
+  const { theme, static, base = '' } = options;
   const parsedUrl = url.parse(theme);
   if (parsedUrl.host) {
     return theme;
   } else {
     const revealTheme = revealThemes.find(
       themePath => path.basename(themePath).replace(path.extname(themePath), '') === theme
     );
-    return '/' + revealTheme || getAssetPath(theme);
+    return revealTheme || base + '/' + (static ? theme : getAssetPath(theme));
   }
 }
 

diff --git a/lib/serve.js b/lib/serve.js
@@ -13,8 +13,6 @@ const { getOptions } = require('./options');
 
 const staticDir = express.static;
 
-const getAsset = (req, res) => res.sendFile(path.resolve(process.cwd(), req.url.replace(/^\/_assets\//, '')));
-
 module.exports = function startServer(options, cb) {
   const app = express();
 
@@ -36,8 +34,7 @@ module.exports = function startServer(options, cb) {
 
   app.get(/(\w+\.md)/, renderMarkdown);
 
-  app.get('/_assets/*', getAsset);
-
+  app.use('/_assets', staticDir(process.cwd()));
   app.use('/', staticDir(process.cwd()));
 
   app.get('/*', (req, res, next) => {