Skip to content

Commit 4e89fae

Browse files
FatmeFatme
Fatme
authored and
Fatme
committed
Merge pull request #537 from NativeScript/fatme/cherrypick-fix-path
Cherrypick the fix for node_modules folder
2 parents 544d72f + bba3ed6 commit 4e89fae

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lib/services/plugins-service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export class PluginsService implements IPluginsService {
101101
}
102102

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

107107
public getAllInstalledPlugins(): IFuture<IPluginData[]> {

lib/tools/broccoli/trees/node-modules-tree.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import destCopy from '../node-modules-dest-copy';
88

99
class NodeModulesTree implements INodeModulesTree {
1010
public makeNodeModulesTree(absoluteOutputPath: string, projectDir: string): any {
11-
let nodeModulesFunnel = new Funnel(".", { include: ["node_modules/**"] });
11+
let nodeModulesFunnel = new Funnel(".", { include: [projectDir + "/node_modules/**"] });
1212
let result = destCopy(nodeModulesFunnel, absoluteOutputPath, "node_modules", projectDir);
1313
return result;
1414
}

0 commit comments

Comments
 (0)