Merge pull request #2156 from NativeScript/pete/copy-node_modules

petekanev · web-flow · commit 859c8eacb3f9 · 2016-10-26T13:21:07.000+03:00
Extract tns-core-modules on root level of tns_modules
diff --git a/lib/tools/node-modules/node-modules-dest-copy.ts b/lib/tools/node-modules/node-modules-dest-copy.ts
@@ -30,6 +30,11 @@ export class TnsModulesCopy {
 				Future.wait(deleteFilesFutures);
 
 				shelljs.rm("-rf", path.join(tnsCoreModulesResourcePath, "node_modules"));
+
+				// TODO: The following two lines are necessary to temporarily work around hardcoded 
+				// path dependencies in iOS livesync logic. Should be addressed ASAP
+				shelljs.cp("-Rf", path.join(tnsCoreModulesResourcePath, "*"), this.outputRoot);
+				shelljs.rm("-rf", tnsCoreModulesResourcePath);
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,11 @@ export class TnsModulesCopy {`
`30`	`30`	`Future.wait(deleteFilesFutures);`
`31`	`31`
`32`	`32`	`shelljs.rm("-rf", path.join(tnsCoreModulesResourcePath, "node_modules"));`
	`33`	`+`
	`34`	`+ // TODO: The following two lines are necessary to temporarily work around hardcoded`
	`35`	`+ // path dependencies in iOS livesync logic. Should be addressed ASAP`
	`36`	`+ shelljs.cp("-Rf", path.join(tnsCoreModulesResourcePath, "*"), this.outputRoot);`
	`37`	`+ shelljs.rm("-rf", tnsCoreModulesResourcePath);`
`33`	`38`	`}`
`34`	`39`	`}`
`35`	`40`	`}`