Skip to content

Add --no-strip-wasm flag support to build and serve commands. #7888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenzieschmoll merged 1 commit into from
Jun 5, 2024
Merged

Add --no-strip-wasm flag support to build and serve commands. #7888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions tool/lib/commands/build.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ class BuildCommand extends Command {
..addUpdatePerfettoFlag()
..addPubGetFlag()
..addBulidModeOption()
..addWasmFlag();
..addWasmFlag()
..addNoStripWasmFlag();
}

@override
Expand All @@ -65,6 +66,7 @@ class BuildCommand extends Command {
final runPubGet = results[BuildCommandArgs.pubGet.flagName] as bool;
final buildMode = results[BuildCommandArgs.buildMode.flagName] as String;
final useWasm = results[BuildCommandArgs.wasm.flagName] as bool;
final noStripWasm = results[BuildCommandArgs.noStripWasm.flagName] as bool;

final webBuildDir =
Directory(path.join(repo.devtoolsAppDirectoryPath, 'build', 'web'));
Expand Down Expand Up @@ -99,9 +101,10 @@ class BuildCommand extends Command {
[
'build',
'web',
if (useWasm)
'--wasm'
else ...[
if (useWasm) ...[
BuildCommandArgs.wasm.asArg(),
if (noStripWasm) BuildCommandArgs.noStripWasm.asArg(),
] else ...[
'--web-renderer',
'canvaskit',
// Do not minify stack traces in debug mode.
Expand Down
4 changes: 4 additions & 0 deletions tool/lib/commands/serve.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ class ServeCommand extends Command {
..addPubGetFlag()
..addBulidModeOption()
..addWasmFlag()
..addNoStripWasmFlag()
// Flags defined in the server in DDS.
..addFlag(
_machineFlag,
Expand Down Expand Up @@ -129,6 +130,7 @@ class ServeCommand extends Command {
final updatePerfetto =
results[BuildCommandArgs.updatePerfetto.flagName] as bool;
final useWasm = results[BuildCommandArgs.wasm.flagName] as bool;
final noStripWasm = results[BuildCommandArgs.noStripWasm.flagName] as bool;
final runPubGet = results[BuildCommandArgs.pubGet.flagName] as bool;
final devToolsAppBuildMode =
results[BuildCommandArgs.buildMode.flagName] as String;
Expand All @@ -140,6 +142,7 @@ class ServeCommand extends Command {
..remove(BuildCommandArgs.updateFlutter.asArg(negated: true))
..remove(BuildCommandArgs.updatePerfetto.asArg())
..remove(BuildCommandArgs.wasm.asArg())
..remove(BuildCommandArgs.noStripWasm.asArg())
..remove(valueAsArg(_buildAppFlag))
..remove(valueAsArg(_buildAppFlag, negated: true))
..remove(valueAsArg(_debugServerFlag))
Expand Down Expand Up @@ -179,6 +182,7 @@ class ServeCommand extends Command {
BuildCommandArgs.updateFlutter.asArg(negated: !updateFlutter),
if (updatePerfetto) BuildCommandArgs.updatePerfetto.asArg(),
if (useWasm) BuildCommandArgs.wasm.asArg(),
if (noStripWasm) BuildCommandArgs.noStripWasm.asArg(),
'${BuildCommandArgs.buildMode.asArg()}=$devToolsAppBuildMode',
BuildCommandArgs.pubGet.asArg(negated: !runPubGet),
]),
Expand Down
12 changes: 12 additions & 0 deletions tool/lib/commands/shared.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,24 @@ extension BuildCommandArgsExtension on ArgParser {
help: 'Whether to build DevTools with dart2wasm instead of dart2js.',
);
}

void addNoStripWasmFlag() {
addFlag(
BuildCommandArgs.noStripWasm.flagName,
defaultsTo: false,
help:
'When this flag is present, static symbol names will be included in '
'the resulting wasm file. This flag is ignored if the --wasm flag is '
'not present.',
);
}
}

enum BuildCommandArgs {
buildMode('build-mode'),
pubGet('pub-get'),
wasm('wasm'),
noStripWasm('no-strip-wasm'),
updateFlutter('update-flutter'),
updatePerfetto('update-perfetto');

Expand Down