mirror of
https://github.com/flutter/flutter.git
synced 2026-02-13 22:31:34 +08:00
<!-- 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>
202 lines
7.4 KiB
Dart
202 lines
7.4 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 '../framework/framework.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 kInitialStartupTime = 'InitialStartupTime';
|
|
const String kFirstRestartTime = 'FistRestartTime';
|
|
const String kFirstRecompileTime = 'FirstRecompileTime';
|
|
const String kSecondStartupTime = 'SecondStartupTime';
|
|
const String kSecondRestartTime = 'SecondRestartTime';
|
|
|
|
abstract class WebDevice {
|
|
static const String chrome = 'chrome';
|
|
static const String webServer = 'web-server';
|
|
}
|
|
|
|
TaskFunction createWebDevModeTest(String webDevice, bool enableIncrementalCompiler) {
|
|
return () async {
|
|
final List<String> options = <String>[
|
|
'--hot',
|
|
'-d',
|
|
webDevice,
|
|
'--verbose',
|
|
'--resident',
|
|
'--target=lib/main.dart',
|
|
];
|
|
int hotRestartCount = 0;
|
|
final String expectedMessage =
|
|
webDevice == WebDevice.webServer ? 'Recompile complete' : 'Reloaded application';
|
|
final Map<String, int> measurements = <String, int>{};
|
|
await inDirectory<void>(flutterDirectory, () async {
|
|
rmTree(_editedFlutterGalleryDir);
|
|
mkdirs(_editedFlutterGalleryDir);
|
|
recursiveCopy(flutterGalleryDir, _editedFlutterGalleryDir);
|
|
await inDirectory<void>(_editedFlutterGalleryDir, () async {
|
|
{
|
|
await flutter('packages', options: <String>['get']);
|
|
final Process process = await startFlutter('run', options: options);
|
|
|
|
final Completer<void> stdoutDone = Completer<void>();
|
|
final Completer<void> stderrDone = Completer<void>();
|
|
final Stopwatch sw = Stopwatch()..start();
|
|
bool restarted = false;
|
|
process.stdout
|
|
.transform<String>(utf8.decoder)
|
|
.transform<String>(const LineSplitter())
|
|
.listen(
|
|
(String line) {
|
|
// non-dwds builds do not know when the browser is loaded so keep trying
|
|
// until this succeeds.
|
|
if (line.contains('Ignoring terminal input')) {
|
|
Future<void>.delayed(const Duration(seconds: 1)).then((void _) {
|
|
process.stdin.write(restarted ? 'q' : 'r');
|
|
});
|
|
return;
|
|
}
|
|
if (line.contains('Hot restart')) {
|
|
// measure clean start-up time.
|
|
sw.stop();
|
|
measurements[kInitialStartupTime] = sw.elapsedMilliseconds;
|
|
sw
|
|
..reset()
|
|
..start();
|
|
process.stdin.write('r');
|
|
return;
|
|
}
|
|
if (line.contains(expectedMessage)) {
|
|
if (hotRestartCount == 0) {
|
|
measurements[kFirstRestartTime] = sw.elapsedMilliseconds;
|
|
// Update the file and reload again.
|
|
final File appDartSource = file(
|
|
path.join(_editedFlutterGalleryDir.path, 'lib/gallery/app.dart'),
|
|
);
|
|
appDartSource.writeAsStringSync(
|
|
appDartSource.readAsStringSync().replaceFirst(
|
|
"'Flutter Gallery'",
|
|
"'Updated Flutter Gallery'",
|
|
),
|
|
);
|
|
sw
|
|
..reset()
|
|
..start();
|
|
process.stdin.writeln('r');
|
|
++hotRestartCount;
|
|
} else {
|
|
restarted = true;
|
|
measurements[kFirstRecompileTime] = sw.elapsedMilliseconds;
|
|
// Quit after second hot restart.
|
|
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;
|
|
}
|
|
|
|
// Start `flutter run` again to make sure it loads from the previous
|
|
// state. dev compilers loads up from previously compiled JavaScript.
|
|
{
|
|
final Stopwatch sw = Stopwatch()..start();
|
|
final Process process = await startFlutter('run', options: options);
|
|
final Completer<void> stdoutDone = Completer<void>();
|
|
final Completer<void> stderrDone = Completer<void>();
|
|
bool restarted = false;
|
|
process.stdout
|
|
.transform<String>(utf8.decoder)
|
|
.transform<String>(const LineSplitter())
|
|
.listen(
|
|
(String line) {
|
|
// non-dwds builds do not know when the browser is loaded so keep trying
|
|
// until this succeeds.
|
|
if (line.contains('Ignoring terminal input')) {
|
|
Future<void>.delayed(const Duration(seconds: 1)).then((void _) {
|
|
process.stdin.write(restarted ? 'q' : 'r');
|
|
});
|
|
return;
|
|
}
|
|
if (line.contains('Hot restart')) {
|
|
measurements[kSecondStartupTime] = sw.elapsedMilliseconds;
|
|
sw
|
|
..reset()
|
|
..start();
|
|
process.stdin.write('r');
|
|
return;
|
|
}
|
|
if (line.contains(expectedMessage)) {
|
|
restarted = true;
|
|
measurements[kSecondRestartTime] = sw.elapsedMilliseconds;
|
|
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;
|
|
}
|
|
});
|
|
});
|
|
if (hotRestartCount != 1) {
|
|
return TaskResult.failure(null);
|
|
}
|
|
return TaskResult.success(
|
|
measurements,
|
|
benchmarkScoreKeys: <String>[
|
|
kInitialStartupTime,
|
|
kFirstRestartTime,
|
|
kFirstRecompileTime,
|
|
kSecondStartupTime,
|
|
kSecondRestartTime,
|
|
],
|
|
);
|
|
};
|
|
}
|