From 5dc21a659e153149f8e9c6e8cfbfdc428f38b63e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 2 Jul 2024 11:03:52 +0200 Subject: [PATCH 1/2] chore: use port 7001 instead of 5001 to avoid conflicts with forms --- .gitpod.yml | 2 +- packages/core/src/middleware/koa-spa-proxy.ts | 2 +- packages/core/src/routes/applications/application.test.ts | 2 +- packages/experience/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 31dcc8e32d6..dc9abc7d35b 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -38,7 +38,7 @@ ports: port: 5432 visibility: public onOpen: ignore - - port: 5001 + - 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..a9ccebd58dd 100644 --- a/packages/core/src/middleware/koa-spa-proxy.ts +++ b/packages/core/src/middleware/koa-spa-proxy.ts @@ -11,7 +11,7 @@ import serveStatic from '#src/middleware/koa-serve-static.js'; export default function koaSpaProxy( mountedApps: string[], packagePath = 'experience', - port = 5001, + port = 7001, prefix = '' ): MiddlewareType { type Middleware = MiddlewareType; diff --git a/packages/core/src/routes/applications/application.test.ts b/packages/core/src/routes/applications/application.test.ts index f02353db2e1..fae2729607e 100644 --- a/packages/core/src/routes/applications/application.test.ts +++ b/packages/core/src/routes/applications/application.test.ts @@ -72,7 +72,7 @@ const applicationRoutes = await pickDefault(import('./application.js')); const customClientMetadata = { corsAllowedOrigins: [ 'http://localhost:5000', - 'http://localhost:5001', + '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", From 4b7498ce3c2b776815f47b9a588f6b78cf7f127d Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 2 Jul 2024 11:34:18 +0200 Subject: [PATCH 2/2] chore: add ogcio comments --- .gitpod.yml | 1 + packages/core/src/middleware/koa-spa-proxy.ts | 1 + packages/core/src/routes/applications/application.test.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/.gitpod.yml b/.gitpod.yml index dc9abc7d35b..b6a984ffb9f 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -38,6 +38,7 @@ ports: port: 5432 visibility: public onOpen: ignore + # OGCIO - formsie port collision fixed - port: 7001 onOpen: ignore - port: 5002 diff --git a/packages/core/src/middleware/koa-spa-proxy.ts b/packages/core/src/middleware/koa-spa-proxy.ts index a9ccebd58dd..d207ccfa581 100644 --- a/packages/core/src/middleware/koa-spa-proxy.ts +++ b/packages/core/src/middleware/koa-spa-proxy.ts @@ -11,6 +11,7 @@ import serveStatic from '#src/middleware/koa-serve-static.js'; export default function koaSpaProxy( mountedApps: string[], packagePath = 'experience', + // OGCIO - formsie port collision fixed port = 7001, prefix = '' ): MiddlewareType { diff --git a/packages/core/src/routes/applications/application.test.ts b/packages/core/src/routes/applications/application.test.ts index fae2729607e..f54689f5332 100644 --- a/packages/core/src/routes/applications/application.test.ts +++ b/packages/core/src/routes/applications/application.test.ts @@ -72,6 +72,7 @@ const applicationRoutes = await pickDefault(import('./application.js')); const customClientMetadata = { corsAllowedOrigins: [ 'http://localhost:5000', + // OGCIO - formsie port collision fixed 'http://localhost:7001', 'https://silverhand.com', 'capacitor://localhost',