diff --git a/package.json b/package.json index 9c5e03e..a801927 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,6 @@ }, "homepage": "https://github.com/typings/core", "dependencies": { - "any-promise": "^1.3.0", "array-uniq": "^1.0.2", "configstore": "^2.0.0", "debug": "^2.2.0", @@ -58,7 +57,7 @@ "mkdirp": "^0.5.1", "object.pick": "^1.1.1", "parse-json": "^2.2.0", - "popsicle": "^8.0.2", + "popsicle": "^9.0.0", "popsicle-proxy-agent": "^3.0.0", "popsicle-retry": "^3.2.0", "popsicle-rewrite": "^1.0.0", diff --git a/src/bundle.ts b/src/bundle.ts index ebce596..d2e7ee2 100644 --- a/src/bundle.ts +++ b/src/bundle.ts @@ -1,10 +1,9 @@ -import Promise = require('any-promise') import { resolve, dirname } from 'path' import { EventEmitter } from 'events' import { resolveAllDependencies } from './lib/dependencies' import { CompileResult, compile } from './lib/compile' import { writeFile, mkdirp } from './utils/fs' -import { Emitter } from './interfaces' +import { Emitter, DependencyTree } from './interfaces' import { InstallResult } from './install' /** @@ -32,7 +31,7 @@ export function bundle (options: BundleOptions): Promise { } return resolveAllDependencies({ cwd, dev: false, global: false, emitter }) - .then(tree => { + .then(tree => { const name = options.name || tree.name if (name == null) { @@ -43,7 +42,7 @@ export function bundle (options: BundleOptions): Promise { return compile(tree, [resolution], { cwd, name, global, emitter, meta: true }) }) - .then((output: CompileResult) => { + .then<{ tree: DependencyTree }>((output) => { const path = resolve(cwd, out) return mkdirp(dirname(path)) diff --git a/src/init.ts b/src/init.ts index f6298ea..5ab8c76 100644 --- a/src/init.ts +++ b/src/init.ts @@ -1,4 +1,3 @@ -import Promise = require('any-promise') import extend = require('xtend') import { join, basename } from 'path' import { ConfigJson } from './interfaces' diff --git a/src/install.spec.ts b/src/install.spec.ts index c93a9af..cebd6c0 100644 --- a/src/install.spec.ts +++ b/src/install.spec.ts @@ -1,5 +1,4 @@ import test = require('blue-tape') -import Promise = require('any-promise') import { join } from 'path' import { EventEmitter } from 'events' import nock = require('nock') diff --git a/src/install.ts b/src/install.ts index d6dfe13..7c1b752 100644 --- a/src/install.ts +++ b/src/install.ts @@ -1,5 +1,4 @@ import extend = require('xtend') -import Promise = require('any-promise') import { dirname, join } from 'path' import { EventEmitter } from 'events' import { resolveDependency, resolveTypeDependencies, DEFAULT_DEPENDENCY } from './lib/dependencies' diff --git a/src/lib/compile.ts b/src/lib/compile.ts index 409bfde..1c0a4ee 100644 --- a/src/lib/compile.ts +++ b/src/lib/compile.ts @@ -1,7 +1,6 @@ import * as ts from 'typescript' import extend = require('xtend') import has = require('has') -import Promise = require('any-promise') import { join, relative, basename } from 'path' import { DependencyTree, Overrides, Emitter } from '../interfaces' import { readFileFrom } from '../utils/fs' diff --git a/src/lib/dependencies.ts b/src/lib/dependencies.ts index e3ce1ae..4b26a77 100644 --- a/src/lib/dependencies.ts +++ b/src/lib/dependencies.ts @@ -2,7 +2,6 @@ import extend = require('xtend') import listify = require('listify') import invariant = require('invariant') import zipObject = require('zip-object') -import Promise = require('any-promise') import { resolve, dirname, join } from 'path' import { resolve as resolveUrl } from 'url' import { readJspmPackageJson, resolveByPackageJson, resolve as resolveJspm, ModuleNotFoundError } from 'jspm-config' diff --git a/src/list.ts b/src/list.ts index 26541c4..7840ce5 100644 --- a/src/list.ts +++ b/src/list.ts @@ -1,5 +1,4 @@ import { EventEmitter } from 'events' -import Promise = require('any-promise') import { Emitter, DependencyTree } from './interfaces' import { resolveTypeDependencies } from './lib/dependencies' diff --git a/src/prune.spec.ts b/src/prune.spec.ts index b7f9b86..1a4a1ea 100644 --- a/src/prune.spec.ts +++ b/src/prune.spec.ts @@ -1,5 +1,4 @@ import test = require('blue-tape') -import Promise = require('any-promise') import { join } from 'path' import { prune } from './prune' import { readFile, writeFile, mkdirp, isFile } from './utils/fs' diff --git a/src/prune.ts b/src/prune.ts index 38993a2..4417df7 100644 --- a/src/prune.ts +++ b/src/prune.ts @@ -1,5 +1,4 @@ import { dirname } from 'path' -import Promise = require('any-promise') import extend = require('xtend') import { EventEmitter } from 'events' import { Emitter } from './interfaces' @@ -35,7 +34,7 @@ export function prune (options: PruneOptions): Promise { /** * Read the bundle and remove typings not in config file. */ -function transformBundles (config: ConfigJson, options: PruneOptions) { +function transformBundles (config: ConfigJson, options: PruneOptions): Promise { const { production } = options const resolutions = normalizeResolutions(config.resolution, options) const dependencies = extend(config.dependencies, config.peerDependencies, production ? {} : config.devDependencies) diff --git a/src/search.ts b/src/search.ts index 8787f98..3e9a309 100644 --- a/src/search.ts +++ b/src/search.ts @@ -1,5 +1,4 @@ import extend = require('xtend') -import Promise = require('any-promise') import pick = require('object.pick') import { stringify } from 'querystring' import { resolve } from 'url' diff --git a/src/uninstall.ts b/src/uninstall.ts index 902d88a..829a791 100644 --- a/src/uninstall.ts +++ b/src/uninstall.ts @@ -1,5 +1,4 @@ import extend = require('xtend') -import Promise = require('any-promise') import { EventEmitter } from 'events' import { dirname } from 'path' import { transformConfig, transformDtsFile, rmdirUntil, unlink, isFile, readConfig } from './utils/fs' diff --git a/src/utils/find.ts b/src/utils/find.ts index 65ec04b..cb28f0f 100644 --- a/src/utils/find.ts +++ b/src/utils/find.ts @@ -1,5 +1,4 @@ import { join, dirname } from 'path' -import Promise = require('any-promise') import { isFile } from '../utils/fs' import { CONFIG_FILE } from './config' diff --git a/src/utils/fs.ts b/src/utils/fs.ts index 20e6d10..6223388 100644 --- a/src/utils/fs.ts +++ b/src/utils/fs.ts @@ -1,6 +1,5 @@ import * as fs from 'graceful-fs' import extend = require('xtend') -import Promise = require('any-promise') import thenify = require('thenify') import stripBom = require('strip-bom') import parse = require('parse-json') diff --git a/src/view.ts b/src/view.ts index 6390c7e..f929261 100644 --- a/src/view.ts +++ b/src/view.ts @@ -1,4 +1,3 @@ -import Promise = require('any-promise') import { joinUrl } from './utils/path' import { readJsonFrom } from './utils/fs' import { expandRegistry, parseDependency } from './utils/parse' diff --git a/tsconfig.json b/tsconfig.json index a6fd707..8275ad5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,10 @@ "module": "commonjs", "rootDir": "src", "moduleResolution": "node", - "lib": ["es5"], + "lib": [ + "es5", + "es2015.promise" + ], "declaration": true, "noImplicitAny": true, "removeComments": true,