From 0e649beea9efe078515ef7ed3a9e31f6713fa685 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Sun, 31 Aug 2014 22:24:54 -0700 Subject: [PATCH] [changed] Use Browserify to build examples --- .gitignore | 4 +--- examples/animations/app.js | 8 ++++---- examples/animations/index.html | 3 ++- examples/auth-flow/app.js | 2 +- examples/auth-flow/index.html | 3 ++- examples/data-flow/app.js | 2 +- examples/data-flow/index.html | 3 ++- examples/dynamic-segments/app.js | 2 +- examples/dynamic-segments/index.html | 3 ++- examples/master-detail/app.js | 2 +- examples/master-detail/index.html | 3 ++- examples/partial-app-loading/app.js | 2 +- examples/partial-app-loading/dashboard.js | 2 +- examples/partial-app-loading/index.html | 3 ++- examples/query-params/app.js | 2 +- examples/query-params/index.html | 3 ++- examples/shared-root/app.js | 2 +- examples/shared-root/index.html | 3 ++- examples/simple-master-detail/app.js | 3 +-- examples/simple-master-detail/index.html | 3 ++- examples/transitions/app.js | 2 +- examples/transitions/index.html | 3 ++- package.json | 2 +- scripts/build-examples | 18 +++++++++++++++++- 24 files changed, 53 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index af828f2ff2..aa4c1ddffc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -examples/_* -examples/build -node_modules +examples/**/*-bundle.js diff --git a/examples/animations/app.js b/examples/animations/app.js index 85bc076018..73c3a98a75 100644 --- a/examples/animations/app.js +++ b/examples/animations/app.js @@ -1,10 +1,10 @@ /** @jsx React.DOM */ var React = require('react'); -var Router = require('../../modules'); +var CSSTransitionGroup = require('react/lib/ReactCSSTransitionGroup'); +var Router = require('react-router'); var Routes = Router.Routes; var Route = Router.Route; var Link = Router.Link; -var Transition = require('react/lib/ReactCSSTransitionGroup'); var App = React.createClass({ render: function() { @@ -14,9 +14,9 @@ var App = React.createClass({
  • Kitten
  • Cage
    • - + {this.props.activeRouteHandler()} - + ); } diff --git a/examples/animations/index.html b/examples/animations/index.html index 024f779cd9..ac371569f3 100644 --- a/examples/animations/index.html +++ b/examples/animations/index.html @@ -5,4 +5,5 @@

    React Router Examples / Animations

    - + + diff --git a/examples/auth-flow/app.js b/examples/auth-flow/app.js index fa14cbd5b5..046c2e2247 100644 --- a/examples/auth-flow/app.js +++ b/examples/auth-flow/app.js @@ -1,6 +1,6 @@ /** @jsx React.DOM */ var React = require('react'); -var Router = require('../../modules'); +var Router = require('react-router'); var Route = Router.Route; var Routes = Router.Routes; var Link = Router.Link; diff --git a/examples/auth-flow/index.html b/examples/auth-flow/index.html index bd966bcf8b..b1ec4d211a 100644 --- a/examples/auth-flow/index.html +++ b/examples/auth-flow/index.html @@ -4,5 +4,6 @@

    React Router Examples / Auth Flow

    - + + diff --git a/examples/data-flow/app.js b/examples/data-flow/app.js index 2dc981c4a5..8434f1b8d7 100644 --- a/examples/data-flow/app.js +++ b/examples/data-flow/app.js @@ -1,6 +1,6 @@ /** @jsx React.DOM */ var React = require('react'); -var Router = require('../../modules'); +var Router = require('react-router'); var Route = Router.Route; var Routes = Router.Routes; var Link = Router.Link; diff --git a/examples/data-flow/index.html b/examples/data-flow/index.html index 0b770d7099..9f59328396 100644 --- a/examples/data-flow/index.html +++ b/examples/data-flow/index.html @@ -5,4 +5,5 @@

    React Router Examples / Data Flow

    - + + diff --git a/examples/dynamic-segments/app.js b/examples/dynamic-segments/app.js index dd06ed5f9f..b22874d608 100644 --- a/examples/dynamic-segments/app.js +++ b/examples/dynamic-segments/app.js @@ -1,6 +1,6 @@ /** @jsx React.DOM */ var React = require('react'); -var Router = require('../../modules'); +var Router = require('react-router'); var Route = Router.Route; var Routes = Router.Routes; var Redirect = Router.Redirect; diff --git a/examples/dynamic-segments/index.html b/examples/dynamic-segments/index.html index 75daca3efc..1f6d663b71 100644 --- a/examples/dynamic-segments/index.html +++ b/examples/dynamic-segments/index.html @@ -4,4 +4,5 @@

    React Router Examples / Dynamic Segments

    - + + diff --git a/examples/master-detail/app.js b/examples/master-detail/app.js index a4a55ae116..2b32092eca 100644 --- a/examples/master-detail/app.js +++ b/examples/master-detail/app.js @@ -1,6 +1,6 @@ /** @jsx React.DOM */ var React = require('react'); -var Router = require('../../modules'); +var Router = require('react-router'); var Route = Router.Route; var DefaultRoute = Router.DefaultRoute; var Routes = Router.Routes; diff --git a/examples/master-detail/index.html b/examples/master-detail/index.html index 074ad93096..42f82fa508 100644 --- a/examples/master-detail/index.html +++ b/examples/master-detail/index.html @@ -5,4 +5,5 @@

    React Router Examples / Master Detail

    - + + diff --git a/examples/partial-app-loading/app.js b/examples/partial-app-loading/app.js index 9abc8785b4..6a638a2af6 100644 --- a/examples/partial-app-loading/app.js +++ b/examples/partial-app-loading/app.js @@ -1,6 +1,6 @@ /** @jsx React.DOM */ var React = require('react'); -var Router = require('../../modules'); +var Router = require('react-router'); var Route = Router.Route; var Routes = Router.Routes; var Link = Router.Link; diff --git a/examples/partial-app-loading/dashboard.js b/examples/partial-app-loading/dashboard.js index 36be037bd9..1e4b2ff298 100644 --- a/examples/partial-app-loading/dashboard.js +++ b/examples/partial-app-loading/dashboard.js @@ -1,7 +1,7 @@ /** @jsx React.DOM */ var React = require('react'); -var ReactRouter = require('../../modules'); +var ReactRouter = require('react-router'); var Link = ReactRouter.Link; var Dashboard = React.createClass({ diff --git a/examples/partial-app-loading/index.html b/examples/partial-app-loading/index.html index cb2ce6c337..ca9b309699 100644 --- a/examples/partial-app-loading/index.html +++ b/examples/partial-app-loading/index.html @@ -4,4 +4,5 @@

    React Router Examples / Partial App Loading

    - + + diff --git a/examples/query-params/app.js b/examples/query-params/app.js index c21dc1b093..2e4e48118f 100644 --- a/examples/query-params/app.js +++ b/examples/query-params/app.js @@ -1,6 +1,6 @@ /** @jsx React.DOM */ var React = require('react'); -var Router = require('../../modules'); +var Router = require('react-router'); var Route = Router.Route; var Routes = Router.Routes; var Link = Router.Link; diff --git a/examples/query-params/index.html b/examples/query-params/index.html index a83a7e2faa..30f4d49562 100644 --- a/examples/query-params/index.html +++ b/examples/query-params/index.html @@ -4,4 +4,5 @@

    React Router Examples / Query Params

    - + + diff --git a/examples/shared-root/app.js b/examples/shared-root/app.js index 5b878acd16..554dd67fbf 100644 --- a/examples/shared-root/app.js +++ b/examples/shared-root/app.js @@ -1,6 +1,6 @@ /** @jsx React.DOM */ var React = require('react'); -var Router = require('../../modules'); +var Router = require('react-router'); var Route = Router.Route; var Routes = Router.Routes; var Link = Router.Link; diff --git a/examples/shared-root/index.html b/examples/shared-root/index.html index 3d8b6b5ea5..02b473534c 100644 --- a/examples/shared-root/index.html +++ b/examples/shared-root/index.html @@ -4,4 +4,5 @@

    React Router Examples / Shared Root

    - + + diff --git a/examples/simple-master-detail/app.js b/examples/simple-master-detail/app.js index 41baa35874..eca47b4bbd 100644 --- a/examples/simple-master-detail/app.js +++ b/examples/simple-master-detail/app.js @@ -1,6 +1,6 @@ /** @jsx React.DOM */ var React = require('react'); -var Router = require('../../modules'); +var Router = require('react-router'); var Route = Router.Route; var Routes = Router.Routes; var Link = Router.Link; @@ -130,4 +130,3 @@ function findStates() { function underscore(str) { return str.toLowerCase().replace(/ /, '_'); } - diff --git a/examples/simple-master-detail/index.html b/examples/simple-master-detail/index.html index 15cb2928ca..d6fca32904 100644 --- a/examples/simple-master-detail/index.html +++ b/examples/simple-master-detail/index.html @@ -5,4 +5,5 @@

    React Router Examples / Simple Master Detail

    - + + diff --git a/examples/transitions/app.js b/examples/transitions/app.js index 552325e9ef..d40e87e716 100644 --- a/examples/transitions/app.js +++ b/examples/transitions/app.js @@ -1,6 +1,6 @@ /** @jsx React.DOM */ var React = require('react'); -var Router = require('../../modules'); +var Router = require('react-router'); var Route = Router.Route; var Routes = Router.Routes; var Link = Router.Link; diff --git a/examples/transitions/index.html b/examples/transitions/index.html index 025275ff85..6f838519f9 100644 --- a/examples/transitions/index.html +++ b/examples/transitions/index.html @@ -4,4 +4,5 @@

    React Router Examples / Transitions

    - + + diff --git a/package.json b/package.json index d9eb8b5f9f..1720c94c2a 100644 --- a/package.json +++ b/package.json @@ -65,4 +65,4 @@ "browserify-shim": { "react": "global:React" } -} \ No newline at end of file +} diff --git a/scripts/build-examples b/scripts/build-examples index af5e1244ac..5d1a955d50 100755 --- a/scripts/build-examples +++ b/scripts/build-examples @@ -1,2 +1,18 @@ #!/bin/sh -webpack --devtool inline-source-map "$@" +BROWSERIFY="node_modules/.bin/browserify --debug --detect-globals false" +BUNDLE_EXAMPLE="$BROWSERIFY -t reactify -x react -x react/lib/ReactCSSTransitionGroup -x when -x react-router" + +$BROWSERIFY -t envify -r react -r react/lib/ReactCSSTransitionGroup -r when -r ./modules:react-router > examples/global-bundle.js + +$BUNDLE_EXAMPLE examples/animations/app.js > examples/animations/app-bundle.js +$BUNDLE_EXAMPLE examples/auth-flow/app.js > examples/auth-flow/app-bundle.js +$BUNDLE_EXAMPLE examples/data-flow/app.js > examples/data-flow/app-bundle.js +$BUNDLE_EXAMPLE examples/dynamic-segments/app.js > examples/dynamic-segments/app-bundle.js +$BUNDLE_EXAMPLE examples/master-detail/app.js > examples/master-detail/app-bundle.js +# $BUNDLE_EXAMPLE examples/partial-app-loading/app.js > examples/partial-app-loading/app-bundle.js +# $BUNDLE_EXAMPLE examples/partial-app-loading/dashboard.js > examples/partial-app-loading/dashboard-bundle.js +# $BUNDLE_EXAMPLE examples/partial-app-loading/inbox.js > examples/partial-app-loading/inbox-bundle.js +$BUNDLE_EXAMPLE examples/query-params/app.js > examples/query-params/app-bundle.js +$BUNDLE_EXAMPLE examples/shared-root/app.js > examples/shared-root/app-bundle.js +$BUNDLE_EXAMPLE examples/simple-master-detail/app.js > examples/simple-master-detail/app-bundle.js +$BUNDLE_EXAMPLE examples/transitions/app.js > examples/transitions/app-bundle.js