diff --git a/devtools/BUILD.bazel b/devtools/BUILD.bazel
index 9e0065b59d3..7c7201f1319 100644
--- a/devtools/BUILD.bazel
+++ b/devtools/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_config")
+load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
package(default_visibility = ["//visibility:public"])
@@ -7,10 +7,15 @@ exports_files([
"cypress.json",
])
-ts_config(
- name = "tsconfig_spec",
- src = "tsconfig.spec.json",
+rules_js_tsconfig(
+ name = "tsconfig_build",
+ src = "tsconfig.json",
+)
+
+rules_js_tsconfig(
+ name = "tsconfig_test",
+ src = "tsconfig-test.json",
deps = [
- "//devtools:tsconfig.json",
+ ":tsconfig_build",
],
)
diff --git a/devtools/projects/demo-standalone/src/app/demo-app/demo-app.component.ts b/devtools/projects/demo-standalone/src/app/demo-app/demo-app.component.ts
index 21c2e07f4e9..147168f9af0 100644
--- a/devtools/projects/demo-standalone/src/app/demo-app/demo-app.component.ts
+++ b/devtools/projects/demo-standalone/src/app/demo-app/demo-app.component.ts
@@ -23,7 +23,7 @@ import {
} from '@angular/core';
import {createCustomElement} from '@angular/elements';
import {RouterOutlet} from '@angular/router';
-import {initializeMessageBus} from 'ng-devtools-backend';
+import {initializeMessageBus} from '../../../../ng-devtools-backend';
import {ZoneUnawareIFrameMessageBus} from '../../../../../src/zone-unaware-iframe-message-bus';
diff --git a/devtools/projects/demo-standalone/src/app/devtools-app/devtools-app.component.ts b/devtools/projects/demo-standalone/src/app/devtools-app/devtools-app.component.ts
index d414d51d6c5..31c12c2ff2f 100644
--- a/devtools/projects/demo-standalone/src/app/devtools-app/devtools-app.component.ts
+++ b/devtools/projects/demo-standalone/src/app/devtools-app/devtools-app.component.ts
@@ -7,10 +7,10 @@
*/
import {Component, ElementRef, ViewChild} from '@angular/core';
-import {Events, MessageBus, PriorityAwareMessageBus} from 'protocol';
+import {Events, MessageBus, PriorityAwareMessageBus} from '../../../../protocol';
import {IFrameMessageBus} from '../../../../../src/iframe-message-bus';
-import {DevToolsComponent} from 'ng-devtools';
+import {DevToolsComponent} from '../../../../ng-devtools';
import {FrameManager} from '../../../../../projects/ng-devtools/src/lib/application-services/frame_manager';
@Component({
diff --git a/devtools/projects/demo-standalone/src/main.ts b/devtools/projects/demo-standalone/src/main.ts
index 55e95a412f5..08d4e39021b 100644
--- a/devtools/projects/demo-standalone/src/main.ts
+++ b/devtools/projects/demo-standalone/src/main.ts
@@ -9,7 +9,7 @@
import {bootstrapApplication} from '@angular/platform-browser';
import {provideAnimations} from '@angular/platform-browser/animations';
import {provideRouter} from '@angular/router';
-import {ApplicationEnvironment, ApplicationOperations} from 'ng-devtools';
+import {ApplicationEnvironment, ApplicationOperations} from '../../ng-devtools';
import {DemoApplicationEnvironment} from '../../../src/demo-application-environment';
import {DemoApplicationOperations} from '../../../src/demo-application-operations';
diff --git a/devtools/projects/ng-devtools-backend/BUILD.bazel b/devtools/projects/ng-devtools-backend/BUILD.bazel
index 43f89e0b8c9..94ab9fa6c3f 100644
--- a/devtools/projects/ng-devtools-backend/BUILD.bazel
+++ b/devtools/projects/ng-devtools-backend/BUILD.bazel
@@ -1,18 +1,11 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
load("//devtools/tools:typescript.bzl", "ts_library")
package(default_visibility = ["//visibility:public"])
ts_library(
- name = "ng_devtools_backend_ts",
+ name = "ng-devtools-backend",
srcs = ["index.ts"],
deps = [
- "//devtools/projects/ng-devtools-backend/src",
+ "//devtools/projects/ng-devtools-backend/src:src_rjs",
],
)
-
-js_library(
- name = "ng-devtools-backend",
- package_name = "ng-devtools-backend",
- deps = [":ng_devtools_backend_ts"],
-)
diff --git a/devtools/projects/ng-devtools-backend/src/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/BUILD.bazel
index a72fd0c9ad3..c2a9691cbb0 100644
--- a/devtools/projects/ng-devtools-backend/src/BUILD.bazel
+++ b/devtools/projects/ng-devtools-backend/src/BUILD.bazel
@@ -6,7 +6,7 @@ ts_library(
name = "src",
srcs = ["public-api.ts"],
deps = [
- "//devtools/projects/ng-devtools-backend/src/lib",
- "//devtools/projects/ng-devtools-backend/src/lib:component_tree",
+ "//devtools/projects/ng-devtools-backend/src/lib:component_tree_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:lib_rjs",
],
)
diff --git a/devtools/projects/ng-devtools-backend/src/lib/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/lib/BUILD.bazel
index 4c2209b5bf7..f989e956c53 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/BUILD.bazel
+++ b/devtools/projects/ng-devtools-backend/src/lib/BUILD.bazel
@@ -6,21 +6,23 @@ package(default_visibility = ["//visibility:public"])
ts_library(
name = "lib",
srcs = ["index.ts"],
- deps = [
- ":client_event_subscribers",
- "//devtools/projects/ng-devtools-backend/src/lib/component-inspector",
- "//devtools/projects/ng-devtools-backend/src/lib/directive-forest",
- "//devtools/projects/ng-devtools-backend/src/lib/hooks",
+ interop_deps = [
"//devtools/projects/ng-devtools-backend/src/lib/ng-debug-api",
"//devtools/projects/ng-devtools-backend/src/lib/state-serializer",
- "//devtools/projects/protocol",
+ ],
+ deps = [
+ ":client_event_subscribers_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib/component-inspector:component-inspector_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib/directive-forest:directive-forest_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib/hooks:hooks_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
karma_web_test_suite(
name = "highlighter_test",
deps = [
- ":highlighter_test_lib",
+ ":highlighter_test_lib_rjs",
],
)
@@ -29,19 +31,23 @@ ts_test_library(
srcs = [
"highlighter.spec.ts",
],
- deps = [
- ":highlighter",
+ interop_deps = [
"//packages/core",
- "@npm//@types",
+ ],
+ deps = [
+ ":highlighter_rjs",
],
)
ts_library(
name = "highlighter",
srcs = ["highlighter.ts"],
- deps = [
- "//devtools/projects/protocol",
+ interop_deps = [
"//packages/core",
+ "//devtools/projects/ng-devtools-backend/src/lib/ng-debug-api",
+ ],
+ deps = [
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -49,7 +55,7 @@ ts_library(
name = "interfaces",
srcs = ["interfaces.ts"],
deps = [
- "//devtools/projects/protocol",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -65,31 +71,34 @@ ts_test_library(
srcs = [
"router-tree.spec.ts",
],
- deps = [
- ":router_tree",
- "//devtools/projects/protocol",
+ interop_deps = [
"//packages/core",
"//packages/router",
- "@npm//@types",
+ ],
+ deps = [
+ ":router_tree_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
ts_library(
name = "router_tree",
srcs = ["router-tree.ts"],
- deps = [
- "//devtools/projects/protocol",
+ interop_deps = [
"//packages/router",
],
+ deps = [
+ "//devtools/projects/protocol:protocol_rjs",
+ ],
)
ts_library(
name = "set_console_reference",
srcs = ["set-console-reference.ts"],
deps = [
- ":interfaces",
- "//devtools/projects/protocol",
- "//devtools/projects/shared-utils",
+ ":interfaces_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
+ "//devtools/projects/shared-utils:shared-utils_rjs",
],
)
@@ -116,44 +125,46 @@ ts_test_library(
"client-event-subscribers.spec.ts",
],
deps = [
- ":client_event_subscribers",
- "//devtools/projects/ng-devtools-backend/src/lib/hooks",
- "//devtools/projects/protocol",
- "//devtools/projects/shared-utils",
- "@npm//rxjs",
+ ":client_event_subscribers_rjs",
+ "//:node_modules/rxjs",
+ "//devtools/projects/ng-devtools-backend/src/lib/hooks:hooks_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
+ "//devtools/projects/shared-utils:shared-utils_rjs",
],
)
ts_library(
name = "client_event_subscribers",
srcs = ["client-event-subscribers.ts"],
+ interop_deps = [
+ "//devtools/projects/ng-devtools-backend/src/lib/ng-debug-api:ng-debug-api",
+ ],
deps = [
- ":component_tree",
- ":highlighter",
- ":interfaces",
- ":router_tree",
- ":set_console_reference",
- ":utils",
- "//devtools/projects/ng-devtools-backend/src/lib/component-inspector",
- "//devtools/projects/ng-devtools-backend/src/lib/hooks",
- "//devtools/projects/ng-devtools-backend/src/lib/ng-debug-api",
+ ":component_tree_rjs",
+ ":highlighter_rjs",
+ ":interfaces_rjs",
+ ":router_tree_rjs",
+ ":set_console_reference_rjs",
+ ":utils_rjs",
+ "//:node_modules/rxjs",
+ "//devtools/projects/ng-devtools-backend/src/lib/component-inspector:component-inspector_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib/hooks:hooks_rjs",
"//devtools/projects/ng-devtools-backend/src/lib/state-serializer",
- "//devtools/projects/protocol",
- "//devtools/projects/shared-utils",
- "@npm//rxjs",
],
)
ts_library(
name = "component_tree",
srcs = ["component-tree.ts"],
+ interop_deps = [
+ "//devtools/projects/ng-devtools-backend/src/lib/ng-debug-api",
+ "//devtools/projects/ng-devtools-backend/src/lib/state-serializer",
+ ],
deps = [
":interfaces",
":utils",
- "//devtools/projects/ng-devtools-backend/src/lib/directive-forest",
- "//devtools/projects/ng-devtools-backend/src/lib/ng-debug-api",
- "//devtools/projects/ng-devtools-backend/src/lib/state-serializer",
- "//devtools/projects/protocol",
+ "//devtools/projects/ng-devtools-backend/src/lib/directive-forest:directive-forest_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
"//packages/core",
],
)
@@ -162,7 +173,7 @@ ts_test_library(
name = "component_tree_test_lib",
srcs = ["component-tree.spec.ts"],
deps = [
- ":component_tree",
+ ":component_tree_rjs",
"//packages/core",
"@npm//jasmine",
],
diff --git a/devtools/projects/ng-devtools-backend/src/lib/client-event-subscribers.spec.ts b/devtools/projects/ng-devtools-backend/src/lib/client-event-subscribers.spec.ts
index c5567f30ec2..7004ef22de0 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/client-event-subscribers.spec.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/client-event-subscribers.spec.ts
@@ -6,9 +6,9 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {Events, MessageBus} from 'protocol';
+import {Events, MessageBus} from '../../../protocol';
import {subscribeToClientEvents} from './client-event-subscribers';
-import {appIsAngular, appIsAngularIvy, appIsSupportedAngularVersion} from 'shared-utils';
+import {appIsAngular, appIsAngularIvy, appIsSupportedAngularVersion} from '../../../shared-utils';
import {DirectiveForestHooks} from './hooks/hooks';
import {of} from 'rxjs';
diff --git a/devtools/projects/ng-devtools-backend/src/lib/client-event-subscribers.ts b/devtools/projects/ng-devtools-backend/src/lib/client-event-subscribers.ts
index be60680e5d1..b46f7a0d4d0 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/client-event-subscribers.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/client-event-subscribers.ts
@@ -19,7 +19,7 @@ import {
Route,
SerializedInjector,
SerializedProviderRecord,
-} from 'protocol';
+} from '../../../protocol';
import {debounceTime} from 'rxjs/operators';
import {
appIsAngularInDevMode,
@@ -27,7 +27,7 @@ import {
appIsSupportedAngularVersion,
getAngularVersion,
isHydrationEnabled,
-} from 'shared-utils';
+} from '../../../shared-utils';
import {ComponentInspector} from './component-inspector/component-inspector';
import {
diff --git a/devtools/projects/ng-devtools-backend/src/lib/component-inspector/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/lib/component-inspector/BUILD.bazel
index 4512723cd21..9e2b3435a21 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/component-inspector/BUILD.bazel
+++ b/devtools/projects/ng-devtools-backend/src/lib/component-inspector/BUILD.bazel
@@ -1,5 +1,5 @@
-load("//devtools/tools:typescript.bzl", "ts_library", "ts_test_library")
load("//devtools/tools:defaults.bzl", "karma_web_test_suite")
+load("//devtools/tools:typescript.bzl", "ts_library", "ts_test_library")
package(default_visibility = ["//visibility:public"])
@@ -7,11 +7,11 @@ ts_library(
name = "component-inspector",
srcs = ["component-inspector.ts"],
deps = [
- "//devtools/projects/ng-devtools-backend/src/lib:component_tree",
- "//devtools/projects/ng-devtools-backend/src/lib:highlighter",
- "//devtools/projects/ng-devtools-backend/src/lib:interfaces",
- "//devtools/projects/ng-devtools-backend/src/lib/hooks",
- "//devtools/projects/protocol",
+ "//devtools/projects/ng-devtools-backend/src/lib:component_tree_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:highlighter_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:interfaces_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib/hooks:hooks_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -25,15 +25,16 @@ ts_test_library(
srcs = [
"component-inspector.spec.ts",
],
- deps = [
- ":component-inspector",
- "//devtools/projects/ng-devtools-backend/src/lib:component_tree",
- "//devtools/projects/ng-devtools-backend/src/lib:highlighter",
- "//devtools/projects/ng-devtools-backend/src/lib:interfaces",
- "//devtools/projects/ng-devtools-backend/src/lib:utils",
- "//devtools/projects/ng-devtools-backend/src/lib/hooks",
- "//devtools/projects/protocol",
+ interop_deps = [
"//packages/core",
- "@npm//@types",
+ ],
+ deps = [
+ ":component-inspector_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:component_tree_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:highlighter_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:interfaces_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:utils_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib/hooks:hooks_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools-backend/src/lib/component-inspector/component-inspector.ts b/devtools/projects/ng-devtools-backend/src/lib/component-inspector/component-inspector.ts
index 2c38ba13b96..b3941144281 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/component-inspector/component-inspector.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/component-inspector/component-inspector.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {ElementPosition, HydrationStatus} from 'protocol';
+import {ElementPosition, HydrationStatus} from '../../../../protocol';
import {findNodeInForest} from '../component-tree';
import {
diff --git a/devtools/projects/ng-devtools-backend/src/lib/component-tree.ts b/devtools/projects/ng-devtools-backend/src/lib/component-tree.ts
index 4408b6bd4c0..33a509a6984 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/component-tree.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/component-tree.ts
@@ -15,7 +15,7 @@ import {
SerializedInjector,
SerializedProviderRecord,
UpdatedStateData,
-} from 'protocol';
+} from '../../../protocol';
import {buildDirectiveTree, getLViewFromDirectiveOrElementInstance} from './directive-forest/index';
import {
diff --git a/devtools/projects/ng-devtools-backend/src/lib/directive-forest/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/lib/directive-forest/BUILD.bazel
index 6092878f65b..9d596413eae 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/directive-forest/BUILD.bazel
+++ b/devtools/projects/ng-devtools-backend/src/lib/directive-forest/BUILD.bazel
@@ -1,5 +1,5 @@
-load("//devtools/tools:typescript.bzl", "ts_library", "ts_test_library")
load("//devtools/tools:defaults.bzl", "karma_web_test_suite")
+load("//devtools/tools:typescript.bzl", "ts_library", "ts_test_library")
package(default_visibility = ["//visibility:public"])
@@ -9,15 +9,17 @@ ts_library(
include = ["*.ts"],
exclude = ["*.spec.ts"],
),
- deps = [
- "//devtools/projects/ng-devtools-backend/src/lib:highlighter",
- "//devtools/projects/ng-devtools-backend/src/lib:interfaces",
- "//devtools/projects/ng-devtools-backend/src/lib:utils",
- "//devtools/projects/ng-devtools-backend/src/lib:version",
- "//devtools/projects/ng-devtools-backend/src/lib/ng-debug-api",
- "//devtools/projects/protocol",
+ interop_deps = [
"//packages/core",
- "@npm//semver-dsl",
+ "//devtools/projects/ng-devtools-backend/src/lib/ng-debug-api",
+ ],
+ deps = [
+ "//:node_modules/semver-dsl",
+ "//devtools/projects/ng-devtools-backend/src/lib:highlighter_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:interfaces_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:utils_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:version_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -33,10 +35,12 @@ ts_test_library(
srcs = [
"render-tree.spec.ts",
],
+ interop_deps = [
+ "//packages/core",
+ ],
deps = [
- ":directive-forest",
- "//devtools/projects/ng-devtools-backend/src/lib:interfaces",
- "//devtools/projects/ng-devtools-backend/src/lib:utils",
- "@npm//@types",
+ ":directive-forest_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:interfaces_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:utils_rjs",
],
)
diff --git a/devtools/projects/ng-devtools-backend/src/lib/directive-forest/render-tree.ts b/devtools/projects/ng-devtools-backend/src/lib/directive-forest/render-tree.ts
index 15576df4723..e29ac323d69 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/directive-forest/render-tree.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/directive-forest/render-tree.ts
@@ -7,7 +7,7 @@
*/
import {ɵHydratedNode as HydrationNode} from '@angular/core';
-import {HydrationStatus} from 'protocol';
+import {HydrationStatus} from '../../../../protocol';
import {ComponentTreeNode} from '../interfaces';
import {ngDebugClient} from '../ng-debug-api/ng-debug-api';
diff --git a/devtools/projects/ng-devtools-backend/src/lib/highlighter.ts b/devtools/projects/ng-devtools-backend/src/lib/highlighter.ts
index dc41f06f3f4..6da77ec3cef 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/highlighter.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/highlighter.ts
@@ -7,7 +7,7 @@
*/
import type {ɵGlobalDevModeUtils as GlobalDevModeUtils, Type} from '@angular/core';
-import {HydrationStatus} from 'protocol';
+import {HydrationStatus} from '../../../protocol';
let hydrationOverlayItems: HTMLElement[] = [];
let selectedElementOverlay: HTMLElement | null = null;
diff --git a/devtools/projects/ng-devtools-backend/src/lib/hooks/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/lib/hooks/BUILD.bazel
index 9aba484951e..fb93d224c41 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/hooks/BUILD.bazel
+++ b/devtools/projects/ng-devtools-backend/src/lib/hooks/BUILD.bazel
@@ -12,12 +12,12 @@ ts_library(
],
),
deps = [
- ":identity_tracker",
- "//devtools/projects/ng-devtools-backend/src/lib:highlighter",
- "//devtools/projects/ng-devtools-backend/src/lib:interfaces",
- "//devtools/projects/ng-devtools-backend/src/lib:utils",
- "//devtools/projects/ng-devtools-backend/src/lib/hooks/profiler",
- "//devtools/projects/protocol",
+ ":identity_tracker_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:highlighter_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:interfaces_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:utils_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib/hooks/profiler:profiler_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -25,8 +25,8 @@ ts_library(
name = "identity_tracker",
srcs = ["identity-tracker.ts"],
deps = [
- "//devtools/projects/ng-devtools-backend/src/lib:component_tree",
- "//devtools/projects/ng-devtools-backend/src/lib:interfaces",
- "//devtools/projects/protocol",
+ "//devtools/projects/ng-devtools-backend/src/lib:component_tree_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:interfaces_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools-backend/src/lib/hooks/capture.ts b/devtools/projects/ng-devtools-backend/src/lib/hooks/capture.ts
index b4432c7c3f3..bf2e3630a16 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/hooks/capture.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/hooks/capture.ts
@@ -12,7 +12,7 @@ import {
ElementProfile,
LifecycleProfile,
ProfilerFrame,
-} from 'protocol';
+} from '../../../../protocol';
import {getDirectiveName} from '../highlighter';
import {ComponentTreeNode} from '../interfaces';
diff --git a/devtools/projects/ng-devtools-backend/src/lib/hooks/hooks.ts b/devtools/projects/ng-devtools-backend/src/lib/hooks/hooks.ts
index 8710ff72fee..01e21ed6ef5 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/hooks/hooks.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/hooks/hooks.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {ElementPosition} from 'protocol';
+import {ElementPosition} from '../../../../protocol';
import {ComponentTreeNode} from '../interfaces';
diff --git a/devtools/projects/ng-devtools-backend/src/lib/hooks/identity-tracker.ts b/devtools/projects/ng-devtools-backend/src/lib/hooks/identity-tracker.ts
index c5dd8d625ca..d28d4914fd7 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/hooks/identity-tracker.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/hooks/identity-tracker.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {DevToolsNode, ElementPosition} from 'protocol';
+import {DevToolsNode, ElementPosition} from '../../../../protocol';
import {buildDirectiveForest} from '../component-tree';
import {ComponentInstanceType, ComponentTreeNode, DirectiveInstanceType} from '../interfaces';
diff --git a/devtools/projects/ng-devtools-backend/src/lib/hooks/index.ts b/devtools/projects/ng-devtools-backend/src/lib/hooks/index.ts
index 7379b57b4f7..1cec578c1ed 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/hooks/index.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/hooks/index.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {LifecycleProfile} from 'protocol';
+import {LifecycleProfile} from '../../../../protocol';
import {getDirectiveName} from '../highlighter';
diff --git a/devtools/projects/ng-devtools-backend/src/lib/hooks/profiler/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/lib/hooks/profiler/BUILD.bazel
index 1c24f7fd8ec..5581673bb92 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/hooks/profiler/BUILD.bazel
+++ b/devtools/projects/ng-devtools-backend/src/lib/hooks/profiler/BUILD.bazel
@@ -8,13 +8,15 @@ ts_library(
include = ["*.ts"],
exclude = ["*.spec.ts"],
),
- deps = [
- "//devtools/projects/ng-devtools-backend/src/lib:utils",
- "//devtools/projects/ng-devtools-backend/src/lib/directive-forest",
- "//devtools/projects/ng-devtools-backend/src/lib/hooks:identity_tracker",
- "//devtools/projects/ng-devtools-backend/src/lib/ng-debug-api",
- "//devtools/projects/protocol",
+ interop_deps = [
"//packages/core",
- "@npm//rxjs",
+ "//devtools/projects/ng-devtools-backend/src/lib/ng-debug-api",
+ "//devtools/projects/ng-devtools-backend/src/lib/directive-forest",
+ ],
+ deps = [
+ "//:node_modules/rxjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:utils_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib/hooks:identity_tracker_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools-backend/src/lib/hooks/profiler/shared.ts b/devtools/projects/ng-devtools-backend/src/lib/hooks/profiler/shared.ts
index 888d7fcdeec..faf8414c94e 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/hooks/profiler/shared.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/hooks/profiler/shared.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {ElementPosition, LifecycleProfile} from 'protocol';
+import {ElementPosition, LifecycleProfile} from '../../../../../protocol';
import {Subject} from 'rxjs';
import {NodeArray} from '../identity-tracker';
diff --git a/devtools/projects/ng-devtools-backend/src/lib/index.ts b/devtools/projects/ng-devtools-backend/src/lib/index.ts
index 1b24d4befa0..334e4c5f4a1 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/index.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/index.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {Events, MessageBus} from 'protocol';
+import {Events, MessageBus} from '../../../protocol';
import {subscribeToClientEvents} from './client-event-subscribers';
diff --git a/devtools/projects/ng-devtools-backend/src/lib/interfaces.ts b/devtools/projects/ng-devtools-backend/src/lib/interfaces.ts
index 066174091f9..9997676e8e7 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/interfaces.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/interfaces.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {DevToolsNode} from 'protocol';
+import {DevToolsNode} from '../../../protocol';
export interface DebuggingAPI {
getComponent(node: Node): any;
diff --git a/devtools/projects/ng-devtools-backend/src/lib/ng-debug-api/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/lib/ng-debug-api/BUILD.bazel
index f8e3b727241..a707c565fec 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/ng-debug-api/BUILD.bazel
+++ b/devtools/projects/ng-devtools-backend/src/lib/ng-debug-api/BUILD.bazel
@@ -18,10 +18,12 @@ ng_module(
ts_test_library(
name = "ng-debug-api_test_lib",
srcs = ["ng-debug-api.spec.ts"],
- deps = [
- ":ng-debug-api",
+ interop_deps = [
"//packages/core",
- "@npm//jasmine",
+ ":ng-debug-api",
+ ],
+ deps = [
+ "//:node_modules/jasmine",
],
)
diff --git a/devtools/projects/ng-devtools-backend/src/lib/router-tree.ts b/devtools/projects/ng-devtools-backend/src/lib/router-tree.ts
index 92c08971d56..1a46b3254fc 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/router-tree.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/router-tree.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {Route} from 'protocol';
+import {Route} from '../../../protocol';
// todo(aleksanderbodurri): type these properly
type AngularRoute = any;
diff --git a/devtools/projects/ng-devtools-backend/src/lib/set-console-reference.ts b/devtools/projects/ng-devtools-backend/src/lib/set-console-reference.ts
index b01fc27c729..efd85e5086c 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/set-console-reference.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/set-console-reference.ts
@@ -6,8 +6,8 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {ElementPosition} from 'protocol';
-import {arrayEquals} from 'shared-utils';
+import {ElementPosition} from '../../../protocol';
+import {arrayEquals} from '../../../shared-utils';
import {ComponentTreeNode} from './interfaces';
diff --git a/devtools/projects/ng-devtools-backend/src/lib/state-serializer/BUILD.bazel b/devtools/projects/ng-devtools-backend/src/lib/state-serializer/BUILD.bazel
index 8a2584e7f21..09850c2403b 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/state-serializer/BUILD.bazel
+++ b/devtools/projects/ng-devtools-backend/src/lib/state-serializer/BUILD.bazel
@@ -1,6 +1,6 @@
-load("//devtools/tools:typescript.bzl", "ts_test_library")
-load("//devtools/tools:ng_module.bzl", "ng_module")
load("//devtools/tools:defaults.bzl", "karma_web_test_suite")
+load("//devtools/tools:ng_module.bzl", "ng_module")
+load("//devtools/tools:typescript.bzl", "ts_test_library")
package(default_visibility = ["//visibility:public"])
@@ -29,9 +29,10 @@ ts_test_library(
"prop-type.spec.ts",
"state-serializer.spec.ts",
],
- deps = [
+ interop_deps = [
":state-serializer",
- "//devtools/projects/protocol",
- "@npm//@types",
+ ],
+ deps = [
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools-backend/src/lib/state-serializer/prop-type.spec.ts b/devtools/projects/ng-devtools-backend/src/lib/state-serializer/prop-type.spec.ts
index 5833b01e2f1..9643cde02c4 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/state-serializer/prop-type.spec.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/state-serializer/prop-type.spec.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {PropType} from 'protocol';
+import {PropType} from '../../../../protocol';
import {getPropType} from './prop-type';
diff --git a/devtools/projects/ng-devtools-backend/src/lib/state-serializer/prop-type.ts b/devtools/projects/ng-devtools-backend/src/lib/state-serializer/prop-type.ts
index 83319ba166f..e6f7bf9ce7f 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/state-serializer/prop-type.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/state-serializer/prop-type.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {PropType} from 'protocol';
+import {PropType} from '../../../../protocol';
import {isSignal} from '../utils';
diff --git a/devtools/projects/ng-devtools-backend/src/lib/state-serializer/serialized-descriptor-factory.ts b/devtools/projects/ng-devtools-backend/src/lib/state-serializer/serialized-descriptor-factory.ts
index e32507330ca..ef06beb5c2e 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/state-serializer/serialized-descriptor-factory.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/state-serializer/serialized-descriptor-factory.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {ContainerType, Descriptor, NestedProp, PropType} from 'protocol';
+import {ContainerType, Descriptor, NestedProp, PropType} from '../../../../protocol';
import {isSignal, unwrapSignal} from '../utils';
diff --git a/devtools/projects/ng-devtools-backend/src/lib/state-serializer/state-serializer.spec.ts b/devtools/projects/ng-devtools-backend/src/lib/state-serializer/state-serializer.spec.ts
index 9dc892de7a8..5424474b116 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/state-serializer/state-serializer.spec.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/state-serializer/state-serializer.spec.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {PropType} from 'protocol';
+import {PropType} from '../../../../protocol';
import {getDescriptor, getKeys} from './object-utils';
import {deeplySerializeSelectedProperties} from './state-serializer';
diff --git a/devtools/projects/ng-devtools-backend/src/lib/state-serializer/state-serializer.ts b/devtools/projects/ng-devtools-backend/src/lib/state-serializer/state-serializer.ts
index 4123de64063..cd6c2147e52 100644
--- a/devtools/projects/ng-devtools-backend/src/lib/state-serializer/state-serializer.ts
+++ b/devtools/projects/ng-devtools-backend/src/lib/state-serializer/state-serializer.ts
@@ -6,8 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {ContainerType, Descriptor, NestedProp, PropType} from 'protocol';
-import type {Signal} from '@angular/core';
+import {ContainerType, Descriptor, NestedProp, PropType} from '../../../../protocol';
import {isSignal, unwrapSignal} from '../utils';
diff --git a/devtools/projects/ng-devtools/BUILD.bazel b/devtools/projects/ng-devtools/BUILD.bazel
index 997db742c3d..0ed90042b5d 100644
--- a/devtools/projects/ng-devtools/BUILD.bazel
+++ b/devtools/projects/ng-devtools/BUILD.bazel
@@ -1,4 +1,3 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
load("//devtools/tools:ng_module.bzl", "ng_module")
package(default_visibility = ["//visibility:public"])
@@ -6,7 +5,7 @@ package(default_visibility = ["//visibility:public"])
exports_files(["tsconfig.lib.json"])
ng_module(
- name = "ng_devtools_ts",
+ name = "ng-devtools",
srcs = ["index.ts"],
deps = [
"//devtools/projects/ng-devtools/src",
@@ -25,9 +24,3 @@ ng_module(
"@npm//webtreemap",
],
)
-
-js_library(
- name = "ng-devtools",
- package_name = "ng-devtools",
- deps = [":ng_devtools_ts"],
-)
diff --git a/devtools/projects/ng-devtools/src/lib/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/BUILD.bazel
index 63b6e6f97ab..ee89589aabf 100644
--- a/devtools/projects/ng-devtools/src/lib/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/BUILD.bazel
@@ -42,13 +42,16 @@ ng_module(
ts_test_library(
name = "devtools_test",
srcs = ["devtools_spec.ts"],
- deps = [
- ":lib",
- "//devtools/projects/ng-devtools/src/lib/application-services:frame_manager",
- "//devtools/projects/ng-devtools/src/lib/devtools-tabs",
- "//devtools/projects/protocol",
+ interop_deps = [
"//packages/core",
"//packages/core/testing",
+ ":lib",
+ "//devtools/projects/ng-devtools/src/lib/devtools-tabs:devtools-tabs",
+ "//devtools/projects/ng-devtools/src/lib/application-services:frame_manager",
+ ],
+ deps = [
+ "//:node_modules/tslib",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/application-environment/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/application-environment/BUILD.bazel
index 0f90fadea26..8ffcfc19362 100644
--- a/devtools/projects/ng-devtools/src/lib/application-environment/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/application-environment/BUILD.bazel
@@ -6,7 +6,6 @@ ts_library(
name = "application-environment",
srcs = ["index.ts"],
deps = [
- "//devtools/projects/protocol",
- "@npm//@types",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/application-operations/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/application-operations/BUILD.bazel
index c9a1c69bc73..6a503237d30 100644
--- a/devtools/projects/ng-devtools/src/lib/application-operations/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/application-operations/BUILD.bazel
@@ -6,8 +6,7 @@ ts_library(
name = "application-operations",
srcs = ["index.ts"],
deps = [
- "//devtools/projects/ng-devtools/src/lib/application-environment",
- "//devtools/projects/protocol",
- "@npm//@types",
+ "//devtools/projects/ng-devtools/src/lib/application-environment:application-environment_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/application-operations/index.ts b/devtools/projects/ng-devtools/src/lib/application-operations/index.ts
index 456f49582c9..eb4f098fc5e 100644
--- a/devtools/projects/ng-devtools/src/lib/application-operations/index.ts
+++ b/devtools/projects/ng-devtools/src/lib/application-operations/index.ts
@@ -7,7 +7,7 @@
*/
import {Frame} from '../application-environment';
-import {DirectivePosition, ElementPosition} from 'protocol';
+import {DirectivePosition, ElementPosition} from '../../../../protocol';
export abstract class ApplicationOperations {
abstract viewSource(position: ElementPosition, target: Frame, directiveIndex?: number): void;
diff --git a/devtools/projects/ng-devtools/src/lib/application-services/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/application-services/BUILD.bazel
index ada3c0e7e2f..95f44eca6d4 100644
--- a/devtools/projects/ng-devtools/src/lib/application-services/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/application-services/BUILD.bazel
@@ -39,16 +39,18 @@ ng_module(
ts_test_library(
name = "test_application_services_lib",
srcs = glob(["*_spec.ts"]),
- deps = [
+ interop_deps = [
+ "//packages/common",
+ "//packages/core/testing",
":browser_styles",
":frame_manager",
":theme",
- "//devtools/projects/ng-devtools/src/lib/application-environment",
"//devtools/projects/ng-devtools/src/lib/application-providers:window",
- "//devtools/projects/protocol",
- "//packages/common",
- "//packages/core/testing",
- "@npm//@angular/cdk",
+ ],
+ deps = [
+ "//:node_modules/@angular/cdk",
+ "//devtools/projects/ng-devtools/src/lib/application-environment:application-environment_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/application-services/frame_manager.ts b/devtools/projects/ng-devtools/src/lib/application-services/frame_manager.ts
index 61b62498da4..aa564d30544 100644
--- a/devtools/projects/ng-devtools/src/lib/application-services/frame_manager.ts
+++ b/devtools/projects/ng-devtools/src/lib/application-services/frame_manager.ts
@@ -6,8 +6,10 @@
* found in the LICENSE file at https://angular.dev/license
*/
+///
+
import {Injectable, inject, signal, computed} from '@angular/core';
-import {Events, MessageBus} from 'protocol';
+import {Events, MessageBus} from '../../../../protocol';
import {Frame, TOP_LEVEL_FRAME_ID} from '../application-environment';
diff --git a/devtools/projects/ng-devtools/src/lib/application-services/frame_manager_spec.ts b/devtools/projects/ng-devtools/src/lib/application-services/frame_manager_spec.ts
index e60a020f5fc..14f3db2fba2 100644
--- a/devtools/projects/ng-devtools/src/lib/application-services/frame_manager_spec.ts
+++ b/devtools/projects/ng-devtools/src/lib/application-services/frame_manager_spec.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {Events, MessageBus} from 'protocol';
+import {Events, MessageBus} from '../../../../protocol';
import {FrameManager} from './frame_manager';
import {TestBed} from '@angular/core/testing';
import {Frame} from '../application-environment';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/BUILD.bazel
index 751c31e7825..55d3613bbfc 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/BUILD.bazel
@@ -41,20 +41,23 @@ ng_module(
ts_test_library(
name = "devtools_tabs_test",
srcs = ["devtools-tabs.spec.ts"],
- deps = [
+ interop_deps = [
+ "//packages/core",
":devtools-tabs",
- "//devtools/projects/ng-devtools/src/lib/application-environment",
- "//devtools/projects/ng-devtools/src/lib/application-services:frame_manager",
- "//devtools/projects/ng-devtools/src/lib/application-services:theme",
"//devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer",
"//devtools/projects/ng-devtools/src/lib/devtools-tabs/tab-update",
- "//devtools/projects/protocol",
- "//packages/common",
- "//packages/core",
"//packages/core/src/util",
"//packages/core/testing",
- "@npm//@angular/material",
- "@npm//rxjs",
+ "//packages/common",
+ "//devtools/projects/ng-devtools/src/lib/application-services:frame_manager",
+ "//devtools/projects/ng-devtools/src/lib/application-services:theme",
+ ],
+ deps = [
+ "//:node_modules/@angular/material",
+ "//:node_modules/rxjs",
+ "//:node_modules/tslib",
+ "//devtools/projects/ng-devtools/src/lib/application-environment:application-environment_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection/BUILD.bazel
index d3f6c568a2d..e6c6fa8344e 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection/BUILD.bazel
@@ -1,5 +1,5 @@
-load("//devtools/tools:typescript.bzl", "ts_library")
load("//devtools/tools:ng_module.bzl", "ng_module")
+load("//devtools/tools:typescript.bzl", "ts_library")
package(default_visibility = ["//visibility:public"])
@@ -18,11 +18,12 @@ ng_module(
ts_library(
name = "injector_tree_visualizer",
srcs = ["injector-tree-visualizer.ts"],
- deps = [
- "//devtools/projects/protocol",
+ interop_deps = [
"//packages/core",
- "@npm//@types",
- "@npm//d3",
- "@npm//rxjs",
+ ],
+ deps = [
+ "//:node_modules/@types/d3",
+ "//:node_modules/d3",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection/injector-tree-visualizer.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection/injector-tree-visualizer.ts
index 52110417435..fa455c2f190 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection/injector-tree-visualizer.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection/injector-tree-visualizer.ts
@@ -7,7 +7,7 @@
*/
import * as d3 from 'd3';
-import {SerializedInjector} from 'protocol';
+import {SerializedInjector} from '../../../../../protocol';
let arrowDefId = 0;
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection/resolution-path.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection/resolution-path.component.ts
index de165827c7e..598d7364531 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection/resolution-path.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection/resolution-path.component.ts
@@ -16,7 +16,7 @@ import {
OnDestroy,
viewChild,
} from '@angular/core';
-import {SerializedInjector} from 'protocol';
+import {SerializedInjector} from '../../../../../protocol';
import {InjectorTreeNode, InjectorTreeVisualizer} from './injector-tree-visualizer';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/devtools-tabs.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/devtools-tabs.component.ts
index d632a3057e7..16fbf96b1fa 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/devtools-tabs.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/devtools-tabs.component.ts
@@ -12,7 +12,7 @@ import {MatMenu, MatMenuItem, MatMenuTrigger} from '@angular/material/menu';
import {MatSlideToggle} from '@angular/material/slide-toggle';
import {MatTabLink, MatTabNav, MatTabNavPanel} from '@angular/material/tabs';
import {MatTooltip} from '@angular/material/tooltip';
-import {Events, MessageBus, Route} from 'protocol';
+import {Events, MessageBus, Route} from '../../../../protocol';
import {ApplicationEnvironment, Frame, TOP_LEVEL_FRAME_ID} from '../application-environment/index';
import {FrameManager} from '../application-services/frame_manager';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/devtools-tabs.spec.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/devtools-tabs.spec.ts
index f27d9ab3de9..57a9ad0fad3 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/devtools-tabs.spec.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/devtools-tabs.spec.ts
@@ -10,7 +10,7 @@ import {Component} from '@angular/core';
import {TestBed} from '@angular/core/testing';
import {MatMenuModule} from '@angular/material/menu';
import {MatTooltip} from '@angular/material/tooltip';
-import {Events, MessageBus} from 'protocol';
+import {Events, MessageBus} from '../../../../protocol';
import {Subject} from 'rxjs';
import {ApplicationEnvironment} from '../application-environment';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/diffing/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/diffing/BUILD.bazel
index b07a40c8716..a6cfe2fae63 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/diffing/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/diffing/BUILD.bazel
@@ -4,14 +4,13 @@ package(default_visibility = ["//visibility:public"])
ts_library(
name = "diffing",
- srcs = glob(
- include = [
- "index.ts",
- ],
- ),
- deps = [
+ srcs = [
+ "index.ts",
+ ],
+ interop_deps = [
"//packages/core",
- "@npm//@types",
- "@npm//rxjs",
+ ],
+ deps = [
+ "//:node_modules/rxjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/BUILD.bazel
index 75ec5878889..7947b298d0d 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/BUILD.bazel
@@ -41,20 +41,23 @@ ng_module(
ts_test_library(
name = "directive_explorer_test",
srcs = ["directive-explorer.spec.ts"],
- deps = [
+ interop_deps = [
+ "//packages/core",
":directive-explorer",
- "//devtools/projects/ng-devtools/src/lib/application-operations",
- "//devtools/projects/ng-devtools/src/lib/application-services:frame_manager",
"//devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest",
"//devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/breadcrumbs",
"//devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/index-forest",
"//devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver",
"//devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab",
"//devtools/projects/ng-devtools/src/lib/devtools-tabs/tab-update",
- "//devtools/projects/protocol",
- "//packages/core",
"//packages/core/testing",
"//packages/platform-browser",
+ "//devtools/projects/ng-devtools/src/lib/application-services:frame_manager",
+ ],
+ deps = [
+ "//:node_modules/tslib",
+ "//devtools/projects/ng-devtools/src/lib/application-operations:application-operations_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-explorer.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-explorer.component.ts
index 9bf292aaecd..e9d9ec5ab9e 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-explorer.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-explorer.component.ts
@@ -27,7 +27,7 @@ import {
MessageBus,
PropertyQuery,
PropertyQueryTypes,
-} from 'protocol';
+} from '../../../../../protocol';
import {SplitComponent} from '../../../lib/vendor/angular-split/public_api';
import {ApplicationOperations} from '../../application-operations/index';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-explorer.spec.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-explorer.spec.ts
index 5f7699f0b11..77948a68bbb 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-explorer.spec.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-explorer.spec.ts
@@ -9,7 +9,7 @@
import {ComponentFixture, TestBed} from '@angular/core/testing';
import {ApplicationOperations} from '../../application-operations';
-import {DirectivePosition, MessageBus, PropType, PropertyQueryTypes} from 'protocol';
+import {DirectivePosition, MessageBus, PropType, PropertyQueryTypes} from '../../../../../protocol';
import {DirectiveExplorerComponent} from './directive-explorer.component';
import {DirectiveForestComponent} from './directive-forest/directive-forest.component';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/component-data-source/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/component-data-source/BUILD.bazel
index 04032388abb..40c33ce9156 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/component-data-source/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/component-data-source/BUILD.bazel
@@ -1,20 +1,22 @@
-load("//devtools/tools:typescript.bzl", "ts_library", "ts_test_library")
load("//devtools/tools:defaults.bzl", "karma_web_test_suite")
+load("//devtools/tools:typescript.bzl", "ts_library", "ts_test_library")
package(default_visibility = ["//visibility:public"])
ts_library(
name = "component-data-source",
srcs = ["index.ts"],
- deps = [
- "//devtools/projects/ng-devtools/src/lib/devtools-tabs/diffing",
- "//devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/index-forest",
- "//devtools/projects/protocol",
+ interop_deps = [
"//packages/core",
- "@npm//@angular/cdk",
- "@npm//@angular/material",
- "@npm//@types",
- "@npm//rxjs",
+ ],
+ deps = [
+ "//:node_modules/@angular/cdk",
+ "//:node_modules/@angular/material",
+ "//:node_modules/@types",
+ "//:node_modules/rxjs",
+ "//devtools/projects/ng-devtools/src/lib/devtools-tabs/diffing:diffing_rjs",
+ "//devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/index-forest:index-forest_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -22,9 +24,9 @@ ts_test_library(
name = "component_data_source_test",
srcs = glob(["**/*.spec.ts"]),
deps = [
- ":component-data-source",
- "//devtools/projects/protocol",
- "@npm//@angular/cdk",
+ ":component-data-source_rjs",
+ "//:node_modules/@angular/cdk",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/component-data-source/component-data-source.spec.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/component-data-source/component-data-source.spec.ts
index 74dc0a62b72..498d4618d3b 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/component-data-source/component-data-source.spec.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/component-data-source/component-data-source.spec.ts
@@ -7,7 +7,7 @@
*/
import {FlatTreeControl} from '@angular/cdk/tree';
-import {DevToolsNode} from 'protocol';
+import {DevToolsNode} from '../../../../../../../protocol';
import {ComponentDataSource, FlatNode} from '.';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/component-data-source/index.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/component-data-source/index.ts
index cc181e95e28..7a2227cc673 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/component-data-source/index.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/component-data-source/index.ts
@@ -10,7 +10,7 @@ import {CollectionViewer, DataSource} from '@angular/cdk/collections';
import {FlatTreeControl} from '@angular/cdk/tree';
import {DefaultIterableDiffer, TrackByFunction} from '@angular/core';
import {MatTreeFlattener} from '@angular/material/tree';
-import {DevToolsNode, HydrationStatus} from 'protocol';
+import {DevToolsNode, HydrationStatus} from '../../../../../../../protocol';
import {BehaviorSubject, merge, Observable} from 'rxjs';
import {map} from 'rxjs/operators';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/directive-forest-utils.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/directive-forest-utils.ts
index 53213fc1158..bdea6093efd 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/directive-forest-utils.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/directive-forest-utils.ts
@@ -8,7 +8,7 @@
import {FlatTreeControl} from '@angular/cdk/tree';
-import {FlatNode} from './component-data-source';
+import {FlatNode} from './component-data-source/index';
export const isChildOf = (childPosition: number[], parentPosition: number[]) => {
if (childPosition.length <= parentPosition.length) {
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/directive-forest.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/directive-forest.component.ts
index cfbccc4376c..06938e069b7 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/directive-forest.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/directive-forest.component.ts
@@ -26,7 +26,7 @@ import {
signal,
viewChild,
} from '@angular/core';
-import {DevToolsNode, ElementPosition, Events, MessageBus} from 'protocol';
+import {DevToolsNode, ElementPosition, Events, MessageBus} from '../../../../../../protocol';
import {TabUpdate} from '../../tab-update/index';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/index-forest/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/index-forest/BUILD.bazel
index 271645f621a..129d4f13c55 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/index-forest/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/index-forest/BUILD.bazel
@@ -1,5 +1,5 @@
-load("//devtools/tools:typescript.bzl", "ts_library", "ts_test_library")
load("//devtools/tools:defaults.bzl", "karma_web_test_suite")
+load("//devtools/tools:typescript.bzl", "ts_library", "ts_test_library")
package(default_visibility = ["//visibility:public"])
@@ -7,8 +7,8 @@ ts_library(
name = "index-forest",
srcs = ["index.ts"],
deps = [
- "//devtools/projects/protocol",
- "@npm//@angular/material",
+ "//:node_modules/@angular/material",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -16,7 +16,7 @@ ts_test_library(
name = "index_forest_test",
srcs = glob(["**/*.spec.ts"]),
deps = [
- ":index-forest",
+ ":index-forest_rjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/index-forest/index.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/index-forest/index.ts
index 8e01c7efd2b..75bfdfa349d 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/index-forest/index.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/index-forest/index.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {DevToolsNode, ElementPosition} from 'protocol';
+import {DevToolsNode, ElementPosition} from '../../../../../../../protocol';
export interface IndexedNode extends DevToolsNode {
position: ElementPosition;
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/BUILD.bazel
index 461b99a5c82..e65ac064ecb 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/BUILD.bazel
@@ -1,6 +1,6 @@
+load("//devtools/tools:defaults.bzl", "karma_web_test_suite")
load("//devtools/tools:ng_module.bzl", "ng_module")
load("//devtools/tools:typescript.bzl", "ts_test_library")
-load("//devtools/tools:defaults.bzl", "karma_web_test_suite")
package(default_visibility = ["//visibility:public"])
@@ -34,12 +34,14 @@ ts_test_library(
"element-property-resolver.spec.ts",
"property-data-source.spec.ts",
],
- deps = [
- ":property-resolver",
+ interop_deps = [
"//devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-forest/index-forest",
- "//devtools/projects/protocol",
- "@npm//@angular/cdk",
- "@npm//@angular/material",
+ ":property-resolver",
+ ],
+ deps = [
+ "//:node_modules/@angular/cdk",
+ "//:node_modules/@angular/material",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/arrayify-props.spec.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/arrayify-props.spec.ts
index 7ba9bf3a91e..5bc1a247b55 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/arrayify-props.spec.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/arrayify-props.spec.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {PropType} from 'protocol';
+import {PropType} from '../../../../../../protocol';
import {arrayifyProps} from './arrayify-props';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/arrayify-props.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/arrayify-props.ts
index 4c47230db77..5488404b5e9 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/arrayify-props.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/arrayify-props.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {Descriptor} from 'protocol';
+import {Descriptor} from '../../../../../../protocol';
import {Property} from './element-property-resolver';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/directive-property-resolver.spec.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/directive-property-resolver.spec.ts
index fc970fe1c4f..6b98ceef719 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/directive-property-resolver.spec.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/directive-property-resolver.spec.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {Properties, PropType} from 'protocol';
+import {Properties, PropType} from '../../../../../../protocol';
import {DirectivePropertyResolver} from './directive-property-resolver';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/directive-property-resolver.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/directive-property-resolver.ts
index b9ca3f5bbfa..6be056be941 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/directive-property-resolver.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/directive-property-resolver.ts
@@ -16,7 +16,7 @@ import {
MessageBus,
NestedProp,
Properties,
-} from 'protocol';
+} from '../../../../../../protocol';
import {FlatNode, Property} from './element-property-resolver';
import {getTreeFlattener} from './flatten';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/element-property-resolver.spec.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/element-property-resolver.spec.ts
index 2862ed7e747..5ae741d52ba 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/element-property-resolver.spec.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/element-property-resolver.spec.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {Properties, PropType} from 'protocol';
+import {Properties, PropType} from '../../../../../../protocol';
import {IndexedNode} from '../directive-forest/index-forest';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/element-property-resolver.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/element-property-resolver.ts
index 39b08687cbd..09d5cf38395 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/element-property-resolver.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/element-property-resolver.ts
@@ -14,7 +14,7 @@ import {
DirectivesProperties,
Events,
MessageBus,
-} from 'protocol';
+} from '../../../../../../protocol';
import {IndexedNode} from '../directive-forest/index-forest';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/flatten.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/flatten.ts
index 0118982464c..9fca59fc19d 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/flatten.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/flatten.ts
@@ -7,7 +7,7 @@
*/
import {MatTreeFlattener} from '@angular/material/tree';
-import {Descriptor, PropType} from 'protocol';
+import {Descriptor, PropType} from '../../../../../../protocol';
import {Observable} from 'rxjs';
import {arrayifyProps} from './arrayify-props';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/property-data-source.spec.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/property-data-source.spec.ts
index 8487becebea..da3b95a0b92 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/property-data-source.spec.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/property-data-source.spec.ts
@@ -7,7 +7,7 @@
*/
import {FlatTreeControl} from '@angular/cdk/tree';
-import {PropType} from 'protocol';
+import {PropType} from '../../../../../../protocol';
import {FlatNode} from './element-property-resolver';
import {getTreeFlattener} from './flatten';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/property-data-source.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/property-data-source.ts
index 5c00f5e0597..b1b8276f557 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/property-data-source.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/property-data-source.ts
@@ -10,7 +10,13 @@ import {CollectionViewer, DataSource, SelectionChange} from '@angular/cdk/collec
import {FlatTreeControl} from '@angular/cdk/tree';
import {DefaultIterableDiffer, TrackByFunction} from '@angular/core';
import {MatTreeFlattener} from '@angular/material/tree';
-import {Descriptor, DirectivePosition, Events, MessageBus, Properties} from 'protocol';
+import {
+ Descriptor,
+ DirectivePosition,
+ Events,
+ MessageBus,
+ Properties,
+} from '../../../../../../protocol';
import {BehaviorSubject, merge, Observable, Subscription} from 'rxjs';
import {map} from 'rxjs/operators';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/property-expanded-directive-properties.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/property-expanded-directive-properties.ts
index 000a9b9a15e..0907972bcd6 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/property-expanded-directive-properties.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-resolver/property-expanded-directive-properties.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {Descriptor, NestedProp, PropType} from 'protocol';
+import {Descriptor, NestedProp, PropType} from '../../../../../../protocol';
import {FlatNode} from './element-property-resolver';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/component-metadata.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/component-metadata.component.ts
index 8477159726e..793463f8bb5 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/component-metadata.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/component-metadata.component.ts
@@ -7,7 +7,7 @@
*/
import {ChangeDetectionStrategy, Component, computed, inject, input} from '@angular/core';
-import {ComponentType} from 'protocol';
+import {ComponentType} from '../../../../../../protocol';
import {ElementPropertyResolver} from '../property-resolver/element-property-resolver';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-tab.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-tab.component.ts
index 6e916a8c7d6..9e44ed9c1ee 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-tab.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-tab.component.ts
@@ -7,7 +7,7 @@
*/
import {Component, input, output} from '@angular/core';
-import {DirectivePosition} from 'protocol';
+import {DirectivePosition} from '../../../../../../protocol';
import {IndexedNode} from '../directive-forest/index-forest';
import {FlatNode} from '../property-resolver/element-property-resolver';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-editor.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-editor.component.ts
index b9994c12e28..6eb1cd90d81 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-editor.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-editor.component.ts
@@ -17,7 +17,7 @@ import {
viewChild,
} from '@angular/core';
import {FormsModule} from '@angular/forms';
-import {ContainerType} from 'protocol';
+import {ContainerType} from '../../../../../../../protocol';
type EditorType = string | number | boolean;
type EditorResult = EditorType | Array;
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-preview.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-preview.component.ts
index 0c8ac06fe0c..6fbd79f28bd 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-preview.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-preview.component.ts
@@ -7,7 +7,7 @@
*/
import {Component, computed, input, output} from '@angular/core';
-import {PropType} from 'protocol';
+import {PropType} from '../../../../../../../protocol';
import {FlatNode} from '../../property-resolver/element-property-resolver';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-tab-body.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-tab-body.component.ts
index 583db0f2fd3..453ef6b9338 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-tab-body.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-tab-body.component.ts
@@ -7,7 +7,7 @@
*/
import {Component, computed, input, output} from '@angular/core';
-import {DirectivePosition} from 'protocol';
+import {DirectivePosition} from '../../../../../../../protocol';
import {IndexedNode} from '../../directive-forest/index-forest';
import {FlatNode} from '../../property-resolver/element-property-resolver';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-view-body.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-view-body.component.ts
index e88579f3351..8a3ca2c116e 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-view-body.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-view-body.component.ts
@@ -8,7 +8,7 @@
import {CdkDragDrop, moveItemInArray, CdkDropList, CdkDrag} from '@angular/cdk/drag-drop';
import {Component, computed, forwardRef, input, output, signal} from '@angular/core';
-import {DirectivePosition, SerializedInjectedService} from 'protocol';
+import {DirectivePosition, SerializedInjectedService} from '../../../../../../../protocol';
import {
DirectivePropertyResolver,
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-view.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-view.component.ts
index 996ad911f96..2847e1135fc 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-view.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-view.component.ts
@@ -7,7 +7,7 @@
*/
import {Component, computed, inject, input, output} from '@angular/core';
-import {DirectivePosition} from 'protocol';
+import {DirectivePosition} from '../../../../../../../protocol';
import {ElementPropertyResolver, FlatNode} from '../../property-resolver/element-property-resolver';
import {PropertyViewBodyComponent} from './property-view-body.component';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/BUILD.bazel
index 942e155b4f3..d4c1e4d3582 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/BUILD.bazel
@@ -48,9 +48,9 @@ ts_test_library(
"injector-tree-fns.spec.ts",
],
deps = [
- ":injector_tree_fns",
- "//devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection:injector_tree_visualizer",
- "//devtools/projects/protocol",
+ ":injector_tree_fns_rjs",
+ "//devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection:injector_tree_visualizer_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -58,7 +58,7 @@ ts_library(
name = "injector_tree_fns",
srcs = ["injector-tree-fns.ts"],
deps = [
- "//devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection:injector_tree_visualizer",
- "//devtools/projects/protocol",
+ "//devtools/projects/ng-devtools/src/lib/devtools-tabs/dependency-injection:injector_tree_visualizer_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-providers/injector-providers.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-providers/injector-providers.component.ts
index 1299a2c4ad5..28c421da4f2 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-providers/injector-providers.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-providers/injector-providers.component.ts
@@ -14,7 +14,12 @@ import {MatInput} from '@angular/material/input';
import {MatSelect} from '@angular/material/select';
import {MatTableModule} from '@angular/material/table';
import {MatTooltip} from '@angular/material/tooltip';
-import {Events, MessageBus, SerializedInjector, SerializedProviderRecord} from 'protocol';
+import {
+ Events,
+ MessageBus,
+ SerializedInjector,
+ SerializedProviderRecord,
+} from '../../../../../../protocol';
@Component({
selector: 'ng-injector-providers',
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-tree-fns.spec.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-tree-fns.spec.ts
index 9819b5c203e..089d4852fed 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-tree-fns.spec.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-tree-fns.spec.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {ComponentType, DevToolsNode} from 'protocol';
+import {DevToolsNode} from '../../../../../protocol';
import {
InjectorTreeD3Node,
InjectorTreeNode,
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-tree-fns.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-tree-fns.ts
index 5a660444e4c..1fa78a22590 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-tree-fns.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-tree-fns.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {DevToolsNode, SerializedInjector} from 'protocol';
+import {DevToolsNode, SerializedInjector} from '../../../../../protocol';
import {
InjectorTreeD3Node,
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-tree.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-tree.component.ts
index 22faaad7373..2ea3c863ad7 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-tree.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/injector-tree/injector-tree.component.ts
@@ -25,7 +25,7 @@ import {
MessageBus,
SerializedInjector,
SerializedProviderRecord,
-} from 'protocol';
+} from '../../../../../protocol';
import {SplitAreaDirective, SplitComponent} from '../../vendor/angular-split/public_api';
import {
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/profiler.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/profiler.component.ts
index e620df1cbdc..b35d9a2a640 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/profiler.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/profiler.component.ts
@@ -8,7 +8,7 @@
import {Component, inject, signal} from '@angular/core';
import {MatDialog} from '@angular/material/dialog';
-import {Events, MessageBus, ProfilerFrame} from 'protocol';
+import {Events, MessageBus, ProfilerFrame} from '../../../../../protocol';
import {Subject} from 'rxjs';
import {FileApiService} from './file-api-service';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/BUILD.bazel
index bb290bcd0f7..6942c3bb39c 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/BUILD.bazel
@@ -1,7 +1,7 @@
-load("//devtools/tools:ng_module.bzl", "ng_module")
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
-load("//devtools/tools:typescript.bzl", "ts_test_library")
load("//devtools/tools:defaults.bzl", "karma_web_test_suite")
+load("//devtools/tools:ng_module.bzl", "ng_module")
+load("//devtools/tools:typescript.bzl", "ts_test_library")
package(default_visibility = ["//visibility:public"])
@@ -71,7 +71,7 @@ ts_test_library(
"filter.spec.ts",
"timeline.component.spec.ts",
],
- deps = [
+ interop_deps = [
":timeline",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/filter.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/filter.ts
index 35490cd7602..faed052667a 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/filter.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/filter.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {ProfilerFrame} from 'protocol';
+import {ProfilerFrame} from '../../../../../../protocol';
import {GraphNode} from './record-formatter/record-formatter';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/BUILD.bazel
index 9a1b89cc5dd..2b1cf482279 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/BUILD.bazel
@@ -1,5 +1,5 @@
-load("//devtools/tools:typescript.bzl", "ts_library", "ts_test_library")
load("//devtools/tools:defaults.bzl", "karma_web_test_suite")
+load("//devtools/tools:typescript.bzl", "ts_library", "ts_test_library")
package(default_visibility = ["//visibility:public"])
@@ -15,23 +15,25 @@ ts_library(
"frame-merger.spec.ts",
],
),
- deps = [
- "//devtools/projects/protocol",
+ interop_deps = [
"//packages/core",
- "@npm//@types",
- "@npm//rxjs",
+ ],
+ deps = [
+ "//:node_modules/rxjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
ts_library(
name = "record_formatter_spec_constants",
srcs = ["record-formatter-spec-constants.ts"],
- deps = [
- "//devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/flamegraph-formatter",
- "//devtools/projects/protocol",
+ interop_deps = [
"//packages/core",
- "@npm//@types",
- "@npm//rxjs",
+ "//devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/flamegraph-formatter",
+ ],
+ deps = [
+ "//:node_modules/rxjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -41,11 +43,13 @@ ts_test_library(
"frame-merger.spec.ts",
"record-formatter.spec.ts",
],
- deps = [
- ":record-formatter",
- ":record_formatter_spec_constants",
+ interop_deps = [
"//devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/flamegraph-formatter",
- "//devtools/projects/protocol",
+ ],
+ deps = [
+ ":record-formatter_rjs",
+ ":record_formatter_spec_constants_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/bargraph-formatter/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/bargraph-formatter/BUILD.bazel
index 1715c6d3ebf..9a50b30b123 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/bargraph-formatter/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/bargraph-formatter/BUILD.bazel
@@ -9,14 +9,16 @@ ts_library(
"*.ts",
],
),
- deps = [
- "//devtools/projects/ng-devtools/src/lib/application-services:theme",
- "//devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter",
- "//devtools/projects/ng-devtools/src/lib/vendor/memo-decorator",
- "//devtools/projects/protocol",
+ interop_deps = [
"//packages/core",
- "@npm//@types",
- "@npm//ngx-flamegraph",
- "@npm//rxjs",
+ "//devtools/projects/ng-devtools/src/lib/application-services:theme",
+ ],
+ deps = [
+ "//:node_modules/ngx-flamegraph",
+ "//:node_modules/rxjs",
+ "//:node_modules/tslib",
+ "//devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter:record-formatter_rjs",
+ "//devtools/projects/ng-devtools/src/lib/vendor/memo-decorator:memo-decorator_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/bargraph-formatter/bargraph-formatter.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/bargraph-formatter/bargraph-formatter.ts
index f1ba3dc622c..baf875b953e 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/bargraph-formatter/bargraph-formatter.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/bargraph-formatter/bargraph-formatter.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {DirectiveProfile, ElementProfile, ProfilerFrame} from 'protocol';
+import {DirectiveProfile, ElementProfile, ProfilerFrame} from '../../../../../../../../protocol';
import {memo} from '../../../../../vendor/memo-decorator';
import {RecordFormatter} from '../record-formatter';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/flamegraph-formatter/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/flamegraph-formatter/BUILD.bazel
index 99719aa8332..1271a48e47b 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/flamegraph-formatter/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/flamegraph-formatter/BUILD.bazel
@@ -28,11 +28,13 @@ ts_test_library(
srcs = [
"flamegraph-formatter.spec.ts",
],
- deps = [
+ interop_deps = [
":flamegraph-formatter",
- "//devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter",
- "//devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter:record_formatter_spec_constants",
- "//devtools/projects/protocol",
+ ],
+ deps = [
+ "//devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter:record-formatter_rjs",
+ "//devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter:record_formatter_spec_constants_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/flamegraph-formatter/flamegraph-formatter.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/flamegraph-formatter/flamegraph-formatter.ts
index 40ea39fbb9f..9b8d569691c 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/flamegraph-formatter/flamegraph-formatter.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/flamegraph-formatter/flamegraph-formatter.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {ElementProfile, ProfilerFrame} from 'protocol';
+import {ElementProfile, ProfilerFrame} from '../../../../../../../../protocol';
import {Theme} from '../../../../../application-services/theme_service';
import {RecordFormatter} from '../record-formatter';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/frame-merger.spec.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/frame-merger.spec.ts
index 5eb4013477b..8c50c235a26 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/frame-merger.spec.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/frame-merger.spec.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {ProfilerFrame} from 'protocol';
+import {ProfilerFrame} from '../../../../../../../protocol';
import {mergeFrames} from './frame-merger';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/frame-merger.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/frame-merger.ts
index fbba10d2fac..72fd64feab8 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/frame-merger.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/frame-merger.ts
@@ -6,7 +6,12 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {DirectiveProfile, ElementProfile, LifecycleProfile, ProfilerFrame} from 'protocol';
+import {
+ DirectiveProfile,
+ ElementProfile,
+ LifecycleProfile,
+ ProfilerFrame,
+} from '../../../../../../../protocol';
const mergeProperty = (mergeInProp: number | undefined, value: number | undefined) => {
if (mergeInProp === undefined) {
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/record-formatter.spec.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/record-formatter.spec.ts
index c8aaee00341..87fd006e6e5 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/record-formatter.spec.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/record-formatter.spec.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {DirectiveProfile, ElementProfile, ProfilerFrame} from 'protocol';
+import {DirectiveProfile, ElementProfile, ProfilerFrame} from '../../../../../../../protocol';
import {RecordFormatter} from './record-formatter';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/record-formatter.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/record-formatter.ts
index 9a94c64c8e5..2fae63cd1a8 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/record-formatter.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/record-formatter.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {DirectiveProfile, ElementProfile, ProfilerFrame} from 'protocol';
+import {DirectiveProfile, ElementProfile, ProfilerFrame} from '../../../../../../../protocol';
export interface TimelineView {
timeline: AppEntry[];
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/tree-map-formatter/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/tree-map-formatter/BUILD.bazel
index c903f71e790..7f89cfab9e9 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/tree-map-formatter/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/tree-map-formatter/BUILD.bazel
@@ -1,5 +1,5 @@
-load("//devtools/tools:typescript.bzl", "ts_library", "ts_test_library")
load("//devtools/tools:defaults.bzl", "karma_web_test_suite")
+load("//devtools/tools:typescript.bzl", "ts_library", "ts_test_library")
package(default_visibility = ["//visibility:public"])
@@ -14,9 +14,10 @@ ts_library(
],
),
deps = [
- "//devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter",
- "//devtools/projects/ng-devtools/src/lib/vendor/memo-decorator",
- "//devtools/projects/protocol",
+ "//:node_modules/tslib",
+ "//devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter:record-formatter_rjs",
+ "//devtools/projects/ng-devtools/src/lib/vendor/memo-decorator:memo-decorator_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -26,10 +27,10 @@ ts_test_library(
"tree-map-formatter.spec.ts",
],
deps = [
- ":tree-map-formatter",
- "//devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter",
- "//devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter:record_formatter_spec_constants",
- "//devtools/projects/protocol",
+ ":tree-map-formatter_rjs",
+ "//devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter:record-formatter_rjs",
+ "//devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter:record_formatter_spec_constants_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/tree-map-formatter/tree-map-formatter.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/tree-map-formatter/tree-map-formatter.ts
index c39a43d5d02..050b9388a97 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/tree-map-formatter/tree-map-formatter.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/record-formatter/tree-map-formatter/tree-map-formatter.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {ElementProfile, ProfilerFrame} from 'protocol';
+import {ElementProfile, ProfilerFrame} from '../../../../../../../../protocol';
import {memo} from '../../../../../vendor/memo-decorator';
import {RecordFormatter} from '../record-formatter';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/bargraph-visualizer.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/bargraph-visualizer.component.ts
index 1c31cd7bc32..151850b61c4 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/bargraph-visualizer.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/bargraph-visualizer.component.ts
@@ -7,7 +7,7 @@
*/
import {ChangeDetectionStrategy, Component, computed, inject, input, output} from '@angular/core';
-import {ProfilerFrame} from 'protocol';
+import {ProfilerFrame} from '../../../../../../../protocol';
import {ThemeService} from '../../../../application-services/theme_service';
import {BarGraphFormatter, BargraphNode} from '../record-formatter/bargraph-formatter/index';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/flamegraph-visualizer.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/flamegraph-visualizer.component.ts
index 18c236ceae4..33a4d3374c4 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/flamegraph-visualizer.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/flamegraph-visualizer.component.ts
@@ -8,7 +8,7 @@
import {ChangeDetectionStrategy, Component, computed, inject, input, output} from '@angular/core';
import {Color, RawData} from 'ngx-flamegraph/lib/utils';
-import {ProfilerFrame} from 'protocol';
+import {ProfilerFrame} from '../../../../../../../protocol';
import {ThemeService} from '../../../../application-services/theme_service';
import {
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/profile-formatter.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/profile-formatter.ts
index f6f7779ed49..03476eb9f46 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/profile-formatter.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/profile-formatter.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {DirectiveProfile} from 'protocol';
+import {DirectiveProfile} from '../../../../../../../protocol';
import {SelectedDirective} from './timeline-visualizer.component';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/timeline-visualizer.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/timeline-visualizer.component.ts
index b1affb6a7ec..71e77cad216 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/timeline-visualizer.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/timeline-visualizer.component.ts
@@ -7,7 +7,7 @@
*/
import {ChangeDetectionStrategy, Component, computed, input, linkedSignal} from '@angular/core';
-import {ProfilerFrame} from 'protocol';
+import {ProfilerFrame} from '../../../../../../../protocol';
import {BargraphNode} from '../record-formatter/bargraph-formatter';
import {FlamegraphNode} from '../record-formatter/flamegraph-formatter';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/tree-map-visualizer.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/tree-map-visualizer.component.ts
index 935c03d52c8..0a30d42df33 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/tree-map-visualizer.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/recording-visualizer/tree-map-visualizer.component.ts
@@ -19,7 +19,7 @@ import {
OnDestroy,
viewChild,
} from '@angular/core';
-import {ProfilerFrame} from 'protocol';
+import {ProfilerFrame} from '../../../../../../../protocol';
import {Subject, Subscription} from 'rxjs';
import {debounceTime} from 'rxjs/operators';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/timeline-controls.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/timeline-controls.component.ts
index b56a1106696..dd73476da95 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/timeline-controls.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/timeline-controls.component.ts
@@ -7,7 +7,7 @@
*/
import {Component, input, model, output} from '@angular/core';
-import {ProfilerFrame} from 'protocol';
+import {ProfilerFrame} from '../../../../../../protocol';
import {VisualizationMode} from './visualization-mode';
import {MatButton} from '@angular/material/button';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/timeline.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/timeline.component.ts
index 6f902ea7923..71f5c88be4f 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/timeline.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/timeline/timeline.component.ts
@@ -7,7 +7,7 @@
*/
import {Component, computed, effect, input, output, signal} from '@angular/core';
-import {ProfilerFrame} from 'protocol';
+import {ProfilerFrame} from '../../../../../../protocol';
import {Observable} from 'rxjs';
import {createFilter, Filter, noopFilter} from './filter';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/router-tree/router-tree-visualizer.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/router-tree/router-tree-visualizer.ts
index 6106cf7107e..c539c244d4f 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/router-tree/router-tree-visualizer.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/router-tree/router-tree-visualizer.ts
@@ -7,7 +7,7 @@
*/
import * as d3 from 'd3';
-import {Route} from 'protocol';
+import {Route} from '../../../../../protocol';
let arrowDefId = 0;
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/router-tree/router-tree.component.ts b/devtools/projects/ng-devtools/src/lib/devtools-tabs/router-tree/router-tree.component.ts
index 124313c3bcc..7b31f79b96b 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/router-tree/router-tree.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/router-tree/router-tree.component.ts
@@ -9,7 +9,7 @@
import {CommonModule} from '@angular/common';
import {afterNextRender, Component, effect, ElementRef, input, viewChild} from '@angular/core';
import {MatInputModule} from '@angular/material/input';
-import {Route} from 'protocol';
+import {Route} from '../../../../../protocol';
import {RouterTreeVisualizer} from './router-tree-visualizer';
import {MatCheckboxModule} from '@angular/material/checkbox';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools-tabs/tab-update/BUILD.bazel b/devtools/projects/ng-devtools/src/lib/devtools-tabs/tab-update/BUILD.bazel
index e3ee2687fa3..efa4254f677 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools-tabs/tab-update/BUILD.bazel
+++ b/devtools/projects/ng-devtools/src/lib/devtools-tabs/tab-update/BUILD.bazel
@@ -4,14 +4,13 @@ package(default_visibility = ["//visibility:public"])
ts_library(
name = "tab-update",
- srcs = glob(
- include = [
- "index.ts",
- ],
- ),
- deps = [
+ srcs = [
+ "index.ts",
+ ],
+ interop_deps = [
"//packages/core",
- "@npm//@types",
- "@npm//rxjs",
+ ],
+ deps = [
+ "//:node_modules/rxjs",
],
)
diff --git a/devtools/projects/ng-devtools/src/lib/devtools.component.ts b/devtools/projects/ng-devtools/src/lib/devtools.component.ts
index af46953631f..e4bc309270e 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools.component.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools.component.ts
@@ -9,7 +9,7 @@
import {animate, style, transition, trigger} from '@angular/animations';
import {Platform} from '@angular/cdk/platform';
import {Component, computed, inject, OnDestroy, OnInit, signal} from '@angular/core';
-import {Events, MessageBus} from 'protocol';
+import {Events, MessageBus} from '../../../protocol';
import {interval} from 'rxjs';
import {FrameManager} from './application-services/frame_manager';
diff --git a/devtools/projects/ng-devtools/src/lib/devtools_spec.ts b/devtools/projects/ng-devtools/src/lib/devtools_spec.ts
index c48f7e0843c..12efc900c74 100644
--- a/devtools/projects/ng-devtools/src/lib/devtools_spec.ts
+++ b/devtools/projects/ng-devtools/src/lib/devtools_spec.ts
@@ -11,7 +11,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
import {FrameManager} from './application-services/frame_manager';
import {DevToolsComponent} from './devtools.component';
import {DevToolsTabsComponent} from './devtools-tabs/devtools-tabs.component';
-import {MessageBus} from 'protocol';
+import {MessageBus} from '../../../protocol';
@Component({
selector: 'ng-devtools-tabs',
diff --git a/devtools/projects/protocol/BUILD.bazel b/devtools/projects/protocol/BUILD.bazel
index c1cc9ff3c9b..68488bc7b2c 100644
--- a/devtools/projects/protocol/BUILD.bazel
+++ b/devtools/projects/protocol/BUILD.bazel
@@ -1,4 +1,3 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
load("//devtools/tools:defaults.bzl", "karma_web_test_suite")
load("//devtools/tools:typescript.bzl", "ts_library", "ts_test_library")
@@ -10,7 +9,7 @@ exports_files([
])
ts_library(
- name = "protocol_ts",
+ name = "protocol",
srcs = glob(
["**/*.ts"],
exclude = [
@@ -18,8 +17,10 @@ ts_library(
"src/test.ts",
],
),
- deps = [
+ interop_deps = [
"//packages/core",
+ ],
+ deps = [
"@npm//@types",
],
)
@@ -29,19 +30,15 @@ ts_test_library(
srcs = glob(
["**/*.spec.ts"],
),
- deps = [
- ":protocol_ts",
+ interop_deps = [
"//packages/core/testing",
+ ],
+ deps = [
+ ":protocol_rjs",
"@npm//@types",
],
)
-js_library(
- name = "protocol",
- package_name = "protocol",
- deps = [":protocol_ts"],
-)
-
karma_web_test_suite(
name = "test",
deps = [
diff --git a/devtools/projects/shared-utils/BUILD.bazel b/devtools/projects/shared-utils/BUILD.bazel
index 8a09265b3d4..b360ecaba3e 100644
--- a/devtools/projects/shared-utils/BUILD.bazel
+++ b/devtools/projects/shared-utils/BUILD.bazel
@@ -1,11 +1,10 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
load("//devtools/tools:defaults.bzl", "karma_web_test_suite")
load("//devtools/tools:typescript.bzl", "ts_library", "ts_test_library")
package(default_visibility = ["//visibility:public"])
ts_library(
- name = "shared_utils_ts",
+ name = "shared-utils",
srcs = glob(
["**/*.ts"],
exclude = [
@@ -13,25 +12,19 @@ ts_library(
"src/test.ts",
],
),
- deps = [
+ interop_deps = [
"//packages/core",
- "@npm//@types",
],
)
-js_library(
- name = "shared-utils",
- package_name = "shared-utils",
- deps = [":shared_utils_ts"],
-)
-
ts_test_library(
name = "shared_utils_test",
srcs = glob(["**/*.spec.ts"]),
- deps = [
- ":shared-utils",
+ interop_deps = [
"//packages/core",
- "@npm//@types",
+ ],
+ deps = [
+ ":shared-utils_rjs",
],
)
diff --git a/devtools/projects/shared-utils/src/lib/shared-utils.spec.ts b/devtools/projects/shared-utils/src/lib/shared-utils.spec.ts
index 14daa5bd2be..512cf0545fa 100644
--- a/devtools/projects/shared-utils/src/lib/shared-utils.spec.ts
+++ b/devtools/projects/shared-utils/src/lib/shared-utils.spec.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {arrayEquals} from 'shared-utils';
+import {arrayEquals} from '../../../shared-utils';
describe('arrayEquals', () => {
let a: any;
diff --git a/devtools/projects/shell-browser/src/BUILD.bazel b/devtools/projects/shell-browser/src/BUILD.bazel
index cc89c4cea15..b408f78bf05 100644
--- a/devtools/projects/shell-browser/src/BUILD.bazel
+++ b/devtools/projects/shell-browser/src/BUILD.bazel
@@ -35,7 +35,7 @@ ts_library(
"devtools.ts",
],
deps = [
- "@npm//@types/chrome",
+ "//:node_modules/@types/chrome",
],
)
diff --git a/devtools/projects/shell-browser/src/app/BUILD.bazel b/devtools/projects/shell-browser/src/app/BUILD.bazel
index 1797548f9df..431614d1669 100644
--- a/devtools/projects/shell-browser/src/app/BUILD.bazel
+++ b/devtools/projects/shell-browser/src/app/BUILD.bazel
@@ -47,7 +47,7 @@ ts_library(
"ng-validate.ts",
],
deps = [
- "@npm//@types/chrome",
+ "//:node_modules/@types/chrome",
],
)
@@ -57,10 +57,9 @@ ts_library(
"chrome-window-extensions.ts",
],
deps = [
- "//devtools/projects/ng-devtools-backend",
- "//devtools/projects/ng-devtools-backend/src/lib:component_tree",
- "//devtools/projects/protocol",
- "@npm//@types",
+ "//devtools/projects/ng-devtools-backend:ng-devtools-backend_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:component_tree_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -69,10 +68,11 @@ ts_library(
srcs = [
"chrome-application-environment.ts",
],
+ interop_deps = [
+ "//devtools/projects/ng-devtools:ng-devtools",
+ ],
deps = [
- "//devtools/projects/ng-devtools",
- "//devtools/projects/shell-browser/src/environments:environment",
- "@npm//@types",
+ "//devtools/projects/shell-browser/src/environments:environment_rjs",
],
)
@@ -81,13 +81,15 @@ ts_library(
srcs = [
"chrome-application-operations.ts",
],
- deps = [
- ":chrome_application_environment",
- "//devtools/projects/ng-devtools",
- "//devtools/projects/protocol",
+ interop_deps = [
"//packages/core",
- "@npm//@angular/cdk",
- "@npm//@types",
+ "//devtools/projects/ng-devtools:ng-devtools",
+ ],
+ deps = [
+ ":chrome_application_environment_rjs",
+ "//:node_modules/@angular/cdk",
+ "//:node_modules/@types/chrome",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -96,10 +98,11 @@ ts_library(
srcs = [
"same-page-message-bus.ts",
],
- deps = [
- "//devtools/projects/protocol",
+ interop_deps = [
"//packages/core",
- "@npm//@types",
+ ],
+ deps = [
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -108,11 +111,13 @@ ts_library(
srcs = [
"zone-aware-chrome-message-bus.ts",
],
- deps = [
- ":chrome_message_bus",
- "//devtools/projects/protocol",
+ interop_deps = [
"//packages/core",
- "@npm//@types",
+ ],
+ deps = [
+ ":chrome_message_bus_rjs",
+ "//:node_modules/@types/chrome",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -121,10 +126,12 @@ ts_library(
srcs = [
"chrome-message-bus.ts",
],
- deps = [
- "//devtools/projects/protocol",
+ interop_deps = [
"//packages/core",
- "@npm//@types",
+ ],
+ deps = [
+ "//:node_modules/@types/chrome",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -134,9 +141,9 @@ ts_library(
"background.ts",
],
deps = [
- ":tab_manager",
- "//devtools/projects/protocol",
- "//devtools/projects/shell-browser/src/app:detect_angular_for_extension_icon",
+ ":detect_angular_for_extension_icon_rjs",
+ ":tab_manager_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -146,7 +153,8 @@ ts_library(
"tab_manager.ts",
],
deps = [
- "//devtools/projects/protocol",
+ "//:node_modules/@types/chrome",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -163,7 +171,8 @@ ts_test_library(
"tab_manager_spec.ts",
],
deps = [
- ":tab_manager",
+ ":tab_manager_rjs",
+ "//:node_modules/@types/chrome",
],
)
@@ -173,11 +182,10 @@ ts_library(
"backend.ts",
],
deps = [
- ":same_page_message_bus",
- "//devtools/projects/ng-devtools-backend",
- "//devtools/projects/ng-devtools-backend/src/lib:highlighter",
- "//devtools/projects/shell-browser/src/app:chrome_window_extensions",
- "@npm//@types",
+ ":chrome_window_extensions_rjs",
+ ":same_page_message_bus_rjs",
+ "//devtools/projects/ng-devtools-backend:ng-devtools-backend_rjs",
+ "//devtools/projects/ng-devtools-backend/src/lib:highlighter_rjs",
],
)
@@ -187,10 +195,9 @@ ts_library(
"content-script.ts",
],
deps = [
- ":chrome_message_bus",
- ":same_page_message_bus",
- "//devtools/projects/protocol",
- "@npm//@types",
+ ":chrome_message_bus_rjs",
+ ":same_page_message_bus_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
],
)
@@ -200,10 +207,9 @@ ts_library(
"detect-angular-for-extension-icon.ts",
],
deps = [
- ":same_page_message_bus",
- "//devtools/projects/protocol",
- "//devtools/projects/shared-utils",
- "@npm//@types",
+ ":same_page_message_bus_rjs",
+ "//devtools/projects/protocol:protocol_rjs",
+ "//devtools/projects/shared-utils:shared-utils_rjs",
],
)
diff --git a/devtools/projects/shell-browser/src/app/app.component.spec.ts b/devtools/projects/shell-browser/src/app/app.component.spec.ts
index 5ae503a74dc..bc8ebc4481c 100644
--- a/devtools/projects/shell-browser/src/app/app.component.spec.ts
+++ b/devtools/projects/shell-browser/src/app/app.component.spec.ts
@@ -8,7 +8,7 @@
import {TestBed, waitForAsync} from '@angular/core/testing';
import {RouterModule} from '@angular/router';
-import {ApplicationOperations} from 'ng-devtools';
+import {ApplicationOperations} from '../../../ng-devtools';
import {AppComponent} from './app.component';
diff --git a/devtools/projects/shell-browser/src/app/app.component.ts b/devtools/projects/shell-browser/src/app/app.component.ts
index 772932fd279..7034bdc7639 100644
--- a/devtools/projects/shell-browser/src/app/app.component.ts
+++ b/devtools/projects/shell-browser/src/app/app.component.ts
@@ -7,8 +7,8 @@
*/
import {ChangeDetectorRef, Component, inject, OnInit} from '@angular/core';
-import {DevToolsComponent} from 'ng-devtools';
-import {Events, MessageBus} from 'protocol';
+import {DevToolsComponent} from '../../../ng-devtools';
+import {Events, MessageBus} from '../../../protocol';
@Component({
selector: 'app-root',
diff --git a/devtools/projects/shell-browser/src/app/app.config.ts b/devtools/projects/shell-browser/src/app/app.config.ts
index 03331a0aaf6..f63bcd637eb 100644
--- a/devtools/projects/shell-browser/src/app/app.config.ts
+++ b/devtools/projects/shell-browser/src/app/app.config.ts
@@ -8,12 +8,12 @@
import {ApplicationConfig, inject, NgZone} from '@angular/core';
import {provideAnimations} from '@angular/platform-browser/animations';
-import {ApplicationEnvironment, ApplicationOperations} from 'ng-devtools';
+import {ApplicationEnvironment, ApplicationOperations} from '../../../ng-devtools';
import {ChromeApplicationEnvironment} from './chrome-application-environment';
import {ChromeApplicationOperations} from './chrome-application-operations';
import {ZoneAwareChromeMessageBus} from './zone-aware-chrome-message-bus';
-import {Events, MessageBus, PriorityAwareMessageBus} from 'protocol';
+import {Events, MessageBus, PriorityAwareMessageBus} from '../../../protocol';
import {FrameManager} from '../../../ng-devtools/src/lib/application-services/frame_manager';
import {Platform} from '@angular/cdk/platform';
diff --git a/devtools/projects/shell-browser/src/app/backend.ts b/devtools/projects/shell-browser/src/app/backend.ts
index b65e9bdf5d0..0cd4ec4762c 100644
--- a/devtools/projects/shell-browser/src/app/backend.ts
+++ b/devtools/projects/shell-browser/src/app/backend.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {initializeMessageBus} from 'ng-devtools-backend';
+import {initializeMessageBus} from '../../../ng-devtools-backend';
import {unHighlight} from '../../../ng-devtools-backend/src/lib/highlighter';
diff --git a/devtools/projects/shell-browser/src/app/background.ts b/devtools/projects/shell-browser/src/app/background.ts
index 8f61037a7a6..c46a297e367 100644
--- a/devtools/projects/shell-browser/src/app/background.ts
+++ b/devtools/projects/shell-browser/src/app/background.ts
@@ -8,7 +8,7 @@
///
-import {AngularDetection} from 'protocol';
+import {AngularDetection} from '../../../protocol';
import {TabManager, Tabs} from './tab_manager';
function getPopUpName(ng: AngularDetection): string {
diff --git a/devtools/projects/shell-browser/src/app/chrome-application-environment.ts b/devtools/projects/shell-browser/src/app/chrome-application-environment.ts
index 8df9d20f70d..5d82ac9e6ed 100644
--- a/devtools/projects/shell-browser/src/app/chrome-application-environment.ts
+++ b/devtools/projects/shell-browser/src/app/chrome-application-environment.ts
@@ -6,12 +6,12 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {ApplicationEnvironment, Environment} from 'ng-devtools';
+import {ApplicationEnvironment, Environment} from '../../../ng-devtools';
import {environment} from '../environments/environment';
export class ChromeApplicationEnvironment extends ApplicationEnvironment {
- frameSelectorEnabled = true;
+ override frameSelectorEnabled = true;
override get environment(): Environment {
return environment;
diff --git a/devtools/projects/shell-browser/src/app/chrome-application-operations.ts b/devtools/projects/shell-browser/src/app/chrome-application-operations.ts
index 8398094fb56..1f0dd75214b 100644
--- a/devtools/projects/shell-browser/src/app/chrome-application-operations.ts
+++ b/devtools/projects/shell-browser/src/app/chrome-application-operations.ts
@@ -10,8 +10,8 @@
import {Platform} from '@angular/cdk/platform';
import {inject} from '@angular/core';
-import {ApplicationOperations, Frame, TOP_LEVEL_FRAME_ID} from 'ng-devtools';
-import {DirectivePosition, ElementPosition} from 'protocol';
+import {ApplicationOperations, Frame, TOP_LEVEL_FRAME_ID} from '../../../ng-devtools';
+import {DirectivePosition, ElementPosition} from '../../../protocol';
export class ChromeApplicationOperations extends ApplicationOperations {
platform = inject(Platform);
diff --git a/devtools/projects/shell-browser/src/app/chrome-message-bus.ts b/devtools/projects/shell-browser/src/app/chrome-message-bus.ts
index bc67247ebe2..31a8a7b8196 100644
--- a/devtools/projects/shell-browser/src/app/chrome-message-bus.ts
+++ b/devtools/projects/shell-browser/src/app/chrome-message-bus.ts
@@ -8,7 +8,7 @@
///
-import {Events, MessageBus, Parameters} from 'protocol';
+import {Events, MessageBus, Parameters} from '../../../protocol';
interface ChromeMessage {
topic: K;
diff --git a/devtools/projects/shell-browser/src/app/chrome-window-extensions.ts b/devtools/projects/shell-browser/src/app/chrome-window-extensions.ts
index f12da69463c..9f5a27a7593 100644
--- a/devtools/projects/shell-browser/src/app/chrome-window-extensions.ts
+++ b/devtools/projects/shell-browser/src/app/chrome-window-extensions.ts
@@ -6,14 +6,14 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {findNodeFromSerializedPosition} from 'ng-devtools-backend';
+import {findNodeFromSerializedPosition} from '../../../ng-devtools-backend';
import {
buildDirectiveForest,
queryDirectiveForest,
} from '../../../ng-devtools-backend/src/lib/component-tree';
-import {ElementPosition} from 'protocol';
+import {ElementPosition} from '../../../protocol';
export const initializeExtendedWindowOperations = () => {
extendWindowOperations(globalThis, {inspectedApplication: chromeWindowExtensions});
diff --git a/devtools/projects/shell-browser/src/app/content-script.ts b/devtools/projects/shell-browser/src/app/content-script.ts
index f25e2b46356..0c28baa7d44 100644
--- a/devtools/projects/shell-browser/src/app/content-script.ts
+++ b/devtools/projects/shell-browser/src/app/content-script.ts
@@ -6,6 +6,8 @@
* found in the LICENSE file at https://angular.dev/license
*/
+///
+
import {ChromeMessageBus} from './chrome-message-bus';
import {SamePageMessageBus} from './same-page-message-bus';
diff --git a/devtools/projects/shell-browser/src/app/detect-angular-for-extension-icon.ts b/devtools/projects/shell-browser/src/app/detect-angular-for-extension-icon.ts
index 8582b8ab9af..24a3a304ffd 100644
--- a/devtools/projects/shell-browser/src/app/detect-angular-for-extension-icon.ts
+++ b/devtools/projects/shell-browser/src/app/detect-angular-for-extension-icon.ts
@@ -6,13 +6,13 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {AngularDetection} from 'protocol';
+import {AngularDetection} from '../../../protocol';
import {
appIsAngular,
appIsAngularInDevMode,
appIsAngularIvy,
appIsSupportedAngularVersion,
-} from 'shared-utils';
+} from '../../../shared-utils';
import {SamePageMessageBus} from './same-page-message-bus';
diff --git a/devtools/projects/shell-browser/src/app/same-page-message-bus.ts b/devtools/projects/shell-browser/src/app/same-page-message-bus.ts
index 30d1e0686a9..87c6c75d738 100644
--- a/devtools/projects/shell-browser/src/app/same-page-message-bus.ts
+++ b/devtools/projects/shell-browser/src/app/same-page-message-bus.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {Events, MessageBus, Parameters} from 'protocol';
+import {Events, MessageBus, Parameters} from '../../../protocol';
type AnyEventCallback = (topic: E, args: Parameters) => void;
diff --git a/devtools/projects/shell-browser/src/app/tab_manager.ts b/devtools/projects/shell-browser/src/app/tab_manager.ts
index 17464af7e6a..bd2d73c63ff 100644
--- a/devtools/projects/shell-browser/src/app/tab_manager.ts
+++ b/devtools/projects/shell-browser/src/app/tab_manager.ts
@@ -8,7 +8,7 @@
///
-import {Events, Topic} from 'protocol';
+import {Events, Topic} from '../../../protocol';
export interface ContentScriptConnection {
port: chrome.runtime.Port | null;
diff --git a/devtools/projects/shell-browser/src/app/tab_manager_spec.ts b/devtools/projects/shell-browser/src/app/tab_manager_spec.ts
index b96d5d9fab1..5094ebd85eb 100644
--- a/devtools/projects/shell-browser/src/app/tab_manager_spec.ts
+++ b/devtools/projects/shell-browser/src/app/tab_manager_spec.ts
@@ -6,6 +6,8 @@
* found in the LICENSE file at https://angular.dev/license
*/
+///
+
import {DevToolsConnection, TabManager, Tabs} from './tab_manager';
interface MockSender {
diff --git a/devtools/projects/shell-browser/src/app/zone-aware-chrome-message-bus.ts b/devtools/projects/shell-browser/src/app/zone-aware-chrome-message-bus.ts
index c26d66924b2..c3bc9d14114 100644
--- a/devtools/projects/shell-browser/src/app/zone-aware-chrome-message-bus.ts
+++ b/devtools/projects/shell-browser/src/app/zone-aware-chrome-message-bus.ts
@@ -6,8 +6,10 @@
* found in the LICENSE file at https://angular.dev/license
*/
+///
+
import {NgZone} from '@angular/core';
-import {Events, MessageBus, Parameters} from 'protocol';
+import {Events, MessageBus, Parameters} from '../../../protocol';
import {ChromeMessageBus} from './chrome-message-bus';
diff --git a/devtools/src/app/app.config.ts b/devtools/src/app/app.config.ts
index d7e3a27e058..2282ceafae2 100644
--- a/devtools/src/app/app.config.ts
+++ b/devtools/src/app/app.config.ts
@@ -9,7 +9,7 @@
import {ApplicationConfig} from '@angular/core';
import {provideAnimations} from '@angular/platform-browser/animations';
import {provideRouter} from '@angular/router';
-import {ApplicationEnvironment, ApplicationOperations} from 'ng-devtools';
+import {ApplicationEnvironment, ApplicationOperations} from '../../projects/ng-devtools';
import {DemoApplicationEnvironment} from '../demo-application-environment';
import {DemoApplicationOperations} from '../demo-application-operations';
diff --git a/devtools/src/app/demo-app/demo-app.routes.ts b/devtools/src/app/demo-app/demo-app.routes.ts
index f9533c8ad69..b9dcd3e6389 100644
--- a/devtools/src/app/demo-app/demo-app.routes.ts
+++ b/devtools/src/app/demo-app/demo-app.routes.ts
@@ -9,7 +9,7 @@
import {inject, Injector, provideEnvironmentInitializer} from '@angular/core';
import {createCustomElement} from '@angular/elements';
import {Routes} from '@angular/router';
-import {initializeMessageBus} from 'ng-devtools-backend';
+import {initializeMessageBus} from '../../../projects/ng-devtools-backend';
import {ZoneUnawareIFrameMessageBus} from '../../zone-unaware-iframe-message-bus';
diff --git a/devtools/src/app/devtools-app/devtools-app.component.ts b/devtools/src/app/devtools-app/devtools-app.component.ts
index d6106518880..ccfaae1b2ba 100644
--- a/devtools/src/app/devtools-app/devtools-app.component.ts
+++ b/devtools/src/app/devtools-app/devtools-app.component.ts
@@ -9,7 +9,7 @@
import {Component, ElementRef, viewChild} from '@angular/core';
import {IFrameMessageBus} from '../../iframe-message-bus';
-import {DevToolsComponent} from 'ng-devtools';
+import {DevToolsComponent} from '../../../projects/ng-devtools';
import {SplitAreaDirective} from '../../../projects/ng-devtools/src/lib/vendor/angular-split/lib/component/splitArea.directive';
import {SplitComponent} from '../../../projects/ng-devtools/src/lib/vendor/angular-split/lib/component/split.component';
diff --git a/devtools/src/app/devtools-app/devtools-app.routes.ts b/devtools/src/app/devtools-app/devtools-app.routes.ts
index 8ef8b847e3b..73f31713660 100644
--- a/devtools/src/app/devtools-app/devtools-app.routes.ts
+++ b/devtools/src/app/devtools-app/devtools-app.routes.ts
@@ -10,7 +10,7 @@ import {Routes} from '@angular/router';
import {AppDevToolsComponent} from './devtools-app.component';
import {FrameManager} from '../../../projects/ng-devtools/src/lib/application-services/frame_manager';
-import {Events, MessageBus, PriorityAwareMessageBus} from 'protocol';
+import {Events, MessageBus, PriorityAwareMessageBus} from '../../../projects/protocol';
import {IFrameMessageBus} from '../../iframe-message-bus';
export const DEVTOOL_ROUTES: Routes = [
diff --git a/devtools/src/demo-application-environment.ts b/devtools/src/demo-application-environment.ts
index 5b1aec0cc15..f2a66bc4c63 100644
--- a/devtools/src/demo-application-environment.ts
+++ b/devtools/src/demo-application-environment.ts
@@ -6,12 +6,13 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {ApplicationEnvironment, Environment} from 'ng-devtools';
+import {ApplicationEnvironment, Environment} from '../projects/ng-devtools';
import {environment} from './environments/environment';
export class DemoApplicationEnvironment extends ApplicationEnvironment {
- frameSelectorEnabled = false;
+ override frameSelectorEnabled = false;
+
override get environment(): Environment {
return environment;
}
diff --git a/devtools/src/demo-application-operations.ts b/devtools/src/demo-application-operations.ts
index ebf89f760da..346924a2bc2 100644
--- a/devtools/src/demo-application-operations.ts
+++ b/devtools/src/demo-application-operations.ts
@@ -6,8 +6,8 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {ApplicationOperations} from 'ng-devtools';
-import {DirectivePosition, ElementPosition} from 'protocol';
+import {ApplicationOperations} from '../projects/ng-devtools';
+import {DirectivePosition, ElementPosition} from '../projects/protocol';
export class DemoApplicationOperations extends ApplicationOperations {
override viewSource(position: ElementPosition): void {
diff --git a/devtools/src/iframe-message-bus.ts b/devtools/src/iframe-message-bus.ts
index 085f366cb98..8e7d03ecf8c 100644
--- a/devtools/src/iframe-message-bus.ts
+++ b/devtools/src/iframe-message-bus.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {Events, MessageBus, Parameters} from 'protocol';
+import {Events, MessageBus, Parameters} from '../projects/protocol';
type AnyEventCallback = (topic: E, args: Parameters) => void;
diff --git a/devtools/src/zone-unaware-iframe-message-bus.ts b/devtools/src/zone-unaware-iframe-message-bus.ts
index 4da37ea4e50..91da85099ad 100644
--- a/devtools/src/zone-unaware-iframe-message-bus.ts
+++ b/devtools/src/zone-unaware-iframe-message-bus.ts
@@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/
-import {Events, MessageBus, Parameters} from 'protocol';
+import {Events, MessageBus, Parameters} from '../projects/protocol';
import {IFrameMessageBus} from './iframe-message-bus';
diff --git a/devtools/tools/typescript.bzl b/devtools/tools/typescript.bzl
index 77954cb3477..874581c2f2c 100644
--- a/devtools/tools/typescript.bzl
+++ b/devtools/tools/typescript.bzl
@@ -1,19 +1,21 @@
"""Helper macros for compiling typescript with consistent config"""
-load("//tools:defaults.bzl", _ts_library = "ts_library")
+load("//tools:defaults2.bzl", _ts_project = "ts_project")
-def ts_library(name, tsconfig = "//devtools:tsconfig.json", **kwargs):
- _ts_library(
+def ts_library(name, **kwargs):
+ _ts_project(
name = name,
- tsconfig = tsconfig,
+ tsconfig = "//devtools:tsconfig_build",
**kwargs
)
-def ts_test_library(name, tsconfig = "//devtools:tsconfig_spec", deps = [], **kwargs):
- _ts_library(
+def ts_test_library(name, deps = [], **kwargs):
+ _ts_project(
name = name,
- tsconfig = tsconfig,
+ tsconfig = "//devtools:tsconfig_test",
testonly = 1,
- deps = deps,
+ deps = deps + [
+ "//:node_modules/@types/jasmine",
+ ],
**kwargs
)
diff --git a/devtools/tsconfig.spec.json b/devtools/tsconfig-test.json
similarity index 90%
rename from devtools/tsconfig.spec.json
rename to devtools/tsconfig-test.json
index 9e8f927471a..efde9e3caa3 100644
--- a/devtools/tsconfig.spec.json
+++ b/devtools/tsconfig-test.json
@@ -9,7 +9,6 @@
]
}
],
- "sourceMap": false,
"types": ["jasmine", "node"],
}
}
\ No newline at end of file
diff --git a/devtools/tsconfig.json b/devtools/tsconfig.json
index 7d9a57dd18e..66bf6c64491 100644
--- a/devtools/tsconfig.json
+++ b/devtools/tsconfig.json
@@ -1,8 +1,5 @@
{
- "compileOnSave": false,
"compilerOptions": {
- "baseUrl": "../",
- "outDir": "bazel-out/darwin-fastbuild/bin",
"sourceMap": true,
"declaration": true,
"strict": true,
@@ -17,31 +14,10 @@
"importHelpers": true,
"target": "es2020",
"lib": ["es2020", "dom", "dom.iterable"],
- "typeRoots": [
- "./devtools/node_modules/@types",
- ],
- "types": [
- "angular",
- "jasmine",
- "node"
- ],
"paths": {
"@angular/*": [
- "./packages/*",
- "./dist/bin/packages/*"
+ "../packages/*",
],
- "ng-devtools": [
- "./devtools/projects/ng-devtools/src/public-api.ts",
- ],
- "ng-devtools-backend": [
- "./devtools/projects/ng-devtools-backend/src/public-api.ts",
- ],
- "protocol": [
- "./devtools/projects/protocol/src/public-api.ts",
- ],
- "shared-utils": [
- "./devtools/projects/shared-utils/src/public-api.ts",
- ]
},
},
"angularCompilerOptions": {