From cde2de3ce75d28d3875197da2b5e909e57738eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Tue, 10 Nov 2015 15:22:34 -0800 Subject: [PATCH] Merge pull request #5431 from zpao/license-in-packages Ensure license and patents files are packaged for npm (cherry picked from commit fc245226f93146a47aea5f52633598989bf92443) --- grunt/tasks/npm-react-addons.js | 8 ++++---- grunt/tasks/npm-react-dom.js | 3 ++- grunt/tasks/npm-react.js | 3 ++- packages/react/package.json | 2 ++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/grunt/tasks/npm-react-addons.js b/grunt/tasks/npm-react-addons.js index 54364cf5e2..67bbf783b8 100644 --- a/grunt/tasks/npm-react-addons.js +++ b/grunt/tasks/npm-react-addons.js @@ -73,13 +73,13 @@ function generateSource(info) { function buildReleases() { var pkgTemplate = grunt.file.readJSON('./packages/react-addons/package.json'); - var license = grunt.file.read('./LICENSE'); - var patents = grunt.file.read('./PATENTS'); Object.keys(addons).map(function(k) { var info = addons[k]; var pkgName = 'react-addons-' + info.name; var destDir = 'build/packages/' + pkgName; + var destLicense = path.join(destDir, 'LICENSE'); + var destPatents = path.join(destDir, 'PATENTS'); var pkgData = assign({}, pkgTemplate); pkgData.name = pkgName; @@ -89,8 +89,8 @@ function buildReleases() { link = `https://facebook.github.io/react/docs/${link}.html`; fs.writeFileSync(path.join(destDir, 'index.js'), generateSource(info)); fs.writeFileSync(path.join(destDir, 'package.json'), JSON.stringify(pkgData, null, 2)); - fs.writeFileSync(path.join(destDir, 'LICENSE'), license); - fs.writeFileSync(path.join(destDir, 'PATENTS'), patents); + grunt.file.copy('LICENSE', destLicense); + grunt.file.copy('PATENTS', destPatents); fs.writeFileSync( path.join(destDir, 'README.md'), ` diff --git a/grunt/tasks/npm-react-dom.js b/grunt/tasks/npm-react-dom.js index ceb0ed7422..d45343423c 100644 --- a/grunt/tasks/npm-react-dom.js +++ b/grunt/tasks/npm-react-dom.js @@ -18,7 +18,8 @@ function buildRelease() { // Copy to build/packages/react-dom var mappings = [].concat( - grunt.file.expandMapping('**/*', dest, {cwd: src}) + grunt.file.expandMapping('**/*', dest, {cwd: src}), + grunt.file.expandMapping('{LICENSE,PATENTS}', dest) ); mappings.forEach(function(mapping) { var mappingSrc = mapping.src[0]; diff --git a/grunt/tasks/npm-react.js b/grunt/tasks/npm-react.js index b2424b068b..2e459ec93b 100644 --- a/grunt/tasks/npm-react.js +++ b/grunt/tasks/npm-react.js @@ -28,7 +28,8 @@ function buildRelease() { // and build/modules/**/* to build/react-core/lib var mappings = [].concat( grunt.file.expandMapping('**/*', dest, {cwd: src}), - grunt.file.expandMapping('**/*', lib, {cwd: modSrc}) + grunt.file.expandMapping('**/*', lib, {cwd: modSrc}), + grunt.file.expandMapping('{LICENSE,PATENTS}', dest) ); mappings.forEach(function(mapping) { var mappingSrc = mapping.src[0]; diff --git a/packages/react/package.json b/packages/react/package.json index 22a06df949..cacdb0ec3e 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -9,6 +9,8 @@ "bugs": "https://github.com/facebook/react/issues", "license": "BSD-3-Clause", "files": [ + "LICENSE", + "PATENTS", "addons.js", "react.js", "addons/",