diff --git a/package.json b/package.json index 2eff458f2..3c0bb0eb2 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "@types/js-yaml": "^4.0.5", "@types/mocha": "^9.1.0", "@types/node": "^16.11.7", + "@types/ncp": "^2.0.5", "@types/pull-stream": "^3.6.2", "@types/semver": "^7.3.9", "@types/shell-quote": "^1.7.1", @@ -65,7 +66,6 @@ "vinyl-fs": "^3.0.3" }, "dependencies": { - "@types/ncp": "^2.0.5", "ncp": "^2.0.0", "follow-redirects": "^1.14.8", "js-yaml": "^4.1.0", diff --git a/src/spec-common/injectHeadless.ts b/src/spec-common/injectHeadless.ts index 292b0647b..5dc522a58 100644 --- a/src/spec-common/injectHeadless.ts +++ b/src/spec-common/injectHeadless.ts @@ -105,7 +105,7 @@ export type DevContainerConfigCommand = 'initializeCommand' | 'onCreateCommand' const defaultWaitFor: DevContainerConfigCommand = 'updateContentCommand'; -export interface DevContainerFeature{ +export interface DevContainerFeature { id: string; options: boolean | string | Record; } diff --git a/src/spec-configuration/configuration.ts b/src/spec-configuration/configuration.ts index a10a7c443..4dd42dd71 100644 --- a/src/spec-configuration/configuration.ts +++ b/src/spec-configuration/configuration.ts @@ -26,7 +26,7 @@ export interface HostRequirements { storage?: string; } -export interface DevContainerFeature{ +export interface DevContainerFeature { id: string; options: boolean | string | Record; } diff --git a/src/spec-configuration/containerFeaturesConfiguration.ts b/src/spec-configuration/containerFeaturesConfiguration.ts index a099b4d4b..3359bf58a 100644 --- a/src/spec-configuration/containerFeaturesConfiguration.ts +++ b/src/spec-configuration/containerFeaturesConfiguration.ts @@ -5,14 +5,12 @@ import * as jsonc from 'jsonc-parser'; import * as path from 'path'; -//import * as semver from 'semver'; import * as URL from 'url'; import * as tar from 'tar'; import { DevContainerConfig } from './configuration'; import { mkdirpLocal, readLocalFile, rmLocal, writeLocalFile, cpDirectoryLocal } from '../spec-utils/pfs'; import { Log, LogLevel } from '../spec-utils/log'; import { request } from '../spec-utils/httpRequest'; -import { DevContainerFeature } from './configuration'; import { existsSync } from 'fs'; const ASSET_NAME = 'devcontainer-features.tgz'; @@ -25,7 +23,7 @@ export interface Feature { runApp?: string; runParams?: string; infoString?: string; - internalVersion?: string; + internalVersion?: string; // set programmatically tempLocalPath?: string; consecutiveId?: string; install?: Record;