@rollup-extras/plugin-html 2.1.0 → 2.1.2

package/README.md

@@ -1,3 +1,5 @@
+![Coverage](https://raw.githubusercontent.com/kshutkin/rollup-extras/refs/heads/coverage/plugin-html/badge.svg)
+
 # Plugin Html
 
 Rollup plugin to inject assets names into html template.

package/asset-factories.js

@@ -35,10 +35,15 @@ export function simpleModuleScript(predicateSource) {
 
 export function combineAssetFactories(...factories) {
     return (fileName, content, type) => {
-        for (const factory of factories) {
-            const result = factory(fileName, content, type);
-            if (result) {
-                return result;
+        return next(0);
+
+        function next(start) {
+            for (let index = start; index < factories.length; index++) {
+                const result = factories[index](fileName, content, type);
+                if (result instanceof Promise) {
+                    return result.then(asset => asset || next(index + 1));
+                }
+                if (result) return result;
             }
         }
     };

package/index.js

@@ -79,18 +79,18 @@ export default function (options = {}) {
                     handleTemplateReadError(e);
                 }
             } else {
-                templateString = new Promise(resolve => {
-                    readFile(template, { encoding: 'utf8' })
-                        .then(newTemplateString => {
-                            if (!isUsableByDefaultTemplateFactory(newTemplateString) && !hasCustomTemplateFactory) {
-                                warnAboutUsingDefaultTemplate();
-                                resolve(defaultTemplate);
-                            } else {
-                                resolve(newTemplateString);
-                            }
-                        })
-                        .catch(handleTemplateReadError);
-                });
+                templateString = readFile(template, { encoding: 'utf8' })
+                    .then(newTemplateString => {
+                        if (!isUsableByDefaultTemplateFactory(newTemplateString) && !hasCustomTemplateFactory) {
+                            warnAboutUsingDefaultTemplate();
+                            return defaultTemplate;
+                        }
+                        return newTemplateString;
+                    })
+                    .catch(e => {
+                        handleTemplateReadError(e);
+                        return defaultTemplate;
+                    });
             }
         }
     }
@@ -245,7 +245,7 @@ export default function (options = {}) {
         const dir = options.dir ?? '';
         for (const fileName of Object.keys(bundle)) {
             const relativeToRootAssetPath = join(dir, fileName);
-            const assetPath = relative(initialDir, relativeToRootAssetPath);
+            const assetPath = getAssetPath(relativeToRootAssetPath);
             if (ignore(relativeToRootAssetPath) || processedFiles.has(relativeToRootAssetPath)) {
                 continue;
             }
@@ -285,7 +285,7 @@ export default function (options = {}) {
                     if (modulepreload && options.format === 'es') {
                         const transitiveImports = collectTransitiveImports(bundle, fileName);
                         for (const importFileName of transitiveImports) {
-                            const importAssetPath = relative(initialDir, join(dir, importFileName));
+                            const importAssetPath = getAssetPath(join(dir, importFileName));
                              (assets.asset).push({
                                 html: getModulePreloadElement(importAssetPath),
                                 head: true,
@@ -298,6 +298,10 @@ export default function (options = {}) {
         }
     }
 
+    function getAssetPath(fileName) {
+        return relative(dirname(fileNameInInitialDir), fileName).replaceAll('\\', '/');
+    }
+
     async function useAssetFactory(fileName, relativeToRootAssetPath, source, format) {
         if (assetsFactory) {
             try {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.1.0",
+  "version": "2.1.2",
   "license": "MIT",
   "name": "@rollup-extras/plugin-html",
   "author": "Konstantin Shutkin",