Skip to content

Commit ee90ea0

Browse files
committed
Merge remote-tracking branch 'microsoft/main' into lint-deploy
2 parents 8abf34e + 1f0fe3d commit ee90ea0

File tree

5 files changed

+83
-73
lines changed

5 files changed

+83
-73
lines changed

baselines/dom.generated.d.ts

Lines changed: 67 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3033,49 +3033,49 @@ interface CSSStyleDeclaration {
30333033
userSelect: string;
30343034
verticalAlign: string;
30353035
visibility: string;
3036-
/** @deprecated */
3036+
/** @deprecated This is a legacy alias of `alignContent`. */
30373037
webkitAlignContent: string;
3038-
/** @deprecated */
3038+
/** @deprecated This is a legacy alias of `alignItems`. */
30393039
webkitAlignItems: string;
3040-
/** @deprecated */
3040+
/** @deprecated This is a legacy alias of `alignSelf`. */
30413041
webkitAlignSelf: string;
3042-
/** @deprecated */
3042+
/** @deprecated This is a legacy alias of `animation`. */
30433043
webkitAnimation: string;
3044-
/** @deprecated */
3044+
/** @deprecated This is a legacy alias of `animationDelay`. */
30453045
webkitAnimationDelay: string;
3046-
/** @deprecated */
3046+
/** @deprecated This is a legacy alias of `animationDirection`. */
30473047
webkitAnimationDirection: string;
3048-
/** @deprecated */
3048+
/** @deprecated This is a legacy alias of `animationDuration`. */
30493049
webkitAnimationDuration: string;
3050-
/** @deprecated */
3050+
/** @deprecated This is a legacy alias of `animationFillMode`. */
30513051
webkitAnimationFillMode: string;
3052-
/** @deprecated */
3052+
/** @deprecated This is a legacy alias of `animationIterationCount`. */
30533053
webkitAnimationIterationCount: string;
3054-
/** @deprecated */
3054+
/** @deprecated This is a legacy alias of `animationName`. */
30553055
webkitAnimationName: string;
3056-
/** @deprecated */
3056+
/** @deprecated This is a legacy alias of `animationPlayState`. */
30573057
webkitAnimationPlayState: string;
3058-
/** @deprecated */
3058+
/** @deprecated This is a legacy alias of `animationTimingFunction`. */
30593059
webkitAnimationTimingFunction: string;
3060-
/** @deprecated */
3060+
/** @deprecated This is a legacy alias of `appearance`. */
30613061
webkitAppearance: string;
3062-
/** @deprecated */
3062+
/** @deprecated This is a legacy alias of `backfaceVisibility`. */
30633063
webkitBackfaceVisibility: string;
3064-
/** @deprecated */
3064+
/** @deprecated This is a legacy alias of `backgroundClip`. */
30653065
webkitBackgroundClip: string;
3066-
/** @deprecated */
3066+
/** @deprecated This is a legacy alias of `backgroundOrigin`. */
30673067
webkitBackgroundOrigin: string;
3068-
/** @deprecated */
3068+
/** @deprecated This is a legacy alias of `backgroundSize`. */
30693069
webkitBackgroundSize: string;
3070-
/** @deprecated */
3070+
/** @deprecated This is a legacy alias of `borderBottomLeftRadius`. */
30713071
webkitBorderBottomLeftRadius: string;
3072-
/** @deprecated */
3072+
/** @deprecated This is a legacy alias of `borderBottomRightRadius`. */
30733073
webkitBorderBottomRightRadius: string;
3074-
/** @deprecated */
3074+
/** @deprecated This is a legacy alias of `borderRadius`. */
30753075
webkitBorderRadius: string;
3076-
/** @deprecated */
3076+
/** @deprecated This is a legacy alias of `borderTopLeftRadius`. */
30773077
webkitBorderTopLeftRadius: string;
3078-
/** @deprecated */
3078+
/** @deprecated This is a legacy alias of `borderTopRightRadius`. */
30793079
webkitBorderTopRightRadius: string;
30803080
/** @deprecated */
30813081
webkitBoxAlign: string;
@@ -3087,83 +3087,83 @@ interface CSSStyleDeclaration {
30873087
webkitBoxOrient: string;
30883088
/** @deprecated */
30893089
webkitBoxPack: string;
3090-
/** @deprecated */
3090+
/** @deprecated This is a legacy alias of `boxShadow`. */
30913091
webkitBoxShadow: string;
3092-
/** @deprecated */
3092+
/** @deprecated This is a legacy alias of `boxSizing`. */
30933093
webkitBoxSizing: string;
3094-
/** @deprecated */
3094+
/** @deprecated This is a legacy alias of `filter`. */
30953095
webkitFilter: string;
3096-
/** @deprecated */
3096+
/** @deprecated This is a legacy alias of `flex`. */
30973097
webkitFlex: string;
3098-
/** @deprecated */
3098+
/** @deprecated This is a legacy alias of `flexBasis`. */
30993099
webkitFlexBasis: string;
3100-
/** @deprecated */
3100+
/** @deprecated This is a legacy alias of `flexDirection`. */
31013101
webkitFlexDirection: string;
3102-
/** @deprecated */
3102+
/** @deprecated This is a legacy alias of `flexFlow`. */
31033103
webkitFlexFlow: string;
3104-
/** @deprecated */
3104+
/** @deprecated This is a legacy alias of `flexGrow`. */
31053105
webkitFlexGrow: string;
3106-
/** @deprecated */
3106+
/** @deprecated This is a legacy alias of `flexShrink`. */
31073107
webkitFlexShrink: string;
3108-
/** @deprecated */
3108+
/** @deprecated This is a legacy alias of `flexWrap`. */
31093109
webkitFlexWrap: string;
3110-
/** @deprecated */
3110+
/** @deprecated This is a legacy alias of `justifyContent`. */
31113111
webkitJustifyContent: string;
31123112
webkitLineClamp: string;
3113-
/** @deprecated */
3113+
/** @deprecated This is a legacy alias of `mask`. */
31143114
webkitMask: string;
3115-
/** @deprecated */
3115+
/** @deprecated This is a legacy alias of `maskBorder`. */
31163116
webkitMaskBoxImage: string;
3117-
/** @deprecated */
3117+
/** @deprecated This is a legacy alias of `maskBorderOutset`. */
31183118
webkitMaskBoxImageOutset: string;
3119-
/** @deprecated */
3119+
/** @deprecated This is a legacy alias of `maskBorderRepeat`. */
31203120
webkitMaskBoxImageRepeat: string;
3121-
/** @deprecated */
3121+
/** @deprecated This is a legacy alias of `maskBorderSlice`. */
31223122
webkitMaskBoxImageSlice: string;
3123-
/** @deprecated */
3123+
/** @deprecated This is a legacy alias of `maskBorderSource`. */
31243124
webkitMaskBoxImageSource: string;
3125-
/** @deprecated */
3125+
/** @deprecated This is a legacy alias of `maskBorderWidth`. */
31263126
webkitMaskBoxImageWidth: string;
3127-
/** @deprecated */
3127+
/** @deprecated This is a legacy alias of `maskClip`. */
31283128
webkitMaskClip: string;
31293129
webkitMaskComposite: string;
3130-
/** @deprecated */
3130+
/** @deprecated This is a legacy alias of `maskImage`. */
31313131
webkitMaskImage: string;
3132-
/** @deprecated */
3132+
/** @deprecated This is a legacy alias of `maskOrigin`. */
31333133
webkitMaskOrigin: string;
3134-
/** @deprecated */
3134+
/** @deprecated This is a legacy alias of `maskPosition`. */
31353135
webkitMaskPosition: string;
3136-
/** @deprecated */
3136+
/** @deprecated This is a legacy alias of `maskRepeat`. */
31373137
webkitMaskRepeat: string;
3138-
/** @deprecated */
3138+
/** @deprecated This is a legacy alias of `maskSize`. */
31393139
webkitMaskSize: string;
3140-
/** @deprecated */
3140+
/** @deprecated This is a legacy alias of `order`. */
31413141
webkitOrder: string;
3142-
/** @deprecated */
3142+
/** @deprecated This is a legacy alias of `perspective`. */
31433143
webkitPerspective: string;
3144-
/** @deprecated */
3144+
/** @deprecated This is a legacy alias of `perspectiveOrigin`. */
31453145
webkitPerspectiveOrigin: string;
31463146
webkitTextFillColor: string;
31473147
webkitTextStroke: string;
31483148
webkitTextStrokeColor: string;
31493149
webkitTextStrokeWidth: string;
3150-
/** @deprecated */
3150+
/** @deprecated This is a legacy alias of `transform`. */
31513151
webkitTransform: string;
3152-
/** @deprecated */
3152+
/** @deprecated This is a legacy alias of `transformOrigin`. */
31533153
webkitTransformOrigin: string;
3154-
/** @deprecated */
3154+
/** @deprecated This is a legacy alias of `transformStyle`. */
31553155
webkitTransformStyle: string;
3156-
/** @deprecated */
3156+
/** @deprecated This is a legacy alias of `transition`. */
31573157
webkitTransition: string;
3158-
/** @deprecated */
3158+
/** @deprecated This is a legacy alias of `transitionDelay`. */
31593159
webkitTransitionDelay: string;
3160-
/** @deprecated */
3160+
/** @deprecated This is a legacy alias of `transitionDuration`. */
31613161
webkitTransitionDuration: string;
3162-
/** @deprecated */
3162+
/** @deprecated This is a legacy alias of `transitionProperty`. */
31633163
webkitTransitionProperty: string;
3164-
/** @deprecated */
3164+
/** @deprecated This is a legacy alias of `transitionTimingFunction`. */
31653165
webkitTransitionTimingFunction: string;
3166-
/** @deprecated */
3166+
/** @deprecated This is a legacy alias of `userSelect`. */
31673167
webkitUserSelect: string;
31683168
whiteSpace: string;
31693169
widows: string;
@@ -4274,6 +4274,7 @@ interface Document extends Node, DocumentAndElementEventHandlers, DocumentOrShad
42744274
readonly characterSet: string;
42754275
/**
42764276
* Gets or sets the character set used to encode the object.
4277+
* @deprecated This is a legacy alias of `characterSet`.
42774278
*/
42784279
readonly charset: string;
42794280
/**
@@ -4360,6 +4361,7 @@ interface Document extends Node, DocumentAndElementEventHandlers, DocumentOrShad
43604361
readonly implementation: DOMImplementation;
43614362
/**
43624363
* Returns the character encoding used to create the webpage that is loaded into the document object.
4364+
* @deprecated This is a legacy alias of `characterSet`.
43634365
*/
43644366
readonly inputEncoding: string;
43654367
/**
@@ -4996,7 +4998,7 @@ interface Element extends Node, ARIAMixin, Animatable, ChildNode, InnerHTML, Non
49964998
* Returns true if qualifiedName is now present, and false otherwise.
49974999
*/
49985000
toggleAttribute(qualifiedName: string, force?: boolean): boolean;
4999-
/** @deprecated */
5001+
/** @deprecated This is a legacy alias of `matches`. */
50005002
webkitMatchesSelector(selectors: string): boolean;
50015003
addEventListener<K extends keyof ElementEventMap>(type: K, listener: (this: Element, ev: ElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
50025004
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -17181,6 +17183,7 @@ interface WindowEventMap extends GlobalEventHandlersEventMap, WindowEventHandler
1718117183
/** A window containing a DOM document; the document property points to the DOM document loaded in that window. */
1718217184
interface Window extends EventTarget, AnimationFrameProvider, GlobalEventHandlers, WindowEventHandlers, WindowLocalStorage, WindowOrWorkerGlobalScope, WindowSessionStorage {
1718317185
HTMLDocument: Document;
17186+
/** @deprecated This is a legacy alias of `navigator`. */
1718417187
readonly clientInformation: Navigator;
1718517188
/**
1718617189
* Returns true if the window has been closed, false otherwise.
@@ -17223,7 +17226,9 @@ interface Window extends EventTarget, AnimationFrameProvider, GlobalEventHandler
1722317226
readonly orientation: number;
1722417227
readonly outerHeight: number;
1722517228
readonly outerWidth: number;
17229+
/** @deprecated This is a legacy alias of `scrollX`. */
1722617230
readonly pageXOffset: number;
17231+
/** @deprecated This is a legacy alias of `scrollY`. */
1722717232
readonly pageYOffset: number;
1722817233
readonly parent: WindowProxy | null;
1722917234
/**
@@ -18242,6 +18247,7 @@ declare var Option: {
1824218247
new(text?: string, value?: string, defaultSelected?: boolean, selected?: boolean): HTMLOptionElement;
1824318248
};
1824418249
declare var HTMLDocument: Document;
18250+
/** @deprecated This is a legacy alias of `navigator`. */
1824518251
declare var clientInformation: Navigator;
1824618252
/**
1824718253
* Returns true if the window has been closed, false otherwise.
@@ -18284,7 +18290,9 @@ declare var opener: any;
1828418290
declare var orientation: number;
1828518291
declare var outerHeight: number;
1828618292
declare var outerWidth: number;
18293+
/** @deprecated This is a legacy alias of `scrollX`. */
1828718294
declare var pageXOffset: number;
18295+
/** @deprecated This is a legacy alias of `scrollY`. */
1828818296
declare var pageYOffset: number;
1828918297
declare var parent: WindowProxy | null;
1829018298
/**

deploy/deployChangedPackages.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import * as fs from "fs";
99
import { basename } from "path";
1010
import { spawnSync } from "child_process";
11-
import { Octokit } from "@octokit/core";
11+
import { Octokit } from "@octokit/rest";
1212
import printDiff from "print-diff";
1313
import { gitShowFile, generateChangelogFrom } from "../lib/changelog.js";
1414
import { packages } from "./createTypesPackages.js";
@@ -39,7 +39,6 @@ for (const dirName of fs.readdirSync(generatedDir)) {
3939
.readdirSync(packageDir)
4040
.filter((f) => f.endsWith(".d.ts"));
4141

42-
/** @type {string} */
4342
let releaseNotes = "";
4443

4544
// Look through each .d.ts file included in a package to
@@ -133,7 +132,7 @@ async function createRelease(tag, body) {
133132
const octokit = new Octokit({ auth: authToken });
134133

135134
try {
136-
await octokit.request("POST /repos/{owner}/{repo}/releases", {
135+
await octokit.repos.createRelease({
137136
owner: "microsoft",
138137
repo: "TypeScript-DOM-lib-generator",
139138
tag_name: tag,

package-lock.json

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"type": "module",
4141
"devDependencies": {
4242
"@mdn/browser-compat-data": "^3.3.13",
43+
"@octokit/rest": "^16.43.2",
4344
"@types/jsdom": "^16.2.13",
4445
"@types/node": "^16.4.8",
4546
"@types/node-fetch": "^2.5.12",

src/build/bcd.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,13 @@ export function getRemovalData(webidl: Browser.WebIdl): Browser.WebIdl {
6565
}
6666

6767
export function getDeprecationData(webidl: Browser.WebIdl): Browser.WebIdl {
68-
return mapToBcdCompat(webidl, ({ key, compat }) => {
69-
if (
70-
compat?.status?.deprecated ||
71-
(compat?.status?.preferred_name && key.startsWith("webkit"))
72-
) {
68+
return mapToBcdCompat(webidl, ({ compat }) => {
69+
if (compat?.status?.deprecated) {
7370
return { deprecated: 1 };
71+
} else if (compat?.status?.preferred_name) {
72+
return {
73+
deprecated: `This is a legacy alias of \`${compat.status.preferred_name}\`.`,
74+
};
7475
}
7576
}) as Browser.WebIdl;
7677
}

0 commit comments

Comments
 (0)