Skip to content

Commit 09a8071

Browse files
committed
merge
2 parents 88daf24 + 043b1d8 commit 09a8071

17 files changed

+480
-79
lines changed

baselines/dom.generated.d.ts

Lines changed: 70 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -183,26 +183,57 @@ interface AudioWorkletNodeOptions extends AudioNodeOptions {
183183
interface AuthenticationExtensionsClientInputs {
184184
appid?: string;
185185
credProps?: boolean;
186+
credentialProtectionPolicy?: string;
187+
enforceCredentialProtectionPolicy?: boolean;
186188
hmacCreateSecret?: boolean;
189+
largeBlob?: AuthenticationExtensionsLargeBlobInputs;
187190
minPinLength?: boolean;
188191
prf?: AuthenticationExtensionsPRFInputs;
189192
}
190193

191194
interface AuthenticationExtensionsClientInputsJSON {
195+
appid?: string;
196+
credProps?: boolean;
197+
largeBlob?: AuthenticationExtensionsLargeBlobInputsJSON;
198+
prf?: AuthenticationExtensionsPRFInputsJSON;
192199
}
193200

194201
interface AuthenticationExtensionsClientOutputs {
195202
appid?: boolean;
196203
credProps?: CredentialPropertiesOutput;
197204
hmacCreateSecret?: boolean;
205+
largeBlob?: AuthenticationExtensionsLargeBlobOutputs;
198206
prf?: AuthenticationExtensionsPRFOutputs;
199207
}
200208

209+
interface AuthenticationExtensionsLargeBlobInputs {
210+
read?: boolean;
211+
support?: string;
212+
write?: BufferSource;
213+
}
214+
215+
interface AuthenticationExtensionsLargeBlobInputsJSON {
216+
read?: boolean;
217+
support?: string;
218+
write?: Base64URLString;
219+
}
220+
221+
interface AuthenticationExtensionsLargeBlobOutputs {
222+
blob?: ArrayBuffer;
223+
supported?: boolean;
224+
written?: boolean;
225+
}
226+
201227
interface AuthenticationExtensionsPRFInputs {
202228
eval?: AuthenticationExtensionsPRFValues;
203229
evalByCredential?: Record<string, AuthenticationExtensionsPRFValues>;
204230
}
205231

232+
interface AuthenticationExtensionsPRFInputsJSON {
233+
eval?: AuthenticationExtensionsPRFValuesJSON;
234+
evalByCredential?: Record<string, AuthenticationExtensionsPRFValuesJSON>;
235+
}
236+
206237
interface AuthenticationExtensionsPRFOutputs {
207238
enabled?: boolean;
208239
results?: AuthenticationExtensionsPRFValues;
@@ -213,6 +244,11 @@ interface AuthenticationExtensionsPRFValues {
213244
second?: BufferSource;
214245
}
215246

247+
interface AuthenticationExtensionsPRFValuesJSON {
248+
first: Base64URLString;
249+
second?: Base64URLString;
250+
}
251+
216252
interface AuthenticatorSelectionCriteria {
217253
authenticatorAttachment?: AuthenticatorAttachment;
218254
requireResidentKey?: boolean;
@@ -713,6 +749,10 @@ interface GetAnimationsOptions {
713749
subtree?: boolean;
714750
}
715751

752+
interface GetComposedRangesOptions {
753+
shadowRoots?: ShadowRoot[];
754+
}
755+
716756
interface GetHTMLOptions {
717757
serializableShadowRoots?: boolean;
718758
shadowRoots?: ShadowRoot[];
@@ -2529,6 +2569,7 @@ interface ANGLE_instanced_arrays {
25292569
}
25302570

25312571
interface ARIAMixin {
2572+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaActiveDescendantElement) */
25322573
ariaActiveDescendantElement: Element | null;
25332574
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaAtomic) */
25342575
ariaAtomic: string | null;
@@ -2550,18 +2591,23 @@ interface ARIAMixin {
25502591
ariaColIndexText: string | null;
25512592
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaColSpan) */
25522593
ariaColSpan: string | null;
2594+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaControlsElements) */
25532595
ariaControlsElements: ReadonlyArray<Element> | null;
25542596
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaCurrent) */
25552597
ariaCurrent: string | null;
2598+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaDescribedByElements) */
25562599
ariaDescribedByElements: ReadonlyArray<Element> | null;
25572600
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaDescription) */
25582601
ariaDescription: string | null;
2602+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaDetailsElements) */
25592603
ariaDetailsElements: ReadonlyArray<Element> | null;
25602604
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaDisabled) */
25612605
ariaDisabled: string | null;
2606+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaErrorMessageElements) */
25622607
ariaErrorMessageElements: ReadonlyArray<Element> | null;
25632608
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaExpanded) */
25642609
ariaExpanded: string | null;
2610+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaFlowToElements) */
25652611
ariaFlowToElements: ReadonlyArray<Element> | null;
25662612
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaHasPopup) */
25672613
ariaHasPopup: string | null;
@@ -2573,6 +2619,7 @@ interface ARIAMixin {
25732619
ariaKeyShortcuts: string | null;
25742620
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaLabel) */
25752621
ariaLabel: string | null;
2622+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaLabelledByElements) */
25762623
ariaLabelledByElements: ReadonlyArray<Element> | null;
25772624
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaLevel) */
25782625
ariaLevel: string | null;
@@ -2586,6 +2633,7 @@ interface ARIAMixin {
25862633
ariaMultiSelectable: string | null;
25872634
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaOrientation) */
25882635
ariaOrientation: string | null;
2636+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaOwnsElements) */
25892637
ariaOwnsElements: ReadonlyArray<Element> | null;
25902638
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/ariaPlaceholder) */
25912639
ariaPlaceholder: string | null;
@@ -12459,13 +12507,14 @@ interface GlobalEventHandlersEventMap {
1245912507
"animationstart": AnimationEvent;
1246012508
"auxclick": PointerEvent;
1246112509
"beforeinput": InputEvent;
12510+
"beforematch": Event;
1246212511
"beforetoggle": ToggleEvent;
1246312512
"blur": FocusEvent;
1246412513
"cancel": Event;
1246512514
"canplay": Event;
1246612515
"canplaythrough": Event;
1246712516
"change": Event;
12468-
"click": MouseEvent;
12517+
"click": PointerEvent;
1246912518
"close": Event;
1247012519
"compositionend": CompositionEvent;
1247112520
"compositionstart": CompositionEvent;
@@ -12572,6 +12621,8 @@ interface GlobalEventHandlers {
1257212621
onauxclick: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
1257312622
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/beforeinput_event) */
1257412623
onbeforeinput: ((this: GlobalEventHandlers, ev: InputEvent) => any) | null;
12624+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/beforematch_event) */
12625+
onbeforematch: ((this: GlobalEventHandlers, ev: Event) => any) | null;
1257512626
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLElement/beforetoggle_event) */
1257612627
onbeforetoggle: ((this: GlobalEventHandlers, ev: ToggleEvent) => any) | null;
1257712628
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/blur_event) */
@@ -12584,7 +12635,12 @@ interface GlobalEventHandlers {
1258412635
oncanplaythrough: ((this: GlobalEventHandlers, ev: Event) => any) | null;
1258512636
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLElement/change_event) */
1258612637
onchange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
12587-
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/click_event) */
12638+
/**
12639+
* Fires when the user clicks the left mouse button on the object
12640+
* @param ev The mouse event.
12641+
*
12642+
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/click_event)
12643+
*/
1258812644
onclick: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
1258912645
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLDialogElement/close_event) */
1259012646
onclose: ((this: GlobalEventHandlers, ev: Event) => any) | null;
@@ -30141,11 +30197,7 @@ interface Selection {
3014130197
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Selection/extend)
3014230198
*/
3014330199
extend(node: Node, offset?: number): void;
30144-
/**
30145-
* The **`getRangeAt()`** method of the Selection interface returns a range object representing a currently selected range.
30146-
*
30147-
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Selection/getRangeAt)
30148-
*/
30200+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Selection/getRangeAt) */
3014930201
getRangeAt(index: number): Range;
3015030202
/**
3015130203
* The **`Selection.modify()`** method applies a change to the current selection or cursor position, using simple textual commands.
@@ -30373,11 +30425,7 @@ interface ServiceWorkerRegistration extends EventTarget {
3037330425
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerRegistration/unregister)
3037430426
*/
3037530427
unregister(): Promise<boolean>;
30376-
/**
30377-
* The **`update()`** method of the worker.
30378-
*
30379-
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerRegistration/update)
30380-
*/
30428+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerRegistration/update) */
3038130429
update(): Promise<void>;
3038230430
addEventListener<K extends keyof ServiceWorkerRegistrationEventMap>(type: K, listener: (this: ServiceWorkerRegistration, ev: ServiceWorkerRegistrationEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
3038330431
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -36282,11 +36330,7 @@ interface Window extends EventTarget, AnimationFrameProvider, GlobalEventHandler
3628236330
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/window)
3628336331
*/
3628436332
readonly window: Window & typeof globalThis;
36285-
/**
36286-
* `window.alert()` instructs the browser to display a dialog with an optional message, and to wait until the user dismisses the dialog.
36287-
*
36288-
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/alert)
36289-
*/
36333+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/alert) */
3629036334
alert(message?: string): void;
3629136335
/**
3629236336
* The **`Window.blur()`** method does nothing.
@@ -38226,11 +38270,7 @@ declare var visualViewport: VisualViewport | null;
3822638270
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/window)
3822738271
*/
3822838272
declare var window: Window & typeof globalThis;
38229-
/**
38230-
* `window.alert()` instructs the browser to display a dialog with an optional message, and to wait until the user dismisses the dialog.
38231-
*
38232-
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/alert)
38233-
*/
38273+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/alert) */
3823438274
declare function alert(message?: string): void;
3823538275
/**
3823638276
* The **`Window.blur()`** method does nothing.
@@ -38402,6 +38442,8 @@ declare var onanimationstart: ((this: Window, ev: AnimationEvent) => any) | null
3840238442
declare var onauxclick: ((this: Window, ev: PointerEvent) => any) | null;
3840338443
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/beforeinput_event) */
3840438444
declare var onbeforeinput: ((this: Window, ev: InputEvent) => any) | null;
38445+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/beforematch_event) */
38446+
declare var onbeforematch: ((this: Window, ev: Event) => any) | null;
3840538447
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLElement/beforetoggle_event) */
3840638448
declare var onbeforetoggle: ((this: Window, ev: ToggleEvent) => any) | null;
3840738449
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/blur_event) */
@@ -38414,7 +38456,12 @@ declare var oncanplay: ((this: Window, ev: Event) => any) | null;
3841438456
declare var oncanplaythrough: ((this: Window, ev: Event) => any) | null;
3841538457
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLElement/change_event) */
3841638458
declare var onchange: ((this: Window, ev: Event) => any) | null;
38417-
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/click_event) */
38459+
/**
38460+
* Fires when the user clicks the left mouse button on the object
38461+
* @param ev The mouse event.
38462+
*
38463+
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/click_event)
38464+
*/
3841838465
declare var onclick: ((this: Window, ev: MouseEvent) => any) | null;
3841938466
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLDialogElement/close_event) */
3842038467
declare var onclose: ((this: Window, ev: Event) => any) | null;

baselines/serviceworker.generated.d.ts

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,11 @@ interface PushEventInit extends ExtendableEventInit {
481481
data?: PushMessageDataInit;
482482
}
483483

484+
interface PushSubscriptionChangeEventInit extends ExtendableEventInit {
485+
newSubscription?: PushSubscription;
486+
oldSubscription?: PushSubscription;
487+
}
488+
484489
interface PushSubscriptionJSON {
485490
endpoint?: string;
486491
expirationTime?: EpochTimeStamp | null;
@@ -6167,6 +6172,17 @@ declare var PushSubscription: {
61676172
new(): PushSubscription;
61686173
};
61696174

6175+
/** Available only in secure contexts. */
6176+
interface PushSubscriptionChangeEvent extends ExtendableEvent {
6177+
readonly newSubscription: PushSubscription | null;
6178+
readonly oldSubscription: PushSubscription | null;
6179+
}
6180+
6181+
declare var PushSubscriptionChangeEvent: {
6182+
prototype: PushSubscriptionChangeEvent;
6183+
new(type: string, eventInitDict?: PushSubscriptionChangeEventInit): PushSubscriptionChangeEvent;
6184+
};
6185+
61706186
/**
61716187
* The **`PushSubscriptionOptions`** interface of the Push API represents the options associated with a push subscription.
61726188
* Available only in secure contexts.
@@ -6867,7 +6883,7 @@ interface ServiceWorkerGlobalScopeEventMap extends WorkerGlobalScopeEventMap {
68676883
"notificationclick": NotificationEvent;
68686884
"notificationclose": NotificationEvent;
68696885
"push": PushEvent;
6870-
"pushsubscriptionchange": Event;
6886+
"pushsubscriptionchange": PushSubscriptionChangeEvent;
68716887
}
68726888

68736889
/**
@@ -6906,12 +6922,8 @@ interface ServiceWorkerGlobalScope extends WorkerGlobalScope {
69066922
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/push_event) */
69076923
onpush: ((this: ServiceWorkerGlobalScope, ev: PushEvent) => any) | null;
69086924
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/pushsubscriptionchange_event) */
6909-
onpushsubscriptionchange: ((this: ServiceWorkerGlobalScope, ev: Event) => any) | null;
6910-
/**
6911-
* The **`registration`** read-only property of the ServiceWorkerGlobalScope interface returns a reference to the ServiceWorkerRegistration object, which represents the service worker's registration.
6912-
*
6913-
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/registration)
6914-
*/
6925+
onpushsubscriptionchange: ((this: ServiceWorkerGlobalScope, ev: PushSubscriptionChangeEvent) => any) | null;
6926+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/registration) */
69156927
readonly registration: ServiceWorkerRegistration;
69166928
/**
69176929
* The **`serviceWorker`** read-only property of the ServiceWorkerGlobalScope interface returns a reference to the ServiceWorker object, which represents the service worker.
@@ -7009,12 +7021,8 @@ interface ServiceWorkerRegistration extends EventTarget {
70097021
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerRegistration/unregister)
70107022
*/
70117023
unregister(): Promise<boolean>;
7012-
/**
7013-
* The **`update()`** method of the worker.
7014-
*
7015-
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerRegistration/update)
7016-
*/
7017-
update(): Promise<void>;
7024+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerRegistration/update) */
7025+
update(): Promise<ServiceWorkerRegistration>;
70187026
addEventListener<K extends keyof ServiceWorkerRegistrationEventMap>(type: K, listener: (this: ServiceWorkerRegistration, ev: ServiceWorkerRegistrationEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
70197027
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
70207028
removeEventListener<K extends keyof ServiceWorkerRegistrationEventMap>(type: K, listener: (this: ServiceWorkerRegistration, ev: ServiceWorkerRegistrationEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -11008,12 +11016,8 @@ declare var onnotificationclose: ((this: ServiceWorkerGlobalScope, ev: Notificat
1100811016
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/push_event) */
1100911017
declare var onpush: ((this: ServiceWorkerGlobalScope, ev: PushEvent) => any) | null;
1101011018
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/pushsubscriptionchange_event) */
11011-
declare var onpushsubscriptionchange: ((this: ServiceWorkerGlobalScope, ev: Event) => any) | null;
11012-
/**
11013-
* The **`registration`** read-only property of the ServiceWorkerGlobalScope interface returns a reference to the ServiceWorkerRegistration object, which represents the service worker's registration.
11014-
*
11015-
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/registration)
11016-
*/
11019+
declare var onpushsubscriptionchange: ((this: ServiceWorkerGlobalScope, ev: PushSubscriptionChangeEvent) => any) | null;
11020+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/registration) */
1101711021
declare var registration: ServiceWorkerRegistration;
1101811022
/**
1101911023
* The **`serviceWorker`** read-only property of the ServiceWorkerGlobalScope interface returns a reference to the ServiceWorker object, which represents the service worker.

baselines/sharedworker.generated.d.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6562,12 +6562,17 @@ interface ServiceWorkerRegistration extends EventTarget {
65626562
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerRegistration/unregister)
65636563
*/
65646564
unregister(): Promise<boolean>;
6565+
<<<<<<< HEAD
65656566
/**
65666567
* The **`update()`** method of the worker.
65676568
*
65686569
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerRegistration/update)
65696570
*/
65706571
update(): Promise<void>;
6572+
=======
6573+
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerRegistration/update) */
6574+
update(): Promise<ServiceWorkerRegistration>;
6575+
>>>>>>> 043b1d804eb57b45edb74969ad75ba3f98074ec9
65716576
addEventListener<K extends keyof ServiceWorkerRegistrationEventMap>(type: K, listener: (this: ServiceWorkerRegistration, ev: ServiceWorkerRegistrationEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
65726577
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
65736578
removeEventListener<K extends keyof ServiceWorkerRegistrationEventMap>(type: K, listener: (this: ServiceWorkerRegistration, ev: ServiceWorkerRegistrationEventMap[K]) => any, options?: boolean | EventListenerOptions): void;

0 commit comments

Comments
 (0)