Use the correct folders

Author: EnoahNetzach

packages/create-react-app/index.js

@@ -69,7 +69,7 @@ var program = require('commander')
   })
   .option('--verbose', 'print additional logs')
   .option('--scripts-version <alternative-package>', 'use a non-standard version of react-scripts')
-  .option('--template <variant> [app]', 'to select a template variant', 'app')
+  .option('--template <path-to-variant>', 'to select a template variant')
   .on('--help', function () {
     console.log('    Only ' + chalk.green('<project-directory>') + ' is required.');
     console.log();

packages/react-scripts/.npmignore

@@ -1 +1 @@
-/templates/kitchensink
+/fixtures

packages/react-scripts/config/paths.js

@@ -80,13 +80,13 @@ module.exports = {
 if (__dirname.indexOf(path.join('packages', 'react-scripts', 'config')) !== -1) {
   module.exports = {
     appBuild: resolveOwn('../../../build'),
-    appPublic: resolveOwn('../templates/app/public'),
-    appHtml: resolveOwn('../templates/app/public/index.html'),
-    appIndexJs: resolveOwn('../templates/app/src/index.js'),
+    appPublic: resolveOwn('../template/public'),
+    appHtml: resolveOwn('../template/public/index.html'),
+    appIndexJs: resolveOwn('../template/src/index.js'),
     appPackageJson: resolveOwn('../package.json'),
-    appSrc: resolveOwn('../templates/app/src'),
-    yarnLockFile: resolveOwn('../templates/app/yarn.lock'),
-    testsSetup: resolveOwn('../templates/app/src/setupTests.js'),
+    appSrc: resolveOwn('../template/src'),
+    yarnLockFile: resolveOwn('../template/yarn.lock'),
+    testsSetup: resolveOwn('../template/src/setupTests.js'),
     appNodeModules: resolveOwn('../node_modules'),
     ownNodeModules: resolveOwn('../node_modules'),
     nodePaths: nodePaths

packages/react-scripts/templates/kitchensink/.babelrc renamed to packages/react-scripts/fixtures/kitchensink/.babelrc

@@ -16,7 +16,7 @@
     "bin",
     "config",
     "scripts",
-    "templates",
+    "template",
     "utils"
   ],
   "bin": {

packages/react-scripts/templates/kitchensink/.env renamed to packages/react-scripts/fixtures/kitchensink/.env

@@ -41,11 +41,11 @@ module.exports = function(appPath, appName, verbose, originalDirectory, template
   }
 
   // Copy the files for the user
-  var templatePath = path.join(ownPath, 'templates', template);
+  var templatePath = template ? path.resolve(originalDirectory, template) : path.join(ownPath, 'template');
   if (fs.existsSync(templatePath)) {
     fs.copySync(templatePath, appPath);
   } else {
-    console.error('Could not locate supplied template: ' + template);
+    console.error('Could not locate supplied template: ' + chalk.green(templatePath));
     return;
   }
 

packages/react-scripts/templates/kitchensink/.flowconfig renamed to packages/react-scripts/fixtures/kitchensink/.flowconfig

@@ -138,7 +138,7 @@ npm install $cli_path
 
 # Install the app in a temporary location
 cd $temp_app_path
-create_react_app --scripts-version=$scripts_path --template=kitchensink test-app
+create_react_app --scripts-version=$scripts_path --template=$root_path/packages/react-scripts/fixtures/kitchensink test-app
 
 # ******************************************************************************
 # Now that we used create-react-app to create an app depending on react-scripts,