DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Treat assets as variants only if they share the same filename (#112602)

Browse Source
This commit is contained in:
Jason Simmons 2022-09-28 18:36:20 -07:00 committed by GitHub
parent 5c68452df7
commit 74dfc0708d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter_tools/lib/src/asset.dart
View File

@ -1033,16 +1033,18 @@ class _AssetDirectoryCache {
final List<FileSystemEntity> entitiesInDirectory = _fileSystem.directory(directory).listSync();
final File assetFile = _fileSystem.file(assetPath);
final List<String> pathsOfVariants = <String>[
// It's possible that the user specifies only explicit variants (e.g. .../1x/asset.png),
// so there does not necessarily need to be a file at the given path.
if (_fileSystem.file(assetPath).existsSync())
if (assetFile.existsSync())
assetPath,
...entitiesInDirectory
.whereType<Directory>()
.where((Directory dir) => _assetVariantDirectoryRegExp.hasMatch(dir.basename))
.expand((Directory dir) => dir.listSync())
.whereType<File>()
.where((File file) => file.basename == assetFile.basename)
.map((File file) => file.path),
];

12
packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart
View File

@ -219,14 +219,18 @@ $assetsSection
writePubspecFile(
'p/p/pubspec.yaml',
'test_package',
assets: <String>['a/foo'],
assets: <String>['a/foo', 'a/bar'],
);
final List<String> assets = <String>['a/foo', 'a/2x/foo'];
final List<String> assets = <String>['a/foo', 'a/2x/foo', 'a/bar'];
writeAssets('p/p/', assets);
const String expectedManifest = '{"packages/test_package/a/foo":'
'["packages/test_package/a/foo","packages/test_package/a/2x/foo"]}';
const String expectedManifest = '{'
'"packages/test_package/a/bar":'
'["packages/test_package/a/bar"],'
'"packages/test_package/a/foo":'
'["packages/test_package/a/foo","packages/test_package/a/2x/foo"]'
'}';
await buildAndVerifyAssets(
assets,