Merge pull request #44 from david-macpherson/BF_Prod_Dev_WEBSOCKET_URL

Bug Fix: Setting the WEBSOCKET_URL var prod and dev

Author: dan-tw

.gitignore

@@ -3,4 +3,4 @@ node_modules/
 types/
 .vscode
 !.env.example
-.env
+*.env

examples/typescript/webpack.common.js

@@ -1,16 +1,12 @@
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const webpack = require('webpack');
-require('dotenv').config({ path: './.env' }); 
+require('dotenv').config({ path: './.env' });
 
 module.exports = {
     entry: {
         index: './src/index.ts',
     },
     plugins: [
-        new webpack.DefinePlugin({
-            WEBSOCKET_URL: JSON.stringify((process.env.WEBSOCKET_URL !== undefined) ? process.env.WEBSOCKET_URL : '')
-        }),
         new HtmlWebpackPlugin({
             title: 'Scalable Pixel Streaming Frontend',
             template: './src/index.html',

examples/typescript/webpack.dev.js

@@ -1,8 +1,14 @@
 const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
 const path = require('path');
+const webpack = require('webpack');
 
 module.exports = merge(common, {
     mode: 'development',
     devtool: 'source-map',
-});
+    plugins: [
+        new webpack.DefinePlugin({
+            WEBSOCKET_URL: JSON.stringify((process.env.WEBSOCKET_URL !== undefined) ? process.env.WEBSOCKET_URL : undefined)
+        }),
+    ]
+});

examples/typescript/webpack.prod.js

@@ -1,14 +1,20 @@
 const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
+const webpack = require('webpack');
 
 module.exports = merge(common, {
-    mode: 'production',
-    optimization: {
-      usedExports: true,
-      minimize: true
-    },
-    stats: 'errors-only',
-	performance: {
-		hints: false
-	}
+  mode: 'production',
+  optimization: {
+    usedExports: true,
+    minimize: true
+  },
+  stats: 'errors-only',
+  performance: {
+    hints: false
+  },
+  plugins: [
+    new webpack.DefinePlugin({
+      WEBSOCKET_URL: undefined
+    }),
+  ]
 });

library/src/SPSApplication.ts

@@ -61,7 +61,7 @@ export class SPSApplication extends Application {
 		this.stream.setSignallingUrlBuilder(() => {
 
 			// if we have overriden the signalling server URL with a .env file use it here
-			if (WEBSOCKET_URL) {
+			if (WEBSOCKET_URL !== undefined ) {
 				return WEBSOCKET_URL as string;
 			}