fix: use fallback absolute path when relative path method is broken

fixes straker#79
matmar10 · Aug 30, 2021 · 3feb70f · 3feb70f
1 parent 1c3a31e
commit 3feb70f
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 8 deletions.
diff --git a/examples/multiple-dirs/index.js b/examples/multiple-dirs/index.js
@@ -2,7 +2,15 @@ var path = require('path');
 
 var livingcss = require('../../index');
 
-livingcss('css/buttons.css', 'styleguide');
-livingcss(path.join(__dirname, 'css/buttons.css'), 'styleguide');
-livingcss(path.join(__dirname, 'css/buttons.css'), path.join(__dirname, 'styleguide'));
-livingcss('css/buttons.css', path.join(__dirname, 'styleguide'));
+(async function() {
+  try {
+    // all these methods should work:
+    await livingcss('css/buttons.css', 'styleguide');
+    // await livingcss(path.join(__dirname, 'css/buttons.css'), 'styleguide');
+    // await livingcss(path.join(__dirname, 'css/buttons.css'), path.join(__dirname, 'styleguide'));
+    // await livingcss('css/buttons.css', path.join(__dirname, 'styleguide'));
+  } catch (err) {
+    console.error(err);
+    console.error(err.stack);
+  }
+})();
diff --git a/lib/generate.js b/lib/generate.js
@@ -55,13 +55,30 @@ function generate(dest, template, context, options) {
   }
 
   return preprocess
-    .then(function() {
+    .then(async function() {
       // inline all stylesheets for polymer shared styles to work
       // @see https://www.polymer-project.org/1.0/docs/devguide/styling#style-modules
-      return utils.readFiles(context.stylesheets, function(data, file) {
+
+      const parsedStylesheetFile = function(data, file) {
         context.parsedStylesheets = context.parsedStylesheets || [];
         context.parsedStylesheets.push(utils.fixSVGIssue(data));
-      });
+      };
+
+      let fileList;
+      try {
+        fileList = await utils.readFiles(context.stylesheets, parsedStylesheetFile);
+      } catch (err) {
+        if ('ENOENT' !== err.code) {
+          throw err;
+        }
+        const destDir = path.dirname(dest);
+        const stylesheets = context.stylesheets.map((file) => {
+          return path.resolve(destDir, file);
+        });
+        fileList = await utils.readFiles(stylesheets, parsedStylesheetFile);
+      }
+
+      return fileList;
     })
     .then(function success() {
       var html = Handlebars.compile(template)(context);
@@ -94,4 +111,4 @@ function generate(dest, template, context, options) {
     });
 }
 
-module.exports = generate;
+module.exports = generate;