Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flutter-candidate.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2a82af4d2fb83a3f728c3f6e434778c4edf38290
a0711824a5bac6a4bb9703b5e11601004db3d14b
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class _DropdownInputState<T> extends State<_DropdownInput<T>>
Widget build(BuildContext context) {
final theme = Theme.of(context);
return DropdownButtonFormField(
value: widget.property.valueDisplay,
initialValue: widget.property.valueDisplay,
autovalidateMode: AutovalidateMode.onUserInteraction,
validator: (text) => inputValidator(text, property: widget.property),
decoration: decoration(
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion tool/build_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ flutter build web \
--wasm \
--pwa-strategy=offline-first \
--release \
--no-tree-shake-icons
--no-tree-shake-icons \
--no-minify-wasm

# Ensure permissions are set correctly on canvaskit binaries.
chmod 0755 build/web/canvaskit/canvaskit.*
Expand Down
6 changes: 5 additions & 1 deletion tool/lib/commands/build.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ class BuildCommand extends Command {
..addPubGetFlag()
..addBulidModeOption()
..addWasmFlag()
..addNoStripWasmFlag();
..addNoStripWasmFlag()
..addNoMinifyWasmFlag();
}

@override
Expand All @@ -67,6 +68,8 @@ class BuildCommand extends Command {
final buildMode = results[SharedCommandArgs.buildMode.flagName] as String;
final useWasm = results[SharedCommandArgs.wasm.flagName] as bool;
final noStripWasm = results[SharedCommandArgs.noStripWasm.flagName] as bool;
final noMinifyWasm =
results[SharedCommandArgs.noMinifyWasm.flagName] as bool;

final webBuildDir = Directory(
path.join(repo.devtoolsAppDirectoryPath, 'build', 'web'),
Expand Down Expand Up @@ -105,6 +108,7 @@ class BuildCommand extends Command {
if (useWasm) ...[
SharedCommandArgs.wasm.asArg(),
if (noStripWasm) SharedCommandArgs.noStripWasm.asArg(),
if (noMinifyWasm) SharedCommandArgs.noMinifyWasm.asArg(),
] else ...[
// Do not minify stack traces in debug mode.
if (buildMode == 'debug') '--dart2js-optimization=O1',
Expand Down
4 changes: 4 additions & 0 deletions tool/lib/commands/serve.dart
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ class ServeCommand extends Command {
..addBulidModeOption()
..addWasmFlag()
..addNoStripWasmFlag()
..addNoMinifyWasmFlag()
// Flags defined in the server in DDS.
..addFlag(
_machineFlag,
Expand Down Expand Up @@ -147,6 +148,7 @@ class ServeCommand extends Command {
results[SharedCommandArgs.updatePerfetto.flagName] as bool;
final useWasm = results[SharedCommandArgs.wasm.flagName] as bool;
final noStripWasm = results[SharedCommandArgs.noStripWasm.flagName] as bool;
final noMinifyWasm = results[SharedCommandArgs.noMinifyWasm.flagName] as bool;
final runPubGet = results[SharedCommandArgs.pubGet.flagName] as bool;
final devToolsAppBuildMode =
results[SharedCommandArgs.buildMode.flagName] as String;
Expand All @@ -172,6 +174,7 @@ class ServeCommand extends Command {
..remove(SharedCommandArgs.updatePerfetto.asArg())
..remove(SharedCommandArgs.wasm.asArg())
..remove(SharedCommandArgs.noStripWasm.asArg())
..remove(SharedCommandArgs.noMinifyWasm.asArg())
..remove(valueAsArg(_buildAppFlag))
..remove(valueAsArg(_buildAppFlag, negated: true))
..remove(SharedCommandArgs.runApp.asArg())
Expand Down Expand Up @@ -221,6 +224,7 @@ class ServeCommand extends Command {
if (updatePerfetto) SharedCommandArgs.updatePerfetto.asArg(),
if (useWasm) SharedCommandArgs.wasm.asArg(),
if (noStripWasm) SharedCommandArgs.noStripWasm.asArg(),
if (noMinifyWasm) SharedCommandArgs.noMinifyWasm.asArg(),
'${SharedCommandArgs.buildMode.asArg()}=$devToolsAppBuildMode',
SharedCommandArgs.pubGet.asArg(negated: !runPubGet),
]),
Expand Down
12 changes: 12 additions & 0 deletions tool/lib/commands/shared.dart
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,17 @@ extension BuildCommandArgsExtension on ArgParser {
);
}

void addNoMinifyWasmFlag() {
addFlag(
SharedCommandArgs.noMinifyWasm.flagName,
defaultsTo: false,
help:
'When this flag is present, class names and errors will not be '
'truncated. This flag is ignored if the --wasm flag is '
'not present.',
);
}

void addDebugServerFlag() {
addFlag(
SharedCommandArgs.debugServer.flagName,
Expand All @@ -109,6 +120,7 @@ enum SharedCommandArgs {
pubGet('pub-get'),
wasm('wasm'),
noStripWasm('no-strip-wasm'),
noMinifyWasm('no-minify-wasm'),
runApp('run-app'),
serveWithDartSdk('serve-with-dart-sdk'),
updateFlutter('update-flutter'),
Expand Down