wpstudio/assetsmanifest-plugin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* allow use dev vitejs build without manifest reader

Browse Source
This commit is contained in:
dimti
2022-07-18 13:31:13 +03:00
parent 0c7f82ab7e
commit 2c2c419332
4 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Plugin.php
View File

@ -4,6 +4,7 @@ use Backend;
use Cms\Classes\Theme; use Cms\Classes\Theme;
use System\Classes\PluginBase; use System\Classes\PluginBase;
use Wpstudio\AssetsManifest\Classes\Bundlers\Bundler; use Wpstudio\AssetsManifest\Classes\Bundlers\Bundler;
use Wpstudio\AssetsManifest\Classes\Bundlers\ViteBundler;
use Wpstudio\AssetsManifest\Classes\ManifestReader; use Wpstudio\AssetsManifest\Classes\ManifestReader;
use Wpstudio\AssetsManifest\Classes\TwigFilters; use Wpstudio\AssetsManifest\Classes\TwigFilters;
use Config; use Config;
@ -37,15 +38,19 @@ class Plugin extends PluginBase
{ {
app()->singleton(Bundler::class, Config::get('wpstudio.assetsmanifest::bundler')); app()->singleton(Bundler::class, Config::get('wpstudio.assetsmanifest::bundler'));
app()->singleton(ManifestReader::class, fn() => new ManifestReader( if (Config::get('wpstudio.assetsmanifest::vite_dev_enabled') != ViteBundler::class ||
Theme::getActiveTheme()->getPath( !Config::get('wpstudio.assetsmanifest::vite_dev_enabled')
sprintf( ) {
'%s/%s/manifest.json', app()->singleton(ManifestReader::class, fn() => new ManifestReader(
Theme::getActiveTheme()->getDirName(), Theme::getActiveTheme()->getPath(
Config::get('wpstudio.assetsmanifest::vite_path_build') sprintf(
) '%s/%s/manifest.json',
), Theme::getActiveTheme()->getDirName(),
)); Config::get('wpstudio.assetsmanifest::vite_path_build')
)
),
));
}
} }
/** /**

10
classes/TwigFilters.php
View File

@ -61,6 +61,10 @@ class TwigFilters
$bundler->validateBundlerType(Bundler::BUNDLER_VITE); $bundler->validateBundlerType(Bundler::BUNDLER_VITE);
assert($bundler instanceof ViteBundler); assert($bundler instanceof ViteBundler);
if ($bundler->isViteDevEnabled()) {
return '';
}
return $bundler->getEntrypointStylesheets($entrypointName); return $bundler->getEntrypointStylesheets($entrypointName);
} }
@ -76,7 +80,11 @@ class TwigFilters
$bundler->validateBundlerType(Bundler::BUNDLER_VITE); $bundler->validateBundlerType(Bundler::BUNDLER_VITE);
assert($bundler instanceof ViteBundler); assert($bundler instanceof ViteBundler);
return $bundler->getEntrypointAssets($entrypointName); if ($bundler->isViteDevEnabled()) {
return $bundler->getScriptTag($entrypointName);
} else {
return $bundler->getEntrypointAssets($entrypointName);
}
} }
public static function viteDevClientScriptTag() public static function viteDevClientScriptTag()

8
classes/bundlers/Bundler.php
View File

@ -13,11 +13,13 @@ abstract class Bundler
self::BUNDLER_VITE => ViteBundler::class, self::BUNDLER_VITE => ViteBundler::class,
]; ];
protected ManifestReader $manifestReader; protected ?ManifestReader $manifestReader;
public function __construct(ManifestReader $manifestReader) public function __construct(?ManifestReader $manifestReader = null)
{ {
$this->manifestReader = $manifestReader; if (isset($manifestReader)) {
$this->manifestReader = $manifestReader;
}
} }
public function getBundlerType(): string public function getBundlerType(): string

8
classes/bundlers/ViteBundler.php
View File

@ -60,10 +60,6 @@ class ViteBundler extends Bundler
*/ */
public function getEntrypointStylesheets(string $entrypointName): string public function getEntrypointStylesheets(string $entrypointName): string
{ {
if ($this->isViteDevEnabled()) {
return '';
}
$entrypoint = $this->getViteEntrypoint($entrypointName); $entrypoint = $this->getViteEntrypoint($entrypointName);
$stylesheetTags = collect(); $stylesheetTags = collect();
@ -85,7 +81,7 @@ class ViteBundler extends Bundler
return $stylesheetTags->implode(PHP_EOL); return $stylesheetTags->implode(PHP_EOL);
} }
private function getStylesheetTag(string $href): string public function getStylesheetTag(string $href): string
{ {
return sprintf( return sprintf(
'<link rel="stylesheet" href="%s">', '<link rel="stylesheet" href="%s">',
@ -93,7 +89,7 @@ class ViteBundler extends Bundler
); );
} }
private function getScriptTag(string $entrypointName, ViteEntrypoint $entrypoint): string public function getScriptTag(string $entrypointName, ?ViteEntrypoint $entrypoint = null): string
{ {
return sprintf( return sprintf(
'<script type="module" src="%s" %s></script>', '<script type="module" src="%s" %s></script>',