diff --git a/all_devtools_modules.gni b/all_devtools_modules.gni
index 87d1772fd1..f0c2eda16f 100644
--- a/all_devtools_modules.gni
+++ b/all_devtools_modules.gni
@@ -399,7 +399,6 @@ all_devtools_modules = [
   "webauthn/WebauthnPane.js",
   "worker_main/WorkerMain.js",
   "worker_service/ServiceDispatcher.js",
-  "workspace_diff/WorkspaceDiff.js",
 ]
 
 input_devtools_modules = []
@@ -668,6 +667,7 @@ all_typescript_modules = [
   "timeline_model/TimelineModelFilter.js",
   "timeline_model/TimelineProfileTree.js",
   "timeline_model/TracingLayerTree.js",
+  "workspace_diff/WorkspaceDiff.js",
 ]
 
 foreach(module, all_typescript_modules) {
diff --git a/devtools_module_entrypoints.gni b/devtools_module_entrypoints.gni
index d2370c1d18..6975f67987 100644
--- a/devtools_module_entrypoints.gni
+++ b/devtools_module_entrypoints.gni
@@ -135,7 +135,6 @@ devtools_module_entrypoints = [
   "worker_main/worker_main-legacy.js",
   "worker_service/worker_service.js",
   "workspace/workspace-legacy.js",
-  "workspace_diff/workspace_diff.js",
   "workspace_diff/workspace_diff-legacy.js",
 ]
 
@@ -172,4 +171,5 @@ generated_typescript_entrypoints = [
   "$resources_out_dir/timeline_model/timeline_model.js",
   "$resources_out_dir/platform/platform.js",
   "$resources_out_dir/workspace/workspace.js",
+  "$resources_out_dir/workspace_diff/workspace_diff.js",
 ]
diff --git a/front_end/BUILD.gn b/front_end/BUILD.gn
index abe2d11543..0312d8e15c 100644
--- a/front_end/BUILD.gn
+++ b/front_end/BUILD.gn
@@ -29,6 +29,7 @@ group("front_end") {
     "third_party/lighthouse",
     "timeline_model:bundle",
     "workspace:bundle",
+    "workspace_diff:bundle",
   ]
 
   data_deps = [
diff --git a/front_end/workspace_diff/BUILD.gn b/front_end/workspace_diff/BUILD.gn
new file mode 100644
index 0000000000..f13c2bac3e
--- /dev/null
+++ b/front_end/workspace_diff/BUILD.gn
@@ -0,0 +1,24 @@
+# Copyright 2020 The Chromium 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("../../scripts/build/ninja/devtools_entrypoint.gni")
+import("../../scripts/build/ninja/devtools_module.gni")
+
+devtools_module("workspace_diff") {
+  sources = [ "WorkspaceDiff.js" ]
+
+  deps = [
+    "../common:bundle",
+    "../diff:bundle",
+    "../host:bundle",
+    "../workspace:bundle",
+  ]
+}
+
+devtools_entrypoint("bundle") {
+  entrypoint = "workspace_diff.js"
+  is_legacy_javascript_entrypoint = [ "crbug.com/1011811" ]
+
+  deps = [ ":workspace_diff" ]
+}
diff --git a/front_end/workspace_diff/WorkspaceDiff.js b/front_end/workspace_diff/WorkspaceDiff.js
index 6d7ac7842f..da549649c1 100644
--- a/front_end/workspace_diff/WorkspaceDiff.js
+++ b/front_end/workspace_diff/WorkspaceDiff.js
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// @ts-nocheck
+// TODO(crbug.com/1011811): Enable TypeScript compiler checks
+
 import * as Common from '../common/common.js';
 import * as Diff from '../diff/diff.js';
 import * as Host from '../host/host.js';
diff --git a/front_end/workspace_diff/module.json b/front_end/workspace_diff/module.json
index 2de5631046..69b74c8ba9 100644
--- a/front_end/workspace_diff/module.json
+++ b/front_end/workspace_diff/module.json
@@ -8,5 +8,6 @@
     "workspace_diff.js",
     "workspace_diff-legacy.js",
     "WorkspaceDiff.js"
-  ]
-}
+  ],
+  "skip_rollup": true
+}
\ No newline at end of file