Skip to content

Cherrypick the fix for node_modules folder #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 8, 2015
Merged

Cherrypick the fix for node_modules folder #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e36ef0c
Fix npm install -wip
Fatme Jun 8, 2015
bba3ed6
Process only node_modules in projectDIr
Fatme Jun 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/services/plugins-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export class PluginsService implements IPluginsService {
}

public ensureAllDependenciesAreInstalled(): IFuture<void> {
return this.$childProcess.exec("npm install");
return this.$childProcess.exec("npm install ", { cwd: this.$projectData.projectDir });
}

public getAllInstalledPlugins(): IFuture<IPluginData[]> {
Expand Down
2 changes: 1 addition & 1 deletion lib/tools/broccoli/trees/node-modules-tree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import destCopy from '../node-modules-dest-copy';

class NodeModulesTree implements INodeModulesTree {
public makeNodeModulesTree(absoluteOutputPath: string, projectDir: string): any {
let nodeModulesFunnel = new Funnel(".", { include: ["node_modules/**"] });
let nodeModulesFunnel = new Funnel(".", { include: [projectDir + "/node_modules/**"] });
let result = destCopy(nodeModulesFunnel, absoluteOutputPath, "node_modules", projectDir);
return result;
}
Expand Down