From 4517cc689550896d76e674a4ec85709001e0e28e Mon Sep 17 00:00:00 2001 From: Pete Cook Date: Tue, 5 Jan 2016 11:55:26 +0000 Subject: [PATCH] Rebase on react-transform-boilerplate Uses https://github.com/CookPete/react-transform-boilerplate Closes https://github.com/CookPete/react-player/issues/8 --- .babelrc | 9 ++- .gitignore | 1 + .travis.yml | 3 + LICENSE | 142 +++++++++++++++++++++++++++++++++++------ index.html | 9 ++- package.json | 51 +++++++++------ server.js | 30 ++++++--- webpack.config.dev.js | 40 ++++++++++++ webpack.config.js | 33 ---------- webpack.config.prod.js | 45 +++++++++++++ 10 files changed, 276 insertions(+), 87 deletions(-) create mode 100644 webpack.config.dev.js delete mode 100644 webpack.config.js create mode 100644 webpack.config.prod.js diff --git a/.babelrc b/.babelrc index ce840ab8..add93976 100644 --- a/.babelrc +++ b/.babelrc @@ -1,3 +1,8 @@ { - "stage": 0 -} \ No newline at end of file + "presets": ["react", "es2015", "stage-0"], + "env": { + "development": { + "presets": ["react-hmre"] + } + } +} diff --git a/.gitignore b/.gitignore index eb4b9d41..3bcb4de1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules npm-debug.log .DS_Store lib +demo diff --git a/.travis.yml b/.travis.yml index 175be467..77091ab7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,7 @@ language: node_js +install: + - npm install -g npm@2 + - npm install node_js: - "4.1" - "4.0" diff --git a/LICENSE b/LICENSE index 44a03c28..0e259d42 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,121 @@ -The MIT License (MIT) - -Copyright (c) 2014 Dan Abramov - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/index.html b/index.html index e2ddf1f3..e2c30827 100644 --- a/index.html +++ b/index.html @@ -1,10 +1,13 @@ + + + ReactPlayer Demo + -
-
- +
+ diff --git a/package.json b/package.json index f3cf345f..099fe757 100644 --- a/package.json +++ b/package.json @@ -4,15 +4,16 @@ "description": "A react component for playing a variety of URLs, including file paths, YouTube, SoundCloud and Vimeo", "main": "lib/ReactPlayer.js", "scripts": { + "clean": "rimraf lib; rimraf demo", + "build:webpack": "NODE_ENV=production webpack --config webpack.config.prod.js", + "build:demo": "npm run clean && npm run build:webpack && cp index.html demo", + "build:compile": "NODE_ENV=production babel src -d lib --ignore App.js,index.js", "start": "node server.js", - "lint": "standard", - "test": "mocha test --compilers js:babel/register", - "build": "babel src -d lib", - "clean": "rimraf lib", - "prepublish": "npm run build", - "postpublish": "npm run clean", + "lint": "standard --verbose | snazzy", "preversion": "npm run lint && npm run test", - "version": "auto-changelog --package --template compact; git add CHANGELOG.md" + "version": "auto-changelog --package --template compact; git add CHANGELOG.md", + "prepublish": "npm run build:compile", + "postpublish": "npm run clean" }, "repository": { "type": "git", @@ -39,22 +40,34 @@ }, "devDependencies": { "auto-changelog": "^0.2.2", - "babel": "^5.8.21", - "babel-core": "^5.4.7", - "babel-eslint": "^4.0.10", - "babel-loader": "^5.1.2", - "chai": "^3.2.0", + "babel-cli": "^6.3.17", + "babel-core": "^6.3.17", + "babel-eslint": "^5.0.0-beta6", + "babel-loader": "^6.2.0", + "babel-preset-es2015": "^6.3.13", + "babel-preset-react": "^6.3.13", + "babel-preset-react-hmre": "^1.0.1", + "babel-preset-stage-0": "^6.3.13", + "chai": "^3.4.1", + "css-loader": "^0.23.0", "exports-loader": "^0.6.2", + "express": "^4.13.3", + "extract-text-webpack-plugin": "^0.9.1", + "ignore-styles": "^1.1.0", "imports-loader": "^0.6.4", - "mocha": "^2.2.5", + "mocha": "^2.3.4", + "node-sass": "^3.4.2", "react": "^0.14.0", - "react-addons-test-utils": "^0.14.0", + "react-addons-test-utils": "^0.14.3", "react-dom": "^0.14.0", - "react-hot-loader": "^1.2.7", - "rimraf": "^2.4.3", - "standard": "^5.1.0", - "webpack": "^1.9.6", - "webpack-dev-server": "^1.8.2", + "rimraf": "^2.4.4", + "sass-loader": "^3.1.2", + "snazzy": "^2.0.1", + "standard": "^5.4.1", + "style-loader": "^0.13.0", + "webpack": "^1.12.9", + "webpack-dev-middleware": "^1.4.0", + "webpack-hot-middleware": "^2.6.0", "whatwg-fetch": "^0.9.0" }, "dependencies": { diff --git a/server.js b/server.js index 50bdbea5..2fe761e7 100644 --- a/server.js +++ b/server.js @@ -1,15 +1,27 @@ +var path = require('path') +var express = require('express') var webpack = require('webpack') -var WebpackDevServer = require('webpack-dev-server') -var config = require('./webpack.config') - -new WebpackDevServer(webpack(config), { - publicPath: config.output.publicPath, - hot: true, - historyApiFallback: true -}).listen(3000, 'localhost', function (err, result) { +var config = require('./webpack.config.dev') + +var app = express() +var compiler = webpack(config) + +app.use(require('webpack-dev-middleware')(compiler, { + noInfo: true, + publicPath: config.output.publicPath +})) + +app.use(require('webpack-hot-middleware')(compiler)) + +app.get('*', function (req, res) { + res.sendFile(path.join(__dirname, 'index.html')) +}) + +app.listen(3000, 'localhost', function (err) { if (err) { console.log(err) + return } - console.log('Listening at localhost:3000') + console.log('Listening at http://localhost:3000') }) diff --git a/webpack.config.dev.js b/webpack.config.dev.js new file mode 100644 index 00000000..7c6de8ef --- /dev/null +++ b/webpack.config.dev.js @@ -0,0 +1,40 @@ +var path = require('path') +var webpack = require('webpack') + +module.exports = { + devtool: 'cheap-module-eval-source-map', + entry: [ + 'webpack-hot-middleware/client', + './src/index' + ], + output: { + path: path.join(__dirname, 'demo'), + filename: 'app.js', + publicPath: '/' + }, + plugins: [ + new webpack.HotModuleReplacementPlugin(), + new webpack.NoErrorsPlugin(), + new webpack.ProvidePlugin({ + 'fetch': 'imports?this=>global!exports?global.fetch!whatwg-fetch' + }) + ], + module: { + loaders: [{ + test: /\.js$/, + loader: 'babel', + include: [ + path.join(__dirname, 'src'), + path.join(__dirname, 'test', 'karma') + ] + }, { + test: /\.scss$/, + loader: 'style!css?modules&sourceMap!sass?sourceMap', + include: path.join(__dirname, 'src') + }, { + test: /normalize.css$/, + loader: 'style?insertAt=top!css', + include: path.join(__dirname, 'node_modules', 'normalize.css') + }] + } +} diff --git a/webpack.config.js b/webpack.config.js deleted file mode 100644 index c55dfb33..00000000 --- a/webpack.config.js +++ /dev/null @@ -1,33 +0,0 @@ -var path = require('path') -var webpack = require('webpack') - -module.exports = { - devtool: 'eval-cheap-module-source-map', - entry: [ - 'webpack-dev-server/client?http://localhost:3000', - 'webpack/hot/only-dev-server', - './src/index' - ], - output: { - path: path.join(__dirname, 'dist'), - filename: 'bundle.js', - publicPath: '/static/' - }, - plugins: [ - new webpack.HotModuleReplacementPlugin(), - new webpack.NoErrorsPlugin(), - new webpack.ProvidePlugin({ - 'fetch': 'imports?this=>global!exports?global.fetch!whatwg-fetch' - }) - ], - resolve: { - extensions: ['', '.js', '.jsx'] - }, - module: { - loaders: [{ - test: /\.jsx?$/, - loaders: ['react-hot', 'babel'], - include: path.join(__dirname, 'src') - }] - } -} diff --git a/webpack.config.prod.js b/webpack.config.prod.js new file mode 100644 index 00000000..52f72e78 --- /dev/null +++ b/webpack.config.prod.js @@ -0,0 +1,45 @@ +var path = require('path') +var webpack = require('webpack') +var ExtractTextPlugin = require('extract-text-webpack-plugin') + +module.exports = { + devtool: 'source-map', + entry: './src/index', + output: { + path: path.join(__dirname, 'demo'), + filename: 'app.js', + publicPath: '/' + }, + plugins: [ + new webpack.optimize.OccurenceOrderPlugin(), + new webpack.DefinePlugin({ + 'process.env': { + 'NODE_ENV': JSON.stringify('production') + } + }), + new webpack.optimize.UglifyJsPlugin({ + compressor: { + warnings: false + } + }), + new ExtractTextPlugin('app.css') + ], + module: { + loaders: [{ + test: /\.js$/, + loader: 'babel', + include: [ + path.join(__dirname, 'src'), + path.join(__dirname, 'test', 'karma') + ] + }, { + test: /\.scss$/, + loader: ExtractTextPlugin.extract('style', 'css?modules&sourceMap!sass?sourceMap'), + include: path.join(__dirname, 'src') + }, { + test: /normalize.css$/, + loader: ExtractTextPlugin.extract('style', 'css'), + include: path.join(__dirname, 'node_modules', 'normalize.css') + }] + } +}