3 files changed, 16 insertions, 8 deletions

diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js
index 266e630f6..459985880 100644
--- a/client/config/webpack.common.js
+++ b/client/config/webpack.common.js
@@ -168,6 +168,13 @@ module.exports = function (options) {
             helpers.root('src/index.html'),
             helpers.root('src/standalone/videos/embed.html')
           ]
+        },
+
+        /* File loader for supporting images, for example, in CSS files.
+         */
+        {
+          test: /\.(jpg|png|gif)$/,
+          use: 'file-loader'
         }
 
       ]
@@ -271,7 +278,7 @@ module.exports = function (options) {
        * See: https://github.com/numical/script-ext-html-webpack-plugin
        */
       new ScriptExtHtmlWebpackPlugin({
-        sync: [ /polyfill|vendor/, 'webtorrent.min.js' ],
+        sync: [ /polyfill|vendor/ ],
         defaultAttribute: 'async',
         preload: [/polyfill|vendor|main/],
         prefetch: [/chunk/]
diff --git a/client/config/webpack.dev.js b/client/config/webpack.dev.js
index 03d6d2fba..d6ebed730 100644
--- a/client/config/webpack.dev.js
+++ b/client/config/webpack.dev.js
@@ -22,7 +22,8 @@ const METADATA = webpackMerge(commonConfig({env: ENV}).metadata, {
   host: HOST,
   port: PORT,
   ENV: ENV,
-  HMR: HMR
+  HMR: HMR,
+  API_URL: 'http://localhost:9000'
 })
 
 const DllBundlesPlugin = require('webpack-dll-bundles-plugin').DllBundlesPlugin
@@ -79,9 +80,7 @@ module.exports = function (env) {
       chunkFilename: '[id].chunk.js',
 
       library: 'ac_[name]',
-      libraryTarget: 'var',
-
-      publicPath: '/client/'
+      libraryTarget: 'var'
     },
 
     externals: {
@@ -125,6 +124,7 @@ module.exports = function (env) {
       new DefinePlugin({
         'ENV': JSON.stringify(METADATA.ENV),
         'HMR': METADATA.HMR,
+        'API_URL': JSON.stringify(METADATA.API_URL),
         'process.env': {
           'ENV': JSON.stringify(METADATA.ENV),
           'NODE_ENV': JSON.stringify(METADATA.ENV),
@@ -234,8 +234,7 @@ module.exports = function (env) {
       historyApiFallback: true,
       watchOptions: {
         ignored: /node_modules/
-      },
-      outputPath: helpers.root('dist')
+      }
     },
 
     /*
diff --git a/client/config/webpack.prod.js b/client/config/webpack.prod.js
index 9bb7306af..3f063c7c6 100644
--- a/client/config/webpack.prod.js
+++ b/client/config/webpack.prod.js
@@ -26,7 +26,8 @@ const METADATA = webpackMerge(commonConfig({env: ENV}).metadata, {
   host: HOST,
   port: PORT,
   ENV: ENV,
-  HMR: false
+  HMR: false,
+  API_URL: ''
 })
 
 module.exports = function (env) {
@@ -125,6 +126,7 @@ module.exports = function (env) {
       new DefinePlugin({
         'ENV': JSON.stringify(METADATA.ENV),
         'HMR': METADATA.HMR,
+        'API_URL': JSON.stringify(METADATA.API_URL),
         'process.env': {
           'ENV': JSON.stringify(METADATA.ENV),
           'NODE_ENV': JSON.stringify(METADATA.ENV),