Merge pull request #1796 from NativeScript/vladimirov/cherry-pick-scoped-fixes

Flatten only dependencies with valid package.json

Author: rosen-vladimirov

lib/tools/broccoli/node-modules-dest-copy.ts

@@ -44,7 +44,7 @@ export class DestCopy implements IBroccoliPlugin {
 				_.each(packageJsonFiles, packageJsonFilePath => {
 					let fileContent = require(packageJsonFilePath);
 
-					if (!this.devDependencies[fileContent.name]) { // Don't flatten dev dependencies
+					if (!this.devDependencies[fileContent.name] && fileContent.name && fileContent.version) { // Don't flatten dev dependencies and flatten only dependencies with valid package.json
 						let currentDependency = {
 							name: fileContent.name,
 							version: fileContent.version,

test/npm-support.ts

@@ -223,7 +223,7 @@ describe("Npm support tests", () => {
 		addDependencies(testInjector, projectFolder, {}).wait();
 		//create module dir, and add a package.json
 		shelljs.mkdir("-p", scopedModule);
-		fs.writeFile(scopedPackageJson, JSON.stringify({ name: scopedName })).wait();
+		fs.writeFile(scopedPackageJson, JSON.stringify({ name: scopedName, version: "1.0.0" })).wait();
 
 		// Act
 		preparePlatform(testInjector).wait();