Support async code loading again

petehunt · petehunt · commit 9f43019b26ad · 2014-05-27T00:30:55.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 tmp
 node_modules
 dist
-examples/*/app.build.js
-
+examples/build
diff --git a/examples/auth-flow/index.html b/examples/auth-flow/index.html
@@ -2,5 +2,5 @@
 <title>Authentication Flow Example</title>
 <link rel="stylesheet" href="../app.css"/>
 <body>
-<script src="app.build.js"></script>
+<script src="../build/auth-flow.js"></script>
 
diff --git a/examples/data-flow/index.html b/examples/data-flow/index.html
@@ -2,5 +2,5 @@
 <title>Data Flow Example</title>
 <link href="app.css" rel="stylesheet"/>
 <body>
-<script src="app.build.js"></script>
+<script src="../build/data-flow.js"></script>
 
diff --git a/examples/dynamic-segments/index.html b/examples/dynamic-segments/index.html
@@ -2,4 +2,4 @@
 <title>Managed ActiveRoute Example</title>
 <link href="../app.css" rel="stylesheet"/>
 <body>
-<script src="app.build.js"></script>
+<script src="../build/dynamic-segments.js"></script>
diff --git a/examples/managed-active-route/index.html b/examples/managed-active-route/index.html
@@ -2,4 +2,4 @@
 <title>Managed ActiveRoute Example</title>
 <link href="../app.css" rel="stylesheet"/>
 <body>
-<script src="app.build.js"></script>
+<script src="../build/managed-active-route.js"></script>
diff --git a/examples/master-detail/index.html b/examples/master-detail/index.html
@@ -2,4 +2,4 @@
 <title>Address Book Example</title>
 <link href="app.css" rel="stylesheet"/>
 <body>
-<script src="app.build.js"></script>
+<script src="../build/master-detail.js"></script>
diff --git a/examples/partial-app-loading/app.js b/examples/partial-app-loading/app.js
@@ -14,7 +14,6 @@ var AsyncJSXRoute = {
     }
 
     require.ensure([], function() {
-      console.log('loading', this.globalName, this.filePath);
       this.routeCache[this.globalName] = require('./async-components/' + this.filePath);
       this.forceUpdate();
     }.bind(this));
@@ -44,7 +43,7 @@ var Main = React.createClass({
 
 var PreDashboard = React.createClass({
   mixins: [AsyncJSXRoute],
-  filePath: 'partial-app-dashboard.js',
+  filePath: 'dashboard.js',
   globalName: 'Dashboard',
   preRender: function() {
     return <div>Loading dashboard...</div>
@@ -53,7 +52,7 @@ var PreDashboard = React.createClass({
 
 var PreInbox = React.createClass({
   mixins: [AsyncJSXRoute],
-  filePath: 'partial-app-inbox.js',
+  filePath: 'inbox.js',
   globalName: 'Inbox',
   preRender: function() {
     return <div>Loading inbox...</div>
diff --git a/examples/partial-app-loading/async-components/dashboard.js b/examples/partial-app-loading/async-components/dashboard.js
@@ -1,4 +1,9 @@
 /** @jsx React.DOM */
+
+var React = require('react');
+var ReactRouter = require('../../../lib/main');
+var Link = ReactRouter.Link;
+
 var Dashboard = React.createClass({
 
   render: function() {
@@ -14,3 +19,4 @@ var Dashboard = React.createClass({
   }
 });
 
+module.exports = Dashboard;
diff --git a/examples/partial-app-loading/async-components/inbox.js b/examples/partial-app-loading/async-components/inbox.js
@@ -1,4 +1,7 @@
 /** @jsx React.DOM */
+
+var React = require('react');
+
 var Inbox = React.createClass({
 
   render: function() {
@@ -10,4 +13,4 @@ var Inbox = React.createClass({
   }
 });
 
-
+module.exports = Inbox;
diff --git a/examples/partial-app-loading/index.html b/examples/partial-app-loading/index.html
@@ -2,4 +2,4 @@
 <title>Partial App Loading Example</title>
 <link rel="stylesheet" href="../app.css"/>
 <body>
-<script src="app.build.js"></script>
+<script src="../build/partial-app-loading.js"></script>
diff --git a/package.json b/package.json
@@ -12,8 +12,9 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "webpack": "^1.2.0-beta4",
-    "jsx-loader": "^0.10.2"
+    "webpack": "^1.2.0-beta5",
+    "jsx-loader": "^0.10.2",
+    "bundle-loader": "^0.5.0"
   },
   "dependencies": {
     "react": "^0.10.0",
diff --git a/webpack.config.js b/webpack.config.js
@@ -3,6 +3,9 @@ var fs = require('fs');
 
 function buildEntries() {
   return fs.readdirSync('examples').reduce(function(entries, dir) {
+    if (dir === 'build') {
+      return entries;
+    }
     var isDraft = dir.charAt(0) === '_';
     if (!isDraft && fs.lstatSync(path.join('examples', dir)).isDirectory()) {
       entries[dir] = './examples/'+dir+'/'+'app.js';
@@ -11,14 +14,14 @@ function buildEntries() {
   }, {});
 }
 
-console.log(buildEntries());
-
 module.exports = {
   entry: buildEntries(),
 
   output: {
-    path: path.join(__dirname, 'examples'),
-    filename: '[name]/app.build.js',
+    filename: '[name].js',
+    chunkFilename: '[id].chunk.js',
+    path: path.join(__dirname, 'examples', 'build'),
+    publicPath: '/build/'
   },
 
   module: {
