From 6954e0ba2cb6149a3a3cab0eac686a087a535af7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Oct 2026 17:48:21 +0000 Subject: [PATCH 1/2] Bump nock from 14.0.11 to 15.0.1 (#63869) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kevin Heis Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: d3dbb39e-5170-4220-9231-748252ae4624 --- package-lock.json | 90 ++++++++++-------------------- package.json | 2 +- src/observability/tests/failbot.ts | 3 +- 3 files changed, 33 insertions(+), 62 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4981c2ace5bd..74eb4c4fac24 100644 --- a/package-lock.json +++ b/package-lock.json @@ -163,7 +163,7 @@ "mdast-util-gfm": "^3.1.0", "micromark-extension-gfm": "^3.0.0", "mockdate": "^3.0.5", - "nock": "^14.0.11", + "nock": "^15.0.1", "nodemon": "3.1.10", "ora": "^9.3.0", "patch-package": "^8.0.1", @@ -2130,21 +2130,21 @@ "license": "BSD-3-Clause" }, "node_modules/@mswjs/interceptors": { - "version": "0.41.3", - "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.41.3.tgz", - "integrity": "sha512-cXu86tF4VQVfwz8W1SPbhoRyHJkti6mjH/XJIxp40jhO4j2k1m4KYrEykxqWPkFF3vrK4rgQppBh//AwyGSXPA==", + "version": "0.44.0", + "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.44.0.tgz", + "integrity": "sha512-IYHevRStF4ijM20GI9c9Ndhw483NSAjCydQhUr4/zIB0BNLsTVw3vFAxTo6TlvX4QnV60wEHttUa9539TTAq+A==", "dev": true, "license": "MIT", "dependencies": { - "@open-draft/deferred-promise": "^2.2.0", - "@open-draft/logger": "^0.3.0", - "@open-draft/until": "^2.0.0", + "@open-draft/until": "^3.0.1", + "@types/debug": "^4.1.13", + "debug": "^4.4.3", "is-node-process": "^1.2.0", "outvariant": "^1.4.3", - "strict-event-emitter": "^0.5.1" + "rettime": "^0.11.11" }, "engines": { - "node": ">=18" + "node": ">=22" } }, "node_modules/@napi-rs/lzma-linux-x64-gnu": { @@ -2658,31 +2658,16 @@ "integrity": "sha512-n9q0ZXYRct6aYmOjjF5E+i5i0RSjVCkoKDJWILzJAkDBk4jmWOAZFjQfExtcAiJa0buX/Lx/CzBdGgiSSAlbrw==", "license": "BSD-3-Clause" }, - "node_modules/@open-draft/deferred-promise": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz", - "integrity": "sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@open-draft/logger": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@open-draft/logger/-/logger-0.3.0.tgz", - "integrity": "sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==", + "node_modules/@open-draft/until": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-3.0.1.tgz", + "integrity": "sha512-s7/9ELP4aP9YZtW7RJaa0Xf3RISaRH9+EFN18FtykJYRHGNrl8f9ymvoNXzjhrjmftFvkQudtuDU9RYhk0xs3A==", "dev": true, "license": "MIT", - "dependencies": { - "is-node-process": "^1.2.0", - "outvariant": "^1.4.0" + "funding": { + "url": "https://github.com/sponsors/kettanaito" } }, - "node_modules/@open-draft/until": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz", - "integrity": "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==", - "dev": true, - "license": "MIT" - }, "node_modules/@opentelemetry/api": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz", @@ -4520,9 +4505,9 @@ "license": "MIT" }, "node_modules/@types/debug": { - "version": "4.1.12", - "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz", - "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==", + "version": "4.1.13", + "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.13.tgz", + "integrity": "sha512-KSVgmQmzMwPlmtljOomayoR89W4FynCAi3E8PPs7vmDVPe84hT+vGPKkJfThkmXs0x0jAaa9U8uW8bbfyS2fWw==", "license": "MIT", "dependencies": { "@types/ms": "*" @@ -10503,11 +10488,6 @@ "dev": true, "license": "MIT" }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "dev": true, - "license": "ISC" - }, "node_modules/jsonfile": { "version": "6.1.0", "dev": true, @@ -12236,18 +12216,16 @@ } }, "node_modules/nock": { - "version": "14.0.11", - "resolved": "https://registry.npmjs.org/nock/-/nock-14.0.11.tgz", - "integrity": "sha512-u5xUnYE+UOOBA6SpELJheMCtj2Laqx15Vl70QxKo43Wz/6nMHXS7PrEioXLjXAwhmawdEMNImwKCcPhBJWbKVw==", + "version": "15.0.1", + "resolved": "https://registry.npmjs.org/nock/-/nock-15.0.1.tgz", + "integrity": "sha512-Mjx5Xl4t9vP13eUZPWqwwpjjXNjvhUTo1qTdryVM3+7t6Z2w6WHZ9GVZk/zQ8Ym1vbmloWaglye3cloyHAJ8FA==", "dev": true, "license": "MIT", "dependencies": { - "@mswjs/interceptors": "^0.41.0", - "json-stringify-safe": "^5.0.1", - "propagate": "^2.0.0" + "@mswjs/interceptors": "^0.44.0" }, "engines": { - "node": ">=18.20.0 <20 || >=20.12.1" + "node": ">=20.12.1" } }, "node_modules/node-addon-api": { @@ -13074,14 +13052,6 @@ "node": ">=6.0.0" } }, - "node_modules/propagate": { - "version": "2.0.1", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, "node_modules/property-information": { "version": "6.0.1", "license": "MIT", @@ -13644,6 +13614,13 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/rettime": { + "version": "0.11.12", + "resolved": "https://registry.npmjs.org/rettime/-/rettime-0.11.12.tgz", + "integrity": "sha512-5ExtR1ppiDBQkVoPw5NAqdbfH4Iq2VOmQKHMtUoaFxA9bo2krzFYBtyq6K40xxbYp+2w/YOr6D+1ToF6tTN53A==", + "dev": true, + "license": "MIT" + }, "node_modules/rfdc": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", @@ -14390,13 +14367,6 @@ "node": ">= 0.4" } }, - "node_modules/strict-event-emitter": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz", - "integrity": "sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==", - "dev": true, - "license": "MIT" - }, "node_modules/string-argv": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz", diff --git a/package.json b/package.json index 1400e5d04cf4..ad117e1c7aa5 100644 --- a/package.json +++ b/package.json @@ -322,7 +322,7 @@ "mdast-util-gfm": "^3.1.0", "micromark-extension-gfm": "^3.0.0", "mockdate": "^3.0.5", - "nock": "^14.0.11", + "nock": "^15.0.1", "nodemon": "3.1.10", "ora": "^9.3.0", "patch-package": "^8.0.1", diff --git a/src/observability/tests/failbot.ts b/src/observability/tests/failbot.ts index 2084a27abab7..6972af427265 100644 --- a/src/observability/tests/failbot.ts +++ b/src/observability/tests/failbot.ts @@ -13,7 +13,8 @@ describe('FailBot', () => { nock('https://haystack.example.com') .post('/') - .reply(200, (uri, requestBody) => { + .reply(200, async (request: Request) => { + const requestBody = await request.json() requestBodiesSent.push(requestBody) return requestBody }) From da942a0de5649b7a5225179128683bb2196492a3 Mon Sep 17 00:00:00 2001 From: docs-bot <77750099+docs-bot@users.noreply.github.com> Date: Thu, 15 Oct 2026 18:04:41 +0000 Subject: [PATCH 2/2] Fix misplaced \{\% endif %} in inline ifversion/else translations (#63865) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Kevin Heis Copilot-Session: d3dbb39e-5170-4220-9231-748252ae4624 --- .../lib/correct-translation-content.ts | 12 +++++++++++ .../tests/correct-translation-content.ts | 20 +++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/languages/lib/correct-translation-content.ts b/src/languages/lib/correct-translation-content.ts index c97888abffaa..27ee539e0849 100644 --- a/src/languages/lib/correct-translation-content.ts +++ b/src/languages/lib/correct-translation-content.ts @@ -67,6 +67,18 @@ export function correctTranslatedContentStrings( ) } + if ( + context.dottedPath === 'reusables.enterprise-migration-tool.commit-signature-verification' || + context.relativePath?.endsWith( + 'data/reusables/enterprise-migration-tool/commit-signature-verification.md', + ) + ) { + content = content.replace( + /(\{%-?\s*ifversion [^%]*?-?%\})\{%-?\s*endif\s*-?%\}(\{%-?\s*data [^%]*?-?%\})(\{%-?\s*else\s*-?%\})(\{%-?\s*data [^%]*?-?%\})(?!\{%-?\s*endif)/g, + '$1$2$3$4{% endif %}', + ) + } + if ( context.code === 'es' && (context.dottedPath === 'reusables.gated-features.dependabot-custom-auto-triage-rules' || diff --git a/src/languages/tests/correct-translation-content.ts b/src/languages/tests/correct-translation-content.ts index 7748ecf1fa5e..9e1af1ff7a96 100644 --- a/src/languages/tests/correct-translation-content.ts +++ b/src/languages/tests/correct-translation-content.ts @@ -35,6 +35,26 @@ async function render(content: string, currentVersion: string) { } describe('correctTranslatedContentStrings', () => { + describe('misplaced endif in inline conditional', () => { + test('[per-file] commit-signature-verification: endif moved before data tags', () => { + function fixAt(content: string, code: string, relativePath: string) { + return correctTranslatedContentStrings(content, '', { + code, + relativePath, + skipOrphanStripping: true, + }) + } + const path = 'data/reusables/enterprise-migration-tool/commit-signature-verification.md' + const broken = + 'contact {% ifversion fpt %}{% endif %}{% data variables.contact.contact_support_page %}{% else %}{% data variables.contact.contact_ent_support %}.' + const fixed = + 'contact {% ifversion fpt %}{% data variables.contact.contact_support_page %}{% else %}{% data variables.contact.contact_ent_support %}{% endif %}.' + expect(fixAt(broken, 'es', path)).toBe(fixed) + expect(fixAt(fixed, 'es', path)).toBe(fixed) + expect(fixAt(broken, 'es', 'data/reusables/other.md')).toBe(broken) + }) + }) + describe('Spanish (es)', () => { test('fixes colon-prefix tags', () => { expect(fix('{%: ifversion ghec %}', 'es')).toBe('{% ifversion ghec %}')