remove deprecated options and fix absolute_url errors

lhapaipai · Oct 22, 2023 · 48f8936 · 48f8936
1 parent 0ecb0d6
commit 48f8936
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v5.0.1
+
+- remove deprecated options
+- fix `absolute_url` error in `shouldUseAbsoluteURL`.
+
 ## v4.3.0
 
 - add `absolute_url` bundle option.

diff --git a/src/Asset/EntrypointRenderer.php b/src/Asset/EntrypointRenderer.php
@@ -123,7 +123,7 @@ private function shouldUseAbsoluteURL(array $options, $buildName)
     {
         $viteServer = $this->entrypointsLookup->getViteServer($buildName);
 
-        return false === $viteServer && $this->useAbsoluteUrl || (isset($options['absolute_url']) && true === $options['absolute_url']);
+        return false === $viteServer && ($this->useAbsoluteUrl || (isset($options['absolute_url']) && true === $options['absolute_url']));
     }
 
     public function renderLinks(string $entryName, array $options = [], $buildName = null): string

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -2,6 +2,7 @@
 
 namespace Pentatrion\ViteBundle\DependencyInjection;
 
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
@@ -10,18 +11,11 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('pentatrion_vite');
+        /** @var ArrayNodeDefinition $rootNode */
         $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()
-                ->scalarNode('public_dir')
-                    ->defaultValue('public')
-                    ->setDeprecated('pentatrion/vite-bundle', '3.3.1', 'The "%node%" option is deprecated. Use "public_directory" instead.')
-                ->end()
-                ->scalarNode('base')
-                    ->defaultValue('/build/')
-                    ->setDeprecated('pentatrion/vite-bundle', '3.3.1', 'The "%node%" option is deprecated. Use "build_directory" instead.')
-                ->end()
                 ->scalarNode('public_directory')
                     ->defaultValue('public')
                 ->end()
@@ -61,10 +55,6 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->useAttributeAsKey('name')
                     ->arrayPrototype()
                         ->children()
-                            ->scalarNode('base')
-                                ->defaultValue('/build/')
-                                ->setDeprecated('pentatrion/vite-bundle', '3.3.1', 'The "%node%" option is deprecated. Use "build_directory" instead.')
-                            ->end()
                             ->scalarNode('build_directory')
                                 ->defaultValue('build')
                             ->end()

diff --git a/src/DependencyInjection/PentatrionViteExtension.php b/src/DependencyInjection/PentatrionViteExtension.php
@@ -43,10 +43,6 @@ public function load(array $configs, ContainerBuilder $container): void
             $defaultBuild = $config['default_build'];
             $builds = [];
             foreach ($config['builds'] as $buildName => $build) {
-                if ('build' === $build['build_directory'] && '/build/' !== $build['base']) {
-                    $build['build_directory'] = $build['base'];
-                }
-
                 $builds[$buildName] = [
                     'base' => self::prepareBase($build['build_directory']),
                     'script_attributes' => $build['script_attributes'],
@@ -55,11 +51,6 @@ public function load(array $configs, ContainerBuilder $container): void
             }
         } else {
             $defaultBuild = 'default';
-
-            if ('build' === $config['build_directory'] && '/build/' !== $config['base']) {
-                $config['build_directory'] = $config['base'];
-            }
-
             $builds = [
                 'default' => [
                     'base' => self::prepareBase($config['build_directory']),
@@ -69,11 +60,6 @@ public function load(array $configs, ContainerBuilder $container): void
             ];
         }
 
-        // if deprecated option is set and not `public_directory`.
-        if ('public' === $config['public_directory'] && 'public' !== $config['public_dir']) {
-            $config['public_directory'] = $config['public_dir'];
-        }
-
         $container->setParameter('pentatrion_vite.public_directory', self::preparePublicDirectory($config['public_directory']));
         $container->setParameter('pentatrion_vite.default_build', $defaultBuild);
         $container->setParameter('pentatrion_vite.builds', $builds);