Merge branch 'master' into redbox

Author: Timer

CHANGELOG.md

@@ -0,0 +1,36 @@
+environment:
+  matrix:
+    - nodejs_version: 6
+      test_suite: "simple"
+    - nodejs_version: 6
+      test_suite: "installs"
+    - nodejs_version: 6
+      test_suite: "kitchensink"
+    - nodejs_version: 4
+      test_suite: "simple"
+    - nodejs_version: 4
+      test_suite: "installs"
+    - nodejs_version: 4
+      test_suite: "kitchensink"
+
+cache:
+  - node_modules
+  - packages\react-scripts\node_modules
+
+clone_depth: 50
+
+matrix:
+  fast_finish: true
+
+platform:
+  - x64
+
+install:
+  - ps: Install-Product node $env:nodejs_version $env:platform
+
+build: off
+
+test_script:
+  - node --version
+  - npm --version
+  - sh tasks/e2e-%test_suite%.sh

appveyor.yml

@@ -30,9 +30,7 @@ const plugins = [
     regenerator: true,
     // Resolve the Babel runtime relative to the config.
     moduleName: path.dirname(require.resolve('babel-runtime/package'))
-  }],
-  // Enables parsing of import()
-  require.resolve('babel-plugin-syntax-dynamic-import')
+  }]
 ];
 
 // This is similar to how `env` works in Babel:
@@ -77,7 +75,10 @@ if (env === 'test') {
       // JSX, Flow
       require.resolve('babel-preset-react')
     ],
-    plugins: plugins
+    plugins: plugins.concat([
+      // Compiles import() to a deferred require()
+      require.resolve('babel-plugin-dynamic-import-node')
+    ])
   };
 } else {
   module.exports = {
@@ -97,6 +98,8 @@ if (env === 'test') {
         // Async functions are converted to generators by babel-preset-latest
         async: false
       }],
+      // Adds syntax support for import()
+      require.resolve('babel-plugin-syntax-dynamic-import'),
     ])
   };
 

packages/babel-preset-react-app/index.js

@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-react-app",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Babel preset used by Create React App",
   "repository": "facebookincubator/create-react-app",
   "license": "BSD-3-Clause",
@@ -11,6 +11,7 @@
     "index.js"
   ],
   "dependencies": {
+    "babel-plugin-dynamic-import-node": "1.0.0",
     "babel-plugin-syntax-dynamic-import": "6.18.0",
     "babel-plugin-transform-class-properties": "6.22.0",
     "babel-plugin-transform-object-rest-spread": "6.22.0",

packages/babel-preset-react-app/package.json

@@ -39,6 +39,7 @@
 'use strict';
 
 var chalk = require('chalk');
+var validateProjectName = require("validate-npm-package-name");
 
 var currentNodeVersion = process.versions.node;
 if (currentNodeVersion.split('.')[0] < 4) {
@@ -58,6 +59,7 @@ var path = require('path');
 var execSync = require('child_process').execSync;
 var spawn = require('cross-spawn');
 var semver = require('semver');
+var dns = require('dns');
 
 var projectName;
 
@@ -97,6 +99,14 @@ if (typeof projectName === 'undefined') {
   process.exit(1);
 }
 
+function printValidationResults(results) {
+  if (typeof results !== 'undefined') {
+    results.forEach(function (error) {
+      console.error(chalk.red('  * ' + error));
+    });
+  }
+}
+
 var hiddenProgram = new commander.Command()
   .option('--internal-testing-template <path-to-template>', '(internal usage only, DO NOT RELY ON THIS) ' +
     'use a non-standard application template')
@@ -145,25 +155,47 @@ function shouldUseYarn() {
   }
 }
 
-function install(dependencies, verbose, callback) {
-  var command;
-  var args;
-  if (shouldUseYarn()) {
-    command = 'yarnpkg';
-    args = [ 'add', '--exact'].concat(dependencies);
-  } else {
-    checkNpmVersion();
-    command = 'npm';
-    args = ['install', '--save', '--save-exact'].concat(dependencies);
-  }
+function install(useYarn, dependencies, verbose, isOnline) {
+  return new Promise(function(resolve, reject) {
+    var command;
+    var args;
+    if (useYarn) {
+      command = 'yarnpkg';
+      args = [
+        'add',
+        '--exact',
+      ];
+      if (!isOnline) {
+        args.push('--offline');
+      }
+      [].push.apply(args, dependencies);
+
+      if (!isOnline) {
+        console.log(chalk.yellow('You appear to be offline.'));
+        console.log(chalk.yellow('Falling back to the local Yarn cache.'));
+        console.log();
+      }
+
+    } else {
+      checkNpmVersion();
+      command = 'npm';
+      args = ['install', '--save', '--save-exact'].concat(dependencies);
+    }
 
-  if (verbose) {
-    args.push('--verbose');
-  }
+    if (verbose) {
+      args.push('--verbose');
+    }
 
-  var child = spawn(command, args, {stdio: 'inherit'});
-  child.on('close', function(code) {
-    callback(code, command, args);
+    var child = spawn(command, args, {stdio: 'inherit'});
+    child.on('close', function(code) {
+      if (code !== 0) {
+        reject({
+          command: command + ' ' + args.join(' ')
+        });
+        return;
+      }
+      resolve();
+    });
   });
 }
 
@@ -179,29 +211,63 @@ function run(root, appName, version, verbose, originalDirectory, template) {
     ', and ' + chalk.cyan(packageName) + '...'
   );
   console.log();
-
-  install(allDependencies, verbose, function(code, command, args) {
-    if (code !== 0) {
-      console.error(chalk.cyan(command + ' ' + args.join(' ')) + ' failed');
+  
+  var useYarn = shouldUseYarn();
+  checkIfOnline(useYarn)
+    .then(function(isOnline) {
+      return install(useYarn, allDependencies, verbose, isOnline);
+    })
+    .then(function() {
+      checkNodeVersion(packageName);
+
+      // Since react-scripts has been installed with --save
+      // we need to move it into devDependencies and rewrite package.json
+      // also ensure react dependencies have caret version range
+      fixDependencies(packageName);
+
+      var scriptsPath = path.resolve(
+        process.cwd(),
+        'node_modules',
+        packageName,
+        'scripts',
+        'init.js'
+      );
+      var init = require(scriptsPath);
+      init(root, appName, verbose, originalDirectory, template);
+    })
+    .catch(function(reason) {
+      console.log();
+      console.log('Aborting installation.');
+      if (reason.command) {
+        console.log('  ' + chalk.cyan(reason.command), 'has failed.')
+      }
+      console.log();
+
+      // On 'exit' we will delete these files from target directory.
+      var knownGeneratedFiles = [
+        'package.json', 'npm-debug.log', 'yarn-error.log', 'yarn-debug.log', 'node_modules'
+      ];
+      var currentFiles = fs.readdirSync(path.join(root));
+      currentFiles.forEach(function (file) {
+        knownGeneratedFiles.forEach(function (fileToMatch) {
+          // This will catch `(npm-debug|yarn-error|yarn-debug).log*` files
+          // and the rest of knownGeneratedFiles.
+          if ((fileToMatch.match(/.log/g) && file.indexOf(fileToMatch) === 0) || file === fileToMatch) {
+            console.log('Deleting generated file...', chalk.cyan(file));
+            fs.removeSync(path.join(root, file));
+          }
+        });
+      });
+      var remainingFiles = fs.readdirSync(path.join(root));
+      if (!remainingFiles.length) {
+        // Delete target folder if empty
+        console.log('Deleting', chalk.cyan(appName + '/'), 'from', chalk.cyan(path.resolve(root, '..')));
+        process.chdir(path.resolve(root, '..'));
+        fs.removeSync(path.join(root));
+      }
+      console.log('Done.');
       process.exit(1);
-    }
-
-    checkNodeVersion(packageName);
-
-    // Since react-scripts has been installed with --save
-    // We need to move it into devDependencies and rewrite package.json
-    moveReactScriptsToDev(packageName);
-
-    var scriptsPath = path.resolve(
-      process.cwd(),
-      'node_modules',
-      packageName,
-      'scripts',
-      'init.js'
-    );
-    var init = require(scriptsPath);
-    init(root, appName, verbose, originalDirectory, template);
-  });
+    });
 }
 
 function getInstallPackage(version) {
@@ -280,11 +346,18 @@ function checkNodeVersion(packageName) {
 }
 
 function checkAppName(appName) {
+  var validationResult = validateProjectName(appName);
+  if (!validationResult.validForNewPackages) {
+    console.error('Could not create a project called ' + chalk.red('"' + appName + '"') + ' because of npm naming restrictions:');
+    printValidationResults(validationResult.errors);
+    printValidationResults(validationResult.warnings);
+    process.exit(1);
+  }
+  
   // TODO: there should be a single place that holds the dependencies
   var dependencies = ['react', 'react-dom'];
   var devDependencies = ['react-scripts'];
   var allDependencies = dependencies.concat(devDependencies).sort();
-
   if (allDependencies.indexOf(appName) >= 0) {
     console.error(
       chalk.red(
@@ -302,7 +375,29 @@ function checkAppName(appName) {
   }
 }
 
-function moveReactScriptsToDev(packageName) {
+function makeCaretRange(dependencies, name) {
+  var version = dependencies[name];
+
+  if (typeof version === 'undefined') {
+    console.error(
+      chalk.red('Missing ' + name + ' dependency in package.json')
+    );
+    process.exit(1);
+  }
+
+  var patchedVersion = '^' + version;
+
+  if (!semver.validRange(patchedVersion)) {
+    console.error(
+      'Unable to patch ' + name + ' dependency version because version ' + chalk.red(version) + ' will become invalid ' + chalk.red(patchedVersion)
+    );
+    patchedVersion = version;
+  }
+
+  dependencies[name] = patchedVersion;
+}
+
+function fixDependencies(packageName) {
   var packagePath = path.join(process.cwd(), 'package.json');
   var packageJson = require(packagePath);
 
@@ -326,6 +421,9 @@ function moveReactScriptsToDev(packageName) {
   packageJson.devDependencies[packageName] = packageVersion;
   delete packageJson.dependencies[packageName];
 
+  makeCaretRange(packageJson.dependencies, 'react');
+  makeCaretRange(packageJson.dependencies, 'react-dom');
+
   fs.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2));
 }
 
@@ -341,3 +439,17 @@ function isSafeToCreateProjectIn(root) {
       return validFiles.indexOf(file) >= 0;
     });
 }
+
+function checkIfOnline(useYarn) {
+  if (!useYarn) {
+    // Don't ping the Yarn registry.
+    // We'll just assume the best case.
+    return Promise.resolve(true);
+  }
+  
+  return new Promise(function(resolve) {
+    dns.resolve('registry.yarnpkg.com', function(err) {
+      resolve(err === null);
+    });
+  });
+}

packages/create-react-app/index.js

@@ -1,6 +1,6 @@
 {
   "name": "create-react-app",
-  "version": "1.0.4",
+  "version": "1.2.1",
   "keywords": [
     "react"
   ],
@@ -24,6 +24,7 @@
     "commander": "^2.9.0",
     "cross-spawn": "^4.0.0",
     "fs-extra": "^1.0.0",
-    "semver": "^5.0.3"
+    "semver": "^5.0.3",
+    "validate-npm-package-name": "^3.0.0"
   }
 }

packages/create-react-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-react-app",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "ESLint configuration used by Create React App",
   "repository": "facebookincubator/create-react-app",
   "license": "BSD-3-Clause",

packages/eslint-config-react-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-dev-utils",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Webpack utilities used by Create React App",
   "repository": "facebookincubator/create-react-app",
   "license": "BSD-3-Clause",

packages/react-dev-utils/package.json

@@ -116,14 +116,13 @@ module.exports = {
         test: /\.(js|jsx)$/,
         enforce: 'pre',
         use: [{
+          // @remove-on-eject-begin
+          // Point ESLint to our predefined config.
           options: {
-            // @remove-on-eject-begin
-            // Point ESLint to our predefined config.
             configFile: path.join(__dirname, '../.eslintrc'),
-            useEslintrc: false,
-            // @remove-on-eject-end
-            cache: true
+            useEslintrc: false
           },
+          // @remove-on-eject-end
           loader: 'eslint-loader'
         }],
         include: paths.appSrc