[AssetMapper] Always downloading vendor files

weaverryan · fabpot · commit 822d684904db · 2023-10-06T16:13:16.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,8 +26,9 @@ CHANGELOG
  * Deprecate `framework.validation.enable_annotations`, use `framework.validation.enable_attributes` instead
  * Deprecate `framework.serializer.enable_annotations`, use `framework.serializer.enable_attributes` instead
  * Add `array $tokenAttributes = []` optional parameter to `KernelBrowser::loginUser()`
- * Add support for relative URLs in BrowserKit's redirect assertion.
+ * Add support for relative URLs in BrowserKit's redirect assertion
  * Change BrowserKitAssertionsTrait::getClient() to be protected
+ * Deprecate the `framework.asset_mapper.provider` config option
 
 6.3
 ---
diff --git a/DependencyInjection/Compiler/UnusedTagsPass.php b/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -25,7 +25,6 @@ class UnusedTagsPass implements CompilerPassInterface
         'annotations.cached_reader',
         'assets.package',
         'asset_mapper.compiler',
-        'asset_mapper.importmap.resolver',
         'auto_alias',
         'cache.pool',
         'cache.pool.clearer',
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -18,7 +18,6 @@
 use Symfony\Bundle\FullStack;
 use Symfony\Component\Asset\Package;
 use Symfony\Component\AssetMapper\AssetMapper;
-use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
 use Symfony\Component\Cache\Adapter\DoctrineAdapter;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
@@ -940,8 +939,7 @@ private function addAssetMapperSection(ArrayNodeDefinition $rootNode, callable $
                             ->defaultValue('%kernel.project_dir%/assets/vendor')
                         ->end()
                         ->scalarNode('provider')
-                            ->info('The provider (CDN) to use'.(class_exists(ImportMapManager::class) ? sprintf(' (e.g.: "%s").', implode('", "', ImportMapManager::PROVIDERS)) : '.'))
-                            ->defaultValue('jsdelivr.esm')
+                            ->setDeprecated('symfony/framework-bundle', '6.4', 'Option "%node%" at "%path%" is deprecated and does nothing. Remove it.')
                         ->end()
                     ->end()
                 ->end()
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -34,7 +34,6 @@
 use Symfony\Component\AssetMapper\AssetMapper;
 use Symfony\Component\AssetMapper\Compiler\AssetCompilerInterface;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
-use Symfony\Component\AssetMapper\ImportMap\Resolver\PackageResolverInterface;
 use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
@@ -1364,28 +1363,24 @@ private function registerAssetMapperConfiguration(array $config, ContainerBuilde
             ->setArgument(1, $config['missing_import_mode']);
 
         $container
-            ->getDefinition('asset_mapper.importmap.manager')
-            ->replaceArgument(3, $config['vendor_dir'])
+            ->getDefinition('asset_mapper.importmap.remote_package_downloader')
+            ->replaceArgument(2, $config['vendor_dir'])
         ;
-
         $container
-            ->getDefinition('asset_mapper.importmap.config_reader')
-            ->replaceArgument(0, $config['importmap_path'])
+            ->getDefinition('asset_mapper.mapped_asset_factory')
+            ->replaceArgument(2, $config['vendor_dir'])
         ;
 
         $container
-            ->getDefinition('asset_mapper.importmap.resolver')
-            ->replaceArgument(0, $config['provider'])
+            ->getDefinition('asset_mapper.importmap.config_reader')
+            ->replaceArgument(0, $config['importmap_path'])
         ;
 
         $container
             ->getDefinition('asset_mapper.importmap.renderer')
             ->replaceArgument(3, $config['importmap_polyfill'] ?? ImportMapManager::POLYFILL_URL)
             ->replaceArgument(4, $config['importmap_script_attributes'])
         ;
-
-        $container->registerForAutoconfiguration(PackageResolverInterface::class)
-            ->addTag('asset_mapper.importmap.resolver');
     }
 
     /**
diff --git a/Resources/config/asset_mapper.php b/Resources/config/asset_mapper.php
@@ -32,9 +32,8 @@
 use Symfony\Component\AssetMapper\ImportMap\ImportMapConfigReader;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapRenderer;
+use Symfony\Component\AssetMapper\ImportMap\RemotePackageDownloader;
 use Symfony\Component\AssetMapper\ImportMap\Resolver\JsDelivrEsmResolver;
-use Symfony\Component\AssetMapper\ImportMap\Resolver\JspmResolver;
-use Symfony\Component\AssetMapper\ImportMap\Resolver\PackageResolver;
 use Symfony\Component\AssetMapper\MapperAwareAssetPackage;
 use Symfony\Component\AssetMapper\Path\PublicAssetsPathResolver;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
@@ -53,6 +52,7 @@
             ->args([
                 service('asset_mapper.public_assets_path_resolver'),
                 service('asset_mapper_compiler'),
+                abstract_arg('vendor directory'),
             ])
 
         ->set('asset_mapper.cached_mapped_asset_factory', CachedMappedAssetFactory::class)
@@ -150,41 +150,20 @@
                 service('asset_mapper'),
                 service('asset_mapper.public_assets_path_resolver'),
                 service('asset_mapper.importmap.config_reader'),
-                abstract_arg('vendor directory'),
+                service('asset_mapper.importmap.remote_package_downloader'),
                 service('asset_mapper.importmap.resolver'),
-                service('http_client'),
             ])
         ->alias(ImportMapManager::class, 'asset_mapper.importmap.manager')
 
-        ->set('asset_mapper.importmap.resolver', PackageResolver::class)
+        ->set('asset_mapper.importmap.remote_package_downloader', RemotePackageDownloader::class)
             ->args([
-                abstract_arg('provider'),
-                tagged_locator('asset_mapper.importmap.resolver'),
+                service('asset_mapper.importmap.config_reader'),
+                service('asset_mapper.importmap.resolver'),
+                abstract_arg('vendor directory'),
             ])
 
-        ->set('asset_mapper.importmap.resolver.jsdelivr_esm', JsDelivrEsmResolver::class)
+        ->set('asset_mapper.importmap.resolver', JsDelivrEsmResolver::class)
             ->args([service('http_client')])
-            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_JSDELIVR_ESM])
-
-        ->set('asset_mapper.importmap.resolver.jspm', JspmResolver::class)
-            ->args([service('http_client'), ImportMapManager::PROVIDER_JSPM])
-            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_JSPM])
-
-        ->set('asset_mapper.importmap.resolver.jspm_system', JspmResolver::class)
-            ->args([service('http_client'), ImportMapManager::PROVIDER_JSPM_SYSTEM])
-            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_JSPM_SYSTEM])
-
-        ->set('asset_mapper.importmap.resolver.skypack', JspmResolver::class)
-            ->args([service('http_client'), ImportMapManager::PROVIDER_SKYPACK])
-            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_SKYPACK])
-
-        ->set('asset_mapper.importmap.resolver.jsdelivr', JspmResolver::class)
-            ->args([service('http_client'), ImportMapManager::PROVIDER_JSDELIVR])
-            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_JSDELIVR])
-
-        ->set('asset_mapper.importmap.resolver.unpkg', JspmResolver::class)
-            ->args([service('http_client'), ImportMapManager::PROVIDER_UNPKG])
-            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_UNPKG])
 
         ->set('asset_mapper.importmap.renderer', ImportMapRenderer::class)
             ->args([
@@ -198,14 +177,12 @@
         ->set('asset_mapper.importmap.auditor', ImportMapAuditor::class)
         ->args([
             service('asset_mapper.importmap.config_reader'),
-            service('asset_mapper.importmap.resolver'),
             service('http_client'),
         ])
 
         ->set('asset_mapper.importmap.command.require', ImportMapRequireCommand::class)
             ->args([
                 service('asset_mapper.importmap.manager'),
-                service('asset_mapper'),
                 param('kernel.project_dir'),
             ])
             ->tag('console.command')
@@ -219,7 +196,10 @@
             ->tag('console.command')
 
         ->set('asset_mapper.importmap.command.install', ImportMapInstallCommand::class)
-            ->args([service('asset_mapper.importmap.manager')])
+            ->args([
+                service('asset_mapper.importmap.remote_package_downloader'),
+                param('kernel.project_dir'),
+            ])
             ->tag('console.command')
 
         ->set('asset_mapper.importmap.command.audit', ImportMapAuditCommand::class)
diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -134,7 +134,6 @@ public function testAssetMapperCanBeEnabled()
             'importmap_path' => '%kernel.project_dir%/importmap.php',
             'importmap_polyfill' => null,
             'vendor_dir' => '%kernel.project_dir%/assets/vendor',
-            'provider' => 'jsdelivr.esm',
             'importmap_script_attributes' => [],
         ];
 
@@ -671,7 +670,6 @@ protected static function getBundleDefaultConfig()
                 'importmap_path' => '%kernel.project_dir%/importmap.php',
                 'importmap_polyfill' => null,
                 'vendor_dir' => '%kernel.project_dir%/assets/vendor',
-                'provider' => 'jsdelivr.esm',
                 'importmap_script_attributes' => [],
             ],
             'cache' => [
diff --git a/Tests/DependencyInjection/Fixtures/xml/asset_mapper.xml b/Tests/DependencyInjection/Fixtures/xml/asset_mapper.xml
@@ -17,7 +17,6 @@
             importmap-path="%kernel.project_dir%/importmap.php"
             importmap-polyfill="https://cdn.example.com/polyfill.js"
             vendor-dir="%kernel.project_dir%/assets/vendor"
-            provider="jspm"
         >
             <framework:path>assets/</framework:path>
             <framework:path namespace="my_namespace">assets2/</framework:path>

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`importmap-path="%kernel.project_dir%/importmap.php"`
`18`	`18`	`importmap-polyfill="https://cdn.example.com/polyfill.js"`
`19`	`19`	`vendor-dir="%kernel.project_dir%/assets/vendor"`
`20`		`- provider="jspm"`
`21`	`20`	`>`
`22`	`21`	`<framework:path>assets/</framework:path>`
`23`	`22`	`<framework:path namespace="my_namespace">assets2/</framework:path>`