Get a basic dev mode working

Signed-off-by: Sebastian Malton <sebastian@malton.name>

packages/core/package.json

@@ -291,7 +291,7 @@
     "typedoc-plugin-markdown": "^3.13.6",
     "typescript": "^4.9.5",
     "typescript-plugin-css-modules": "^3.4.0",
-    "webpack": "^5.75.0",
+    "webpack": "^5.77.0",
     "webpack-cli": "^4.9.2",
     "webpack-dev-server": "^4.11.1",
     "webpack-node-externals": "^3.0.0",

packages/core/src/main/routes/files/development.injectable.ts

@@ -1,29 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import httpProxy from "http-proxy";
-import { webpackDevServerPort } from "../../../../webpack/vars";
-import { publicPath } from "../../../common/vars";
-import type { LensApiRequest, RouteResponse } from "../../router/route";
-
-const devStaticFileRouteHandlerInjectable = getInjectable({
-  id: "dev-static-file-route-handler",
-  instantiate: () => {
-    const proxy = httpProxy.createProxy();
-    const proxyTarget = `http://127.0.0.1:${webpackDevServerPort}`;
-
-    return async ({ raw: { req, res }}: LensApiRequest<"/{path*}">): Promise<RouteResponse<Buffer>> => {
-      if (req.url === "/" || !req.url || !req.url.startsWith(publicPath)) {
-        req.url = `${publicPath}/index.html`;
-      }
-
-      proxy.web(req, res, { target: proxyTarget });
-
-      return { proxy };
-    };
-  },
-});
-
-export default devStaticFileRouteHandlerInjectable;

packages/core/src/main/routes/files/route-handler.injectable.ts

@@ -13,8 +13,8 @@ import { contentTypes } from "../../router/router-content-types";
 import loggerInjectable from "../../../common/logger.injectable";
 import { publicPath } from "../../../common/vars";
 
-const prodStaticFileRouteHandlerInjectable = getInjectable({
-  id: "prod-static-file-route-handler",
+const staticFileRouteHandlerInjectable = getInjectable({
+  id: "tatic-file-route-handler",
   instantiate: (di) => {
     const readFileBuffer = di.inject(readFileBufferInjectable);
     const joinPaths = di.inject(joinPathsInjectable);
@@ -56,4 +56,4 @@ const prodStaticFileRouteHandlerInjectable = getInjectable({
   },
 });
 
-export default prodStaticFileRouteHandlerInjectable;
+export default staticFileRouteHandlerInjectable;

packages/core/src/main/routes/files/static-file-route.injectable.ts

@@ -3,26 +3,16 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getRouteInjectable } from "../../router/router.injectable";
-import isDevelopmentInjectable from "../../../common/vars/is-development.injectable";
 import { route } from "../../router/route";
-import prodStaticFileRouteHandlerInjectable from "./production.injectable";
-import devStaticFileRouteHandlerInjectable from "./development.injectable";
+import staticFileRouteHandlerInjectable from "./route-handler.injectable";
 
 const staticFileRouteInjectable = getRouteInjectable({
   id: "static-file-route",
 
-  instantiate: (di) => {
-    const isDevelopment = di.inject(isDevelopmentInjectable);
-
-    return route({
-      method: "get",
-      path: `/{path*}`,
-    })(
-      isDevelopment
-        ? di.inject(devStaticFileRouteHandlerInjectable)
-        : di.inject(prodStaticFileRouteHandlerInjectable),
-    );
-  },
+  instantiate: (di) => route({
+    method: "get",
+    path: `/{path*}`,
+  })(di.inject(staticFileRouteHandlerInjectable)),
 });
 
 export default staticFileRouteInjectable;

packages/core/webpack/vars.ts

@@ -3,7 +3,6 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import assert from "assert";
 import path from "path";
 import packageInfo from "../package.json";
 
@@ -20,6 +19,3 @@ export const appName = isDevelopment
 export const htmlTemplate = path.resolve(rendererDir, "template.html");
 export const publicPath = "/build/";
 export const sassCommonVars = path.resolve(rendererDir, "components/vars.scss");
-export const webpackDevServerPort = Number(process.env.WEBPACK_DEV_SERVER_PORT) || 9191;
-
-assert(Number.isInteger(webpackDevServerPort), "WEBPACK_DEV_SERVER_PORT environment variable must only be an integer");