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

Commit

Permalink
Update name usage
Browse files Browse the repository at this point in the history
  • Loading branch information
blakeembrey committed Jun 27, 2016
1 parent bd96a7a commit 6140894
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/lib/dependencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ function resolveBowerDependencyFrom (
const devDependencyMap = extend(options.dev ? bowerJson.devDependencies : {})
const dependencyOptions = extend(options, { parent: tree })

options.emitter.emit('resolved', { name, src, tree, raw, parent })
options.emitter.emit('resolved', { name: name || tree.name, src, tree, raw, parent })

return Promise.all([
resolveBowerDependencyMap(componentPath, dependencyMap, dependencyOptions),
Expand Down Expand Up @@ -437,7 +437,7 @@ function resolveTypeDependencyFrom (src: string, raw: string, options: Options)
.then<DependencyTree>(
function (config) {
const tree = extend(DEFAULT_DEPENDENCY, {
name: config.name || name,
name: config.name,
main: config.main,
version: config.version,
browser: config.browser,
Expand All @@ -459,12 +459,12 @@ function resolveTypeDependencyFrom (src: string, raw: string, options: Options)
const globalDevDependencyMap = extend(global && dev ? config.globalDevDependencies : {})
const dependencyOptions = extend(options, { parent: tree })

options.emitter.emit('resolved', { name, src, tree, raw, parent })
options.emitter.emit('resolved', { name: name || tree.name, src, tree, raw, parent })

// Emit "expected" global modules when installing top-level.
if (parent == null && config.globalDependencies) {
options.emitter.emit('globaldependencies', {
name: tree.name,
name: name || tree.name,
raw,
dependencies: config.globalDependencies
})
Expand Down

0 comments on commit 6140894

Please sign in to comment.