random fixes + license

vjeux · vjeux · commit dbd0217d3821 · 2016-07-16T18:57:36.000-07:00
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,30 @@
+BSD License
+
+For create-react-app software
+
+Copyright (c) 2016-present, Facebook, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * Neither the name Facebook nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific
+   prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/PATENTS b/PATENTS
@@ -0,0 +1,33 @@
+Additional Grant of Patent Rights Version 2
+
+"Software" means the create-react-app software distributed by Facebook, Inc.
+
+Facebook, Inc. ("Facebook") hereby grants to each recipient of the Software
+("you") a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
+(subject to the termination provision below) license under any Necessary
+Claims, to make, have made, use, sell, offer to sell, import, and otherwise
+transfer the Software. For avoidance of doubt, no license is granted under
+Facebook’s rights in any patent claims that are infringed by (i) modifications
+to the Software made by you or any third party or (ii) the Software in
+combination with any software or other technology.
+
+The license granted hereunder will terminate, automatically and without notice,
+if you (or any of your subsidiaries, corporate affiliates or agents) initiate
+directly or indirectly, or take a direct financial interest in, any Patent
+Assertion: (i) against Facebook or any of its subsidiaries or corporate
+affiliates, (ii) against any party if such Patent Assertion arises in whole or
+in part from any software, technology, product or service of Facebook or any of
+its subsidiaries or corporate affiliates, or (iii) against any party relating
+to the Software. Notwithstanding the foregoing, if Facebook or any of its
+subsidiaries or corporate affiliates files a lawsuit alleging patent
+infringement against you in the first instance, and you respond by filing a
+patent infringement counterclaim in that lawsuit against that party that is
+unrelated to the Software, the license granted hereunder will not terminate
+under section (i) of this paragraph due to such counterclaim.
+
+A "Necessary Claim" is a claim of a patent owned by Facebook that is
+necessarily infringed by the Software standing alone.
+
+A "Patent Assertion" is any lawsuit or other action alleging direct, indirect,
+or contributory infringement or inducement to infringe any patent, including a
+cross-claim or counterclaim.
diff --git a/global-cli/index.js b/global-cli/index.js
@@ -9,9 +9,9 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// /!\ DO NOT MODIFY THIS FILE /!\
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//   /!\ DO NOT MODIFY THIS FILE /!\
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
 // create-react-app is installed globally on people's computers. This means
 // that it is extremely difficult to have them upgrade the version and
@@ -21,17 +21,17 @@
 // The only job of create-react-app is to init the repository and then
 // forward all the commands to the local version of create-react-app.
 //
-// If you need to add a new command, please add it to local-cli/.
+// If you need to add a new command, please add it to the scripts/ folder.
 //
 // The only reason to modify this file is to add more warnings and
-// troubleshooting information for the `react init` command.
+// troubleshooting information for the `create-react-app` command.
 //
 // Do not make breaking changes! We absolutely don't want to have to
 // tell people to update their global version of create-react-app.
 //
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// /!\ DO NOT MODIFY THIS FILE /!\
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//   /!\ DO NOT MODIFY THIS FILE /!\
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 'use strict';
 
@@ -40,18 +40,18 @@ var path = require('path');
 var spawn = require('child_process').spawn;
 var chalk = require('chalk');
 var semver = require('semver');
+var argv = require('minimist')(process.argv.slice(2));
+
 /**
- * Used arguments:
- *   -v --version - to print current version of create-react-app and create-react-app-scripts dependency
+ * Arguments:
+ *   --version - to print current version
  *   --verbose - to print logs while init
- *   --scripts-version <alternative create-react-app-scripts package> - override default (https://registry.npmjs.org/create-react-app-scripts@latest),
- *      package to install, examples:
- *     - "0.22.0-rc1" - A new app will be created using a specific version of React CLI from npm repo
- *     - "https://registry.npmjs.org/create-react-app-scripts/-/create-react-app-scripts-0.20.0.tgz" - a .tgz archive from any npm repo
- *     - "/Users/home/create-react-app/create-react-app-scripts-0.22.0.tgz" - for package prepared with `npm pack`, useful for e2e tests
+ *   --scripts-version <alternative package>
+ *     Example of valid values:
+ *     - a specific npm version: "0.22.0-rc1"
+ *     - a .tgz archive from any npm repo: "https://registry.npmjs.org/create-react-app-scripts/-/create-react-app-scripts-0.20.0.tgz"
+ *     - a package prepared with `npm pack`: "/Users/home/vjeux/create-react-app/create-react-app-scripts-0.22.0.tgz"
  */
-var argv = require('minimist')(process.argv.slice(2));
-
 var commands = argv._;
 if (commands.length === 0) {
   console.error(
@@ -60,8 +60,8 @@ if (commands.length === 0) {
   process.exit(1);
 }
 
-if (argv.v || argv.version) {
-  console.log('create-react-app: ' + require('./package.json').version);
+if (argv.version) {
+  console.log('create-react-app version: ' + require('./package.json').version);
   process.exit();
 }
 
@@ -70,7 +70,7 @@ createApp(commands[0], argv.verbose, argv['scripts-version']);
 function createApp(name, verbose, version) {
   if (fs.existsSync(name)) {
     console.log('Directory `' + name + '` already exists. Aborting.');
-    process.exit();
+    process.exit(1);
   }
 
   var root = path.resolve(name);
@@ -146,11 +146,12 @@ function checkNodeVersion() {
   if (!packageJson.engines || !packageJson.engines.node) {
     return;
   }
+
   if (!semver.satisfies(process.version, packageJson.engines.node)) {
     console.error(
       chalk.red(
-        'You are currently running Node %s but React CLI requires %s. ' +
-        'Please use a supported version of Node.\n'
+        'You are currently running Node %s but create-react-app requires %s.' +
+        ' Please use a supported version of Node.\n'
       ),
       process.version,
       packageJson.engines.node
diff --git a/scripts/build.js b/scripts/build.js
@@ -1,3 +1,12 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
 process.env.NODE_ENV = 'production';
 
 var spawnSync = require('child_process').spawnSync;
diff --git a/scripts/export-scripts.js b/scripts/export-scripts.js
diff --git a/scripts/graduate.js b/scripts/graduate.js
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+var fs = require('fs');
+
+console.log('Extracting scripts...');
+
+var hostPath = __dirname;
+var selfPath = hostPath + '/node_modules/create-react-app-scripts';
+
+var files = [
+  'scripts',
+  '.webpack.config.dev.js',
+  '.webpack.config.prod.js',
+  '.babelrc',
+  '.eslintrc',
+];
+
+// Ensure that the host folder is clean and we won't override any files
+files.forEach(function(file) {
+  if (fs.existsSync(hostPath + '/' + file)) {
+    console.error(
+      '`' + file + '` already exists on your app folder, we cannot ' +
+      'continue as you would lose all the changes in that file.',
+      'Please delete it (maybe make a copy for backup) and run this ' +
+      'command again.'
+    );
+    process.exit(1);
+  }
+});
+
+// Move the files over
+files.forEach(function(file) {
+  fs.renameSync(selfPath + '/' + file, hostPath + '/' + file);
+});
+
+var hostPackage = require(hostPath + '/package.json');
+
+console.log('Done!');
diff --git a/scripts/init.js b/scripts/init.js
@@ -1,3 +1,12 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
 var fs = require('fs');
 
 module.exports = function(hostPath, appName) {
@@ -15,7 +24,8 @@ module.exports = function(hostPath, appName) {
   // Setup the script rules
   hostPackage.scripts = {};
   ['start', 'build'].forEach(function(command) {
-    hostPackage.scripts[command] = 'node node_modules/create-react-app-scripts/scripts/' + command + '.js';
+    hostPackage.scripts[command] =
+      'node node_modules/create-react-app-scripts/scripts/' + command + '.js';
   });
 
   fs.writeFileSync(hostPath + '/package.json', JSON.stringify(hostPackage, null, 2));
diff --git a/scripts/start.js b/scripts/start.js
@@ -1,3 +1,12 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
 process.env.NODE_ENV = 'development';
 
 var webpack = require('webpack');
diff --git a/webpack.config.dev.js b/webpack.config.dev.js
@@ -1,3 +1,12 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
 var path = require('path');
 var autoprefixer = require('autoprefixer');
 var webpack = require('webpack');
diff --git a/webpack.config.prod.js b/webpack.config.prod.js
@@ -1,3 +1,12 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
 var path = require('path');
 var autoprefixer = require('autoprefixer');
 var webpack = require('webpack');
