Fix broken file picker for new library

The template wasn't waiting for `yarn add {libraryName}` to complete, so
it didn't find any files to select

Author: bdukes

_new/index.js

@@ -6,6 +6,8 @@ const chalk = require('chalk');
 const yosay = require('yosay');
 const inquirer = require('inquirer');
 const packageJson = require('package-json');
+const spawn = require('cross-spawn');
+const eos = require('end-of-stream');
 const globby = require('globby');
 const { formatVersionFolder } = require('../utility');
 
@@ -18,15 +20,22 @@ module.exports = class extends Generator {
 			)
 		);
 
+		let yarnAdd;
+
 		const prompts = [
 			{
 				type: 'input',
 				name: 'libraryName',
 				message: "What is the npm module's name?",
 				validate: (libraryName, answers) => {
-					this.spawnCommand('yarn', ['add', libraryName], {
-						stdio: 'ignore',
-					});
+					yarnAdd = new Promise((resolve, reject) =>
+						eos(
+							spawn('yarn', ['add', libraryName], {
+								stdio: 'ignore',
+							}),
+							err => (err ? reject(err) : resolve())
+						)
+					);
 
 					return packageJson(libraryName, {
 						fullMetadata: true,
@@ -86,32 +95,36 @@ module.exports = class extends Generator {
 				type: 'list',
 				name: 'relativePath',
 				message: 'What is the main JavaScript file?',
-				choices: answers => {
-					try {
-						return globby
-							.sync(`node_modules/${answers.libraryName}/**/*.js`)
-							.map(file =>
-								file.replace(
-									`node_modules/${answers.libraryName}/`,
-									''
+				choices: ({ libraryName }) =>
+					yarnAdd
+						.then(() =>
+							globby([
+								`node_modules/${libraryName}/**/*.js`,
+								`!node_modules/${libraryName}/node_modules/**/*.js`,
+							])
+						)
+						.then(files =>
+							files
+								.map(file =>
+									file.replace(
+										`node_modules/${libraryName}/`,
+										''
+									)
 								)
-							)
-							.map(path.normalize)
-							.map(file => file.replace(/\\/g, '/'))
-							.concat([new inquirer.Separator(), 'Other']);
-					} catch (err) {
-						this.log.error(
-							'There was an unexpected error retrieving files: \n %O',
-							err
-						);
+								.map(path.normalize)
+								.map(file => file.replace(/\\/g, '/'))
+								.concat([new inquirer.Separator(), 'Other'])
+						)
+						.catch(err => {
+							this.log.error(
+								'There was an unexpected error retrieving files: \n %O',
+								err
+							);
 
-						return ['Other'];
-					}
-				},
-				default: answers =>
-					path
-						.normalize(answers.pkg.browser || answers.pkg.main)
-						.replace(/\\/g, '/'),
+							return ['Other'];
+						}),
+				default: ({ pkg }) =>
+					path.normalize(pkg.browser || pkg.main).replace(/\\/g, '/'),
 				filter: relativePath => relativePath.replace(/\\/g, '/'),
 			},
 			{

package.json

@@ -83,6 +83,7 @@
     "chalk": "^2.4.2",
     "cliui": "5.0.0",
     "cross-spawn": "6.0.5",
+    "end-of-stream": "1.4.1",
     "fancy-log": "1.3.3",
     "glob": "^7.1.3",
     "globby": "^10.0.1",

yarn.lock

@@ -1431,7 +1431,7 @@ encodeurl@^1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+end-of-stream@1.4.1, end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
   integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==