From 3e8c9308b69654d9a964767ab03b20187b5fe4e6 Mon Sep 17 00:00:00 2001
From: Palash gupta <palashg7563@gmail.com>
Date: Thu, 29 Jul 2021 17:35:43 +0530
Subject: [PATCH] Fix/base url (#212)

* env is updated

* webpack config is updated

* webpack config is updated

* dotenv-expanded is removed

* vars is updated

* env is updated

* docker ignore is updated

* webpack config is updated

* dev and build is updarted with the progress arguments

* config is updated
---
 frontend/.dockerignore                |  3 ++-
 frontend/package.json                 |  5 ++---
 frontend/src/constants/env.ts         |  2 +-
 frontend/src/typings/environment.d.ts | 11 +++++++++++
 frontend/webpack.config.js            |  8 ++++++++
 frontend/webpack.config.prod.js       |  2 +-
 frontend/yarn.lock                    |  7 +------
 7 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 frontend/src/typings/environment.d.ts

diff --git a/frontend/.dockerignore b/frontend/.dockerignore
index 90b366a44f..ec1a1c2616 100644
--- a/frontend/.dockerignore
+++ b/frontend/.dockerignore
@@ -1,3 +1,4 @@
 node_modules
 .vscode
-build
\ No newline at end of file
+build
+.env
\ No newline at end of file
diff --git a/frontend/package.json b/frontend/package.json
index ba382496cd..bb1b04a08c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -4,9 +4,9 @@
 	"description": "",
 	"main": "webpack.config.js",
 	"scripts": {
-		"dev": "NODE_ENV=development webpack serve",
+		"dev": "NODE_ENV=development webpack serve --progress",
 		"start": "node scripts/start.js",
-		"build": "webpack --config=webpack.config.prod.js",
+		"build": "webpack --config=webpack.config.prod.js --progress",
 		"prettify": "prettier --write .",
 		"lint": "eslint src"
 	},
@@ -54,7 +54,6 @@
 		"d3-flame-graph": "^3.1.1",
 		"d3-tip": "^0.9.1",
 		"dotenv": "8.2.0",
-		"dotenv-expand": "5.1.0",
 		"eslint": "^7.29.0",
 		"eslint-config-react-app": "^6.0.0",
 		"eslint-plugin-flowtype": "^5.2.0",
diff --git a/frontend/src/constants/env.ts b/frontend/src/constants/env.ts
index 43d7dc4acf..d22d785071 100644
--- a/frontend/src/constants/env.ts
+++ b/frontend/src/constants/env.ts
@@ -1,3 +1,3 @@
 export const ENVIRONMENT = {
-	baseURL: "",
+	baseURL: process?.env?.FRONTEND_API_ENDPOINT || "",
 };
diff --git a/frontend/src/typings/environment.d.ts b/frontend/src/typings/environment.d.ts
new file mode 100644
index 0000000000..b1fa236912
--- /dev/null
+++ b/frontend/src/typings/environment.d.ts
@@ -0,0 +1,11 @@
+declare global {
+	namespace NodeJS {
+		interface ProcessEnv {
+			FRONTEND_API_ENDPOINT: string | undefined;
+		}
+	}
+}
+
+// If this file has no import/export statements (i.e. is a script)
+// convert it into a module by adding an empty export statement.
+export {};
diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js
index 7fa3d44086..bc531b2b6c 100644
--- a/frontend/webpack.config.js
+++ b/frontend/webpack.config.js
@@ -1,6 +1,11 @@
 // shared config (dev and prod)
 const { resolve } = require("path");
 const HtmlWebpackPlugin = require("html-webpack-plugin");
+const dotenv = require("dotenv");
+const webpack = require("webpack");
+
+dotenv.config();
+
 console.log(resolve(__dirname, "./src/"));
 
 module.exports = {
@@ -56,6 +61,9 @@ module.exports = {
 	},
 	plugins: [
 		new HtmlWebpackPlugin({ template: "src/index.html.ejs" }),
+		new webpack.DefinePlugin({
+			"process.env": JSON.stringify(process.env),
+		}),
 	],
 	performance: {
 		hints: false,
diff --git a/frontend/webpack.config.prod.js b/frontend/webpack.config.prod.js
index 417c29a93f..d9bd801f78 100644
--- a/frontend/webpack.config.prod.js
+++ b/frontend/webpack.config.prod.js
@@ -46,7 +46,7 @@ module.exports = {
 	},
 	plugins: [
 		new CompressionPlugin({
-			exclude: /.map$/
+			exclude: /.map$/,
 		}),
 		new HtmlWebpackPlugin({ template: "src/index.html.ejs" }),
 		new CopyPlugin({
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index da3d7e8dfb..dc73ce9921 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -5472,11 +5472,6 @@ dot-case@^3.0.4:
     no-case "^3.0.4"
     tslib "^2.0.3"
 
-dotenv-expand@5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
-  integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
-
 dotenv@8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
@@ -14307,4 +14302,4 @@ yargs@~3.10.0:
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
\ No newline at end of file
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==