Skip to content

Commit f16778f

Browse files
authored
Merge pull request #82 from CakeDC/issue/81
81 - Fix resolveExtends including parent assets many times if any plugin uses AssetCompress
2 parents 22547fb + 4a6528a commit f16778f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: echo "::set-output name=date::$(date +'%Y-%m')"
4343

4444
- name: Cache composer dependencies
45-
uses: actions/cache@v1
45+
uses: actions/cache@v4
4646
with:
4747
path: ${{ steps.composer-cache.outputs.dir }}
4848
key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}

src/AssetConfig.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ protected function resolveExtends()
252252
if (!$parentConfig) {
253253
return $config;
254254
}
255-
$config['files'] = array_merge($parentConfig['files'], $config['files']);
256-
$config['filters'] = array_merge($parentConfig['filters'], $config['filters']);
255+
$config['files'] = array_unique(array_merge($parentConfig['files'], $config['files']));
256+
$config['filters'] = array_unique(array_merge($parentConfig['filters'], $config['filters']));
257257
$config['theme'] = $parentConfig['theme'] || $config['theme'];
258258
return $config;
259259
};

0 commit comments

Comments
 (0)