ff-stream-web

commit 48aa12e142585a9e59bdd2be462a9e6dc5344a6a
parent 32e1b7f5cadd3156c6dc8fbd0bc901380fd89fd9
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Wed, 17 Sep 2014 10:30:14 +0400

Make .jsx optional in require(..) statements

Diffstat:
M
config/webpack.config.js
 | 
8
++++++--
M
src/app.jsx
 | 
6
+++---
M
src/layouts/Default.jsx
 | 
2
+-

3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/config/webpack.config.js b/config/webpack.config.js
@@ -13,9 +13,9 @@ var webpack = require('webpack');
 module.exports = function (release) {
   return {
     output: {
-      publicPatch: './build/',
       path: './build/',
-      filename: 'app.js'
+      filename: 'app.js',
+      publicPatch: './build/'
     },
 
     cache: !release,
@@ -36,6 +36,10 @@ module.exports = function (release) {
       new webpack.optimize.AggressiveMergingPlugin()
     ] : [],
 
+    resolve: {
+      extensions: ['', '.webpack.js', '.web.js', '.js', '.jsx']
+    },
+
     module: {
       preLoaders: [
         {
diff --git a/src/app.jsx b/src/app.jsx
@@ -9,9 +9,9 @@ var {Routes, Route} = require('react-router');
 
 React.renderComponent(
   <Routes location="history">
-    <Route name="app" path="/" handler={require('./layouts/Default.jsx')}>
-      <Route name="home" path="/" handler={require('./pages/Home.jsx')} />
-      <Route name="privacy" handler={require('./pages/Privacy.jsx')} />
+    <Route name="app" path="/" handler={require('./layouts/Default')}>
+      <Route name="home" path="/" handler={require('./pages/Home')} />
+      <Route name="privacy" handler={require('./pages/Privacy')} />
     </Route>
   </Routes>,
   document.body
diff --git a/src/layouts/Default.jsx b/src/layouts/Default.jsx
@@ -6,7 +6,7 @@
 
 var React = require('react');
 var {Link} = require('react-router');
-var Navbar = require('../components/Navbar.jsx');
+var Navbar = require('../components/Navbar');
 
 var DefaultLayout = React.createClass({
   render: () => {