Skip to content
This repository has been archived by the owner on Dec 12, 2023. It is now read-only.

Commit

Permalink
Update popsicle, use native promises (#161)
Browse files Browse the repository at this point in the history
  • Loading branch information
blakeembrey committed Dec 9, 2016
1 parent 8ad7b78 commit a7bb1f4
Show file tree
Hide file tree
Showing 16 changed files with 9 additions and 21 deletions.
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
7 changes: 3 additions & 4 deletions src/bundle.ts
Original file line number Diff line number Diff line change
@@ -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'

/**
Expand Down Expand Up @@ -32,7 +31,7 @@ export function bundle (options: BundleOptions): Promise<InstallResult> {
}

return resolveAllDependencies({ cwd, dev: false, global: false, emitter })
.then(tree => {
.then<CompileResult>(tree => {
const name = options.name || tree.name

if (name == null) {
Expand All @@ -43,7 +42,7 @@ export function bundle (options: BundleOptions): Promise<InstallResult> {

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))
Expand Down
1 change: 0 additions & 1 deletion src/init.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Promise = require('any-promise')
import extend = require('xtend')
import { join, basename } from 'path'
import { ConfigJson } from './interfaces'
Expand Down
1 change: 0 additions & 1 deletion src/install.spec.ts
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
1 change: 0 additions & 1 deletion src/install.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
1 change: 0 additions & 1 deletion src/lib/compile.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
1 change: 0 additions & 1 deletion src/lib/dependencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 0 additions & 1 deletion src/list.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { EventEmitter } from 'events'
import Promise = require('any-promise')
import { Emitter, DependencyTree } from './interfaces'
import { resolveTypeDependencies } from './lib/dependencies'

Expand Down
1 change: 0 additions & 1 deletion src/prune.spec.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
3 changes: 1 addition & 2 deletions src/prune.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -35,7 +34,7 @@ export function prune (options: PruneOptions): Promise<void> {
/**
* Read the bundle and remove typings not in config file.
*/
function transformBundles (config: ConfigJson, options: PruneOptions) {
function transformBundles (config: ConfigJson, options: PruneOptions): Promise<void> {
const { production } = options
const resolutions = normalizeResolutions(config.resolution, options)
const dependencies = extend(config.dependencies, config.peerDependencies, production ? {} : config.devDependencies)
Expand Down
1 change: 0 additions & 1 deletion src/search.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
1 change: 0 additions & 1 deletion src/uninstall.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
1 change: 0 additions & 1 deletion src/utils/find.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { join, dirname } from 'path'
import Promise = require('any-promise')
import { isFile } from '../utils/fs'
import { CONFIG_FILE } from './config'

Expand Down
1 change: 0 additions & 1 deletion src/utils/fs.ts
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
1 change: 0 additions & 1 deletion src/view.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
5 changes: 4 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
"module": "commonjs",
"rootDir": "src",
"moduleResolution": "node",
"lib": ["es5"],
"lib": [
"es5",
"es2015.promise"
],
"declaration": true,
"noImplicitAny": true,
"removeComments": true,
Expand Down

0 comments on commit a7bb1f4

Please sign in to comment.