mirror of
https://github.com/flutter/flutter.git
synced 2025-06-03 00:51:18 +00:00
![auto-submit[bot]](/assets/img/avatar_default.png)
<!-- start_original_pr_link --> Reverts: flutter/flutter#169451 <!-- end_original_pr_link --> <!-- start_initiating_author --> Initiated by: matanlurey <!-- end_initiating_author --> <!-- start_revert_reason --> Reason for reverting: Broke a number of post-submit tests (ios_app_extension, packages_autoroller). <!-- end_revert_reason --> <!-- start_original_pr_author --> Original PR Author: mosuem <!-- end_original_pr_author --> <!-- start_reviewers --> Reviewed By: {matanlurey} <!-- end_reviewers --> <!-- start_revert_body --> This change reverts the following previous change: Reland after #169357. Switch Flutter to use pub workspaces as a preparation to unpin selected packages. Assumptions: 1. No packages in this repository are published to pub.dev --> We can use `any` dependencies in most local pubspecs, as the global constraint defines the version. An exception are the packages used outside of this repo with an `sdk` dependency, namely `flutter_localizations`, `flutter_test`, and `flutter`. 2. The "universes" `{flutter_tools}` and `{flutter, flutter_localizations, flutter_goldens}` can use different packages versions, as they are not resolved together. --> We do not need to upgrade them in sync, we can first do one "universe", then the other. Based on these assumptions, we use https://github.com/mosuem/pubspec_merger.dart to merge all packages in the `flutter` universe into a top-level pub workspace. The `flutter` and `flutter_tools` workspaces being separate also ensures that changes to `flutter` will not inadvertently break `flutter_tools`, with not-so-nice consequences for our users which would be unable to run `flutter upgrade`. There is a third "top-level" pubspec besides `./pubspec.yaml` and `packages/flutter_tools/pubspec.yaml`, namely `packages/flutter_tools/.../widget_preview_scaffold/pubspec.yaml`. This is an artifact due to it living under `flutter_tools`, so it can't be part of the `./pubspec.yaml` workspace. Moving it would be a larger change, and out of the scope of this PR. This required a rewrite of the update-packages tool, but the main functionality stays the same, as well as the argument names, to ensure a seamless transition. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md <!-- end_revert_body --> Co-authored-by: auto-submit[bot] <flutter-engprod-team@google.com>
326 lines
12 KiB
Dart
326 lines
12 KiB
Dart
// Copyright 2014 The Flutter Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
import 'dart:async';
|
|
import 'dart:convert';
|
|
import 'dart:io';
|
|
|
|
import 'package:path/path.dart' as path;
|
|
import 'package:process/process.dart';
|
|
|
|
import '../framework/devices.dart';
|
|
import '../framework/framework.dart';
|
|
import '../framework/running_processes.dart';
|
|
import '../framework/task_result.dart';
|
|
import '../framework/utils.dart';
|
|
|
|
final Directory _editedFlutterGalleryDir = dir(
|
|
path.join(Directory.systemTemp.path, 'edited_flutter_gallery'),
|
|
);
|
|
final Directory flutterGalleryDir = dir(
|
|
path.join(flutterDirectory.path, 'dev/integration_tests/flutter_gallery'),
|
|
);
|
|
const String kSourceLine = 'fontSize: (orientation == Orientation.portrait) ? 32.0 : 24.0';
|
|
const String kReplacementLine = 'fontSize: (orientation == Orientation.portrait) ? 34.0 : 24.0';
|
|
|
|
TaskFunction createHotModeTest({
|
|
String? deviceIdOverride,
|
|
bool checkAppRunningOnLocalDevice = false,
|
|
List<String>? additionalOptions,
|
|
}) {
|
|
// This file is modified during the test and needs to be restored at the end.
|
|
final File flutterFrameworkSource = file(
|
|
path.join(flutterDirectory.path, 'packages/flutter/lib/src/widgets/framework.dart'),
|
|
);
|
|
final String oldContents = flutterFrameworkSource.readAsStringSync();
|
|
return () async {
|
|
if (deviceIdOverride == null) {
|
|
final Device device = await devices.workingDevice;
|
|
await device.unlock();
|
|
deviceIdOverride = device.deviceId;
|
|
}
|
|
final File benchmarkFile = file(path.join(_editedFlutterGalleryDir.path, 'hot_benchmark.json'));
|
|
rm(benchmarkFile);
|
|
final List<String> options = <String>[
|
|
'--hot',
|
|
'-d',
|
|
deviceIdOverride!,
|
|
'--benchmark',
|
|
'--resident',
|
|
'--no-android-gradle-daemon',
|
|
'--no-publish-port',
|
|
'--verbose',
|
|
'--uninstall-first',
|
|
if (additionalOptions != null) ...additionalOptions,
|
|
];
|
|
int hotReloadCount = 0;
|
|
late Map<String, dynamic> smallReloadData;
|
|
late Map<String, dynamic> mediumReloadData;
|
|
late Map<String, dynamic> largeReloadData;
|
|
late Map<String, dynamic> freshRestartReloadsData;
|
|
|
|
await inDirectory<void>(flutterDirectory, () async {
|
|
rmTree(_editedFlutterGalleryDir);
|
|
mkdirs(_editedFlutterGalleryDir);
|
|
recursiveCopy(flutterGalleryDir, _editedFlutterGalleryDir);
|
|
|
|
try {
|
|
await inDirectory<void>(_editedFlutterGalleryDir, () async {
|
|
smallReloadData = await captureReloadData(
|
|
options: options,
|
|
benchmarkFile: benchmarkFile,
|
|
onLine: (String line, Process process) {
|
|
if (!line.contains('Reloaded ')) {
|
|
return;
|
|
}
|
|
if (hotReloadCount == 0) {
|
|
// Update a file for 2 library invalidation.
|
|
final File appDartSource = file(
|
|
path.join(_editedFlutterGalleryDir.path, 'lib/gallery/app.dart'),
|
|
);
|
|
appDartSource.writeAsStringSync(
|
|
appDartSource.readAsStringSync().replaceFirst(
|
|
"'Flutter Gallery'",
|
|
"'Updated Flutter Gallery'",
|
|
),
|
|
);
|
|
process.stdin.writeln('r');
|
|
hotReloadCount += 1;
|
|
} else {
|
|
process.stdin.writeln('q');
|
|
}
|
|
},
|
|
);
|
|
|
|
mediumReloadData = await captureReloadData(
|
|
options: options,
|
|
benchmarkFile: benchmarkFile,
|
|
onLine: (String line, Process process) {
|
|
if (!line.contains('Reloaded ')) {
|
|
return;
|
|
}
|
|
if (hotReloadCount == 1) {
|
|
// Update a file for ~50 library invalidation.
|
|
final File appDartSource = file(
|
|
path.join(_editedFlutterGalleryDir.path, 'lib/demo/calculator/home.dart'),
|
|
);
|
|
appDartSource.writeAsStringSync(
|
|
appDartSource.readAsStringSync().replaceFirst(kSourceLine, kReplacementLine),
|
|
);
|
|
process.stdin.writeln('r');
|
|
hotReloadCount += 1;
|
|
} else {
|
|
process.stdin.writeln('q');
|
|
}
|
|
},
|
|
);
|
|
|
|
largeReloadData = await captureReloadData(
|
|
options: options,
|
|
benchmarkFile: benchmarkFile,
|
|
onLine: (String line, Process process) async {
|
|
if (!line.contains('Reloaded ')) {
|
|
return;
|
|
}
|
|
if (hotReloadCount == 2) {
|
|
// Trigger a framework invalidation (370 libraries) without modifying the source
|
|
flutterFrameworkSource.writeAsStringSync(
|
|
'${flutterFrameworkSource.readAsStringSync()}\n',
|
|
);
|
|
process.stdin.writeln('r');
|
|
hotReloadCount += 1;
|
|
} else {
|
|
if (checkAppRunningOnLocalDevice) {
|
|
await _checkAppRunning(true);
|
|
}
|
|
process.stdin.writeln('q');
|
|
}
|
|
},
|
|
);
|
|
|
|
// Start `flutter run` again to make sure it loads from the previous
|
|
// state. Frontend loads up from previously generated kernel files.
|
|
{
|
|
final Process process = await startFlutter('run', options: options);
|
|
final Completer<void> stdoutDone = Completer<void>();
|
|
final Completer<void> stderrDone = Completer<void>();
|
|
process.stdout
|
|
.transform<String>(utf8.decoder)
|
|
.transform<String>(const LineSplitter())
|
|
.listen(
|
|
(String line) {
|
|
if (line.contains('Reloaded ')) {
|
|
process.stdin.writeln('q');
|
|
}
|
|
print('stdout: $line');
|
|
},
|
|
onDone: () {
|
|
stdoutDone.complete();
|
|
},
|
|
);
|
|
process.stderr
|
|
.transform<String>(utf8.decoder)
|
|
.transform<String>(const LineSplitter())
|
|
.listen(
|
|
(String line) {
|
|
print('stderr: $line');
|
|
},
|
|
onDone: () {
|
|
stderrDone.complete();
|
|
},
|
|
);
|
|
|
|
await Future.wait<void>(<Future<void>>[stdoutDone.future, stderrDone.future]);
|
|
await process.exitCode;
|
|
|
|
freshRestartReloadsData =
|
|
json.decode(benchmarkFile.readAsStringSync()) as Map<String, dynamic>;
|
|
}
|
|
});
|
|
if (checkAppRunningOnLocalDevice) {
|
|
await _checkAppRunning(false);
|
|
}
|
|
} finally {
|
|
flutterFrameworkSource.writeAsStringSync(oldContents);
|
|
}
|
|
});
|
|
|
|
return TaskResult.success(
|
|
<String, dynamic>{
|
|
'hotReloadInitialDevFSSyncMilliseconds':
|
|
// ignore: avoid_dynamic_calls
|
|
smallReloadData['hotReloadInitialDevFSSyncMilliseconds'][0],
|
|
// ignore: avoid_dynamic_calls
|
|
'hotRestartMillisecondsToFrame': smallReloadData['hotRestartMillisecondsToFrame'][0],
|
|
// ignore: avoid_dynamic_calls
|
|
'hotReloadMillisecondsToFrame': smallReloadData['hotReloadMillisecondsToFrame'][0],
|
|
// ignore: avoid_dynamic_calls
|
|
'hotReloadDevFSSyncMilliseconds': smallReloadData['hotReloadDevFSSyncMilliseconds'][0],
|
|
'hotReloadFlutterReassembleMilliseconds':
|
|
// ignore: avoid_dynamic_calls
|
|
smallReloadData['hotReloadFlutterReassembleMilliseconds'][0],
|
|
// ignore: avoid_dynamic_calls
|
|
'hotReloadVMReloadMilliseconds': smallReloadData['hotReloadVMReloadMilliseconds'][0],
|
|
'hotReloadMillisecondsToFrameAfterChange':
|
|
// ignore: avoid_dynamic_calls
|
|
smallReloadData['hotReloadMillisecondsToFrame'][1],
|
|
'hotReloadDevFSSyncMillisecondsAfterChange':
|
|
// ignore: avoid_dynamic_calls
|
|
smallReloadData['hotReloadDevFSSyncMilliseconds'][1],
|
|
'hotReloadFlutterReassembleMillisecondsAfterChange':
|
|
// ignore: avoid_dynamic_calls
|
|
smallReloadData['hotReloadFlutterReassembleMilliseconds'][1],
|
|
'hotReloadVMReloadMillisecondsAfterChange':
|
|
// ignore: avoid_dynamic_calls
|
|
smallReloadData['hotReloadVMReloadMilliseconds'][1],
|
|
'hotReloadInitialDevFSSyncAfterRelaunchMilliseconds':
|
|
// ignore: avoid_dynamic_calls
|
|
freshRestartReloadsData['hotReloadInitialDevFSSyncMilliseconds'][0],
|
|
|
|
'hotReloadMillisecondsToFrameAfterMediumChange':
|
|
// ignore: avoid_dynamic_calls
|
|
mediumReloadData['hotReloadMillisecondsToFrame'][1],
|
|
|
|
'hotReloadDevFSSyncMillisecondsAfterMediumChange':
|
|
// ignore: avoid_dynamic_calls
|
|
mediumReloadData['hotReloadDevFSSyncMilliseconds'][1],
|
|
|
|
'hotReloadFlutterReassembleMillisecondsAfterMediumChange':
|
|
// ignore: avoid_dynamic_calls
|
|
mediumReloadData['hotReloadFlutterReassembleMilliseconds'][1],
|
|
|
|
'hotReloadVMReloadMillisecondsAfterMediumChange':
|
|
// ignore: avoid_dynamic_calls
|
|
mediumReloadData['hotReloadVMReloadMilliseconds'][1],
|
|
|
|
'hotReloadMillisecondsToFrameAfterLargeChange':
|
|
// ignore: avoid_dynamic_calls
|
|
largeReloadData['hotReloadMillisecondsToFrame'][1],
|
|
|
|
'hotReloadDevFSSyncMillisecondsAfterLargeChange':
|
|
// ignore: avoid_dynamic_calls
|
|
largeReloadData['hotReloadDevFSSyncMilliseconds'][1],
|
|
|
|
'hotReloadFlutterReassembleMillisecondsAfterLargeChange':
|
|
// ignore: avoid_dynamic_calls
|
|
largeReloadData['hotReloadFlutterReassembleMilliseconds'][1],
|
|
|
|
'hotReloadVMReloadMillisecondsAfterLargeChange':
|
|
// ignore: avoid_dynamic_calls
|
|
largeReloadData['hotReloadVMReloadMilliseconds'][1],
|
|
},
|
|
benchmarkScoreKeys: <String>[
|
|
'hotReloadInitialDevFSSyncMilliseconds',
|
|
'hotRestartMillisecondsToFrame',
|
|
'hotReloadMillisecondsToFrame',
|
|
'hotReloadDevFSSyncMilliseconds',
|
|
'hotReloadFlutterReassembleMilliseconds',
|
|
'hotReloadVMReloadMilliseconds',
|
|
'hotReloadMillisecondsToFrameAfterChange',
|
|
'hotReloadDevFSSyncMillisecondsAfterChange',
|
|
'hotReloadFlutterReassembleMillisecondsAfterChange',
|
|
'hotReloadVMReloadMillisecondsAfterChange',
|
|
'hotReloadInitialDevFSSyncAfterRelaunchMilliseconds',
|
|
'hotReloadMillisecondsToFrameAfterMediumChange',
|
|
'hotReloadDevFSSyncMillisecondsAfterMediumChange',
|
|
'hotReloadFlutterReassembleMillisecondsAfterMediumChange',
|
|
'hotReloadVMReloadMillisecondsAfterMediumChange',
|
|
'hotReloadMillisecondsToFrameAfterLargeChange',
|
|
'hotReloadDevFSSyncMillisecondsAfterLargeChange',
|
|
'hotReloadFlutterReassembleMillisecondsAfterLargeChange',
|
|
'hotReloadVMReloadMillisecondsAfterLargeChange',
|
|
],
|
|
);
|
|
};
|
|
}
|
|
|
|
Future<Map<String, dynamic>> captureReloadData({
|
|
required List<String> options,
|
|
required File benchmarkFile,
|
|
required void Function(String, Process) onLine,
|
|
}) async {
|
|
final Process process = await startFlutter('run', options: options);
|
|
|
|
final Completer<void> stdoutDone = Completer<void>();
|
|
final Completer<void> stderrDone = Completer<void>();
|
|
process.stdout.transform<String>(utf8.decoder).transform<String>(const LineSplitter()).listen((
|
|
String line,
|
|
) {
|
|
onLine(line, process);
|
|
print('stdout: $line');
|
|
}, onDone: stdoutDone.complete);
|
|
|
|
process.stderr
|
|
.transform<String>(utf8.decoder)
|
|
.transform<String>(const LineSplitter())
|
|
.listen((String line) => print('stderr: $line'), onDone: stderrDone.complete);
|
|
|
|
await Future.wait<void>(<Future<void>>[stdoutDone.future, stderrDone.future]);
|
|
await process.exitCode;
|
|
final Map<String, dynamic> result =
|
|
json.decode(benchmarkFile.readAsStringSync()) as Map<String, dynamic>;
|
|
benchmarkFile.deleteSync();
|
|
return result;
|
|
}
|
|
|
|
Future<void> _checkAppRunning(bool shouldBeRunning) async {
|
|
late Set<RunningProcessInfo> galleryProcesses;
|
|
for (int i = 0; i < 10; i++) {
|
|
final String exe = Platform.isWindows ? '.exe' : '';
|
|
galleryProcesses = await getRunningProcesses(
|
|
processName: 'Flutter Gallery$exe',
|
|
processManager: const LocalProcessManager(),
|
|
);
|
|
|
|
if (galleryProcesses.isNotEmpty == shouldBeRunning) {
|
|
return;
|
|
}
|
|
|
|
// Give the app time to shut down.
|
|
sleep(const Duration(seconds: 1));
|
|
}
|
|
print(galleryProcesses.join('\n'));
|
|
throw TaskResult.failure('Flutter Gallery app is ${shouldBeRunning ? 'not' : 'still'} running');
|
|
}
|