Skip to content

Commit 1eb2f68

Browse files
authored
[ Widget Preview ] Move --dtd-url from a global flag to a widget-preview start option (#173712)
`--dtd-url` is only used by widget previews and has no current usage, so this is a safe change.
1 parent f26eddb commit 1eb2f68

3 files changed

Lines changed: 9 additions & 11 deletions

File tree

packages/flutter_tools/lib/src/commands/widget_preview.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import '../isolated/resident_web_runner.dart';
2525
import '../project.dart';
2626
import '../resident_runner.dart';
2727
import '../runner/flutter_command.dart';
28-
import '../runner/flutter_command_runner.dart';
2928
import '../web/web_device.dart';
3029
import '../widget_preview/analytics.dart';
3130
import '../widget_preview/dependency_graph.dart';
@@ -139,6 +138,12 @@ final class WidgetPreviewStartCommand extends WidgetPreviewSubCommandBase with C
139138
'Serve the widget preview environment using the web-server device instead of the '
140139
'browser.',
141140
)
141+
..addOption(
142+
kDtdUrl,
143+
help:
144+
'The address of an existing Dart Tooling Daemon instance to be used by the Flutter CLI.',
145+
hide: !verbose,
146+
)
142147
..addFlag(
143148
kLaunchPreviewer,
144149
defaultsTo: true,
@@ -156,6 +161,7 @@ final class WidgetPreviewStartCommand extends WidgetPreviewSubCommandBase with C
156161
);
157162
}
158163

164+
static const kDtdUrl = 'dtd-url';
159165
static const kWidgetPreviewScaffoldName = 'widget_preview_scaffold';
160166
static const kLaunchPreviewer = 'launch-previewer';
161167
static const kHeadless = 'headless';
@@ -342,7 +348,7 @@ final class WidgetPreviewStartCommand extends WidgetPreviewSubCommandBase with C
342348
///
343349
/// If --dtd-uri is not provided, a DTD instance managed by the tool will be started.
344350
Future<void> configureDtd() async {
345-
final String? existingDtdUriStr = stringArg(FlutterGlobalOptions.kDtdUrl, global: true);
351+
final String? existingDtdUriStr = stringArg(kDtdUrl);
346352
Uri? existingDtdUri;
347353
try {
348354
if (existingDtdUriStr != null) {

packages/flutter_tools/lib/src/runner/flutter_command_runner.dart

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ abstract final class FlutterGlobalOptions {
3636
static const kMachineFlag = 'machine';
3737
static const kPackagesOption = 'packages';
3838
static const kPrefixedErrorsFlag = 'prefixed-errors';
39-
static const kDtdUrl = 'dtd-url';
4039
static const kPrintDtd = 'print-dtd';
4140
static const kQuietFlag = 'quiet';
4241
static const kShowTestDeviceFlag = 'show-test-device';
@@ -152,12 +151,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
152151
hide: !verboseHelp,
153152
help: 'Path to your "package_config.json" file.',
154153
);
155-
argParser.addOption(
156-
FlutterGlobalOptions.kDtdUrl,
157-
help:
158-
'The address of an existing Dart Tooling Daemon instance to be used by the Flutter CLI.',
159-
hide: !verboseHelp,
160-
);
161154
argParser.addFlag(
162155
FlutterGlobalOptions.kPrintDtd,
163156
negatable: false,

packages/flutter_tools/test/integration.shard/widget_preview_test.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import 'package:flutter_tools/src/base/io.dart';
1111
import 'package:flutter_tools/src/base/logger.dart';
1212
import 'package:flutter_tools/src/commands/widget_preview.dart';
1313
import 'package:flutter_tools/src/globals.dart' as globals;
14-
import 'package:flutter_tools/src/runner/flutter_command_runner.dart';
1514
import 'package:flutter_tools/src/widget_preview/dtd_services.dart';
1615
import 'package:process/process.dart';
1716

@@ -74,7 +73,7 @@ void main() {
7473
'--verbose',
7574
'--${WidgetPreviewStartCommand.kHeadless}',
7675
if (useWebServer) '--${WidgetPreviewStartCommand.kWebServer}',
77-
if (dtdUri != null) '--${FlutterGlobalOptions.kDtdUrl}=$dtdUri',
76+
if (dtdUri != null) '--${WidgetPreviewStartCommand.kDtdUrl}=$dtdUri',
7877
], workingDirectory: tempDir.path);
7978

8079
final completer = Completer<void>();

0 commit comments

Comments
 (0)