[AssetMapper] Fix bug where dependencies were preloaded even if the parent was not

weaverryan · nicolas-grekas · commit feb680bb26f5 · 2023-05-19T13:58:56.000+02:00
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php
@@ -417,11 +417,11 @@ private function convertEntriesToImports(array $entries): array
                 $this->modulesToPreload[] = $path;
             }
 
-            $dependencyImportMapEntries = array_map(function (AssetDependency $dependency) {
+            $dependencyImportMapEntries = array_map(function (AssetDependency $dependency) use ($entryOptions) {
                 return new ImportMapEntry(
                     $dependency->asset->getPublicPathWithoutDigest(),
                     $dependency->asset->getLogicalPath(),
-                    preload: !$dependency->isLazy,
+                    preload: $entryOptions->preload && !$dependency->isLazy,
                 );
             }, $dependencies);
             $imports = array_merge($imports, $this->convertEntriesToImports($dependencyImportMapEntries));
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php
@@ -77,7 +77,8 @@ public function testGetImportMapJson()
             '/assets/pizza/index.js' => '/assets/pizza/index-b3fb5ee31adaf5e1b32d28edf1ab8e7a.js',
             '/assets/popcorn.js' => '/assets/popcorn-c0778b84ef9893592385aebc95a2896e.js',
             '/assets/imported_async.js' => '/assets/imported_async-8f0cd418bfeb0cf63826e09a4474a81c.js',
-            'other_app' => '/assets/namespaced_assets2/app2-344d0d513d424647e7d8a394ffe5e4b5.js',
+            'other_app' => '/assets/namespaced_assets2/app2-d5bf10c20bf9a0b77e67d78fcac301c5.js',
+            '/assets/namespaced_assets2/imported.js' => '/assets/namespaced_assets2/imported-9ab37dabcfe317fba77123a4e573d53b.js',
         ]], json_decode($manager->getImportMapJson(), true));
     }
 
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets2/app2.js b/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets2/app2.js
@@ -1 +1,3 @@
+import './imported.js';
+
 console.log('app2');
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets2/imported.js b/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets2/imported.js
@@ -0,0 +1 @@
+console.log('imported.js');

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,8 @@ public function testGetImportMapJson()`
`77`	`77`	`'/assets/pizza/index.js' => '/assets/pizza/index-b3fb5ee31adaf5e1b32d28edf1ab8e7a.js',`
`78`	`78`	`'/assets/popcorn.js' => '/assets/popcorn-c0778b84ef9893592385aebc95a2896e.js',`
`79`	`79`	`'/assets/imported_async.js' => '/assets/imported_async-8f0cd418bfeb0cf63826e09a4474a81c.js',`
`80`		`- 'other_app' => '/assets/namespaced_assets2/app2-344d0d513d424647e7d8a394ffe5e4b5.js',`
	`80`	`+ 'other_app' => '/assets/namespaced_assets2/app2-d5bf10c20bf9a0b77e67d78fcac301c5.js',`
	`81`	`+ '/assets/namespaced_assets2/imported.js' => '/assets/namespaced_assets2/imported-9ab37dabcfe317fba77123a4e573d53b.js',`
`81`	`82`	`]], json_decode($manager->getImportMapJson(), true));`
`82`	`83`	`}`
`83`	`84`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+import './imported.js';`
	`2`	`+`
`1`	`3`	`console.log('app2');`