Use webpack for static assets

Makefile

@@ -8,7 +8,6 @@ WEBPACK=./node_modules/.bin/webpack
 
 build:
 	@make clean
-	@make static
 	@make translations
 	@make webpack
 
@@ -30,9 +29,6 @@ else
 	eb deploy -l $$(git rev-parse --verify --short=5 HEAD) -m "$$(git log -1 --pretty=%s)"
 endif
 
-static:
-	cp -a ./static/. ./build/
-
 translations:
 	./src/scripts/build-locales locales/translations.json
 

package.json

@@ -34,6 +34,7 @@
     "autoprefixer-loader": "2.1.0",
     "classnames": "2.1.3",
     "cookie": "0.2.2",
+    "copy-webpack-plugin": "0.2.0",
     "css-loader": "0.17.0",
     "eslint": "1.3.1",
     "eslint-plugin-react": "3.3.1",

server/index.js

@@ -13,12 +13,14 @@ var log = require('./log');
 var proxies = require('./proxies.json');
 var routes = require('./routes.json');
 
+var isProduction = process.env.NODE_ENV === 'production';
+
 // Create server
 var app = express();
 app.disable('x-powered-by');
 
 // Block POST & PUT requests in production
-if (process.env.NODE_ENV === 'production') {
+if (isProduction) {
     app.use(function (req, res, next) {
         if (req.method === 'GET') return next();
         if (req.method === 'OPTIONS') return next();
@@ -65,8 +67,8 @@ if (typeof process.env.NODE_SENTRY_DSN === 'string') {
     });
 }
 
-// Bind proxies in development
-if (process.env.NODE_ENV !== 'production') {
+if (!isProduction) {
+    // Bind proxies in development
     var proxyHost = process.env.PROXY_HOST || 'https://scratch.mit.edu';
 
     app.use('/', proxy(proxyHost, {

webpack.config.js

+var CopyWebpackPlugin = require('copy-webpack-plugin');
 var path = require('path');
 var webpack = require('webpack');
 
@@ -9,9 +10,7 @@ var entry = {
     main: './src/main.jsx'
 };
 routes.forEach(function (route) {
-    if ( ! route.static ) {
-        entry[route.view] = './src/views/' + route.view + '/' + route.view + '.jsx';
-    }
+    entry[route.view] = './src/views/' + route.view + '/' + route.view + '.jsx';
 });
 
 // Config
@@ -25,8 +24,8 @@ module.exports = {
         'react-intl': 'ReactIntl'
     },
     output: {
-        path: path.resolve(__dirname, 'build/js'),
-        filename: '[name].bundle.js'
+        path: path.resolve(__dirname, 'build'),
+        filename: 'js/[name].bundle.js'
     },
     module: {
         loaders: [
@@ -53,6 +52,9 @@ module.exports = {
         fs: 'empty'
     },
     plugins: [
+        new CopyWebpackPlugin([
+            {from: 'static'}
+        ]),
         new webpack.optimize.UglifyJsPlugin({
             compress: {
                 warnings: false