[AssetMapper] Also preloading non-local, imported modules

weaverryan · weaverryan · commit 20206442d35a · 2023-09-27T20:47:34.000-04:00
diff --git a/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php b/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php
@@ -54,63 +54,30 @@ public function compile(string $content, MappedAsset $asset, AssetMapperInterfac
                 return $fullImportString;
             }
 
-            $isBareImport = !str_starts_with($importedModule, '.');
-            if ($isBareImport) {
-                // try to find a matching importmap.php entry that is "local"
-                // if found, locate the MappedAsset and add it as a dependency
-                // but avoid changing the import path
-                $importMapEntry = $this->importMapManager->findRootImportMapEntry($importedModule);
-                if (!$importMapEntry) {
-                    // don't warn on missing non-relative (bare) imports: these could be valid URLs
-
-                    return $fullImportString;
-                }
-
-                // avoid 3rd party modules (including downloaded modules)
-                if ($importMapEntry->isRemote()) {
-                    return $fullImportString;
-                }
-
-                $resolvedPath = $importMapEntry->path;
+            $isRelativeImport = str_starts_with($importedModule, '.');
+            if (!$isRelativeImport) {
+                $dependentAsset = $this->findAssetForBareImport($importedModule, $assetMapper);
             } else {
-                try {
-                    $resolvedPath = $this->resolvePath(\dirname($asset->logicalPath), $importedModule);
-                } catch (RuntimeException $e) {
-                    $this->handleMissingImport(sprintf('Error processing import in "%s": ', $asset->sourcePath).$e->getMessage(), $e);
-
-                    return $fullImportString;
-                }
-            }
-
-            $dependentAsset = $assetMapper->getAsset($resolvedPath);
-
-            if (!$dependentAsset) {
-                $message = sprintf('Unable to find asset "%s" imported from "%s".', $importedModule, $asset->sourcePath);
-
-                try {
-                    if (null !== $assetMapper->getAsset(sprintf('%s.js', $resolvedPath))) {
-                        $message .= sprintf(' Try adding ".js" to the end of the import - i.e. "%s.js".', $importedModule);
-                    }
-                } catch (CircularAssetsException $e) {
-                    // avoid circular error if there is self-referencing import comments
-                }
-
-                $this->handleMissingImport($message);
-
-                return $fullImportString;
+                $dependentAsset = $this->findAssetForRelativeImport($importedModule, $asset, $assetMapper);
             }
 
-            // We found the path! List it as a dependency.
-            // This will cause the asset to be included in the importmap.
+            // List as a JavaScript import.
+            // This will cause the asset to be included in the importmap (for relative imports)
+            // and will be used to generate the preloads in the importmap.
             $isLazy = str_contains($fullImportString, 'import(');
             $asset->addJavaScriptImport(new JavaScriptImport(
                 $importedModule,
                 $isLazy,
                 $dependentAsset
             ));
 
-            if ($isBareImport) {
-                // do not adjust the path for bare imports
+            if (!$isRelativeImport) {
+                // do not adjust the path for non-relative (bare) imports
+                return $fullImportString;
+            }
+
+            if (!$dependentAsset) {
+                // we can't find the asset: don't modify the import
                 return $fullImportString;
             }
 
@@ -171,4 +138,52 @@ private function isCommentedOut(mixed $offsetStart, string $fullContent): bool
 
         return false;
     }
+
+    private function findAssetForBareImport(string $importedModule, AssetMapperInterface $assetMapper): ?MappedAsset
+    {
+        $importMapEntry = $this->importMapManager->findRootImportMapEntry($importedModule);
+        if (!$importMapEntry) {
+            // don't warn on missing non-relative (bare) imports: these could be valid URLs
+
+            return null;
+        }
+
+        // remote entries have no MappedAsset
+        if ($importMapEntry->isRemote()) {
+            return null;
+        }
+
+        return $assetMapper->getAsset($importMapEntry->path);
+    }
+
+    private function findAssetForRelativeImport(string $importedModule, MappedAsset $asset, AssetMapperInterface $assetMapper): ?MappedAsset
+    {
+        try {
+            $resolvedPath = $this->resolvePath(\dirname($asset->logicalPath), $importedModule);
+        } catch (RuntimeException $e) {
+            $this->handleMissingImport(sprintf('Error processing import in "%s": ', $asset->sourcePath).$e->getMessage(), $e);
+
+            return null;
+        }
+
+        $dependentAsset = $assetMapper->getAsset($resolvedPath);
+
+        if ($dependentAsset) {
+            return $dependentAsset;
+        }
+
+        $message = sprintf('Unable to find asset "%s" imported from "%s".', $importedModule, $asset->sourcePath);
+
+        try {
+            if (null !== $assetMapper->getAsset(sprintf('%s.js', $resolvedPath))) {
+                $message .= sprintf(' Try adding ".js" to the end of the import - i.e. "%s.js".', $importedModule);
+            }
+        } catch (CircularAssetsException $e) {
+            // avoid circular error if there is self-referencing import comments
+        }
+
+        $this->handleMissingImport($message);
+
+        return null;
+    }
 }
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php
@@ -84,7 +84,8 @@ public function getImportMapData(array $entrypointNames): array
                 }
 
                 if (!isset($rawImportMapData[$dependency])) {
-                    throw new \InvalidArgumentException(sprintf('The entrypoint "%s" depends on "%s", but that package is not in the importmap.', $entry, $dependency));
+                    // missing dependency - rely on browser or compilers to warn
+                    continue;
                 }
 
                 if (false === ($rawImportMapData[$dependency]['preload'] ?? null)) {
@@ -379,7 +380,6 @@ private function requirePackages(array $packagesToRequire, ImportMapEntries $imp
                 url: $resolvedPackage->url,
                 isDownloaded: $resolvedPackage->requireOptions->download,
                 type: $type,
-                isEntrypoint: true,
             );
             $importMapEntries->add($newEntry);
             $addedEntries[] = $newEntry;
diff --git a/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php b/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php
@@ -177,10 +177,10 @@ public static function provideCompileTests(): iterable
             'expectedJavaScriptImports' => ['./styles.css' => ['lazy' => false, 'asset' => 'styles.css']],
         ];
 
-        yield 'importing_non_existent_file_without_strict_mode_is_ignored' => [
+        yield 'importing_non_existent_file_without_strict_mode_is_ignored_still_listed_as_an_import' => [
             'sourceLogicalName' => 'app.js',
             'input' => "import './non-existent.js';",
-            'expectedJavaScriptImports' => [],
+            'expectedJavaScriptImports' => ['./non-existent.js' => ['lazy' => false, 'asset' => null]],
         ];
 
         yield 'single_line_comment_at_start_ignored' => [
