From ad26e810dae5fcbdbc31e2db2655e2dc2c05ca65 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Mon, 6 Feb 2023 11:24:38 +0200 Subject: [PATCH] Tweak evil static import paths in build of application Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- packages/open-lens/package.json | 2 +- packages/open-lens/webpack/renderer.ts | 3 ++- packages/open-lens/webpack/vars.ts | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/open-lens/package.json b/packages/open-lens/package.json index f84f1bcccb..03688afb0e 100644 --- a/packages/open-lens/package.json +++ b/packages/open-lens/package.json @@ -34,7 +34,7 @@ "dev:main": "cross-env NODE_ENV=development webpack --config webpack/main.ts --progress --watch", "dev:renderer": "cross-env NODE_ENV=development ts-node ./webpack/dev-server.ts", "test:integration": "jest -xyz --runInBand --detectOpenHandles --forceExit --modulePaths=[\"/integration/\"];", - "build:tray-icons": "generate-tray-icons --output ./static/build/tray --input ./node_modules/@k8slens/core/src/renderer/components/icon/logo-lens.svg --notice-icon ./node_modules/@k8slens/core/src/renderer/components/icon/notice.svg --spinner-icon ./node_modules/@k8slens/core/src/renderer/components/icon/arrow-spinner.svg", + "build:tray-icons": "generate-tray-icons --output ./static/build/tray --input ../../node_modules/@k8slens/core/src/renderer/components/icon/logo-lens.svg --notice-icon ../../node_modules/@k8slens/core/src/renderer/components/icon/notice.svg --spinner-icon ../../node_modules/@k8slens/core/src/renderer/components/icon/arrow-spinner.svg", "download:binaries": "ensure-binaries --package ./package.json --base-dir ./binaries/client" }, "config": { diff --git a/packages/open-lens/webpack/renderer.ts b/packages/open-lens/webpack/renderer.ts index 979aa7ec1d..cd3f65e978 100644 --- a/packages/open-lens/webpack/renderer.ts +++ b/packages/open-lens/webpack/renderer.ts @@ -117,7 +117,8 @@ new CopyPlugin({ patterns: [ { - from: "node_modules/@k8slens/core/static/build/library/*.ttf", + // TODO: Figure out a way to access without relative path + from: "../../node_modules/@k8slens/core/static/build/library/*.ttf", to: "[name][ext]", }, ], diff --git a/packages/open-lens/webpack/vars.ts b/packages/open-lens/webpack/vars.ts index 0179c20af0..41ebdcf334 100644 --- a/packages/open-lens/webpack/vars.ts +++ b/packages/open-lens/webpack/vars.ts @@ -11,9 +11,11 @@ export const mainDir = path.join(process.cwd(), "src", "main"); export const buildDir = path.join(process.cwd(), "static", "build"); export const assetsFolderName = "assets"; export const rendererDir = path.join(process.cwd(), "src", "renderer"); -export const htmlTemplate = path.resolve(__dirname, "..", "node_modules", "@k8slens", "core", "src/renderer", "template.html"); export const publicPath = "/build/"; -export const sassCommonVars = path.resolve(__dirname, "..", "node_modules", "@k8slens", "core", "src", "renderer", "components/vars.scss"); export const webpackDevServerPort = Number(process.env.WEBPACK_DEV_SERVER_PORT) || 9191; +// TODO: Figure out a way to access these without relative paths +export const htmlTemplate = path.resolve(__dirname, "..", "..", "..", "node_modules", "@k8slens", "core", "src/renderer", "template.html"); +export const sassCommonVars = path.resolve(__dirname, "..", "..", "..", "node_modules", "@k8slens", "core", "src", "renderer", "components/vars.scss"); + assert(Number.isInteger(webpackDevServerPort), "WEBPACK_DEV_SERVER_PORT environment variable must only be an integer");