diff --git a/all_devtools_modules.gni b/all_devtools_modules.gni
index 5e2ccd790a..b580c7bbf9 100644
--- a/all_devtools_modules.gni
+++ b/all_devtools_modules.gni
@@ -425,9 +425,6 @@ all_devtools_modules = [
   "worker_main/WorkerMain.js",
   "worker_service/ServiceDispatcher.js",
   "workspace_diff/WorkspaceDiff.js",
-  "workspace/FileManager.js",
-  "workspace/UISourceCode.js",
-  "workspace/WorkspaceImpl.js",
 ]
 
 input_devtools_modules = []
@@ -622,6 +619,9 @@ all_typescript_modules = [
   "sdk/TracingModel.js",
   "sdk/wasm_source_map/pkg/wasm_source_map.js",
   "sdk/WebAuthnModel.js",
+  "workspace/FileManager.js",
+  "workspace/UISourceCode.js",
+  "workspace/WorkspaceImpl.js",
   "third_party/acorn-logical-assignment/package/dist/acorn-logical-assignment.mjs",
   "third_party/acorn-loose/package/dist/acorn-loose.mjs",
   "third_party/acorn-numeric-separator/package/dist/acorn-numeric-separator.mjs",
diff --git a/devtools_module_entrypoints.gni b/devtools_module_entrypoints.gni
index c4f0f54136..f1394a2172 100644
--- a/devtools_module_entrypoints.gni
+++ b/devtools_module_entrypoints.gni
@@ -140,7 +140,6 @@ devtools_module_entrypoints = [
   "worker_main/worker_main.js",
   "worker_main/worker_main-legacy.js",
   "worker_service/worker_service.js",
-  "workspace/workspace.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/root/root.js",
   "$resources_out_dir/sdk/sdk.js",
   "$resources_out_dir/platform/platform.js",
+  "$resources_out_dir/workspace/workspace.js",
 ]
diff --git a/front_end/BUILD.gn b/front_end/BUILD.gn
index d673549c78..e12f12eb56 100644
--- a/front_end/BUILD.gn
+++ b/front_end/BUILD.gn
@@ -22,6 +22,7 @@ group("front_end") {
     "issues:bundle",
     "sdk:bundle",
     "third_party/lighthouse",
+    "workspace:bundle",
   ]
 
   data_deps = [
@@ -78,6 +79,6 @@ ts_library("ts_library-verification") {
     "protocol_client",
     "root:bundle",
     "sdk:bundle",
-    "workspace",
+    "workspace:bundle",
   ]
 }
diff --git a/front_end/bindings/BUILD.gn b/front_end/bindings/BUILD.gn
index 944f80c790..80be71449d 100644
--- a/front_end/bindings/BUILD.gn
+++ b/front_end/bindings/BUILD.gn
@@ -33,7 +33,7 @@ devtools_module("bindings") {
     "../host:bundle",
     "../sdk:bundle",
     "../text_utils",
-    "../workspace",
+    "../workspace:bundle",
   ]
 }
 
diff --git a/front_end/workspace/BUILD.gn b/front_end/workspace/BUILD.gn
index 56eadd9c6d..5ca1cc6f95 100644
--- a/front_end/workspace/BUILD.gn
+++ b/front_end/workspace/BUILD.gn
@@ -2,14 +2,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("../../third_party/typescript/typescript.gni")
+import("../../scripts/build/ninja/devtools_entrypoint.gni")
+import("../../scripts/build/ninja/devtools_module.gni")
 
-ts_library("workspace") {
+devtools_module("workspace") {
   sources = [
     "FileManager.js",
     "UISourceCode.js",
     "WorkspaceImpl.js",
-    "workspace.js",
   ]
 
   deps = [
@@ -19,3 +19,10 @@ ts_library("workspace") {
     "../text_utils",
   ]
 }
+
+devtools_entrypoint("bundle") {
+  entrypoint = "workspace.js"
+  is_legacy_javascript_entrypoint = [ "crbug.com/1011811" ]
+
+  deps = [ ":workspace" ]
+}
diff --git a/front_end/workspace/module.json b/front_end/workspace/module.json
index 826d1a5024..fdb420f4a7 100644
--- a/front_end/workspace/module.json
+++ b/front_end/workspace/module.json
@@ -10,5 +10,6 @@
     "FileManager.js",
     "UISourceCode.js",
     "WorkspaceImpl.js"
-  ]
+  ],
+  "skip_rollup": true
 }