From e36ef0c06a92390d803a6ce900ac99e4af64bf76 Mon Sep 17 00:00:00 2001 From: Fatme Date: Mon, 8 Jun 2015 10:44:26 +0300 Subject: [PATCH 1/2] Fix npm install -wip --- lib/services/plugins-service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services/plugins-service.ts b/lib/services/plugins-service.ts index fcde558f11..7e3f45e6f6 100644 --- a/lib/services/plugins-service.ts +++ b/lib/services/plugins-service.ts @@ -101,7 +101,7 @@ export class PluginsService implements IPluginsService { } public ensureAllDependenciesAreInstalled(): IFuture { - return this.$childProcess.exec("npm install"); + return this.$childProcess.exec("npm install ", { cwd: this.$projectData.projectDir }); } public getAllInstalledPlugins(): IFuture { From bba3ed6c9df87b676177ce537263d420fbb4fce3 Mon Sep 17 00:00:00 2001 From: Fatme Date: Mon, 8 Jun 2015 11:07:19 +0300 Subject: [PATCH 2/2] Process only node_modules in projectDIr --- lib/tools/broccoli/trees/node-modules-tree.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tools/broccoli/trees/node-modules-tree.ts b/lib/tools/broccoli/trees/node-modules-tree.ts index 5a970d4e73..651bba7df4 100644 --- a/lib/tools/broccoli/trees/node-modules-tree.ts +++ b/lib/tools/broccoli/trees/node-modules-tree.ts @@ -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; }