diff --git a/package.json b/package.json index 924e36f1..f86edeed 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "@eslint/compat": "^1.1.1", "@eslint/eslintrc": "^3.1.0", "@eslint/js": "^9.11.1", + "@opentf/std": "^0.13.0", "@total-typescript/ts-reset": "^0.6.1", "@types/eslint__js": "^8.42.3", "@types/node": "^22.7.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 53b6c84e..bbe51bce 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27,6 +27,9 @@ importers: '@eslint/js': specifier: ^9.11.1 version: 9.11.1 + '@opentf/std': + specifier: ^0.13.0 + version: 0.13.0 '@total-typescript/ts-reset': specifier: ^0.6.1 version: 0.6.1 @@ -551,6 +554,10 @@ packages: '@octokit/types@13.6.0': resolution: {integrity: sha512-CrooV/vKCXqwLa+osmHLIMUb87brpgUqlqkPGc6iE2wCkUvTrHiXFMhAKoDDaAAYJrtKtrFTgSQTg5nObBEaew==} + '@opentf/std@0.13.0': + resolution: {integrity: sha512-VG9vn7oML5prxWipDvod1X7z9+3fyyCbw+SuD5F7cWx9F1bXFZdAYGIKGqqHLtfxz3mrXZWHcxnm8d0YwQ7tKQ==} + engines: {node: '>=16.20.2'} + '@pkgjs/parseargs@0.11.0': resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} @@ -2754,6 +2761,8 @@ snapshots: dependencies: '@octokit/openapi-types': 22.2.0 + '@opentf/std@0.13.0': {} + '@pkgjs/parseargs@0.11.0': optional: true diff --git a/src/return-dispatch.ts b/src/return-dispatch.ts index f36a3ce5..417e6dff 100644 --- a/src/return-dispatch.ts +++ b/src/return-dispatch.ts @@ -3,7 +3,7 @@ import * as core from "@actions/core"; import { ActionOutputs, type ActionConfig } from "./action.ts"; import * as api from "./api.ts"; import * as constants from "./constants.ts"; -import { getBranchName, type BranchNameResult } from "./utils.ts"; +import { type BranchNameResult } from "./utils.ts"; export function shouldRetryOrThrow( error: Error, diff --git a/src/test-utils/logging.mock.ts b/src/test-utils/logging.mock.ts index 92167a24..fa6f6d5c 100644 --- a/src/test-utils/logging.mock.ts +++ b/src/test-utils/logging.mock.ts @@ -1,4 +1,5 @@ import * as core from "@actions/core"; +import { symDiff } from "@opentf/std"; import { type MockInstance, vi, expect } from "vitest"; // Consuming test suites must first call: @@ -63,7 +64,10 @@ function assertOnlyCalledInner( ); } - const diff = coreLogMockSet.symmetricDifference(new Set(coreLogMocks)); + // Once Node 22 is LTS, this can be: + // const diff = coreLogMockSet.symmetricDifference(new Set(coreLogMocks)); + + const diff = symDiff([[...coreLogMockSet], coreLogMocks]); for (const logMock of diff) { expect(logMock).not.toHaveBeenCalled(); diff --git a/tsconfig.json b/tsconfig.json index f912871f..7af44a12 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "esnext", + "target": "es2023", "module": "nodenext", "noEmit": true,