Skip to content

[pull] master from DefinitelyTyped:master #1376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Sep 23, 2025
Merged

[pull] master from DefinitelyTyped:master #1376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f62705
🤖 Merge PR #73653 [office-js][office-js-preview] (Outlook) Clarify re…
samantharamon Sep 22, 2025
557c4f6
🤖 Merge PR #73598 [nodegit] Fix Reset return types by @danborthwick
danborthwick Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions types/nodegit/nodegit-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ Git.Rebase.init(repo, annotatedCommit, null, annotatedCommit, rebaseOptions).the
});

Git.Reset.reset(repo, commit, Git.Reset.TYPE.HARD, {}).catch(err => console.log(err));
Git.Reset.default(repo, commit, []).catch(err => console.log(err));
Git.Reset.fromAnnotated(repo, commit, Git.Reset.TYPE.HARD, {}).catch(err => console.log(err));

Git.Cherrypick.cherrypick(repo, commit, {}).catch(err => console.log(err));

Expand Down
2 changes: 1 addition & 1 deletion types/nodegit/reset.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ export class Reset {
commit: AnnotatedCommit,
resetType: number,
checkoutOpts: CheckoutOptions,
): number;
): Promise<number>;
}
12 changes: 6 additions & 6 deletions types/office-js-preview/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ declare namespace Office {
* Specifies the Office application in which the add-in is running.
*
* @remarks
* **Important**: In Outlook, this enum is available from Mailbox requirement set 1.5.
* **Important**: In Outlook, this enum is available starting with Mailbox requirement set 1.5.
*/
enum HostType {
/**
Expand Down Expand Up @@ -946,7 +946,7 @@ declare namespace Office {
* Specifies the OS or other platform on which the Office application is running.
*
* @remarks
* **Important**: In Outlook, this enum is available from Mailbox requirement set 1.5.
* **Important**: In Outlook, this enum is available starting with Mailbox requirement set 1.5.
*/
enum PlatformType {
/**
Expand Down Expand Up @@ -4671,7 +4671,7 @@ declare namespace Office {
* Gets information about the environment in which the add-in is running.
*
* @remarks
* **Important**: In Outlook, this property is available from Mailbox requirement set 1.5.
* **Important**: In Outlook, this property is available starting with Mailbox requirement set 1.5.
* For all Mailbox requirement sets, you can use the
* {@link https://learn.microsoft.com/javascript/api/outlook/office.mailbox?view=outlook-js-preview&preserve-view=true#outlook-office-mailbox-diagnostics-member | Office.context.mailbox.diagnostics}
* property to get similar information.
Expand Down Expand Up @@ -4713,7 +4713,7 @@ declare namespace Office {
* Contains the Office application in which the add-in is running.
*
* @remarks
* **Important**: In Outlook, this property is available from Mailbox requirement set 1.5. You can also use the
* **Important**: In Outlook, this property is available starting with Mailbox requirement set 1.5. You can also use the
* `Office.context.diagnostics` property to get the application starting with requirement set 1.5. For all
* Mailbox requirement sets, you can use the
* {@link https://learn.microsoft.com/javascript/api/outlook/office.mailbox?view=outlook-js-preview&preserve-view=true#outlook-office-mailbox-diagnostics-member | Office.context.mailbox.diagnostics}
Expand Down Expand Up @@ -4760,7 +4760,7 @@ declare namespace Office {
* @remarks
* **Important**:
*
* - In Outlook, this property is available from Mailbox requirement set 1.5. You can also use the
* - In Outlook, this property is available starting with Mailbox requirement set 1.5. You can also use the
* `Office.context.diagnostics` property to get the platform starting with requirement set 1.5. For all
* Mailbox requirement sets, you can use the
* {@link https://learn.microsoft.com/javascript/api/outlook/office.mailbox?view=outlook-js-preview&preserve-view=true#outlook-office-mailbox-diagnostics-member | Office.context.mailbox.diagnostics}
Expand Down Expand Up @@ -4844,7 +4844,7 @@ declare namespace Office {
* Provides information about the environment in which the add-in is running.
*
* @remarks
* **Important**: In Outlook, this object is available from Mailbox requirement set 1.5.
* **Important**: In Outlook, this object is available starting with Mailbox requirement set 1.5.
* For all Mailbox requirement sets, you can use the
* {@link https://learn.microsoft.com/javascript/api/outlook/office.mailbox?view=outlook-js-preview&preserve-view=true#outlook-office-mailbox-diagnostics-member | Office.context.mailbox.diagnostics}
* property to get similar information.
Expand Down
12 changes: 6 additions & 6 deletions types/office-js/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ declare namespace Office {
* Specifies the Office application in which the add-in is running.
*
* @remarks
* **Important**: In Outlook, this enum is available from Mailbox requirement set 1.5.
* **Important**: In Outlook, this enum is available starting with Mailbox requirement set 1.5.
*/
enum HostType {
/**
Expand Down Expand Up @@ -946,7 +946,7 @@ declare namespace Office {
* Specifies the OS or other platform on which the Office application is running.
*
* @remarks
* **Important**: In Outlook, this enum is available from Mailbox requirement set 1.5.
* **Important**: In Outlook, this enum is available starting with Mailbox requirement set 1.5.
*/
enum PlatformType {
/**
Expand Down Expand Up @@ -4661,7 +4661,7 @@ declare namespace Office {
* Gets information about the environment in which the add-in is running.
*
* @remarks
* **Important**: In Outlook, this property is available from Mailbox requirement set 1.5.
* **Important**: In Outlook, this property is available starting with Mailbox requirement set 1.5.
* For all Mailbox requirement sets, you can use the
* {@link https://learn.microsoft.com/javascript/api/outlook/office.mailbox?view=outlook-js-1.1&preserve-view=true#outlook-office-mailbox-diagnostics-member | Office.context.mailbox.diagnostics}
* property to get similar information.
Expand Down Expand Up @@ -4703,7 +4703,7 @@ declare namespace Office {
* Contains the Office application in which the add-in is running.
*
* @remarks
* **Important**: In Outlook, this property is available from Mailbox requirement set 1.5. You can also use the
* **Important**: In Outlook, this property is available starting with Mailbox requirement set 1.5. You can also use the
* `Office.context.diagnostics` property to get the application starting with requirement set 1.5. For all
* Mailbox requirement sets, you can use the
* {@link https://learn.microsoft.com/javascript/api/outlook/office.mailbox?view=outlook-js-1.1&preserve-view=true#outlook-office-mailbox-diagnostics-member | Office.context.mailbox.diagnostics}
Expand Down Expand Up @@ -4750,7 +4750,7 @@ declare namespace Office {
* @remarks
* **Important**:
*
* - In Outlook, this property is available from Mailbox requirement set 1.5. You can also use the
* - In Outlook, this property is available starting with Mailbox requirement set 1.5. You can also use the
* `Office.context.diagnostics` property to get the platform starting with requirement set 1.5. For all
* Mailbox requirement sets, you can use the
* {@link https://learn.microsoft.com/javascript/api/outlook/office.mailbox?view=outlook-js-1.1&preserve-view=true#outlook-office-mailbox-diagnostics-member | Office.context.mailbox.diagnostics}
Expand Down Expand Up @@ -4834,7 +4834,7 @@ declare namespace Office {
* Provides information about the environment in which the add-in is running.
*
* @remarks
* **Important**: In Outlook, this object is available from Mailbox requirement set 1.5.
* **Important**: In Outlook, this object is available starting with Mailbox requirement set 1.5.
* For all Mailbox requirement sets, you can use the
* {@link https://learn.microsoft.com/javascript/api/outlook/office.mailbox?view=outlook-js-1.1&preserve-view=true#outlook-office-mailbox-diagnostics-member | Office.context.mailbox.diagnostics}
* property to get similar information.
Expand Down