Merge branch 'facebook-next' into next

Author: bbuckland

.travis.yml

@@ -9,7 +9,7 @@ cache:
  directories:
  - .npm
 before_install:
- - curl -o- -L https://yarnpkg.com/install.sh | bash
+ - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --nightly
  - export PATH="$HOME/.yarn/bin:$PATH"
 install: true
 script:

CHANGELOG.md

@@ -37,7 +37,7 @@ platform:
 install:
  - ps: Install-Product node $env:nodejs_version $env:platform
  - ps: |
- (New-Object Net.WebClient).DownloadFile("https://yarnpkg.com/latest.msi", "$env:temp\yarn.msi")
+ (New-Object Net.WebClient).DownloadFile("https://nightly.yarnpkg.com/latest.msi", "$env:temp\yarn.msi")
  cmd /c start /wait msiexec.exe /i $env:temp\yarn.msi /quiet /qn /norestart
 
 build: off

appveyor.yml

@@ -1,6 +1,6 @@
 {
  "name": "babel-plugin-named-asset-import",
- "version": "0.2.0",
+ "version": "0.2.1",
  "description": "Babel plugin for named asset imports in Create React App",
  "repository": "facebookincubator/create-react-app",
  "license": "MIT",

packages/babel-plugin-named-asset-import/package.json

@@ -1,6 +1,6 @@
 {
  "name": "babel-preset-react-app",
- "version": "5.0.0",
+ "version": "5.0.1",
  "description": "Babel preset used by Create React App",
  "repository": "facebook/create-react-app",
  "license": "MIT",

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

@@ -1,6 +1,6 @@
 {
  "name": "confusing-browser-globals",
- "version": "1.0.1",
+ "version": "1.0.2",
  "description": "A list of browser globals that are often used by mistake instead of local variables",
  "license": "MIT",
  "main": "index.js",

packages/confusing-browser-globals/package.json

@@ -76,6 +76,7 @@ const program = new commander.Command(packageJson.name)
  'use a non-standard version of react-scripts'
  )
  .option('--use-npm')
+ .option('--use-pnp')
  .allowUnknownOption()
  .on('--help', () => {
  console.log(` Only ${chalk.green('<project-directory>')} is required.`);
@@ -178,10 +179,11 @@ createApp(
  program.verbose,
  program.scriptsVersion,
  program.useNpm,
+ program.usePnp,
  hiddenProgram.internalTestingTemplate
 );
 
-function createApp(name, verbose, version, useNpm, template) {
+function createApp(name, verbose, version, useNpm, usePnp, template) {
  const root = path.resolve(name);
  const appName = path.basename(root);
 
@@ -241,7 +243,16 @@ function createApp(name, verbose, version, useNpm, template) {
  version = 'react-scripts@0.9.x';
  }
  }
- run(root, appName, version, verbose, originalDirectory, template, useYarn);
+ run(
+ root,
+ appName,
+ version,
+ verbose,
+ originalDirectory,
+ template,
+ useYarn,
+ usePnp
+ );
 }
 
 function shouldUseYarn() {
@@ -253,7 +264,7 @@ function shouldUseYarn() {
  }
 }
 
-function install(root, useYarn, dependencies, verbose, isOnline) {
+function install(root, useYarn, usePnp, dependencies, verbose, isOnline) {
  return new Promise((resolve, reject) => {
  let command;
  let args;
@@ -263,6 +274,9 @@ function install(root, useYarn, dependencies, verbose, isOnline) {
  if (!isOnline) {
  args.push('--offline');
  }
+ if (usePnp) {
+ args.push('--enable-pnp');
+ }
  [].push.apply(args, dependencies);
 
  // Explicitly set cwd() to work around issues like
@@ -287,6 +301,12 @@ function install(root, useYarn, dependencies, verbose, isOnline) {
  '--loglevel',
  'error',
  ].concat(dependencies);
+
+ if (usePnp) {
+ console.log(chalk.yellow("NPM doesn't support PnP."));
+ console.log(chalk.yellow('Falling back to the regular installs.'));
+ console.log();
+ }
  }
 
  if (verbose) {
@@ -313,7 +333,8 @@ function run(
  verbose,
  originalDirectory,
  template,
- useYarn
+ useYarn,
+ usePnp
 ) {
  const packageToInstall = getInstallPackage(version, originalDirectory);
  const allDependencies = ['react', 'react-dom', packageToInstall];
@@ -336,23 +357,34 @@ function run(
  );
  console.log();
 
- return install(root, useYarn, allDependencies, verbose, isOnline).then(
- () => packageName
- );
+ return install(
+ root,
+ useYarn,
+ usePnp,
+ allDependencies,
+ verbose,
+ isOnline
+ ).then(() => packageName);
  })
- .then(packageName => {
+ .then(async packageName => {
  checkNodeVersion(packageName);
  setCaretRangeForRuntimeDeps(packageName);
 
- const scriptsPath = path.resolve(
- process.cwd(),
- 'node_modules',
- packageName,
- 'scripts',
- 'init.js'
+ const pnpPath = path.resolve(process.cwd(), '.pnp.js');
+
+ const nodeArgs = fs.existsSync(pnpPath) ? ['--require', pnpPath] : [];
+
+ await executeNodeScript(
+ {
+ cwd: process.cwd(),
+ args: nodeArgs,
+ },
+ [root, appName, verbose, originalDirectory, template],
+ `
+ var init = require('${packageName}/scripts/init.js');
+ init.apply(null, JSON.parse(process.argv[1]));
+ `
  );
- const init = require(scriptsPath);
- init(root, appName, verbose, originalDirectory, template);
 
  if (version === 'react-scripts@0.9.x') {
  console.log(
@@ -540,6 +572,11 @@ function checkNodeVersion(packageName) {
  packageName,
  'package.json'
  );
+
+ if (!fs.existsSync(packageJsonPath)) {
+ return;
+ }
+
  const packageJson = require(packageJsonPath);
  if (!packageJson.engines || !packageJson.engines.node) {
  return;
@@ -794,3 +831,23 @@ function checkIfOnline(useYarn) {
  });
  });
 }
+
+function executeNodeScript({ cwd, args }, data, source) {
+ return new Promise((resolve, reject) => {
+ const child = spawn(
+ process.execPath,
+ [...args, '-e', source, '--', JSON.stringify(data)],
+ { cwd, stdio: 'inherit' }
+ );
+
+ child.on('close', code => {
+ if (code !== 0) {
+ reject({
+ command: `node ${args.join(' ')}`,
+ });
+ return;
+ }
+ resolve();
+ });
+ });
+}

packages/create-react-app/createReactApp.js

@@ -1,6 +1,6 @@
 {
  "name": "create-react-app",
- "version": "2.0.0",
+ "version": "2.0.1",
  "keywords": [
  "react"
  ],

packages/create-react-app/package.json

@@ -199,7 +199,10 @@ module.exports = {
  'react/jsx-uses-react': 'warn',
  'react/jsx-uses-vars': 'warn',
  'react/no-danger-with-children': 'warn',
- 'react/no-deprecated': 'warn',
+ // Disabled because of undesirable warnings
+ // See https://github.com/facebook/create-react-app/issues/5204 for
+ // blockers until its re-enabled
+ // 'react/no-deprecated': 'warn',
  'react/no-direct-mutation-state': 'warn',
  'react/no-is-mounted': 'warn',
  'react/react-in-jsx-scope': 'error',

packages/eslint-config-react-app/index.js

@@ -1,6 +1,6 @@
 {
  "name": "eslint-config-react-app",
- "version": "3.0.0",
+ "version": "3.0.2",
  "description": "ESLint configuration used by Create React App",
  "repository": "facebook/create-react-app",
  "license": "MIT",
@@ -19,6 +19,6 @@
  "eslint-plugin-react": "7.x"
  },
  "dependencies": {
- "confusing-browser-globals": "^1.0.1"
+ "confusing-browser-globals": "^1.0.2"
  }
 }