development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-09-21 17:22:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync .packages file as a normal input file. (#16467)

Browse source 
* Sync .packages file as regular file.

Currently .packages file is treated specially as DevFSStringContent to accommodate package-file rewrite when it is sent to the device for dart1 compilation. In dart2 we need to treat .packages as regular file because from frontend perspective it's just a normal input file.
This commit is contained in:
Alexander Aprelev 2018-04-11 14:48:14 -07:00 committed by GitHub
parent fea7d3c853
commit 4c221231c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
packages/flutter_tools/lib/src/devfs.dart
View file

@ -422,9 +422,10 @@ class DevFS {
await _scanDirectory(rootDirectory,
recursive: true,
fileFilter: fileFilter);
final bool previewDart2 = generator != null;
if (fs.isFileSync(_packagesFilePath)) {
printTrace('Scanning package files');
await _scanPackages(fileFilter);
await _scanPackages(fileFilter, previewDart2);
}
if (bundle != null) {
printTrace('Scanning asset files');
@ -475,7 +476,7 @@ class DevFS {
assetPathsToEvict.add(archivePath);
}
});
if (generator != null) {
if (previewDart2) {
// We run generator even if [dirtyEntries] was empty because we want
// to keep logic of accepting/rejecting generator's output simple:
// we must accept/reject generator's output after every [update] call.
@ -580,9 +581,11 @@ class DevFS {
return true;
}
assert((file is Link) || (file is File));
if (ignoreDotFiles && fs.path.basename(file.path).startsWith('.')) {
// Skip dot files.
return true;
final String basename = fs.path.basename(file.path);
if (ignoreDotFiles && basename.startsWith('.')) {
// Skip dot files, but not the '.packages' file (even though in dart1
// mode devfs['.packages'] will be overwritten with synthesized string content).
return basename != '.packages';
}
return false;
}
@ -688,7 +691,7 @@ class DevFS {
);
}
Future<Null> _scanPackages(Set<String> fileFilter) async {
Future<Null> _scanPackages(Set<String> fileFilter, bool previewDart2) async {
StringBuffer sb;
final PackageMap packageMap = new PackageMap(_packagesFilePath);
@ -721,6 +724,14 @@ class DevFS {
sb.writeln('$packageName:$directoryUriOnDevice');
}
}
if (previewDart2) {
// When in previewDart2 mode we don't update .packages-file entry
// so actual file will get invalidated in frontend.
// We don't need to synthesize device-correct .packages file because
// it is not going to be used on the device anyway - compilation
// is done on the host.
return;
}
if (sb != null) {
final DevFSContent content = _entries[fs.path.toUri('.packages')];
if (content is DevFSStringContent && content.string == sb.toString()) {