1. updated package.json

mvilrokx · mvilrokx · commit ea21c8fd9a84 · 2015-10-05T19:56:22.000-07:00
2. uptake of new way to insert scripts in HtmlPlugin
3. start using react-dom
diff --git a/package.json b/package.json
@@ -24,17 +24,18 @@
     "eslint": "^1.6.0",
     "eslint-friendly-formatter": "^1.2.2",
     "eslint-loader": "^1.0.0",
-    "file-loader": "*",
+    "file-loader": "^0.8.1",
     "html-webpack-plugin": "^2.0.3",
     "image-webpack-loader": "^1.6.1",
     "jquery": "^3.0.0-alpha1",
     "node-sass": "^3.3.3",
     "postcss-loader": "^0.6.0",
     "react": "^0.14.0-rc1",
+    "react-dom": "^0.14.0-rc1",
     "react-hot-loader": "^2.0.0-alpha-4",
     "sass-loader": "^3.0.0",
     "style-loader": "^0.12.4",
-    "url-loader": "*",
+    "url-loader": "^0.5.5",
     "webpack": "^1.12.2",
     "webpack-dev-server": "^1.12.0"
   },
diff --git a/src/scripts/app.js b/src/scripts/app.js
@@ -1,3 +1,4 @@
+import ReactDOM from 'react-dom';
 import React from 'react';
 import WelcomeMsg from './components/welcomeMsg';
 
@@ -14,6 +15,6 @@ var features = [
   {name: 'Development and Production configuration and scripts', url: ''}
 ];
 
-React.render(
+ReactDOM.render(
   <WelcomeMsg features={features} />, document.getElementById('content')
 );
diff --git a/src/template_index.html b/src/template_index.html
@@ -7,6 +7,5 @@
   </head>
   <body>
     <div id="content"></div>
-    <script src="{%=o.htmlWebpackPlugin.assets.main%}"></script>
   </body>
 </html>
diff --git a/webpack.config.js b/webpack.config.js
@@ -37,7 +37,8 @@ var config = {
   },
   plugins: [
     new HtmlWebpackPlugin({
-      template: './src/template_index.html'
+      template: './src/template_index.html',
+      inject: 'body' // Inject all scripts into the body
     })
   ],
   postcss: [autoprefixer, csswring],
diff --git a/webpack.production.config.js b/webpack.production.config.js
@@ -38,7 +38,8 @@ var config = {
   postcss: [autoprefixer, csswring],
   plugins: [
     new HtmlWebpackPlugin({
-      template: './src/template_index.html'
+      template: './src/template_index.html',
+      inject: 'body' // Inject all scripts into the body
     }),
     // removes a lot of debugging code in React
     new webpack.DefinePlugin({
