From a5a39b569b30cbc98f557e4aa60e39965eda6e18 Mon Sep 17 00:00:00 2001
From: Marius Sebastian Besel <145235082+msebastianb@users.noreply.github.com>
Date: Tue, 2 Jul 2024 12:07:53 +0200
Subject: [PATCH] chore: use port 7001 instead of 5001 to avoid conflicts with
 forms (#56)

---
 .gitpod.yml                                               | 3 ++-
 packages/core/src/middleware/koa-spa-proxy.ts             | 3 ++-
 packages/core/src/routes/applications/application.test.ts | 3 ++-
 packages/experience/package.json                          | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index 31dcc8e32d6..b6a984ffb9f 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -38,7 +38,8 @@ ports:
     port: 5432
     visibility: public
     onOpen: ignore
-  - port: 5001
+    # OGCIO - formsie port collision fixed
+  - port: 7001
     onOpen: ignore
   - port: 5002
     onOpen: ignore
diff --git a/packages/core/src/middleware/koa-spa-proxy.ts b/packages/core/src/middleware/koa-spa-proxy.ts
index ede71a7ef4a..d207ccfa581 100644
--- a/packages/core/src/middleware/koa-spa-proxy.ts
+++ b/packages/core/src/middleware/koa-spa-proxy.ts
@@ -11,7 +11,8 @@ import serveStatic from '#src/middleware/koa-serve-static.js';
 export default function koaSpaProxy<StateT, ContextT extends IRouterParamContext, ResponseBodyT>(
   mountedApps: string[],
   packagePath = 'experience',
-  port = 5001,
+  // OGCIO - formsie port collision fixed
+  port = 7001,
   prefix = ''
 ): MiddlewareType<StateT, ContextT, ResponseBodyT> {
   type Middleware = MiddlewareType<StateT, ContextT, ResponseBodyT>;
diff --git a/packages/core/src/routes/applications/application.test.ts b/packages/core/src/routes/applications/application.test.ts
index f02353db2e1..f54689f5332 100644
--- a/packages/core/src/routes/applications/application.test.ts
+++ b/packages/core/src/routes/applications/application.test.ts
@@ -72,7 +72,8 @@ const applicationRoutes = await pickDefault(import('./application.js'));
 const customClientMetadata = {
   corsAllowedOrigins: [
     'http://localhost:5000',
-    'http://localhost:5001',
+    // OGCIO - formsie port collision fixed
+    'http://localhost:7001',
     'https://silverhand.com',
     'capacitor://localhost',
   ],
diff --git a/packages/experience/package.json b/packages/experience/package.json
index 4acb97a76ce..00f8f9b083f 100644
--- a/packages/experience/package.json
+++ b/packages/experience/package.json
@@ -10,7 +10,7 @@
   "scripts": {
     "precommit": "lint-staged",
     "start": "parcel src/index.html",
-    "dev": "cross-env PORT=5001 parcel src/index.html --no-cache --hmr-port 6001",
+    "dev": "cross-env PORT=7001 parcel src/index.html --no-cache --hmr-port 6001",
     "check": "tsc --noEmit",
     "build": "pnpm check && rm -rf dist && parcel build src/index.html --no-autoinstall --no-cache --detailed-report",
     "lint": "eslint --ext .ts --ext .tsx src",