fix script value (#1614)

* fix accessing * adds new function by type * updates function to remove loop --------- Co-authored-by: C. J. Tantay <[email protected]>
datadesk · Nov 7, 2024 · 660993e · 660993e
1 parent 1e5f4f5
commit 660993e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/lib/blocks/script.js b/lib/blocks/script.js
@@ -3,15 +3,21 @@ import debug from 'debug';
 import { getStaticPathFromManifestEntry } from './static.js';
 
 const logger = debug('baker:blocks:script');
+const EntryTypes = {
+  CSS: 'css',
+  MODERN: 'modern',
+  LEGACY: 'legacy',
+};
 
 export function createScriptBlock(rollup) {
   return function script(entry, shouldPreload = false) {
     const { manifest } = rollup;
     const { preloads } = manifest;
 
-    const cssEntry = rollup.getManifestEntry(entry);
-    const modernEntry = rollup.getManifestEntry(entry);
-    const legacyEntry = rollup.getManifestEntry(entry);
+    const cssEntry = rollup.getManifestEntryByType(entry, EntryTypes.CSS);
+    const modernEntry = rollup.getManifestEntryByType(entry, EntryTypes.MODERN);
+    const legacyEntry = rollup.getManifestEntryByType(entry, EntryTypes.LEGACY);
+
     const output = [];
 
     if (!modernEntry) {

diff --git a/lib/engines/base.js b/lib/engines/base.js
@@ -108,19 +108,11 @@ export class BaseEngine {
   }
 
   getManifestEntry(key) {
-    let result = this.manifest[key];
-
-    if (!result && this.subManifests.length) {
-      for (const subManifest of this.subManifests) {
-        const subResult = this.manifest[subManifest][key];
-        if (subResult) {
-          result = subResult;
-          break;
-        }
-      }
-    }
+    return this.manifest[key];
+  }
 
-    return result;
+  getManifestEntryByType(entry, type) {
+    return this.manifest[type]?.[entry];
   }
 
   async outputFile(file) {