From 049c5b3d4b0df46e7aa23da9ec9495b4c5a2354b Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Fri, 30 Jan 2026 14:15:53 -0800 Subject: [PATCH 1/3] Fix node version for deploy, fix package approvals --- .github/workflows/deploy.yml | 2 +- package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cc9a2984a0..2225212db6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: env: - NODE_VERSION: '18.x' # set this to the node version to use (supports 8.x, 10.x, 12.x) + NODE_VERSION: '20.x' # set this to the node version to use (supports 8.x, 10.x, 12.x) RESOURCE_GROUP_NAME: dtmergebot3 FUNCTION_APP_NAME: dtmergebot3 STORAGE_ACCOUNT_NAME: dtmergebot3b1b7 diff --git a/package.json b/package.json index 2fcaec5d30..25630ed32f 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ ] }, "ignoredBuiltDependencies": [ + "@parcel/watcher", "core-js", "core-js-pure", "unrs-resolver", From e91cae5d46e1dc820a73924988ac7c0849a707d4 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Wed, 4 Feb 2026 15:56:23 -0800 Subject: [PATCH 2/3] Fix deps --- packages/typescript-packages/tsconfig.json | 3 ++- pnpm-lock.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/typescript-packages/tsconfig.json b/packages/typescript-packages/tsconfig.json index 5285d28af2..ee685b6682 100644 --- a/packages/typescript-packages/tsconfig.json +++ b/packages/typescript-packages/tsconfig.json @@ -4,5 +4,6 @@ "rootDir": "src", "outDir": "dist" }, - "include": ["src"] + "include": ["src"], + "references": [{ "path": "../typescript-versions" }] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e2ad129981..57cc28974f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1933,8 +1933,8 @@ packages: resolution: {integrity: sha512-mNe0Iigql08YupSOGv197YdHpPPr+EzDZmfCgMc7RPNaZTw5aLN01nBl6CHJOh3BGtnMIj83EeN4butBchc8Ag==} engines: {node: ^20.17.0 || >=22.9.0} - '@sinclair/typebox@0.27.8': - resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} + '@sinclair/typebox@0.27.10': + resolution: {integrity: sha512-MTBk/3jGLNB2tVxv6uLlFh1iu64iYOQ2PbdOSK3NW8JZsmlaOh2q6sdtKowBhfw8QFLmYNzTW4/oK4uATIi6ZA==} '@sinclair/typebox@0.34.48': resolution: {integrity: sha512-kKJTNuK3AQOrgjjotVxMrCn1sUJwM76wMszfq1kdU4uYVJjvEWuFQ6HgvLt4Xz3fSmZlTOxJ/Ie13KnIcWQXFA==} @@ -6438,7 +6438,7 @@ snapshots: '@jest/schemas@29.6.3': dependencies: - '@sinclair/typebox': 0.27.8 + '@sinclair/typebox': 0.27.10 '@jest/schemas@30.0.5': dependencies: @@ -6861,7 +6861,7 @@ snapshots: '@sigstore/core': 3.1.0 '@sigstore/protobuf-specs': 0.5.0 - '@sinclair/typebox@0.27.8': {} + '@sinclair/typebox@0.27.10': {} '@sinclair/typebox@0.34.48': {} From da010c14ca10dde950b947e0b44329a9cbc7130c Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Wed, 4 Feb 2026 15:57:39 -0800 Subject: [PATCH 3/3] make pass in tsgo --- .changeset/khaki-nails-hear.md | 5 +++++ packages/utils/src/miscellany.ts | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changeset/khaki-nails-hear.md diff --git a/.changeset/khaki-nails-hear.md b/.changeset/khaki-nails-hear.md new file mode 100644 index 0000000000..056dcb20a5 --- /dev/null +++ b/.changeset/khaki-nails-hear.md @@ -0,0 +1,5 @@ +--- +"@definitelytyped/utils": patch +--- + +Remove unused type param from misc functions diff --git a/packages/utils/src/miscellany.ts b/packages/utils/src/miscellany.ts index 4623ab082a..bbbda8e40c 100644 --- a/packages/utils/src/miscellany.ts +++ b/packages/utils/src/miscellany.ts @@ -1,7 +1,7 @@ import crypto from "crypto"; import { Minimatch } from "minimatch"; -export function tryParseJson(text: string): unknown; +export function tryParseJson(text: string): unknown; export function tryParseJson(text: string, predicate: (parsed: unknown) => parsed is T): T | undefined; export function tryParseJson(text: string, predicate?: (parsed: unknown) => parsed is T) { try { @@ -11,7 +11,7 @@ export function tryParseJson(text: string, predicate?: (parsed: unknown) => p } } -export function parseJson(text: string): unknown; +export function parseJson(text: string): unknown; export function parseJson(text: string, predicate?: (parsed: unknown) => parsed is T): T; export function parseJson(text: string, predicate: (parsed: unknown) => parsed is T = (_): _ is T => true) { let parsed: unknown;