unify build fs layout

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

build/generate-tray-icons.ts

@@ -9,7 +9,7 @@ import path from "path";
 import sharp from "sharp";
 
 const size = Number(process.env.OUTPUT_SIZE || "16");
-const outputFolder = process.env.OUTPUT_DIR || "./build/tray";
+const outputFolder = process.env.OUTPUT_DIR || "./static/build/tray";
 const inputFile = process.env.INPUT_SVG_PATH || "./src/renderer/components/icon/logo-lens.svg";
 const noticeFile = process.env.NOTICE_SVG_PATH || "./src/renderer/components/icon/notice.svg";
 const spinnerFile = process.env.SPINNER_SVG_PATH || "./src/renderer/components/icon/arrow-spinner.svg";

package.json

@@ -94,25 +94,10 @@
   "build": {
     "generateUpdatesFilesForAllChannels": true,
     "files": [
-      "static/build/main.js"
+      "static/**/*"
     ],
     "afterSign": "build/notarize.js",
     "extraResources": [
-      {
-        "from": "locales/",
-        "to": "locales/",
-        "filter": "**/*.js"
-      },
-      {
-        "from": "static/",
-        "to": "static/",
-        "filter": "!**/main.js"
-      },
-      {
-        "from": "build/tray",
-        "to": "static/icons",
-        "filter": "*.png"
-      },
       {
         "from": "extensions/",
         "to": "./extensions/",

src/common/vars/static-files-directory.injectable.ts

@@ -4,16 +4,14 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import joinPathsInjectable from "../path/join-paths.injectable";
-import lensResourcesDirInjectable from "./lens-resources-dir.injectable";
 
 const staticFilesDirectoryInjectable = getInjectable({
   id: "static-files-directory",
 
   instantiate: (di) => {
     const joinPaths = di.inject(joinPathsInjectable);
-    const lensResourcesDir = di.inject(lensResourcesDirInjectable);
 
-    return joinPaths(lensResourcesDir, "static");
+    return joinPaths(__dirname, "..");
   },
 });
 

src/extensions/extension-discovery/extension-discovery.injectable.ts

@@ -11,7 +11,6 @@ import extensionInstallationStateStoreInjectable from "../extension-installation
 import installExtensionInjectable from "../extension-installer/install-extension/install-extension.injectable";
 import extensionPackageRootDirectoryInjectable from "../extension-installer/extension-package-root-directory/extension-package-root-directory.injectable";
 import installExtensionsInjectable from "../extension-installer/install-extensions/install-extensions.injectable";
-import staticFilesDirectoryInjectable from "../../common/vars/static-files-directory.injectable";
 import readJsonFileInjectable from "../../common/fs/read-json-file.injectable";
 import loggerInjectable from "../../common/logger.injectable";
 import pathExistsInjectable from "../../common/fs/path-exists.injectable";
@@ -29,6 +28,7 @@ import getRelativePathInjectable from "../../common/path/get-relative-path.injec
 import joinPathsInjectable from "../../common/path/join-paths.injectable";
 import removePathInjectable from "../../common/fs/remove-path.injectable";
 import homeDirectoryPathInjectable from "../../common/os/home-directory-path.injectable";
+import lensResourcesDirInjectable from "../../common/vars/lens-resources-dir.injectable";
 
 const extensionDiscoveryInjectable = getInjectable({
   id: "extension-discovery",
@@ -41,7 +41,7 @@ const extensionDiscoveryInjectable = getInjectable({
     installExtension: di.inject(installExtensionInjectable),
     installExtensions: di.inject(installExtensionsInjectable),
     extensionPackageRootDirectory: di.inject(extensionPackageRootDirectoryInjectable),
-    staticFilesDirectory: di.inject(staticFilesDirectoryInjectable),
+    resourcesDirectory: di.inject(lensResourcesDirInjectable),
     readJsonFile: di.inject(readJsonFileInjectable),
     pathExists: di.inject(pathExistsInjectable),
     watch: di.inject(watchInjectable),

src/extensions/extension-discovery/extension-discovery.ts

@@ -38,7 +38,7 @@ interface Dependencies {
   readonly extensionsStore: ExtensionsStore;
   readonly extensionInstallationStateStore: ExtensionInstallationStateStore;
   readonly extensionPackageRootDirectory: string;
-  readonly staticFilesDirectory: string;
+  readonly resourcesDirectory: string;
   readonly logger: Logger;
   readonly isProduction: boolean;
   readonly fileSystemSeparator: string;
@@ -142,7 +142,7 @@ export class ExtensionDiscovery {
   }
 
   get inTreeFolderPath(): string {
-    return this.dependencies.joinPaths(this.dependencies.staticFilesDirectory, "../extensions");
+    return this.dependencies.joinPaths(this.dependencies.resourcesDirectory, "extensions");
   }
 
   get nodeModulesPath(): string {

src/main/tray/menu-icon/get-tray-icon-path.injectable.ts

@@ -4,7 +4,6 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import staticFilesDirectoryInjectable from "../../../common/vars/static-files-directory.injectable";
-import isDevelopmentInjectable from "../../../common/vars/is-development.injectable";
 import isMacInjectable from "../../../common/vars/is-mac.injectable";
 import { camelCase, flow, upperFirst } from "lodash/fp";
 import joinPathsInjectable from "../../../common/path/join-paths.injectable";
@@ -16,12 +15,11 @@ const getTrayIconPathInjectable = getInjectable({
   instantiate: (di) => {
     const joinPaths = di.inject(joinPathsInjectable);
     const staticFilesDirectory = di.inject(staticFilesDirectoryInjectable);
-    const isDevelopment = di.inject(isDevelopmentInjectable);
     const isMac = di.inject(isMacInjectable);
 
     const baseIconDirectory = joinPaths(
       staticFilesDirectory,
-      isDevelopment ? "../build/tray" : "icons", // copied within electron-builder extras
+      "build/tray",
     );
 
     const fileSuffix = isMac ? "Template.png" : ".png";