From 66ed02e8f465f2c901acc4c2d9fbb0152caa4cd6 Mon Sep 17 00:00:00 2001
From: Luke Schoen <ltfschoen@gmail.com>
Date: Wed, 9 Nov 2016 01:06:40 +1100
Subject: [PATCH] Updated NPM and Webpack configuration to overcome
 installation errors

---
 .babelrc          |  4 ++++
 package.json      | 20 +++++++++++++-------
 src/js/app.js     |  4 +---
 webpack.config.js | 25 ++++++++++++++-----------
 4 files changed, 32 insertions(+), 21 deletions(-)
 create mode 100644 .babelrc

diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..4a04322
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,4 @@
+{
+	"plugins": ["syntax-jsx"],
+  "presets": ["es2015", "react", "babel-preset-stage-0"]
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index e661dba..da2930f 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,11 @@
     "aframe-bmfont-text-component": "^0.1.4",
     "aframe-react": "^3.4.0",
     "aframe-text-component": "^0.3.0",
-    "babel-polyfill": "^6.3.14"
+    "graceful-fs": "^4.1.10",
+    "lodash": "^4.16.5",
+    "minimatch": "^3.0.3",
+    "react": "^15.3.2",
+    "react-dom": "^15.3.2"
   },
   "scripts": {
     "build": "webpack",
@@ -37,16 +41,18 @@
   "homepage": "https://github.com/ngokevin/aframe-react-boilerplate#readme",
   "devDependencies": {
     "babel": "^6.3.13",
-    "babel-core": "^6.3.15",
-    "babel-loader": "^6.2.0",
-    "babel-preset-es2015": "^6.3.13",
-    "babel-preset-react": "^6.3.13",
-    "babel-preset-stage-0": "^6.3.13",
+    "babel-core": "^6.18.2",
+    "babel-loader": "^6.2.7",
+    "babel-plugin-syntax-jsx": "^6.18.0",
+    "babel-polyfill": "^6.16.0",
+    "babel-preset-es2015": "^6.18.0",
+    "babel-preset-react": "^6.16.0",
+    "babel-preset-stage-0": "^6.16.0",
     "babel-runtime": "^6.3.13",
     "css-loader": "^0.23.0",
     "json-loader": "^0.5.4",
     "style-loader": "^0.13.0",
-    "webpack": "^1.12.9",
+    "webpack": "^1.13.3",
     "webpack-dev-server": "^1.14.0"
   }
 }
diff --git a/src/js/app.js b/src/js/app.js
index d4c7e70..2485c9b 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -27,9 +27,7 @@ class VRScene extends React.Component {
     return (
       <Scene>
         <Camera>
-          <a-cursor
-            animation__click="property: scale; startEvents: click; from: 0.1 0.1 0.1; to: 1 1 1; dur: 150"
->
+          <a-cursor animation__click="property: scale; startEvents: click; from: 0.1 0.1 0.1; to: 1 1 1; dur: 150">
           </a-cursor>
         </Camera>
 
diff --git a/webpack.config.js b/webpack.config.js
index 7831891..4b270b2 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -4,13 +4,13 @@ require('babel-polyfill');
 
 var IS_PRODUCTION = process.env.NODE_ENV === 'production';
 
-var ENTRY_POINTS = [
-  './src/js/app'
-];
+var BUILD_DIR = path.resolve(__dirname, 'build');
 
-var JS_LOADERS = [
-  'babel?cacheDirectory&presets[]=react,presets[]=es2015,presets[]=stage-0'
-];
+var APP_DIR = path.resolve(__dirname, 'src/js');
+
+// var JS_LOADERS = [
+//   'babel?cacheDirectory&presets[]=react,presets[]=es2015,presets[]=stage-0'
+// ];
 
 var PLUGINS = [];
 if (IS_PRODUCTION) {
@@ -26,12 +26,12 @@ if (IS_PRODUCTION) {
 }
 
 module.exports = {
-  entry: ENTRY_POINTS,
+  entry: APP_DIR + '/app.js',
   output: {
     // Bundle will be served at /bundle.js locally.
     filename: 'bundle.js',
-    // Bundle will be built at ./src/media/js.
-    path: './build',
+    // Bundle will be built at ./build.
+    path: BUILD_DIR,
     publicPath: '/',
   },
   module: {
@@ -42,7 +42,9 @@ module.exports = {
       {
         // JS.
         exclude: /(node_modules|bower_components)/,
-        loaders: JS_LOADERS,
+        // loaders: JS_LOADERS,
+        include: APP_DIR,
+        loader: 'babel-loader',
         test: /\.js$/,
       },
       {
@@ -57,7 +59,7 @@ module.exports = {
   },
   plugins: PLUGINS,
   resolve: {
-    extensions: ['', '.js', '.json'],
+    extensions: ['', '.js', '.jsx', '.json'],
     fallback: path.join(__dirname, 'node_modules'),
     modulesDirectories: [
       'src/js',
@@ -65,6 +67,7 @@ module.exports = {
     ]
   },
   resolveLoader: {
+    root: path.join(__dirname, 'node_modules'),
     fallback: [path.join(__dirname, 'node_modules')]
   }
 };