Skip to content

Commit ba79f23

Browse files
JeanMecheatscott
authored andcommitted
refactor(router): remove dependency on @types/dom-view-transitions (angular#60731)
The types have been shipped in TS 5.6 PR Close angular#60731
1 parent 56cc5fd commit ba79f23

File tree

7 files changed

+4
-50
lines changed

7 files changed

+4
-50
lines changed

adev/shared-docs/components/viewers/BUILD.bazel

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("//tools:defaults.bzl", "karma_web_test_suite", "ng_module", "ts_library")
21
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
2+
load("//tools:defaults.bzl", "karma_web_test_suite", "ng_module", "ts_library")
33

44
package(default_visibility = ["//visibility:private"])
55

@@ -28,7 +28,6 @@ ng_module(
2828
"//packages/router",
2929
"@npm//@angular/cdk",
3030
"@npm//@angular/material",
31-
"@npm//@types/dom-view-transitions",
3231
],
3332
)
3433

adev/shared-docs/components/viewers/docs-viewer/docs-viewer.component.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ import {Breadcrumb} from '../../breadcrumb/breadcrumb.component';
4141
import {CopySourceCodeButton} from '../../copy-source-code-button/copy-source-code-button.component';
4242
import {ExampleViewer} from '../example-viewer/example-viewer.component';
4343

44-
/// <reference types="@types/dom-view-transitions" />
45-
4644
const TOC_HOST_ELEMENT_NAME = 'docs-table-of-contents';
4745
export const ASSETS_EXAMPLES_PATH = 'assets/content/examples';
4846
export const DOCS_VIEWER_SELECTOR = 'docs-viewer';

goldens/public-api/router/index.api.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,13 +1114,7 @@ export const VERSION: Version;
11141114
export interface ViewTransitionInfo {
11151115
from: ActivatedRouteSnapshot;
11161116
to: ActivatedRouteSnapshot;
1117-
transition: {
1118-
finished: Promise<void>;
1119-
ready: Promise<void>;
1120-
updateCallbackDone: Promise<void>;
1121-
skipTransition(): void;
1122-
readonly types: Set<string>;
1123-
};
1117+
transition: ViewTransition;
11241118
}
11251119

11261120
// @public

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
"@types/chrome": "^0.0.313",
8282
"@types/convert-source-map": "^2.0.0",
8383
"@types/diff": "^7.0.0",
84-
"@types/dom-view-transitions": "^1.0.1",
8584
"@types/dom-navigation": "^1.0.5",
8685
"@types/hammerjs": "2.0.46",
8786
"@types/jasmine": "^5.0.0",

packages/router/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ ng_module(
1414
"//packages/common",
1515
"//packages/core",
1616
"//packages/platform-browser",
17-
"@npm//@types/dom-view-transitions",
1817
"@npm//rxjs",
1918
],
2019
)
@@ -81,7 +80,6 @@ generate_api_docs(
8180
"//packages:common_files_and_deps_for_docs",
8281
"//packages/common:files_for_docgen",
8382
"//packages/common/http:files_for_docgen",
84-
"@npm//@types/dom-view-transitions",
8583
],
8684
entry_point = ":index.ts",
8785
module_name = "@angular/router",

packages/router/src/utils/view_transition.ts

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
/// <reference types="dom-view-transitions" />
10-
119
import {DOCUMENT} from '@angular/common';
1210
import {
1311
afterNextRender,
@@ -56,37 +54,11 @@ export interface ViewTransitionsFeatureOptions {
5654
* @experimental
5755
*/
5856
export interface ViewTransitionInfo {
59-
// TODO(atscott): This type can/should be the built-in `ViewTransition` type
60-
// from @types/dom-view-transitions but exporting that type from the public API is currently not
61-
// supported by tooling.
6257
/**
6358
* The `ViewTransition` returned by the call to `startViewTransition`.
6459
* @see https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition
6560
*/
66-
transition: {
67-
/**
68-
* @see https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition/finished
69-
*/
70-
finished: Promise<void>;
71-
/**
72-
* @see https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition/ready
73-
*/
74-
ready: Promise<void>;
75-
/**
76-
* @see https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition/updateCallbackDone
77-
*/
78-
updateCallbackDone: Promise<void>;
79-
/**
80-
* @see https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition/skipTransition
81-
*/
82-
skipTransition(): void;
83-
84-
/**
85-
* @see https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition#browser_compatibility
86-
* @see https://developer.chrome.com/docs/web-platform/view-transitions/same-document#default_style_and_transition_reference
87-
*/
88-
readonly types: Set<string>;
89-
};
61+
transition: ViewTransition;
9062
/**
9163
* The `ActivatedRouteSnapshot` that the navigation is transitioning from.
9264
*/
@@ -131,8 +103,7 @@ export function createViewTransition(
131103
// routes (the DOM update). This view transition waits for the next change detection to
132104
// complete (below), which includes the update phase of the routed components.
133105
return createRenderPromise(injector);
134-
// TODO(atscott): Types in DefinitelyTyped are not up-to-date
135-
}) as ViewTransition & {readonly types: Set<string>};
106+
});
136107
const {onViewTransitionCreated} = transitionOptions;
137108
if (onViewTransitionCreated) {
138109
runInInjectionContext(injector, () => onViewTransitionCreated({transition, from, to}));

yarn.lock

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4330,11 +4330,6 @@
43304330
resolved "https://registry.yarnpkg.com/@types/dom-navigation/-/dom-navigation-1.0.5.tgz#5fd6ed014d3ee66b53b0733b6c50994c105b542d"
43314331
integrity sha512-aM1Mr488jX62+6b9zdEtPHFnI7ILgvbII4BaBJMaqhhbDBupJJJ8+nXFVyQT1ptujOUAg6Sojkjk3j6rU73Bwg==
43324332

4333-
"@types/dom-view-transitions@^1.0.1":
4334-
version "1.0.6"
4335-
resolved "https://registry.yarnpkg.com/@types/dom-view-transitions/-/dom-view-transitions-1.0.6.tgz#e6c53f17826be079fafe6df03623f37fcd1b86ac"
4336-
integrity sha512-Q5IoDouTOcZKEs4nDpmUti2MXP48MQDBkS2nUQKFrsDeTFIaArVmhWUon28vlDfNkbbaK4EROu4Fv0iKObWjSg==
4337-
43384333
"@types/duplexify@*":
43394334
version "3.6.4"
43404335
resolved "https://registry.yarnpkg.com/@types/duplexify/-/duplexify-3.6.4.tgz#aa7e916c33fcc05be8769546fd0441d9b368613e"

0 commit comments

Comments
 (0)