From 0ba5a1250669fe5453b7255f902c7c8241fce63c Mon Sep 17 00:00:00 2001 From: Dmitriy Noa Date: Fri, 8 Apr 2022 15:59:46 +0200 Subject: [PATCH] Move devserver to different port (#5224) * Move devserver to different port Signed-off-by: DmitriyNoa * Move port to common vars Signed-off-by: DmitriyNoa * Use Number to cast Signed-off-by: DmitriyNoa --- src/common/vars.ts | 2 ++ src/main/routes/static-file-route.injectable.ts | 4 ++-- webpack.dev-server.ts | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/common/vars.ts b/src/common/vars.ts index 63e441ed1a..d166e68291 100644 --- a/src/common/vars.ts +++ b/src/common/vars.ts @@ -135,3 +135,5 @@ export const appSemVer = new SemVer(packageInfo.version); export const docsUrl = "https://docs.k8slens.dev/main/" as string; export const sentryDsn = packageInfo.config?.sentryDsn ?? ""; + +export const webpackDevServerPort: number = Number(process.env.WEBPACK_DEV_SERVER_PORT) || 9191; diff --git a/src/main/routes/static-file-route.injectable.ts b/src/main/routes/static-file-route.injectable.ts index cca25f2ed3..e1ee4862b2 100644 --- a/src/main/routes/static-file-route.injectable.ts +++ b/src/main/routes/static-file-route.injectable.ts @@ -8,7 +8,7 @@ import type { SupportedFileExtension } from "../router/router-content-types"; import { contentTypes } from "../router/router-content-types"; import logger from "../logger"; import { routeInjectionToken } from "../router/router.injectable"; -import { appName, publicPath } from "../../common/vars"; +import { appName, publicPath, webpackDevServerPort } from "../../common/vars"; import path from "path"; import isDevelopmentInjectable from "../../common/vars/is-development.injectable"; import httpProxy from "http-proxy"; @@ -74,7 +74,7 @@ const handleStaticFileInDevelopment = } proxy.web(req, res, { - target: "http://127.0.0.1:8080", + target: `http://127.0.0.1:${webpackDevServerPort}`, }); return { proxy }; diff --git a/webpack.dev-server.ts b/webpack.dev-server.ts index 487c89c024..966a0f32de 100644 --- a/webpack.dev-server.ts +++ b/webpack.dev-server.ts @@ -6,7 +6,7 @@ import Webpack from "webpack"; import WebpackDevServer from "webpack-dev-server"; import { webpackLensRenderer } from "./webpack.renderer"; -import { buildDir } from "./src/common/vars"; +import { buildDir, webpackDevServerPort } from "./src/common/vars"; import logger from "./src/common/logger"; /** @@ -26,6 +26,7 @@ function createDevServer(): WebpackDevServer { }, allowedHosts: "all", host: "localhost", + port: webpackDevServerPort, static: buildDir, // aka `devServer.contentBase` in webpack@4 hot: "only", // use HMR only without errors liveReload: false,