switched to .env for variables

Author: Titanium2099

.gitignore

@@ -26,3 +26,4 @@ npm-*
 
 # for act
 .secrets
+.env

package-lock.json

@@ -96,8 +96,8 @@
     "scratch-blocks": "github:CodeTorchNET/scratch-blocks#develop",
     "scratch-paint": "github:CodeTorchNET/scratch-paint#develop",
     "scratch-render": "github:CodeTorchNET/scratch-render#develop",
-    "scratch-vm": "github:CodeTorchNET/scratch-vm#develop",
     "scratch-storage": "github:CodeTorchNET/scratch-storage#develop",
+    "scratch-vm": "github:CodeTorchNET/scratch-vm#develop",
     "showdown": "^2.1.0",
     "simplex-noise": "^4.0.3",
     "style-loader": "^0.23.0",
@@ -125,6 +125,7 @@
     "babel-eslint": "10.1.0",
     "babel-loader": "8.3.0",
     "chromedriver": "117.0.3",
+    "dotenv": "^17.2.3",
     "enzyme": "3.10.0",
     "enzyme-adapter-react-16": "1.15.7",
     "eslint": "8.55.0",

package.json

@@ -8,24 +8,17 @@ import CollaborationConsole from './CollaborationConsole.js';
  */
 export const debugging = true;
 
-export const apiHostURL =
-  ["localhost", "127.0.0.1", "::1"].includes(window.location.hostname)
-    ? "http://localhost:8000"
-    : "https://api.codetorch.net";
-
+export const apiHostURL = process.env.API_HOST;
 /**
  * Development Mode. 
  * Set to `true` to allow the addon to run even if window.CollaborationRoom/OTT are undefined.
  */
-export const devMode =
-  ["localhost", "127.0.0.1", "::1"].includes(window.location.hostname)
-    ? true
-    : false;
+export const devMode = process.env.COLLABORATION_DEV_MODE === 'true';
 
 /**
  * The base URL for the WebSocket server used for Yjs collaboration.
  */
-export const WEBSOCKETBASEURL = 'ws://localhost:4444';
+export const WEBSOCKETBASEURL = process.env.COLLABORATION_HOST;
 
 /**
  * Inactivity thresholds in milliseconds.

src/addons/addons/collaboration/helpers/constants.js

@@ -1,11 +1,12 @@
 // Legacy export format because this is used by some build-time scripts stuck in the past.
 // eslint-disable-next-line import/no-commonjs
 module.exports = {
-    APP_NAME: 'CodeTorch',
-    APP_DOMAIN: 'http://localhost:8080',
-    API_HOST: 'http://localhost:8000',
-    ASSET_HOST: 'http://localhost:8000',
-    EXTENSION_HOST: 'http://localhost:8002',
-    DEFAULT_CLOUD_HOST: 'ws://localhost:8001',
+    APP_NAME: process.env.APP_NAME,
+    APP_DOMAIN: process.env.APP_DOMAIN,
+    API_HOST: process.env.API_HOST,
+    ASSET_HOST: process.env.ASSET_HOST,
+    EXTENSION_HOST: process.env.EXTENSION_HOST,
+    DEFAULT_CLOUD_HOST: process.env.DEFAULT_CLOUD_HOST,
+    TRUSTED_IFRAME_HOST: process.env.TRUSTED_IFRAME_HOST,
     enableGenerate: false
 };

src/lib/brand.js

@@ -37,7 +37,7 @@ import {APP_NAME} from '../lib/brand.js';
 
 import styles from './interface.css';
 
-const isInvalidEmbed = window.parent === window;
+const isInvalidEmbed = process.env.FORCE_EMBED === 'true' ? window.parent === window : false;
 
 const handleClickAddonSettings = () => {
     // addonId might be a string of the addon to focus on, undefined, or an event (treat like undefined)

src/playground/render-interface.jsx

@@ -2,6 +2,8 @@ const defaultsDeep = require('lodash.defaultsdeep');
 const path = require('path');
 const webpack = require('webpack');
 
+require('dotenv').config();
+
 // Plugins
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
@@ -183,7 +185,18 @@ module.exports = [
                 'process.env.DEBUG': Boolean(process.env.DEBUG),
                 'process.env.ENABLE_SERVICE_WORKER': JSON.stringify(process.env.ENABLE_SERVICE_WORKER || ''),
                 'process.env.ROOT': JSON.stringify(root),
-                'process.env.ROUTING_STYLE': JSON.stringify(process.env.ROUTING_STYLE || 'filehash')
+                'process.env.ROUTING_STYLE': JSON.stringify(process.env.ROUTING_STYLE || 'filehash'),
+                
+                'process.env.APP_NAME': JSON.stringify(process.env.APP_NAME || 'CodeTorch'),
+                'process.env.APP_DOMAIN': JSON.stringify(process.env.APP_NAME || 'https://codetorch.net'),
+                'process.env.API_HOST': JSON.stringify(process.env.API_HOST || 'https://api.codetorch.net'),
+                'process.env.ASSET_HOST': JSON.stringify(process.env.ASSET_HOST || 'https://assets.scratch.mit.edu'),
+                'process.env.EXTENSION_HOST': JSON.stringify(process.env.EXTENSION_HOST || 'https://blockextensions.codetorch.net'),
+                'process.env.DEFAULT_CLOUD_HOST': JSON.stringify(process.env.DEFAULT_CLOUD_HOST || 'wss://cloud.codetorch.org'),
+                'process.env.TRUSTED_IFRAME_HOST': JSON.stringify(process.env.TRUSTED_IFRAME_HOST || 'https://codetorch.net'),
+                'process.env.FORCE_EMBED': JSON.stringify(process.env.FORCE_EMBED || 'true'),
+                'process.env.COLLABORATION_HOST': JSON.stringify(process.env.COLLABORATION_HOST || 'wss://collaborator.codetorch.net/'),
+                'process.env.COLLABORATION_DEV_MODE': JSON.stringify(process.env.COLLABORATION_DEV_MODE || 'false')
             }),
             new HtmlWebpackPlugin({
                 chunks: ['editor'],