Merge pull request #121 from cwillisf/webpack-fixups

Webpack fixups

.gitignore

@@ -14,6 +14,4 @@ npm-*
 
 # Build
 /dist
-/playground/scratch-render.js
-/playground/scratch-render.js.map
-/playground/docs
+/playground

package.json

@@ -28,6 +28,7 @@
     "babel-polyfill": "^6.22.0",
     "babel-preset-es2015": "^6.22.0",
     "base64-loader": "^1.0.0",
+    "copy-webpack-plugin": "^4.0.1",
     "docdash": "^0.4.0",
     "eslint": "^3.16.1",
     "eslint-config-scratch": "^3.1.0",
@@ -43,7 +44,7 @@
     "travis-after-all": "^1.4.4",
     "twgl.js": "3.2.0",
     "webpack": "^2.2.1",
-    "webpack-dev-server": "^1.16.3",
+    "webpack-dev-server": "^2.4.1",
     "xhr": "2.4.0"
   }
 }

src/ShaderManager.js

@@ -1,7 +1,7 @@
 const twgl = require('twgl.js');
 
-const vertexShaderText = require('./shaders/sprite.vert');
-const fragmentShaderText = require('./shaders/sprite.frag');
+const vertexShaderText = require('raw-loader!./shaders/sprite.vert');
+const fragmentShaderText = require('raw-loader!./shaders/sprite.frag');
 
 
 class ShaderManager {

webpack.config.js

@@ -1,17 +1,12 @@
+const CopyWebpackPlugin = require('copy-webpack-plugin');
 const path = require('path');
 const webpack = require('webpack');
 
 const base = {
     devServer: {
-        contentBase: path.resolve(__dirname, 'playground'),
+        contentBase: false,
         host: '0.0.0.0',
-        watchOptions: {
-            aggregateTimeout: 300,
-            poll: 1000
-        },
-        stats: {
-            colors: true
-        }
+        port: process.env.PORT || 8361
     },
     devtool: 'source-map',
     module: {
@@ -25,10 +20,6 @@ const base = {
                 options: {
                     presets: ['es2015']
                 }
-            },
-            {
-                test: /\.(glsl|vs|fs|frag|vert)$/,
-                loader: 'raw-loader'
             }
         ]
     },
@@ -51,7 +42,14 @@ module.exports = [
         output: {
             path: path.resolve(__dirname, 'playground'),
             filename: '[name].js'
-        }
+        },
+        plugins: base.plugins.concat([
+            new CopyWebpackPlugin([
+                {
+                    from: 'src/playground'
+                }
+            ])
+        ])
     }),
     // Web-compatible
     Object.assign({}, base, {