From 2f62705a6ba0c778a0467194b65c2584f8ad423e Mon Sep 17 00:00:00 2001 From: Sam Ramon <15154970+samantharamon@users.noreply.github.com> Date: Mon, 22 Sep 2025 16:16:55 -0700 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=96=20Merge=20PR=20#73653=20[offic?= =?UTF-8?q?e-js][office-js-preview]=20(Outlook)=20Clarify=20requirement=20?= =?UTF-8?q?set=20support=20wording=20by=20@samantharamon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- types/office-js-preview/index.d.ts | 12 ++++++------ types/office-js/index.d.ts | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/types/office-js-preview/index.d.ts b/types/office-js-preview/index.d.ts index 6c42e032924610..63d14bc5989e41 100644 --- a/types/office-js-preview/index.d.ts +++ b/types/office-js-preview/index.d.ts @@ -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 { /** @@ -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 { /** @@ -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. @@ -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} @@ -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} @@ -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. diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts index 217c66c371cfe8..353918d0019f78 100644 --- a/types/office-js/index.d.ts +++ b/types/office-js/index.d.ts @@ -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 { /** @@ -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 { /** @@ -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. @@ -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} @@ -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} @@ -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. From 557c4f6bb0233461e551e4af8a4c31c499ed72d2 Mon Sep 17 00:00:00 2001 From: Dan Borthwick Date: Tue, 23 Sep 2025 13:18:36 +1000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A4=96=20Merge=20PR=20#73598=20[nodeg?= =?UTF-8?q?it]=20Fix=20Reset=20return=20types=20by=20@danborthwick?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- types/nodegit/nodegit-tests.ts | 2 ++ types/nodegit/reset.d.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/types/nodegit/nodegit-tests.ts b/types/nodegit/nodegit-tests.ts index 99f4c290563751..1a5a3d6d1b21c1 100644 --- a/types/nodegit/nodegit-tests.ts +++ b/types/nodegit/nodegit-tests.ts @@ -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)); diff --git a/types/nodegit/reset.d.ts b/types/nodegit/reset.d.ts index 306c26720a87af..eece2b7c3676b5 100644 --- a/types/nodegit/reset.d.ts +++ b/types/nodegit/reset.d.ts @@ -37,5 +37,5 @@ export class Reset { commit: AnnotatedCommit, resetType: number, checkoutOpts: CheckoutOptions, - ): number; + ): Promise; }