Alpha

.github/workflows/autodeploy.yml

@@ -6,6 +6,7 @@ name: Auto-Deploy 'beta/live' Branch to beta.coliolis.io or coriolis.io
 on:
   push:
     branches:
+      - alpha
       - beta
       - live
 # Figure out the target branch name
@@ -39,10 +40,12 @@ jobs:
           cd ./coriolis-data
           export NVM_DIR=~/.nvm
           source ~/.nvm/nvm.sh
-          npm install 2>&1
+          rm -Rf node_modules package-lock.json
+          npm install --legacy-peer-deps 2>&1
           npm start
           cd ../coriolis
-          npm install 2>&1
+          rm -Rf node_modules package-lock.json
+          npm install --legacy-peer-deps 2>&1
           npm run build 2>&1
       - name: Zip the code
         shell: bash
@@ -99,5 +102,5 @@ jobs:
       - name: Move the build to the web server
         shell: bash
         run: |
-          if [ ${{ env.BRANCH_NAME }} == "beta" ]; then rsync -av --omit-dir-times --no-perms --delete --exclude='.git/' --exclude='.github/' ./coriolis/build/* /var/www/beta.coriolis.io/; else rsync -av --omit-dir-times --no-perms --delete --exclude='.git/' --exclude='.github/' ./coriolis/build/* /var/www/coriolis.io/; fi
+          if [ ${{ env.BRANCH_NAME }} == "beta" ]; then rsync -av --omit-dir-times --no-perms --delete --exclude='.git/' --exclude='.github/' ./coriolis/build/* /var/www/beta.coriolis.io/; elif [ ${{ env.BRANCH_NAME }} == "alpha" ]; then rsync -av --omit-dir-times --no-perms --delete --exclude='.git/' --exclude='.github/' ./coriolis/build/* /var/www/alpha.coriolis.io/; else rsync -av --omit-dir-times --no-perms --delete --exclude='.git/' --exclude='.github/' ./coriolis/build/* /var/www/coriolis.io/; fi
 

devServer.js

@@ -1,20 +1,33 @@
-var webpack = require('webpack');
-var WebpackDevServer = require("webpack-dev-server");
-var config = require('./webpack.config.dev');
+const webpack = require('webpack');
+const WebpackDevServer = require('webpack-dev-server');
+const config = require('./webpack.config.dev');
 
-new WebpackDevServer(webpack(config), {
+const devServerOptions = {
   hot: true,
-  headers: { "Access-Control-Allow-Origin": "*" },
+  headers: {
+    "Access-Control-Allow-Origin": "*"
+  },
   historyApiFallback: {
     rewrites: [
       // For some reason connect-history-api-fallback does not allow '.' in the URL for history fallback...
       { from: /\/outfit\//, to: '/index.html' }
     ]
+  },
+  host: '0.0.0.0',
+  port: 3300
+};
+
+const compiler = webpack(config);
+const server = new WebpackDevServer(devServerOptions, compiler);
+
+const runServer = async () => {
+  console.log('Starting development server...');
+  try {
+    await server.start();
+    console.log('Successfully started server on http://localhost:3300');
+  } catch (err) {
+    console.log('Error starting server:', err);
   }
-}).listen(3300, "0.0.0.0", function (err, result) {
-  if (err) {
-    console.log(err);
-  }
+};
 
-  console.log("Listening at localhost:3300");
-});
+runServer();