diff --git a/src/Laravel/Resources/config/config.php b/src/Laravel/Resources/config/config.php index 6f7ef36e..9f45ccc6 100644 --- a/src/Laravel/Resources/config/config.php +++ b/src/Laravel/Resources/config/config.php @@ -3,7 +3,7 @@ return array( 'default' => 'template', - 'root_script' => 'https://cdn.jsdelivr.net/npm/@flasher/flasher@0.4.0/dist/flasher.min.js', + 'root_script' => 'https://cdn.jsdelivr.net/npm/@flasher/flasher@0.5.0/dist/flasher.min.js', 'template_factory' => array( 'default' => 'tailwindcss', diff --git a/src/Laravel/ServiceProvider/Providers/Laravel.php b/src/Laravel/ServiceProvider/Providers/Laravel.php index d2156cfa..7bfa07d7 100755 --- a/src/Laravel/ServiceProvider/Providers/Laravel.php +++ b/src/Laravel/ServiceProvider/Providers/Laravel.php @@ -106,13 +106,13 @@ class Laravel implements ServiceProviderInterface $templates = $app['flasher.config']->get('template_factory.templates', array()); foreach ($templates as $template => $factory) { if (isset($factory['scripts'])) { - $resourceManager->addScripts('template_' . $template, $factory['scripts']); + $resourceManager->addScripts('template.' . $template, $factory['scripts']); } if (isset($factory['styles'])) { - $resourceManager->addStyles('template_' . $template, $factory['styles']); + $resourceManager->addStyles('template.' . $template, $factory['styles']); } if (isset($factory['options'])) { - $resourceManager->addOptions('template_' . $template, $factory['options']); + $resourceManager->addOptions('template.' . $template, $factory['options']); } } diff --git a/src/Prime/Response/Resource/ResourceManager.php b/src/Prime/Response/Resource/ResourceManager.php index ea697335..47182f69 100644 --- a/src/Prime/Response/Resource/ResourceManager.php +++ b/src/Prime/Response/Resource/ResourceManager.php @@ -116,7 +116,7 @@ final class ResourceManager implements ResourceManagerInterface $envelope->withStamp(new TemplateStamp($compiled)); - return 'template_' . $view; + return 'template.' . $view; } private function getTemplateAdapter($handler) diff --git a/src/Symfony/DependencyInjection/Configuration.php b/src/Symfony/DependencyInjection/Configuration.php index 52851f4b..7ae806ef 100755 --- a/src/Symfony/DependencyInjection/Configuration.php +++ b/src/Symfony/DependencyInjection/Configuration.php @@ -29,7 +29,7 @@ final class Configuration implements ConfigurationInterface ->defaultValue('template') ->end() ->scalarNode('root_script') - ->defaultValue('https://cdn.jsdelivr.net/npm/@flasher/flasher@0.4.0/dist/flasher.min.js') + ->defaultValue('https://cdn.jsdelivr.net/npm/@flasher/flasher@0.5.0/dist/flasher.min.js') ->end() ->arrayNode('root_scripts') ->prototype('scalar')->end() diff --git a/src/Symfony/DependencyInjection/FlasherExtension.php b/src/Symfony/DependencyInjection/FlasherExtension.php index e59afd17..d4e9658b 100644 --- a/src/Symfony/DependencyInjection/FlasherExtension.php +++ b/src/Symfony/DependencyInjection/FlasherExtension.php @@ -47,13 +47,13 @@ final class FlasherExtension extends Extension $responseManager = $container->getDefinition('flasher.resource_manager'); foreach ($config['template_factory']['templates'] as $template => $factory) { if (isset($factory['scripts'])) { - $responseManager->addMethodCall('addScripts', array('template_' . $template, $factory['scripts'])); + $responseManager->addMethodCall('addScripts', array('template.' . $template, $factory['scripts'])); } if (isset($factory['styles'])) { - $responseManager->addMethodCall('addStyles', array('template_' . $template, $factory['styles'])); + $responseManager->addMethodCall('addStyles', array('template.' . $template, $factory['styles'])); } if (isset($factory['options'])) { - $responseManager->addMethodCall('addOptions', array('template_' . $template, $factory['options'])); + $responseManager->addMethodCall('addOptions', array('template.' . $template, $factory['options'])); } } } diff --git a/tests/Symfony/DependencyInjection/ConfigurationTest.php b/tests/Symfony/DependencyInjection/ConfigurationTest.php index e93b9a18..b2347425 100644 --- a/tests/Symfony/DependencyInjection/ConfigurationTest.php +++ b/tests/Symfony/DependencyInjection/ConfigurationTest.php @@ -14,7 +14,7 @@ class ConfigurationTest extends TestCase $expected = array( 'default' => 'template', - 'root_script' => 'https://cdn.jsdelivr.net/npm/@flasher/flasher@0.4.0/dist/flasher.min.js', + 'root_script' => 'https://cdn.jsdelivr.net/npm/@flasher/flasher@0.5.0/dist/flasher.min.js', 'root_scripts' => array(), 'template_factory' => array( 'default' => 'tailwindcss',