Windows build fix (#159)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

Makefile

@@ -40,6 +40,7 @@ test-dashboard: dashboard-deps
 	cd dashboard && yarn test
 
 build-dashboard: dashboard-deps clean-dashboard
+	export NODE_ENV=production
 	cd dashboard && yarn build
 
 clean:

dashboard/.gitignore

@@ -11,4 +11,3 @@ dump.rdb
 /tslint.json
 *.DS_Store
 locales/_build/
-locales/**/*.js

dashboard/client/i18n.ts

@@ -44,7 +44,7 @@ export class LocalizationStore {
   async load(locale: string) {
     const catalog = await import(
       /* webpackMode: "lazy", webpackChunkName: "locale/[request]" */
-      `@lingui/loader!../locales/${locale}/messages.po`
+      `../locales/${locale}/messages.js`
     );
     return _i18n.load(locale, catalog);
   }
@@ -59,4 +59,4 @@ export class LocalizationStore {
   }
 }
 
-export const i18nStore = new LocalizationStore();
+export const i18nStore = new LocalizationStore();

dashboard/locales/ru/messages.po

@@ -1080,8 +1080,8 @@ msgstr "IP балансировщика нагрузки"
 msgid "Loading"
 msgstr "Загрузка"
 
-#: client/components/+workloads-pods/pod-menu.tsx:67
+#: client/components/+workloads-pods/pod-menu.tsx:86
-#: client/components/+workloads-pods/pod-menu.tsx:68
+#: client/components/+workloads-pods/pod-menu.tsx:87
 msgid "Logs"
 msgstr "Логи"
 
@@ -1503,7 +1503,7 @@ msgstr "Селектор подов"
 msgid "Pod Status"
 msgstr "Статус подов"
 
-#: client/components/+workloads-pods/pod-menu.tsx:44
+#: client/components/+workloads-pods/pod-menu.tsx:63
 msgid "Pod shell"
 msgstr "Командная строка пода"
 
@@ -1967,7 +1967,7 @@ msgid "Set quota"
 msgstr "Установить квоту"
 
 #: client/components/+nodes/node-menu.tsx:48
-#: client/components/+workloads-pods/pod-menu.tsx:45
+#: client/components/+workloads-pods/pod-menu.tsx:64
 msgid "Shell"
 msgstr "Командная строка"
 

dashboard/package.json

@@ -2,12 +2,12 @@
   "name": "kontena-lens",
   "version": "0.0.0",
   "scripts": {
-    "dev": "yarn extract && webpack-cli --watch --cache --progress --output-path ../static/build/client/",
+    "dev": "yarn compile && webpack-cli --watch --cache --progress --output-path ../static/build/client/",
-    "build": "yarn extract && env NODE_ENV=production webpack -p --progress --output-path ../static/build/client/",
+    "build": "webpack -p --progress --output-path ../static/build/client/",
     "test": "jest --config './test/jest.config.js'",
     "add-locale": "lingui add-locale",
-    "extract": "lingui extract --clean",
+    "lingui-extract": "lingui extract --clean",
-    "compile": "lingui compile"
+    "lingui-compile": "lingui compile"
   },
   "dependencies": {
     "axios": "^0.19.0",

dashboard/webpack.config.ts

@@ -9,8 +9,8 @@ export default () => {
   const { IS_PRODUCTION } = config;
   const srcDir = path.resolve(process.cwd(), CLIENT_DIR);
   const buildDir = path.resolve(process.cwd(), BUILD_DIR, CLIENT_DIR);
-  const sassCommonVarsFile = path.resolve(srcDir, "components/vars.scss");
   const tsConfigClientFile = path.resolve(srcDir, "tsconfig.json");
+  const sassCommonVarsFile = "./components/vars.scss"; // needs to be relative for Windows
 
   return {
     entry: {
@@ -45,7 +45,7 @@ export default () => {
             extractComments: {
               condition: "some",
               banner: [
-                `Kontena Lens. Copyright ${new Date().getFullYear()} by Lakend Labs, Inc. All rights reserved.`
+                `Lens. Copyright ${new Date().getFullYear()} by Lakend Labs, Inc. All rights reserved.`
               ].join("\n")
             }
           })

package.json

@@ -90,7 +90,7 @@
     }
   },
   "scripts": {
-    "dev": "concurrently -n 'app,dash' 'yarn dev-electron' 'yarn dev-dashboard'",
+    "dev": "concurrently -n app,dash \"yarn dev-electron\" \"yarn dev-dashboard\"",
     "dev-dashboard": "cd dashboard && yarn dev",
     "dev-electron": "electron-webpack dev",
     "compile": "yarn download:kubectl && electron-webpack",