revert base folder structure to src/*

.gitignore

@@ -7,4 +7,4 @@ tmp/
 static/build/client/
 binaries/client/
 binaries/server/
-locales/**/**.js
+src/locales/**/**.js

.linguirc

@@ -1,18 +0,0 @@
-{
-  "locales": ["en", "ru"],
-  "sourceLocale": "en",
-  "fallbackLocale": "en",
-  "compileNamespace": "cjs",
-  "format": "po",
-  "extractBabelOptions": {
-    "plugins": [
-      "@babel/plugin-syntax-dynamic-import"
-    ]
-  },
-  "catalogs": [
-    {
-      "path": "./locales/{locale}/messages",
-      "include": "./renderer"
-    }
-  ]
-}

package.json

@@ -3,7 +3,7 @@
   "productName": "Lens",
   "description": "Lens - The Kubernetes IDE",
   "version": "3.5.0-beta.1",
-  "main": "main/index.ts",
+  "main": "src/main",
   "scripts": {
     "dev": "electron-webpack dev",
     "compile": "yarn download-bins && yarn i18n:compile  && electron-webpack compile",
@@ -38,14 +38,32 @@
     "commonSourceDirectory": "./common",
     "staticSourceDirectory": "./static",
     "main": {
-      "sourceDirectory": "./main"
+      "sourceDirectory": "./src/main"
     },
     "renderer": {
-      "sourceDirectory": "./renderer",
-      "template": "./renderer/template.html",
-      "webpackConfig": "./renderer/webpack.renderer.js"
+      "sourceDirectory": "./src/renderer",
+      "template": "./src/renderer/template.html",
+      "webpackConfig": "./src/renderer/webpack.renderer.js"
     }
   },
+  "lingui": {
+    "locales": ["en", "ru"],
+    "sourceLocale": "en",
+    "fallbackLocale": "en",
+    "compileNamespace": "cjs",
+    "format": "po",
+    "extractBabelOptions": {
+      "plugins": [
+        "@babel/plugin-syntax-dynamic-import"
+      ]
+    },
+    "catalogs": [
+      {
+        "path": "./src/locales/{locale}/messages",
+        "include": "./src/renderer"
+      }
+    ]
+  },
   "jest": {
     "collectCoverage": true,
     "testRegex": "spec/.*_(spec)\\.[jt]sx?$",
@@ -59,7 +77,7 @@
     "afterSign": "build/notarize.js",
     "extraResources": [
       {
-        "from": "(features|static|locales)/",
+        "from": "src/(features|static|locales)",
         "filter": "**/*"
       },
       "LICENSE"

renderer/_vue/assets/css/fonts.scss

@@ -1,2 +0,0 @@
-@import "~typeface-roboto/index.css";
-@import "~material-design-icons/iconfont/material-icons.css";

spec/src/main/kubectl_spec.ts

@@ -1,7 +1,7 @@
 import { bundledKubectl, Kubectl } from "../../../main/kubectl";
 
 jest.mock("electron")
-jest.mock("../../../src/common/user-store")
+jest.mock("../../../common/user-store")
 
 describe("kubectlVersion", () => {
 

src/common/request.ts

@@ -1,5 +1,5 @@
 import request from "request"
-import { userStore } from "../common/user-store"
+import { userStore } from "./user-store"
 
 export function globalRequestOpts(requestOpts: request.Options ) {
   const userPrefs = userStore.getPreferences()

src/common/tracker.ts

@@ -1,6 +1,6 @@
 import ua from "universal-analytics"
 import { machineIdSync } from "node-machine-id"
-import { userStore } from "../common/user-store"
+import { userStore } from "./user-store"
 
 const GA_ID = "UA-159377374-1"
 

src/common/utils/app-version.ts

@@ -1,9 +1,10 @@
+import packageInfo from "../../../package.json"
 import { app, remote } from "electron"
 
 /**
- *
  * @returns app version correctly regardless of dev/prod mode and main/renderer differences
  */
 export function getAppVersion(): string {
-  return (app || remote.app).getVersion();
+  const version = (app || remote.app).getVersion();
+  return version || packageInfo.version;
 }

src/common/vars.ts

@@ -1,5 +1,5 @@
 // App's common paths/flags/etc. for any process
-import packageInfo from "../package.json"
+import packageInfo from "../../package.json"
 import path from "path";
 
 const { main, renderer } = packageInfo.electronWebpack;

src/main/helm-cli.ts

@@ -1,4 +1,4 @@
-import packageInfo from "../package.json"
+import packageInfo from "../../package.json"
 import path from "path"
 import { LensBinary, LensBinaryOpts } from "./lens-binary"
 import { isProduction } from "../common/vars";

src/main/kubectl.ts

@@ -1,4 +1,4 @@
-import packageInfo from "../package.json"
+import packageInfo from "../../package.json"
 import { app, remote } from "electron"
 import path from "path"
 import fs from "fs"

src/renderer/_vue/assets/css/app.scss

@@ -1,8 +1,8 @@
 
 @import 'custom';
 @import 'fonts';
-@import '~bootstrap/scss/bootstrap';
-@import '~bootstrap-vue/src/index.scss';
+@import '../../../../../node_modules/bootstrap/scss/bootstrap';
+@import '../../../../../node_modules/bootstrap-vue/src/index';
 
 html, body {
   margin: 0;

src/renderer/_vue/assets/css/fonts.scss

@@ -0,0 +1,2 @@
+@import "../../../../../node_modules/typeface-roboto/index.css";
+@import "../../../../../node_modules/material-design-icons/iconfont/material-icons.css";