diff --git a/packages/helpers/__tests__/command-runner.test.ts b/packages/exec/__tests__/command-runner.test.ts similarity index 99% rename from packages/helpers/__tests__/command-runner.test.ts rename to packages/exec/__tests__/command-runner.test.ts index 2941bf50..1a30ab01 100644 --- a/packages/helpers/__tests__/command-runner.test.ts +++ b/packages/exec/__tests__/command-runner.test.ts @@ -1,7 +1,7 @@ -import * as exec from '@actions/exec' +import * as exec from '../src/exec' import * as core from '@actions/core' import * as io from '@actions/io' -import {CommandRunner, createCommandRunner} from '../src/helpers' +import {CommandRunner, createCommandRunner} from '../src/command-runner' describe('command-runner', () => { describe('createCommandRunner', () => { diff --git a/packages/exec/package-lock.json b/packages/exec/package-lock.json index 38321784..c909c7da 100644 --- a/packages/exec/package-lock.json +++ b/packages/exec/package-lock.json @@ -9,20 +9,115 @@ "version": "1.1.1", "license": "MIT", "dependencies": { + "@actions/core": "^1.10.1", "@actions/io": "^1.0.1" } }, + "node_modules/@actions/core": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.1.tgz", + "integrity": "sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==", + "dependencies": { + "@actions/http-client": "^2.0.1", + "uuid": "^8.3.2" + } + }, + "node_modules/@actions/http-client": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.0.tgz", + "integrity": "sha512-q+epW0trjVUUHboliPb4UF9g2msf+w61b32tAkFEwL/IwP0DQWgbCMM0Hbe3e3WXSKz5VcUXbzJQgy8Hkra/Lg==", + "dependencies": { + "tunnel": "^0.0.6", + "undici": "^5.25.4" + } + }, "node_modules/@actions/io": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.0.1.tgz", "integrity": "sha512-rhq+tfZukbtaus7xyUtwKfuiCRXd1hWSfmJNEpFgBQJ4woqPEpsBw04awicjwz9tyG2/MVhAEMfVn664Cri5zA==" + }, + "node_modules/@fastify/busboy": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz", + "integrity": "sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==", + "engines": { + "node": ">=14" + } + }, + "node_modules/tunnel": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", + "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", + "engines": { + "node": ">=0.6.11 <=0.7.0 || >=0.7.3" + } + }, + "node_modules/undici": { + "version": "5.26.3", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.3.tgz", + "integrity": "sha512-H7n2zmKEWgOllKkIUkLvFmsJQj062lSm3uA4EYApG8gLuiOM0/go9bIoC3HVaSnfg4xunowDE2i9p8drkXuvDw==", + "dependencies": { + "@fastify/busboy": "^2.0.0" + }, + "engines": { + "node": ">=14.0" + } + }, + "node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } } }, "dependencies": { + "@actions/core": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.1.tgz", + "integrity": "sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==", + "requires": { + "@actions/http-client": "^2.0.1", + "uuid": "^8.3.2" + } + }, + "@actions/http-client": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.0.tgz", + "integrity": "sha512-q+epW0trjVUUHboliPb4UF9g2msf+w61b32tAkFEwL/IwP0DQWgbCMM0Hbe3e3WXSKz5VcUXbzJQgy8Hkra/Lg==", + "requires": { + "tunnel": "^0.0.6", + "undici": "^5.25.4" + } + }, "@actions/io": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.0.1.tgz", "integrity": "sha512-rhq+tfZukbtaus7xyUtwKfuiCRXd1hWSfmJNEpFgBQJ4woqPEpsBw04awicjwz9tyG2/MVhAEMfVn664Cri5zA==" + }, + "@fastify/busboy": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz", + "integrity": "sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==" + }, + "tunnel": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", + "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==" + }, + "undici": { + "version": "5.26.3", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.3.tgz", + "integrity": "sha512-H7n2zmKEWgOllKkIUkLvFmsJQj062lSm3uA4EYApG8gLuiOM0/go9bIoC3HVaSnfg4xunowDE2i9p8drkXuvDw==", + "requires": { + "@fastify/busboy": "^2.0.0" + } + }, + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" } } } diff --git a/packages/exec/package.json b/packages/exec/package.json index bc4d77a2..9fc136ca 100644 --- a/packages/exec/package.json +++ b/packages/exec/package.json @@ -36,6 +36,7 @@ "url": "https://github.com/actions/toolkit/issues" }, "dependencies": { + "@actions/core": "^1.10.1", "@actions/io": "^1.0.1" } } diff --git a/packages/helpers/src/command-runner/command-runner.ts b/packages/exec/src/command-runner/command-runner.ts similarity index 98% rename from packages/helpers/src/command-runner/command-runner.ts rename to packages/exec/src/command-runner/command-runner.ts index 6b2f625a..f2f0967c 100644 --- a/packages/helpers/src/command-runner/command-runner.ts +++ b/packages/exec/src/command-runner/command-runner.ts @@ -1,4 +1,4 @@ -import * as exec from '@actions/exec' +import * as exec from '../exec' import {CommandRunnerBase} from './core' import { failAction, diff --git a/packages/helpers/src/command-runner/core.ts b/packages/exec/src/command-runner/core.ts similarity index 99% rename from packages/helpers/src/command-runner/core.ts rename to packages/exec/src/command-runner/core.ts index 0e4a8390..e6917418 100644 --- a/packages/helpers/src/command-runner/core.ts +++ b/packages/exec/src/command-runner/core.ts @@ -1,4 +1,4 @@ -import * as exec from '@actions/exec' +import * as exec from '../exec' import {StringDecoder} from 'string_decoder' import { CommandRunnerContext, diff --git a/packages/helpers/src/command-runner/index.ts b/packages/exec/src/command-runner/index.ts similarity index 100% rename from packages/helpers/src/command-runner/index.ts rename to packages/exec/src/command-runner/index.ts diff --git a/packages/helpers/src/command-runner/middleware.ts b/packages/exec/src/command-runner/middleware.ts similarity index 100% rename from packages/helpers/src/command-runner/middleware.ts rename to packages/exec/src/command-runner/middleware.ts diff --git a/packages/helpers/src/command-runner/types.ts b/packages/exec/src/command-runner/types.ts similarity index 97% rename from packages/helpers/src/command-runner/types.ts rename to packages/exec/src/command-runner/types.ts index bb4a987d..7f4659aa 100644 --- a/packages/helpers/src/command-runner/types.ts +++ b/packages/exec/src/command-runner/types.ts @@ -1,4 +1,4 @@ -import * as exec from '@actions/exec' +import * as exec from '../exec' import {PromisifiedFn} from './utils' /* CommandRunner core */ diff --git a/packages/helpers/src/command-runner/utils.ts b/packages/exec/src/command-runner/utils.ts similarity index 100% rename from packages/helpers/src/command-runner/utils.ts rename to packages/exec/src/command-runner/utils.ts