firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Normalize path before searching for package config (#165392)

Browse Source 
If we don't normalize the `.absolute.path` will look like `/child/.`
And `Directory('/child/.').parent` is `Directory('/child)`.
This commit is contained in:
Sigurd Meldgaard 2025-03-20 11:07:32 +01:00 committed by GitHub
parent e6fbc63d37
commit 95843ca334
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter_tools/lib/src/dart/package_map.dart
View File

@ -24,8 +24,8 @@ Future<PackageConfig> currentPackageConfig() async {
// TODO(sigurdm): Only call this once per run - and read in from BuildInfo.
File? findPackageConfigFile(Directory dir) {
final FileSystem fileSystem = dir.fileSystem;
Directory candidateDir = fileSystem.directory(fileSystem.path.normalize(dir.absolute.path));
Directory candidateDir = fileSystem.directory(dir.path).absolute;
while (true) {
final File candidatePackageConfigFile = candidateDir
.childDirectory('.dart_tool')

9
packages/flutter_tools/test/general.shard/dart/package_map_test.dart
View File

@ -45,5 +45,14 @@ void main() {
isNotNull,
);
});
test('Works with a relative directory', () {
final Directory child = fileSystem.currentDirectory.childDirectory('child');
child.createSync(recursive: true);
fileSystem.file('.dart_tool/package_config.json').createSync(recursive: true);
fileSystem.currentDirectory = child;
expect(findPackageConfigFile(fileSystem.directory('.')), isNotNull);
});
});
}