Use babel-loader explicitly for examples

This means we don't need the .examples directory any more.

Author: mjackson

website/package.json

@@ -3,9 +3,9 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
-    "dev": "rm -rf .examples && cp -R examples .examples && webpack-dev-server --config webpack.config.js --inline --content-base build",
-    "build": "npm run clean && cp -R examples .examples && webpack",
-    "clean": "rm -rf .examples build",
+    "dev": "webpack-dev-server --config webpack.config.js --inline --content-base build",
+    "build": "npm run clean && webpack",
+    "clean": "rm -rf build",
     "start": "npm run build && pushstate-server build/"
   },
   "dependencies": {

website/routes.js

@@ -13,68 +13,68 @@ export const PAGES = [
 export const EXAMPLES = [
   { name: 'Basic',
     path: '/basic',
-    load: require('bundle?lazy!./examples/Basic'),
-    loadSource: require('bundle?lazy!!prismjs?lang=jsx!./.examples/Basic.js')
+    load: require('bundle?lazy!babel!./examples/Basic'),
+    loadSource: require('bundle?lazy!prismjs?lang=jsx!./examples/Basic')
   },
   { name: 'URL Parameters',
     path: '/url-parameters',
-    load: require('bundle?lazy!./examples/Params'),
-    loadSource: require('bundle?lazy!!prismjs?lang=jsx!./.examples/Params.js')
+    load: require('bundle?lazy!babel!./examples/Params'),
+    loadSource: require('bundle?lazy!prismjs?lang=jsx!./examples/Params')
   },
   { name: 'Redirects (Auth)',
     path: '/auth-workflow',
-    load: require('bundle?lazy!./examples/Auth'),
-    loadSource: require('bundle?lazy!!prismjs?lang=jsx!./.examples/Auth.js')
+    load: require('bundle?lazy!babel!./examples/Auth'),
+    loadSource: require('bundle?lazy!prismjs?lang=jsx!./examples/Auth')
   },
   { name: 'Custom Link Component',
     path: '/custom-link-component',
-    load: require('bundle?lazy!./examples/CustomLinkComponent'),
-    loadSource: require('bundle?lazy!!prismjs?lang=jsx!./.examples/CustomLinkComponent.js')
+    load: require('bundle?lazy!babel!./examples/CustomLinkComponent'),
+    loadSource: require('bundle?lazy!prismjs?lang=jsx!./examples/CustomLinkComponent')
   },
   { name: 'Preventing Transitions',
     path: '/preventing-transitions',
-    load: require('bundle?lazy!./examples/PreventingTransitions'),
-    loadSource: require('bundle?lazy!!prismjs?lang=jsx!./.examples/PreventingTransitions.js')
+    load: require('bundle?lazy!babel!./examples/PreventingTransitions'),
+    loadSource: require('bundle?lazy!prismjs?lang=jsx!./examples/PreventingTransitions')
   },
   { name: 'Miss (No Match Handling)',
     path: '/no-match-handling',
-    load: require('bundle?lazy!./examples/Miss'),
-    loadSource: require('bundle?lazy!!prismjs?lang=jsx!./.examples/Miss.js')
+    load: require('bundle?lazy!babel!./examples/Miss'),
+    loadSource: require('bundle?lazy!prismjs?lang=jsx!./examples/Miss')
   },
   { name: 'MatchGroup',
     path: '/match-group',
-    load: require('bundle?lazy!./examples/MatchGroup'),
-    loadSource: require('bundle?lazy!!prismjs?lang=jsx!./.examples/MatchGroup.js')
+    load: require('bundle?lazy!babel!./examples/MatchGroup'),
+    loadSource: require('bundle?lazy!prismjs?lang=jsx!./examples/MatchGroup')
   },
   { name: 'Query Params',
     path: '/query-params',
-    load: require('bundle?lazy!./examples/QueryParams'),
-    loadSource: require('bundle?lazy!!prismjs?lang=jsx!./.examples/QueryParams.js')
+    load: require('bundle?lazy!babel!./examples/QueryParams'),
+    loadSource: require('bundle?lazy!prismjs?lang=jsx!./examples/QueryParams')
   },
   { name: 'Recursive Paths',
     path: '/recursive-paths',
-    load: require('bundle?lazy!./examples/Recursive'),
-    loadSource: require('bundle?lazy!!prismjs?lang=jsx!./.examples/Recursive.js')
+    load: require('bundle?lazy!babel!./examples/Recursive'),
+    loadSource: require('bundle?lazy!prismjs?lang=jsx!./examples/Recursive')
   },
   { name: 'Sidebar',
     path: '/sidebar',
-    load: require('bundle?lazy!./examples/Sidebar'),
-    loadSource: require('bundle?lazy!!prismjs?lang=jsx!./.examples/Sidebar.js')
+    load: require('bundle?lazy!babel!./examples/Sidebar'),
+    loadSource: require('bundle?lazy!prismjs?lang=jsx!./examples/Sidebar')
   },
   { name: 'Animated Transitions',
     path: '/animated-transitions',
-    load: require('bundle?lazy!./examples/Animation'),
-    loadSource: require('bundle?lazy!!prismjs?lang=jsx!./.examples/Animation.js')
+    load: require('bundle?lazy!babel!./examples/Animation'),
+    loadSource: require('bundle?lazy!prismjs?lang=jsx!./examples/Animation')
   },
   { name: 'Ambiguous Matches',
     path: '/ambiguous-matches',
-    load: require('bundle?lazy!./examples/Ambiguous'),
-    loadSource: require('bundle?lazy!!prismjs?lang=jsx!./.examples/Ambiguous.js')
+    load: require('bundle?lazy!babel!./examples/Ambiguous'),
+    loadSource: require('bundle?lazy!prismjs?lang=jsx!./examples/Ambiguous')
   },
   { name: 'Route Config',
     path: '/route-config',
-    load: require('bundle?lazy!./examples/RouteConfig'),
-    loadSource: require('bundle?lazy!!prismjs?lang=jsx!./.examples/RouteConfig.js')
+    load: require('bundle?lazy!babel!./examples/RouteConfig'),
+    loadSource: require('bundle?lazy!prismjs?lang=jsx!./examples/RouteConfig')
   }
 ]
 

website/webpack.config.js

@@ -50,22 +50,22 @@ module.exports = {
   module: {
     loaders: [
       { test: /\.js$/,
-        exclude: /node_modules|\.examples/,
-        loader: 'babel-loader'
+        exclude: /node_modules|examples/,
+        loader: 'babel'
       },
       { test: /\.css$/,
         exclude: /prismjs/,
-        loader: 'style-loader!css-loader?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss-loader'
+        loader: 'style!css?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss'
       },
       { test: /\.css$/,
         include: /prismjs/,
-        loader: 'style-loader!css-loader'
+        loader: 'style!css'
       },
       { test: /\.md$/,
         loader: './webpack/markdown-loader'
       },
       { test: /\.(gif|jpe?g|png|ico)$/,
-        loader: 'url-loader?limit=10000'
+        loader: 'url?limit=10000'
       }
     ]
   },