Fix for webpack config in the examples project

gpbl · Jun 8, 2016 · ec6795e · ec6795e
1 parent bbb6d1e
commit ec6795e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/examples/src/Examples.js b/examples/src/Examples.js
@@ -131,14 +131,19 @@ export default class Examples extends Component {
   }
 
   renderNavBarExamples() {
-    const links = Object.keys(EXAMPLES).map(name => <a
-      href={`.?${name}`}
-      onClick={e => { e.preventDefault(); history.push({ pathname: '.', search: `?${name}` }); }}
-      key={name}
-      className={this.state.currentExample === name ? 'selected' : ''}
-    >
-      {EXAMPLES[name].title}
-    </a>);
+    const links = Object.keys(EXAMPLES).map(name =>
+      <a
+        href={`.?${name}`}
+        onClick={e => {
+          e.preventDefault();
+          history.push({ pathname: history.getCurrentLocation().pathname, search: `?${name}` });
+        }}
+        key={name}
+        className={this.state.currentExample === name ? 'selected' : ''}
+      >
+        {EXAMPLES[name].title}
+      </a>
+    );
     return <div className="NavBar-links">{links}</div>;
   }
 

diff --git a/examples/webpack.config.js b/examples/webpack.config.js
@@ -11,19 +11,28 @@ module.exports = {
     filename: 'main.js',
   },
 
-  resolve: { extensions: ['', '.js'] },
-
   module: {
     loaders: [{
       test: /\.js$/,
-      exclude: /node_modules/,
+      include: [
+        path.join(__dirname, '../src'),
+        path.join(__dirname, './src'),
+        path.join(__dirname, '../dist'),
+      ],
       loaders: ['babel'],
     }, {
       test: /\.css$/,
       loaders: ['style', 'css', 'autoprefixer-loader?browsers=last 2 version'],
     }],
   },
 
+  resolve: {
+    extensions: ['', '.js'],
+    alias: {
+      react: path.resolve(__dirname, '../node_modules/react'),
+    },
+  },
+
   plugins: [
 
     // ignore moment locales