Skip to content

Avoid duplicating assets when they have params #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erikn69 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid duplicating assets when they have params #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 32 additions & 9 deletions src/Assets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Assets
*/
public function __construct()
{
$this->collection = new Collection(['css' => array(), 'js' => array()]);
$this->collection = new Collection(['css' => [], 'js' => []]);
}

/**
Expand Down Expand Up @@ -62,13 +62,13 @@ public function dependsOn($dependency)
$collection = $this->collection->get($this->lastAddedType);

foreach ($collection as $path => $item) {
if ($path === $this->lastAddedAsset) {
$collection[$path] = array(
'namespace' => $item['namespace'],
if (self::cleanAsset($path) === $this->lastAddedAsset) {
$collection[$path] = array_merge($item, [
'dependency' => $dependency
);
]);

$this->collection->put($this->lastAddedType, $collection);
break;
}
}

Expand Down Expand Up @@ -171,22 +171,45 @@ protected function addAsset($assets, $namespace = null)

$type = ($this->isCss($assets)) ? 'css' : 'js';
$collection = $this->collection->get($type);
$cleanAsset = self::cleanAsset($assets);
$existingAssets = array_map(function ($asset) {
return self::cleanAsset($asset);
}, array_keys($collection));

if (! in_array($assets, $collection)) {
if (! in_array($cleanAsset, $existingAssets)) {
$collection[$assets] = array(
'namespace' => $namespace,
'dependency' => array()
);

$this->collection->put($type, $collection);

$this->lastAddedType = $type;
$this->lastAddedAsset = $assets;
}

$this->lastAddedType = $type;
$this->lastAddedAsset = $cleanAsset;

return $this;
}

/**
* Remove `?` anf `#` parts from asset
*
* @param string $asset
* @return string
*/
private static function cleanAsset($asset)
{
$asset = (string) $asset;

$result = strstr($asset, '?', true);
$asset = $result === false ? $asset : $result;

$result = strstr($asset, '#', true);
$asset = $result === false ? $asset : $result;

return $asset;
}

/**
* Parse a bonsai.json file and add the assets to the collection.
*
Expand Down