Stage

apps/desktop-timer/src/index.ts

@@ -18,7 +18,7 @@ process.env = Object.assign(process.env, environment);
 
 app.setName(process.env.NAME);
 
-console.log('Node Modules Path', path.join(__dirname, 'node_modules'));
+log.log('Node Modules Path', path.join(__dirname, 'node_modules'));
 
 const Store = require('electron-store');
 import * as remoteMain from '@electron/remote/main';

apps/desktop/src/index.ts

@@ -6,7 +6,7 @@ console.log = log.log;
 Object.assign(console, log.functions);
 
 import * as path from 'path';
-import { app, BrowserWindow, ipcMain, Tray, Menu, shell, MenuItemConstructorOptions, dialog } from 'electron';
+import { app, BrowserWindow, ipcMain, Menu, shell, MenuItemConstructorOptions, dialog } from 'electron';
 import * as remoteMain from '@electron/remote/main';
 
 import { environment } from './environments/environment';

package.json

@@ -124,15 +124,15 @@
 		"build:package:ui-config": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 && yarn run config:dev && yarn --cwd ./packages/ui-config lib:build",
 		"build:package:ui-config:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn run config:prod && yarn --cwd ./packages/ui-config lib:build:prod",
 		"build:package:auth": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/auth build",
-		"build:package:auth:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/auth build",
+		"build:package:auth:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/auth build:prod",
 		"build:package:core": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/core build",
-		"build:package:core:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/core build",
+		"build:package:core:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/core build:prod",
 		"build:package:common": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/common build",
-		"build:package:common:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/common build",
+		"build:package:common:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/common build:prod",
 		"build:package:common-angular": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/common-angular build",
-		"build:package:common-angular:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/common-angular build",
+		"build:package:common-angular:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/common-angular build:prod",
 		"build:package:contracts": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/contracts build",
-		"build:package:contracts:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/contracts build",
+		"build:package:contracts:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/contracts build:prod",
 		"build:package:config": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/config build",
 		"build:package:config:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/config build:prod",
 		"build:package:plugin": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugin build",
@@ -156,17 +156,17 @@
 		"build:package:plugin:jitsu-analytic": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/jitsu-analytics build",
 		"build:package:plugin:jitsu-analytic:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/jitsu-analytics build:prod",
 		"build:package:plugin:product-reviews": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/product-reviews build",
-		"build:package:plugin:product-reviews:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/product-reviews:prod build",
+		"build:package:plugin:product-reviews:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/product-reviews build:prod",
 		"build:package:plugin:job-search": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/job-search build",
-		"build:package:plugin:job-search:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/job-search build",
+		"build:package:plugin:job-search:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/job-search build:prod",
 		"build:package:plugin:job-search-ui": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/job-search-ui lib:build",
 		"build:package:plugin:job-search-ui:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/job-search-ui lib:build:prod",
 		"build:package:plugin:job-proposal": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/job-proposal build",
 		"build:package:plugin:job-proposal:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/job-proposal build:prod",
 		"build:package:plugin:knowledge-base": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/knowledge-base build",
-		"build:package:plugin:knowledge-base:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/knowledge-base build",
+		"build:package:plugin:knowledge-base:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/knowledge-base build:prod",
 		"build:package:plugin:changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/changelog build",
-		"build:package:plugin:changelog:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/changelog build",
+		"build:package:plugin:changelog:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/changelog build:prod",
 		"build:package:plugin:integration-wakatime": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/integration-wakatime build",
 		"build:package:plugin:integration-wakatime:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn --cwd ./packages/plugins/integration-wakatime build:prod",
 		"build:package:all": "yarn run build:package:contracts && yarn run build:package:common && yarn run build:package:common-angular && yarn run build:package:config && yarn run build:package:plugin && yarn run build:package:auth && yarn run build:package:plugins:pre && yarn run build:package:core && yarn run build:package:plugins:post && yarn build:package:desktop-libs && yarn build:package:plugin:integration-wakatime && yarn build:package:desktop-ui-lib",

packages/auth/package.json

@@ -22,6 +22,7 @@
 	},
 	"scripts": {
 		"build": "rimraf dist && yarn run compile",
+		"build:prod": "rimraf dist && yarn run compile",
 		"compile": "tsc -p tsconfig.build.json"
 	},
 	"keywords": [],

packages/common-angular/package.json

@@ -25,6 +25,7 @@
 		"test": "jest",
 		"test:e2e": "jest --config ./__test__/jest.config.json",
 		"build": "rimraf dist && yarn run compile",
+		"build:prod": "rimraf dist && yarn run compile:prod",
 		"compile": "tsc -p tsconfig.build.json"
 	},
 	"dependencies": {

packages/common/package.json

@@ -25,6 +25,7 @@
 		"test": "jest",
 		"test:e2e": "jest --config ./__test__/jest.config.json",
 		"build": "rimraf dist && yarn run compile",
+		"build:prod": "rimraf dist && yarn run compile",
 		"compile": "tsc -p tsconfig.build.json"
 	},
 	"dependencies": {

packages/contracts/package.json

@@ -25,6 +25,7 @@
 		"test": "jest",
 		"test:e2e": "jest --config ./__test__/jest.config.json",
 		"build": "rimraf dist && yarn run compile",
+		"build:prod": "rimraf dist && yarn run compile",
 		"compile": "tsc -p tsconfig.build.json"
 	},
 	"devDependencies": {

packages/core/package.json

@@ -31,6 +31,7 @@
 		"migration:revert": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=14000 yarn ts-node -r tsconfig-paths/register ./src/database/migration.ts migration:revert",
 		"migration:create": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=14000 yarn ts-node -r tsconfig-paths/register ./src/database/migration.ts migration:create",
 		"build": "nest build",
+		"build:prod": "nest build",
 		"postbuild": "yarn run copy-files",
 		"copy-files": "copyfiles -u 1 src/**/**/*.gql src/**/**/*.hbs src/**/**/*.mjml src/**/*.csv src/**/*.json dist/",
 		"prepublishOnly": "yarn run build",

packages/desktop-api/package.json

@@ -22,6 +22,7 @@
 	},
 	"scripts": {
 		"build": "rimraf dist && yarn run compile",
+		"build:prod": "rimraf dist && yarn run compile",
 		"compile": "tsc -p tsconfig.app.json"
 	},
 	"keywords": [],

packages/desktop-libs/package.json

@@ -22,6 +22,7 @@
 	},
 	"scripts": {
 		"build": "rimraf dist && yarn run compile",
+		"build:prod": "rimraf dist && yarn run compile",
 		"compile": "tsc -p tsconfig.build.json",
 		"knex": "./node_modules/.bin/knex --knexfile src/lib/offline/databases/knexfile.ts"
 	},

packages/desktop-libs/src/lib/desktop-ipc.ts

@@ -6,7 +6,6 @@ import { notifyScreenshot, takeshot } from './desktop-screenshot';
 import { resetPermissions } from 'mac-screen-capture-permissions';
 import * as _ from 'underscore';
 import { ScreenCaptureNotification, loginPage } from '@gauzy/desktop-window';
-import log from 'electron-log';
 import NotificationDesktop from './desktop-notifier';
 import { DesktopPowerManager } from './desktop-power-manager';
 import { PowerManagerPreventDisplaySleep, PowerManagerDetectInactivity } from './decorators';
@@ -30,6 +29,7 @@ import { IActivityWatchEventResult } from '@gauzy/contracts';
 
 const timerHandler = new TimerHandler();
 
+import log from 'electron-log';
 console.log = log.log;
 Object.assign(console, log.functions);
 

packages/desktop-libs/src/lib/desktop-store.ts

@@ -1,5 +1,6 @@
 const Store = require('electron-store');
 const store = new Store();
+
 export const LocalStore = {
 	getStore: (source) => {
 		return store.get(source);

packages/desktop-libs/src/lib/desktop-timer.ts

@@ -4,7 +4,6 @@ import { metaData } from './desktop-wakatime';
 import { LocalStore } from './desktop-store';
 import NotificationDesktop from './desktop-notifier';
 import { detectActiveWindow, getScreenshot } from './desktop-screenshot';
-import log from 'electron-log';
 import { ActivityType, ITimeLog, TimeLogSourceEnum } from '@gauzy/contracts';
 import { DesktopEventCounter } from './desktop-event-counter';
 import { DesktopActiveWindow } from './desktop-active-window';
@@ -22,6 +21,7 @@ import {
 	ActivityWatchEdgeService
 } from './integrations';
 
+import log from 'electron-log';
 console.log = log.log;
 Object.assign(console, log.functions);
 

packages/desktop-libs/src/lib/desktop-tray.ts

@@ -4,9 +4,10 @@ import { handleLogoutDialog } from './desktop-ipc';
 import { LocalStore } from './desktop-store';
 import { User, UserService } from './offline';
 import { TranslateService } from './translation';
-const Store = require('electron-store');
 import TitleOptions = Electron.TitleOptions;
 
+const Store = require('electron-store');
+
 export class TrayIcon {
 	tray: Tray;
 	contextMenu: MenuItemConstructorOptions[] = [];

packages/desktop-libs/src/lib/error-handler/app.error.ts

@@ -1,8 +1,8 @@
 import * as Sentry from '@sentry/electron';
 import { BaseError } from './base.error';
-import log from 'electron-log';
 import { ErrorEventManager } from './error-event-manager';
 
+import log from 'electron-log';
 console.error = log.error;
 Object.assign(console, log.functions);
 

packages/desktop-libs/src/lib/error-handler/ui.error.ts

@@ -1,7 +1,7 @@
 import { BaseError } from './base.error';
-import log from 'electron-log';
 import { ErrorEventManager } from './error-event-manager';
 
+import log from 'electron-log';
 console.error = log.error;
 Object.assign(console, log.functions);
 

packages/desktop-ui-lib/package.json

@@ -22,6 +22,7 @@
 	},
 	"scripts": {
 		"build": "rimraf dist && yarn run compile",
+		"build:prod": "rimraf dist && yarn run compile",
 		"compile": "tsc -p tsconfig.lib.json"
 	},
 	"keywords": [],

packages/desktop-ui-lib/src/lib/electron/services/electron/logger.service.ts

@@ -1,24 +1,25 @@
 import { Injectable } from '@angular/core';
 import { ElectronService } from './electron.service';
-import * as Log from 'electron-log';
+import log from 'electron-log';
 
 @Injectable({
-	providedIn: 'root',
+	providedIn: 'root'
 })
 export class LoggerService {
-	private _log: Log.ElectronLog;
+	private _log: log.ElectronLog;
 
 	constructor(private readonly _electronService: ElectronService) {
 		if (this._electronService.isElectron) {
-			// Previously we used that class to on-demand load the electron-log module, but now we load it in the header of this file.
+			// Previously we used that class to on-demand load the electron-log module,
+			// but now we load it in the header of this file.
 			// Still we want to keep that way to "require" it for now
 			this._log = window.require('electron-log');
 			console.log = this._log.log;
 			Object.assign(console, this._log.functions);
 		}
 	}
 
-	public get log(): Log.ElectronLog {
+	public get log(): log.ElectronLog {
 		return this._log;
 	}
 }

packages/desktop-window/package.json

@@ -22,6 +22,7 @@
 	},
 	"scripts": {
 		"build": "rimraf dist && yarn run compile",
+		"build:prod": "rimraf dist && yarn run compile",
 		"compile": "tsc -p tsconfig.build.json"
 	},
 	"keywords": [],

packages/desktop-window/src/lib/concretes/window-config.ts

@@ -1,6 +1,10 @@
 import { BrowserWindowConstructorOptions } from 'electron';
 import { IWindowConfig } from '../interfaces';
 
+import log from 'electron-log';
+console.log = log.log;
+Object.assign(console, log.functions);
+
 const Store = require('electron-store');
 const store = new Store();
 
@@ -9,25 +13,21 @@ export class WindowConfig implements IWindowConfig {
 	private _path: string;
 	private _hash: string;
 
-	constructor(
-		hash: string,
-		path: string,
-		options?: BrowserWindowConstructorOptions
-	) {
+	constructor(hash: string, path: string, options?: BrowserWindowConstructorOptions) {
 		this._hash = hash;
 		this.path = path;
 		this.options = {
 			webPreferences: {
 				nodeIntegration: true,
 				webSecurity: false,
 				contextIsolation: false,
-				sandbox: false,
+				sandbox: false
 			},
 			title: '',
 			show: false,
 			center: true,
 			icon: store.get('filePath').iconPath,
-			...options,
+			...options
 		};
 	}
 

packages/desktop-window/src/lib/desktop-window-about.ts

@@ -1,12 +1,16 @@
 import { BrowserWindow, Menu } from 'electron';
 import * as url from 'url';
 import * as remoteMain from '@electron/remote/main';
+
+import log from 'electron-log';
+console.log = log.log;
+Object.assign(console, log.functions);
+
 const Store = require('electron-store');
 const store = new Store();
 
 export async function createAboutWindow(filePath) {
-	const mainWindowSettings: Electron.BrowserWindowConstructorOptions =
-		windowSetting();
+	const mainWindowSettings: Electron.BrowserWindowConstructorOptions = windowSetting();
 
 	const window = new BrowserWindow(mainWindowSettings);
 	remoteMain.enable(window.webContents);
@@ -23,8 +27,7 @@ export async function createAboutWindow(filePath) {
 	window.setMenu(null);
 
 	window.on('show', () => {
-		Menu.getApplicationMenu().getMenuItemById('gauzy-about').enabled =
-			false;
+		Menu.getApplicationMenu().getMenuItemById('gauzy-about').enabled = false;
 	});
 
 	window.on('close', (event) => {

packages/desktop-window/src/lib/desktop-window-image-viewer.ts

@@ -1,10 +1,14 @@
 import { BrowserWindow } from 'electron';
 import * as url from 'url';
 import * as remoteMain from '@electron/remote/main';
+
+import log from 'electron-log';
+console.log = log.log;
+Object.assign(console, log.functions);
+
 const Store = require('electron-store');
 const store = new Store();
 
-
 export async function createImageViewerWindow(imageViewWindow, filePath) {
 	const mainWindowSettings: Electron.BrowserWindowConstructorOptions = windowSetting();
 	imageViewWindow = new BrowserWindow(mainWindowSettings);

packages/desktop-window/src/lib/desktop-window-server.ts

@@ -1,11 +1,15 @@
 import { BrowserWindow } from 'electron';
 import * as remoteMain from '@electron/remote/main';
 import * as url from 'url';
+
+import log from 'electron-log';
+console.log = log.log;
+Object.assign(console, log.functions);
+
 const Store = require('electron-store');
 const store = new Store();
 
 export async function createServerWindow(serverWindow, config, filePath) {
-
 	let mainWindowSettings: Electron.BrowserWindowConstructorOptions = null;
 	mainWindowSettings = windowSetting();
 
@@ -52,7 +56,7 @@ const windowSetting = () => {
 		},
 		width: 380,
 		height: 400,
-		title:  process.env.DESCRIPTION || '',
+		title: process.env.DESCRIPTION || '',
 		show: false,
 		center: true
 	};

packages/desktop-window/src/lib/desktop-window-setting.ts

@@ -1,14 +1,19 @@
 import { BrowserWindow } from 'electron';
 import * as url from 'url';
 import * as remoteMain from '@electron/remote/main';
+
+import log from 'electron-log';
+console.log = log.log;
+Object.assign(console, log.functions);
+
 const Store = require('electron-store');
 const store = new Store();
 
 export async function createSettingsWindow(settingsWindow, filePath) {
 	const mainWindowSettings: Electron.BrowserWindowConstructorOptions = windowSetting();
 
 	settingsWindow = new BrowserWindow(mainWindowSettings);
-	remoteMain.enable(settingsWindow.webContents)
+	remoteMain.enable(settingsWindow.webContents);
 	const launchPath = url.format({
 		pathname: filePath,
 		protocol: 'file:',

packages/desktop-window/src/lib/desktop-window-setup.ts

@@ -1,6 +1,11 @@
 import { BrowserWindow, Menu, app } from 'electron';
 import * as url from 'url';
 import * as remoteMain from '@electron/remote/main';
+
+import log from 'electron-log';
+console.log = log.log;
+Object.assign(console, log.functions);
+
 const Store = require('electron-store');
 const store = new Store();
 

packages/desktop-window/src/lib/desktop-window-timer.ts

@@ -1,8 +1,14 @@
 import { BrowserWindow, screen } from 'electron';
 import * as url from 'url';
 import * as remoteMain from '@electron/remote/main';
+
+import log from 'electron-log';
+console.log = log.log;
+Object.assign(console, log.functions);
+
 const Store = require('electron-store');
 const store = new Store();
+
 export async function createTimeTrackerWindow(timeTrackerWindow, filePath) {
 	const mainWindowSettings: Electron.BrowserWindowConstructorOptions = windowSetting();