diff --git a/package.json b/package.json index 7d1280369..a9c1621de 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "bugs": "https://github.com/oclif/oclif/issues", "dependencies": { - "@oclif/core": "^1.2.0", + "@oclif/core": "^1.3.0", "@oclif/plugin-help": "^5.1.10", "@oclif/plugin-not-found": "^2.2.4", "@oclif/plugin-warn-if-update-available": "^2.0.4", diff --git a/src/index.ts b/src/index.ts index ef26cab59..e32b0b2e5 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,2 +1 @@ export {run} from '@oclif/core' -export {IManifest} from './tarballs' diff --git a/src/tarballs/build.ts b/src/tarballs/build.ts index db70dfa35..5bf071095 100644 --- a/src/tarballs/build.ts +++ b/src/tarballs/build.ts @@ -6,7 +6,7 @@ import * as qq from 'qqjs' import {log} from '../log' import {writeBinScripts} from './bin' -import {BuildConfig, IManifest} from './config' +import {BuildConfig} from './config' import {fetchNodeBinary} from './node' import {commitAWSDir, templateShortKey} from '../upload-util' @@ -123,7 +123,7 @@ export async function build(c: BuildConfig, options: { const gzCloudKey = `${commitAWSDir(config.version, c.gitSha, c.updateConfig.s3)}/${gzLocalKey}` const xzCloudKey = `${commitAWSDir(config.version, c.gitSha, c.updateConfig.s3)}/${xzLocalKey}` - const manifest: IManifest = { + const manifest: Interfaces.S3Manifest = { rollout: rollout === false ? undefined : rollout, version: config.version, sha: c.gitSha, diff --git a/src/tarballs/config.ts b/src/tarballs/config.ts index 3bbcae806..221c2aa72 100644 --- a/src/tarballs/config.ts +++ b/src/tarballs/config.ts @@ -30,21 +30,6 @@ export interface BuildConfig { dist(input: string): string; } -export interface IManifest { - version: string; - sha: string; - gz: string; - xz?: string; - sha256gz: string; - sha256xz?: string; - baseDir: string; - rollout?: number; - node: { - compatible: string; - recommended: string; - }; -} - export async function gitSha(cwd: string, options: {short?: boolean} = {}): Promise { const args = options.short ? ['rev-parse', '--short', 'HEAD'] : ['rev-parse', 'HEAD'] return qq.x.stdout('git', args, {cwd}) diff --git a/yarn.lock b/yarn.lock index 09ecf3d50..7235dc3ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -552,10 +552,10 @@ widest-line "^3.1.0" wrap-ansi "^7.0.0" -"@oclif/core@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@oclif/core/-/core-1.2.0.tgz#f1110b1fe868e439f94f8b4ffad5dd8acf862294" - integrity sha512-h1n8NEAUzaL3+wky7W1FMeySmJWQpYX1LhWMltFY/ScvmapZzee7D9kzy/XI/ZIWWfz2ZYCTMD1wOKXO6ueynw== +"@oclif/core@^1.3.0": + version "1.3.0" + resolved "https://registry.npmjs.org/@oclif/core/-/core-1.3.0.tgz#f0547d2ca9b13c2a54f1c1d88e03a8c8ca7799bb" + integrity sha512-YSy1N3SpOn/8vmY8lllmTzQ4+KGjTlyFoNr/PxvebuYxo0iO0uQSpXIr8qDoNGQUTy+3Z5feUxoV04uUgAlI6Q== dependencies: "@oclif/linewrap" "^1.0.0" "@oclif/screen" "^3.0.2"