development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-13 19:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Roll forward #8467 (#8477)

Browse source 
* Revert "Revert "Simplify path handling logic in dependency checker and devFS (#8414)" (#8467)"

This reverts commit 96ba7f76d2.

* Intentionally use a self-package URI in flutter_gallery

* tests to catch problems with self-package imports
This commit is contained in:
Michael Goderbauer 2017-02-28 17:21:17 -08:00 committed by GitHub
parent 6571b41f40
commit 65835af4e6
8 changed files with 64 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/flutter_gallery/lib/demo/all.dart
View file

@ -33,6 +33,8 @@ export 'snack_bar_demo.dart';
export 'tabs_demo.dart';
export 'tabs_fab_demo.dart';
export 'text_field_demo.dart';
export 'tooltip_demo.dart';
export 'two_level_list_demo.dart';
export 'typography_demo.dart';
// Intentionally use a self-package URL to make sure we don't break these.
export 'package:flutter_gallery/demo/tooltip_demo.dart';

13
packages/flutter_tools/lib/src/dart/dependencies.dart
View file

@ -5,7 +5,6 @@
import 'dart:convert';
import '../artifacts.dart';
import '../base/file_system.dart';
import '../base/process.dart';
class DartDependencySetBuilder {
@ -30,16 +29,6 @@ class DartDependencySetBuilder {
String output = runSyncAndThrowStdErrOnError(args);
final List<String> lines = LineSplitter.split(output).toList();
final Set<String> minimalDependencies = new Set<String>();
for (String line in lines) {
if (!line.startsWith('package:')) {
// We convert the uris so that they are relative to the project
// root.
line = fs.path.relative(line, from: projectRootPath);
}
minimalDependencies.add(line);
}
return minimalDependencies;
return new Set<String>.from(LineSplitter.split(output));
}
}

15
packages/flutter_tools/lib/src/dependency_checker.dart
View file

@ -5,7 +5,6 @@
import 'asset.dart';
import 'base/file_system.dart';
import 'dart/dependencies.dart';
import 'dart/package_map.dart';
import 'globals.dart';
class DependencyChecker {
@ -18,10 +17,7 @@ class DependencyChecker {
/// if it cannot be determined.
bool check(DateTime threshold) {
_dependencies.clear();
PackageMap packageMap;
// Parse the package map.
try {
packageMap = new PackageMap(builder.packagesFilePath)..load();
_dependencies.add(builder.packagesFilePath);
} catch (e, st) {
printTrace('DependencyChecker: could not parse .packages file:\n$e\n$st');
@ -29,16 +25,7 @@ class DependencyChecker {
}
// Build the set of Dart dependencies.
try {
Set<String> dependencies = builder.build();
for (String path in dependencies) {
// Ensure all paths are absolute.
if (path.startsWith('package:')) {
path = packageMap.pathForPackage(Uri.parse(path));
} else {
path = fs.path.join(builder.projectRootPath, path);
}
_dependencies.add(path);
}
_dependencies.addAll(builder.build());
} catch (e, st) {
printTrace('DependencyChecker: error determining .dart dependencies:\n$e\n$st');
return true;

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

@ -461,10 +461,10 @@ class DevFS {
}
bool _shouldIgnore(String devicePath) {
List<String> ignoredPrefixes = <String>['android/',
List<String> ignoredPrefixes = <String>['android' + fs.path.separator,
getBuildDirectory(),
'ios/',
'.pub/'];
'ios' + fs.path.separator,
'.pub' + fs.path.separator];
for (String ignoredPrefix in ignoredPrefixes) {
if (devicePath.startsWith(ignoredPrefix))
return true;
@ -473,16 +473,14 @@ class DevFS {
}
Future<bool> _scanDirectory(Directory directory,
{String directoryName,
{String directoryNameOnDevice,
bool recursive: false,
bool ignoreDotFiles: true,
String packagesDirectoryName,
Set<String> fileFilter}) async {
String prefix = directoryName;
if (prefix == null) {
prefix = fs.path.relative(directory.path, from: rootDirectory.path);
if (prefix == '.')
prefix = '';
if (directoryNameOnDevice == null) {
directoryNameOnDevice = fs.path.relative(directory.path, from: rootDirectory.path);
if (directoryNameOnDevice == '.')
directoryNameOnDevice = '';
}
try {
Stream<FileSystemEntity> files =
@ -508,24 +506,8 @@ class DevFS {
}
final String relativePath =
fs.path.relative(file.path, from: directory.path);
final String devicePath = fs.path.join(prefix, relativePath);
bool filtered = false;
if ((fileFilter != null) &&
!fileFilter.contains(devicePath)) {
if (packagesDirectoryName != null) {
// Double check the filter for packages/packagename/
final String packagesDevicePath =
fs.path.join(packagesDirectoryName, relativePath);
if (!fileFilter.contains(packagesDevicePath)) {
// File was not in the filter set.
filtered = true;
}
} else {
// File was not in the filter set.
filtered = true;
}
}
if (filtered) {
final String devicePath = fs.path.join(directoryNameOnDevice, relativePath);
if ((fileFilter != null) && !fileFilter.contains(file.absolute.path)) {
// Skip files that are not included in the filter.
continue;
}
@ -548,27 +530,26 @@ class DevFS {
PackageMap packageMap = new PackageMap(_packagesFilePath);
for (String packageName in packageMap.map.keys) {
Uri uri = packageMap.map[packageName];
// This project's own package.
final bool isProjectPackage = uri.toString() == 'lib/';
final String directoryName =
isProjectPackage ? 'lib' : fs.path.join('packages', packageName);
// If this is the project's package, we need to pass both
// package:<package_name> and lib/ as paths to be checked against
// the filter because we must support both package: imports and relative
// path imports within the project's own code.
final String packagesDirectoryName =
isProjectPackage ? fs.path.join('packages', packageName) : null;
Directory directory = fs.directory(uri);
bool packageExists =
await _scanDirectory(directory,
directoryName: directoryName,
recursive: true,
packagesDirectoryName: packagesDirectoryName,
fileFilter: fileFilter);
Uri packageUri = packageMap.map[packageName];
String packagePath = fs.path.fromUri(packageUri);
Directory packageDirectory = fs.directory(packageUri);
String directoryNameOnDevice = fs.path.join('packages', packageName);
bool packageExists;
if (fs.path.isWithin(rootDirectory.path, packagePath)) {
// We already scanned everything under the root directory.
packageExists = packageDirectory.existsSync();
directoryNameOnDevice = fs.path.relative(packagePath, from: rootDirectory.path);
} else {
packageExists =
await _scanDirectory(packageDirectory,
directoryNameOnDevice: directoryNameOnDevice,
recursive: true,
fileFilter: fileFilter);
}
if (packageExists) {
sb ??= new StringBuffer();
sb.writeln('$packageName:$directoryName');
sb.writeln('$packageName:$directoryNameOnDevice');
}
}
if (sb != null) {

13
packages/flutter_tools/lib/src/run_hot.dart
View file

@ -98,18 +98,7 @@ class HotRunner extends ResidentRunner {
new DartDependencySetBuilder(
mainPath, projectRootPath, packagesFilePath);
try {
Set<String> dependencies = dartDependencySetBuilder.build();
_dartDependencies = new Set<String>();
for (String path in dependencies) {
// We need to tweak package: uris so that they reflect their devFS
// location.
if (path.startsWith('package:')) {
// Swap out package: for packages/ because we place all package
// sources under packages/.
path = path.replaceFirst('package:', 'packages/');
}
_dartDependencies.add(path);
}
_dartDependencies = new Set<String>.from(dartDependencySetBuilder.build());
} catch (error) {
printStatus('Error detected in application source code:', emphasis: true);
printError('$error');

4
packages/flutter_tools/test/dart_dependencies_test.dart
View file

@ -21,8 +21,8 @@ void main() {
DartDependencySetBuilder builder =
new DartDependencySetBuilder(mainPath, testPath, packagesPath);
Set<String> dependencies = builder.build();
expect(dependencies.contains('main.dart'), isTrue);
expect(dependencies.contains('foo.dart'), isTrue);
expect(dependencies.contains(mainPath), isTrue);
expect(dependencies.contains(fs.path.join(testPath, 'foo.dart')), isTrue);
});
testUsingContext('syntax_error', () {
final String testPath = fs.path.join(dataPath, 'syntax_error');

39
packages/flutter_tools/test/devfs_test.dart
View file

@ -4,6 +4,7 @@
import 'dart:async';
import 'dart:convert';
import 'dart:io' as io;
import 'package:flutter_tools/src/asset.dart';
import 'package:flutter_tools/src/base/io.dart';
@ -18,7 +19,7 @@ import 'src/context.dart';
import 'src/mocks.dart';
void main() {
final String filePath = fs.path.join('bar', 'foo.txt');
final String filePath = fs.path.join('lib', 'foo.txt');
final String filePath2 = fs.path.join('foo', 'bar.txt');
Directory tempDir;
String basePath;
@ -69,6 +70,7 @@ void main() {
File file = fs.file(fs.path.join(basePath, filePath));
await file.parent.create(recursive: true);
file.writeAsBytesSync(<int>[1, 2, 3]);
_packages['my_project'] = 'lib';
// simulate package
await _createPackage('somepkg', 'somefile.txt');
@ -80,12 +82,20 @@ void main() {
int bytes = await devFS.update();
devFSOperations.expectMessages(<String>[
'writeFile test .packages',
'writeFile test ${fs.path.join('bar', 'foo.txt')}',
'writeFile test ${fs.path.join('lib', 'foo.txt')}',
'writeFile test ${fs.path.join('packages', 'somepkg', 'somefile.txt')}',
'writeFile test .packages',
]);
expect(devFS.assetPathsToEvict, isEmpty);
expect(bytes, 31);
List<String> packageSpecOnDevice = LineSplitter.split(UTF8.decode(
await devFSOperations.devicePathToContent['.packages'].contentsAsBytes()
)).toList();
expect(packageSpecOnDevice,
unorderedEquals(['my_project:lib', 'somepkg:packages/somepkg'])
);
expect(bytes, 46);
});
testUsingContext('add new file to local file system', () async {
File file = fs.file(fs.path.join(basePath, filePath2));
@ -110,7 +120,7 @@ void main() {
await file.writeAsBytes(<int>[1, 2, 3, 4, 5, 6]);
bytes = await devFS.update();
devFSOperations.expectMessages(<String>[
'writeFile test ${fs.path.join('bar', 'foo.txt')}',
'writeFile test ${fs.path.join('lib', 'foo.txt')}',
]);
expect(devFS.assetPathsToEvict, isEmpty);
expect(bytes, 6);
@ -120,7 +130,7 @@ void main() {
await file.delete();
int bytes = await devFS.update();
devFSOperations.expectMessages(<String>[
'deleteFile test ${fs.path.join('bar', 'foo.txt')}',
'deleteFile test ${fs.path.join('lib', 'foo.txt')}',
]);
expect(devFS.assetPathsToEvict, isEmpty);
expect(bytes, 0);
@ -133,7 +143,7 @@ void main() {
'writeFile test ${fs.path.join('packages', 'newpkg', 'anotherfile.txt')}',
]);
expect(devFS.assetPathsToEvict, isEmpty);
expect(bytes, 51);
expect(bytes, 66);
});
testUsingContext('add an asset bundle', () async {
assetBundle.entries['a.txt'] = new DevFSStringContent('abc');
@ -197,7 +207,7 @@ void main() {
devFSOperations.expectMessages(<String>['destroy test']);
expect(devFS.assetPathsToEvict, isEmpty);
});
});
}, skip: io.Platform.isWindows);
group('devfs remote', () {
MockVMService vmService;
@ -230,11 +240,11 @@ void main() {
int bytes = await devFS.update();
vmService.expectMessages(<String>[
'writeFile test .packages',
'writeFile test ${fs.path.join('bar', 'foo.txt')}',
'writeFile test ${fs.path.join('lib', 'foo.txt')}',
'writeFile test ${fs.path.join('packages', 'somepkg', 'somefile.txt')}',
]);
expect(devFS.assetPathsToEvict, isEmpty);
expect(bytes, 31);
expect(bytes, 46);
}, timeout: const Timeout(const Duration(seconds: 5)));
testUsingContext('delete dev file system', () async {
@ -242,7 +252,7 @@ void main() {
vmService.expectMessages(<String>['_deleteDevFS {fsName: test}']);
expect(devFS.assetPathsToEvict, isEmpty);
});
});
}, skip: io.Platform.isWindows);
}
class MockVMService extends BasicMock implements VMService {
@ -311,7 +321,7 @@ class MockVM implements VM {
final List<Directory> _tempDirs = <Directory>[];
final Map <String, Directory> _packages = <String, Directory>{};
final Map <String, String> _packages = <String, String>{};
Directory _newTempDir() {
Directory tempDir = fs.systemTempDirectory.createTempSync('devfs${_tempDirs.length}');
@ -330,10 +340,9 @@ Future<Null> _createPackage(String pkgName, String pkgFileName) async {
File pkgFile = fs.file(fs.path.join(pkgTempDir.path, pkgName, 'lib', pkgFileName));
await pkgFile.parent.create(recursive: true);
pkgFile.writeAsBytesSync(<int>[11, 12, 13]);
_packages[pkgName] = pkgTempDir;
_packages[pkgName] = pkgFile.parent.path;
StringBuffer sb = new StringBuffer();
_packages.forEach((String pkgName, Directory pkgTempDir) {
Uri pkgPath = fs.path.toUri(fs.path.join(pkgTempDir.path, pkgName, 'lib'));
_packages.forEach((String pkgName, String pkgPath) {
sb.writeln('$pkgName:$pkgPath');
});
fs.file(fs.path.join(_tempDirs[0].path, '.packages')).writeAsStringSync(sb.toString());

4
packages/flutter_tools/test/src/mocks.dart
View file

@ -95,6 +95,8 @@ class BasicMock {
}
class MockDevFSOperations extends BasicMock implements DevFSOperations {
Map<String, DevFSContent> devicePathToContent = <String, DevFSContent>{};
@override
Future<Uri> create(String fsName) async {
messages.add('create $fsName');
@ -109,10 +111,12 @@ class MockDevFSOperations extends BasicMock implements DevFSOperations {
@override
Future<dynamic> writeFile(String fsName, String devicePath, DevFSContent content) async {
messages.add('writeFile $fsName $devicePath');
devicePathToContent[devicePath] = content;
}
@override
Future<dynamic> deleteFile(String fsName, String devicePath) async {
messages.add('deleteFile $fsName $devicePath');
devicePathToContent.remove(devicePath);
}
}