Unverified Commit 596133a7 authored by Danny Tuppeny's avatar Danny Tuppeny Committed by GitHub

Pass the --disable-dds flag through to dwds (#78806)

parent bde6b162
...@@ -174,6 +174,7 @@ class WebAssetServer implements AssetReader { ...@@ -174,6 +174,7 @@ class WebAssetServer implements AssetReader {
bool useSseForDebugBackend, bool useSseForDebugBackend,
BuildInfo buildInfo, BuildInfo buildInfo,
bool enableDwds, bool enableDwds,
bool enableDds,
Uri entrypoint, Uri entrypoint,
ExpressionCompiler expressionCompiler, ExpressionCompiler expressionCompiler,
NullSafetyMode nullSafetyMode, { NullSafetyMode nullSafetyMode, {
...@@ -280,7 +281,7 @@ class WebAssetServer implements AssetReader { ...@@ -280,7 +281,7 @@ class WebAssetServer implements AssetReader {
_digestProvider, _digestProvider,
).strategy, ).strategy,
expressionCompiler: expressionCompiler, expressionCompiler: expressionCompiler,
spawnDds: true, spawnDds: enableDds,
); );
shelf.Pipeline pipeline = const shelf.Pipeline(); shelf.Pipeline pipeline = const shelf.Pipeline();
if (enableDwds) { if (enableDwds) {
...@@ -609,6 +610,7 @@ class WebDevFS implements DevFS { ...@@ -609,6 +610,7 @@ class WebDevFS implements DevFS {
@required this.useSseForDebugBackend, @required this.useSseForDebugBackend,
@required this.buildInfo, @required this.buildInfo,
@required this.enableDwds, @required this.enableDwds,
@required this.enableDds,
@required this.entrypoint, @required this.entrypoint,
@required this.expressionCompiler, @required this.expressionCompiler,
@required this.chromiumLauncher, @required this.chromiumLauncher,
...@@ -626,6 +628,7 @@ class WebDevFS implements DevFS { ...@@ -626,6 +628,7 @@ class WebDevFS implements DevFS {
final bool useSseForDebugBackend; final bool useSseForDebugBackend;
final BuildInfo buildInfo; final BuildInfo buildInfo;
final bool enableDwds; final bool enableDwds;
final bool enableDds;
final bool testMode; final bool testMode;
final ExpressionCompiler expressionCompiler; final ExpressionCompiler expressionCompiler;
final ChromiumLauncher chromiumLauncher; final ChromiumLauncher chromiumLauncher;
...@@ -703,6 +706,7 @@ class WebDevFS implements DevFS { ...@@ -703,6 +706,7 @@ class WebDevFS implements DevFS {
useSseForDebugBackend, useSseForDebugBackend,
buildInfo, buildInfo,
enableDwds, enableDwds,
enableDds,
entrypoint, entrypoint,
expressionCompiler, expressionCompiler,
nullSafetyMode, nullSafetyMode,
......
...@@ -504,6 +504,7 @@ class ResidentWebRunner extends ResidentRunner { ...@@ -504,6 +504,7 @@ class ResidentWebRunner extends ResidentRunner {
useSseForDebugBackend: debuggingOptions.webUseSseForDebugBackend, useSseForDebugBackend: debuggingOptions.webUseSseForDebugBackend,
buildInfo: debuggingOptions.buildInfo, buildInfo: debuggingOptions.buildInfo,
enableDwds: _enableDwds, enableDwds: _enableDwds,
enableDds: !debuggingOptions.disableDds,
entrypoint: _fileSystem.file(target).uri, entrypoint: _fileSystem.file(target).uri,
expressionCompiler: expressionCompiler, expressionCompiler: expressionCompiler,
chromiumLauncher: _chromiumLauncher, chromiumLauncher: _chromiumLauncher,
......
...@@ -625,6 +625,7 @@ void main() { ...@@ -625,6 +625,7 @@ void main() {
nullSafetyMode: NullSafetyMode.unsound, nullSafetyMode: NullSafetyMode.unsound,
), ),
enableDwds: false, enableDwds: false,
enableDds: false,
entrypoint: Uri.base, entrypoint: Uri.base,
testMode: true, testMode: true,
expressionCompiler: null, expressionCompiler: null,
...@@ -741,6 +742,7 @@ void main() { ...@@ -741,6 +742,7 @@ void main() {
nullSafetyMode: NullSafetyMode.sound, nullSafetyMode: NullSafetyMode.sound,
), ),
enableDwds: false, enableDwds: false,
enableDds: false,
entrypoint: Uri.base, entrypoint: Uri.base,
testMode: true, testMode: true,
expressionCompiler: null, expressionCompiler: null,
...@@ -847,6 +849,7 @@ void main() { ...@@ -847,6 +849,7 @@ void main() {
useSseForDebugBackend: true, useSseForDebugBackend: true,
buildInfo: BuildInfo.debug, buildInfo: BuildInfo.debug,
enableDwds: false, enableDwds: false,
enableDds: false,
entrypoint: Uri.base, entrypoint: Uri.base,
testMode: true, testMode: true,
expressionCompiler: null, expressionCompiler: null,
...@@ -899,6 +902,7 @@ void main() { ...@@ -899,6 +902,7 @@ void main() {
] ]
), ),
enableDwds: false, enableDwds: false,
enableDds: false,
entrypoint: Uri.base, entrypoint: Uri.base,
testMode: true, testMode: true,
expressionCompiler: null, expressionCompiler: null,
...@@ -950,6 +954,7 @@ void main() { ...@@ -950,6 +954,7 @@ void main() {
] ]
), ),
enableDwds: false, enableDwds: false,
enableDds: false,
entrypoint: Uri.base, entrypoint: Uri.base,
testMode: true, testMode: true,
expressionCompiler: null, expressionCompiler: null,
...@@ -980,6 +985,7 @@ void main() { ...@@ -980,6 +985,7 @@ void main() {
treeShakeIcons: false, treeShakeIcons: false,
), ),
false, false,
false,
Uri.base, Uri.base,
null, null,
null, null,
...@@ -1059,6 +1065,7 @@ void main() { ...@@ -1059,6 +1065,7 @@ void main() {
nativeNullAssertions: true, nativeNullAssertions: true,
buildInfo: BuildInfo.debug, buildInfo: BuildInfo.debug,
enableDwds: false, enableDwds: false,
enableDds: false,
entrypoint: Uri.base, entrypoint: Uri.base,
testMode: true, testMode: true,
expressionCompiler: null, expressionCompiler: null,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment