From a4b3f9e70cbf6c29fd9f7d94b009ee32347d37ef Mon Sep 17 00:00:00 2001
From: olav <mail@olav.io>
Date: Wed, 24 Aug 2022 13:52:45 +0200
Subject: [PATCH] fix: use the frontend dir from the backend

---
 package.json                     | 1 -
 src/lib/app.ts                   | 4 ++--
 src/lib/util/findPublicFolder.ts | 5 +++++
 src/lib/util/rewriteHTML.test.ts | 6 ++++--
 tsconfig.json                    | 3 ++-
 yarn.lock                        | 5 -----
 6 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 src/lib/util/findPublicFolder.ts

diff --git a/package.json b/package.json
index 9b952aee14..d9dbac81fe 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,6 @@
     "ts-toolbelt": "^9.6.0",
     "type-is": "^1.6.18",
     "unleash-client": "3.15.0",
-    "unleash-frontend": "4.15.0-beta.1",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
diff --git a/src/lib/app.ts b/src/lib/app.ts
index 645d83fc09..0b3ef4061d 100644
--- a/src/lib/app.ts
+++ b/src/lib/app.ts
@@ -1,4 +1,3 @@
-import { publicFolder } from 'unleash-frontend';
 import express, { Application, RequestHandler } from 'express';
 import compression from 'compression';
 import favicon from 'serve-favicon';
@@ -22,6 +21,7 @@ import noAuthentication from './middleware/no-authentication';
 import secureHeaders from './middleware/secure-headers';
 
 import { loadIndexHTML } from './util/load-index-html';
+import { findPublicFolder } from './util/findPublicFolder';
 
 export default async function getApp(
     config: IUnleashConfig,
@@ -32,7 +32,7 @@ export default async function getApp(
     const app = express();
 
     const baseUriPath = config.server.baseUriPath || '';
-
+    const publicFolder = findPublicFolder();
     let indexHTML = await loadIndexHTML(config, publicFolder);
 
     app.set('trust proxy', true);
diff --git a/src/lib/util/findPublicFolder.ts b/src/lib/util/findPublicFolder.ts
new file mode 100644
index 0000000000..3bd08b517c
--- /dev/null
+++ b/src/lib/util/findPublicFolder.ts
@@ -0,0 +1,5 @@
+import path from 'path';
+
+export const findPublicFolder = (): string => {
+    return path.join(__dirname, '..', '..', '..', 'frontend', 'build');
+};
diff --git a/src/lib/util/rewriteHTML.test.ts b/src/lib/util/rewriteHTML.test.ts
index efe5605794..b40f30ce6c 100644
--- a/src/lib/util/rewriteHTML.test.ts
+++ b/src/lib/util/rewriteHTML.test.ts
@@ -1,9 +1,11 @@
 import fs from 'fs';
 import path from 'path';
 import { rewriteHTML } from './rewriteHTML';
-import { publicFolder } from 'unleash-frontend';
+import { findPublicFolder } from './findPublicFolder';
 
-const input = fs.readFileSync(path.join(publicFolder, 'index.html')).toString();
+const input = fs
+    .readFileSync(path.join(findPublicFolder(), 'index.html'))
+    .toString();
 
 test('rewriteHTML substitutes meta tag with existing rewrite value', () => {
     const result = rewriteHTML(input, '/hosted');
diff --git a/tsconfig.json b/tsconfig.json
index 267d592534..bc401bce09 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -77,6 +77,7 @@
     "snapshots",
     "coverage",
     "website",
-    "scripts"
+    "scripts",
+    "frontend"
   ]
 }
diff --git a/yarn.lock b/yarn.lock
index 99ba25b95a..ab65a0bff3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7243,11 +7243,6 @@ unleash-client@3.15.0:
     murmurhash3js "^3.0.1"
     semver "^7.3.5"
 
-unleash-frontend@4.15.0-beta.1:
-  version "4.15.0-beta.1"
-  resolved "https://registry.yarnpkg.com/unleash-frontend/-/unleash-frontend-4.15.0-beta.1.tgz#c98255af5408c7cce3aa5f3a38fe2c634813a93b"
-  integrity sha512-6kHYetlytLVibTfi+QAweve7YWFmXdWzl6aDcYg2XMYj2Ago0gMHwTqtkG7JfZonG1vU5dkfk/KwBKTFKLJn/g==
-
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"