@rollup-extras/plugin-script-loader 0.1.1 → 0.1.3

package/README.md

@@ -1,3 +1,5 @@
+![Coverage](https://raw.githubusercontent.com/kshutkin/rollup-extras/refs/heads/coverage/plugin-script-loader/badge.svg)
+
 # Plugin Script Loader
 
 Rollup plugin to mimic Webpack's `script-loader` inline behavior. Inlines raw scripts into the bundle in import order, or emits them as a separate asset file for non-module, non-strict mode execution.
@@ -40,6 +42,8 @@ The plugin intercepts imports that start with a configurable prefix (`script!` b
 - **`emit: 'inline'`** (default) — Inlines the raw source code directly into the bundle at the import site
 - **`emit: 'asset'`** — Collects all scripts and emits them as a separate concatenated asset file
 
+In asset mode, script order follows static dependency evaluation across modules: a script imported through a helper runs before a later direct import. Shared dependencies and cycles do not duplicate scripts. Scripts force-loaded by other plugins without a reachable import edge are appended in load order.
+
 Because the code is handled as real JavaScript (not wrapped in `eval()` or `new Function()`), it:
 
 - Preserves **import order** — scripts appear exactly as imported

package/index.js

@@ -43,8 +43,6 @@ export default function (options = {}) {
 
     const scripts = new Map();
 
-    const importOrder = [];
-
     async function tryReadSourcemap(filePath, code) {
 
         const inlineMatch = code.match(
@@ -77,6 +75,39 @@ export default function (options = {}) {
         return code.replace(/\n?\/\/[#@]\s*sourceMappingURL=.+?\s*$/, '');
     }
 
+    function getOrderedScripts(bundle) {
+        const visited = new Set();
+
+        const ordered = [];
+
+        const dynamicImports = [];
+
+        const visit = id => {
+            if (visited.has(id)) return;
+            visited.add(id);
+            const info = this.getModuleInfo(id);
+            if (!info || info.isExternal) return;
+            for (const dependency of info.importedIds) visit(dependency);
+            const script = scripts.get(id);
+            if (script) ordered.push(script);
+            dynamicImports.push(...info.dynamicallyImportedIds);
+        };
+
+        for (const item of Object.values(bundle)) {
+            if (item.type === 'chunk' && item.isEntry && item.facadeModuleId) visit(item.facadeModuleId);
+        }
+        for (const id of this.getModuleIds()) {
+            if (this.getModuleInfo(id)?.isEntry) visit(id);
+        }
+
+        for (const id of dynamicImports) visit(id);
+
+        for (const [id, script] of scripts) {
+            if (!visited.has(id)) ordered.push(script);
+        }
+        return ordered;
+    }
+
     return  ({
         name: pluginName,
 
@@ -111,18 +142,6 @@ export default function (options = {}) {
             };
         },
 
-        moduleParsed(moduleInfo) {
-            if (emit !== 'asset') {
-                return;
-            }
-
-            for (const importedId of moduleInfo.importedIds) {
-                if (importedId.startsWith(scriptPrefix) && !importOrder.includes(importedId)) {
-                    importOrder.push(importedId);
-                }
-            }
-        },
-
         async load(id) {
             if (!id.startsWith(scriptPrefix)) {
                 return null;
@@ -174,23 +193,11 @@ export default function (options = {}) {
                 return;
             }
 
-            const sortedEntries = Array.from(scripts.entries())
-                .sort(([idA], [idB]) => {
-                    const orderA = importOrder.indexOf(idA);
-                    const orderB = importOrder.indexOf(idB);
-
-                    if (orderA !== -1 && orderB !== -1) {
-                        return orderA - orderB;
-                    }
-                    if (orderA !== -1) return -1;
-                    if (orderB !== -1) return 1;
-                    return 0;
-                })
-                .map(([, entry]) => entry);
+            const sortedEntries = getOrderedScripts.call(this, bundle);
 
             const outputDir = _outputOptions.dir ?? (_outputOptions.file ? dirname(_outputOptions.file) : process.cwd());
 
-            const magicBundle = new Bundle({ separator: '\n' });
+            const magicBundle = new Bundle({ separator: '\n;\n' });
 
             for (const entry of sortedEntries) {
                 const ms = new MagicString(entry.code, {
@@ -313,7 +320,6 @@ export default function (options = {}) {
 
         closeBundle() {
             scripts.clear();
-            importOrder.length = 0;
         },
     });
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.1",
+  "version": "0.1.3",
   "license": "MIT",
   "name": "@rollup-extras/plugin-script-loader",
   "author": "Konstantin Shutkin",
@@ -37,7 +37,7 @@
     "@ampproject/remapping": "^2.3.0",
     "@niceties/logger": "^2.1.0",
     "magic-string": "^0.30.21",
-    "@rollup-extras/utils": "^2.0.0"
+    "@rollup-extras/utils": "^2.0.2"
   },
   "peerDependencies": {
     "rollup": "^4.0.0"