flatten android plugins with native code when copying into main/src

NativeScript · May 31, 2017 · e27050a · e27050a
1 parent b519ecf
commit e27050a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts
@@ -361,8 +361,11 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		if (this.$fs.exists(pluginPlatformsFolderPath)) {
 			this.$fs.ensureDirectoryExists(pluginConfigurationDirectoryPath);
 
+			let isScoped = pluginData.name.indexOf("@") === 0;
+			let flattenedDependencyName = isScoped ? pluginData.name.replace("/", "_") : pluginData.name;
+
 			// Copy all resources from plugin
-			let resourcesDestinationDirectoryPath = path.join(this.getPlatformData(projectData).projectRoot, "src", pluginData.name);
+			let resourcesDestinationDirectoryPath = path.join(this.getPlatformData(projectData).projectRoot, "src", flattenedDependencyName);
 			this.$fs.ensureDirectoryExists(resourcesDestinationDirectoryPath);
 			shell.cp("-Rf", path.join(pluginPlatformsFolderPath, "*"), resourcesDestinationDirectoryPath);
 

diff --git a/lib/tools/node-modules/node-modules-dest-copy.ts b/lib/tools/node-modules/node-modules-dest-copy.ts
@@ -35,21 +35,20 @@ export class TnsModulesCopy {
 	}
 
 	private copyDependencyDir(dependency: IDependencyData): void {
-		if (dependency.depth === 0) {
-			let isScoped = dependency.name.indexOf("@") === 0;
-			let targetDir = this.outputRoot;
-
-			if (isScoped) {
-				targetDir = path.join(this.outputRoot, dependency.name.substring(0, dependency.name.indexOf("/")));
-			}
+		const targetPackageDir = path.join(this.outputRoot, dependency.name);
+
+		// check if dependency is scoped, and create a parent @scope directory to copy dependencies into
+		// shelljs otherwise complains during the copy step: 'cp: cannot create directory'
+		let isScoped = dependency.name.indexOf("@") === 0;
+
+		if (isScoped) {
+			shelljs.mkdir("-p", path.join(this.outputRoot, dependency.name.substring(0, dependency.name.indexOf("/"))));
+		}
 
-			shelljs.mkdir("-p", targetDir);
-			shelljs.cp("-Rf", dependency.directory, targetDir);
+		shelljs.cp("-Rf", dependency.directory, targetPackageDir);
 
-			// remove platform-specific files (processed separately by plugin services)
-			const targetPackageDir = path.join(isScoped ? this.outputRoot : targetDir, dependency.name);
-			shelljs.rm("-rf", path.join(targetPackageDir, "platforms"));
-		}
+		// remove platform-specific files (processed separately by plugin services)
+		shelljs.rm("-rf", path.join(targetPackageDir, "platforms"));
 	}
 }