fontastic 0.1.3 → 0.2.0

package/app/main.js

@@ -1,82 +1,98 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const electron_1 = require("electron");
-const path = require("path");
-const fs = require("fs");
-const url = require("url");
-const node_machine_id_1 = require("node-machine-id");
-const Application_1 = require("./Application");
-let win = null;
-const args = process.argv.slice(1), serve = args.some(val => val === '--serve');
-function createWindow() {
-    const electronScreen = electron_1.screen;
-    const size = electronScreen.getPrimaryDisplay().workAreaSize;
-    // Create the browser window.
-    win = new electron_1.BrowserWindow({
-        x: 0,
-        y: 0,
-        width: size.width,
-        height: size.height,
-        webPreferences: {
-            webSecurity: false,
-            nodeIntegration: true,
-            allowRunningInsecureContent: (serve),
-            contextIsolation: false, // false if you want to run e2e test with Spectron
-        },
-    });
-    (0, node_machine_id_1.machineId)(true).then((machineId) => new Application_1.default(machineId, !serve, win).initialize());
-    if (serve) {
-        const debug = require('electron-debug');
-        debug();
-        require('electron-reloader')(module);
-        win.loadURL('http://localhost:4200');
-    }
-    else {
-        // Path when running electron executable
-        let pathIndex = './index.html';
-        if (fs.existsSync(path.join(__dirname, '../dist/index.html'))) {
-            // Path when running electron in local folder
-            pathIndex = '../dist/index.html';
-        }
-        win.loadURL(url.format({
-            pathname: path.join(__dirname, pathIndex),
-            protocol: 'file:',
-            slashes: true
-        }));
-    }
-    // Emitted when the window is closed.
-    win.on('closed', () => {
-        // Dereference the window object, usually you would store window
-        // in an array if your app supports multi windows, this is the time
-        // when you should delete the corresponding element.
-        win = null;
-    });
-    return win;
-}
-try {
-    // This method will be called when Electron has finished
-    // initialization and is ready to create browser windows.
-    // Some APIs can only be used after this event occurs.
-    // Added 400 ms to fix the black background issue while using transparent window. More detais at https://github.com/electron/electron/issues/15947
-    electron_1.app.on('ready', () => setTimeout(createWindow, 400));
-    // Quit when all windows are closed.
-    electron_1.app.on('window-all-closed', () => {
-        // On OS X it is common for applications and their menu bar
-        // to stay active until the user quits explicitly with Cmd + Q
-        if (process.platform !== 'darwin') {
-            electron_1.app.quit();
-        }
-    });
-    electron_1.app.on('activate', () => {
-        // On OS X it's common to re-create a window in the app when the
-        // dock icon is clicked and there are no other windows open.
-        if (win === null) {
-            createWindow();
-        }
-    });
-}
-catch (e) {
-    // Catch Error
-    // throw e;
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const electron_1 = require("electron");
+const path = require("path");
+const fs = require("fs");
+const node_machine_id_1 = require("node-machine-id");
+const Application_1 = require("./Application");
+let win = null;
+let resolveAppReady;
+const appReadyPromise = new Promise(resolve => { resolveAppReady = resolve; });
+const args = process.argv.slice(1), serve = args.some(val => val === '--serve');
+function createWindow() {
+    const size = electron_1.screen.getPrimaryDisplay().workAreaSize;
+    // Create the browser window.
+    win = new electron_1.BrowserWindow({
+        x: 0,
+        y: 0,
+        width: size.width,
+        height: size.height,
+        webPreferences: {
+            nodeIntegration: true,
+            allowRunningInsecureContent: serve,
+            contextIsolation: false,
+            webSecurity: !serve
+        },
+    });
+    (0, node_machine_id_1.machineId)(true).then((machineId) => new Application_1.default(machineId, !serve, win).initialize().then(() => resolveAppReady()));
+    if (serve) {
+        Promise.resolve().then(() => require('electron-debug')).then(debug => {
+            debug.default({ isEnabled: true, showDevTools: true });
+        });
+        Promise.resolve().then(() => require('electron-reloader')).then(reloader => {
+            const reloaderFn = reloader.default || reloader;
+            // watchRenderer: false — Angular dev server handles HMR for the renderer.
+            // Without this, reloader triggers spurious reloads on macOS (issue #840).
+            reloaderFn(module, { watchRenderer: false });
+        });
+        win.loadURL('http://localhost:4200');
+    }
+    else {
+        // Path when running electron executable
+        let pathIndex = './browser/index.html';
+        if (fs.existsSync(path.join(__dirname, '../dist/browser/index.html'))) {
+            // Path when running electron in local folder
+            pathIndex = '../dist/browser/index.html';
+        }
+        const fullPath = path.join(__dirname, pathIndex);
+        const url = `file://${path.resolve(fullPath).replace(/\\/g, '/')}`;
+        win.loadURL(url);
+    }
+    // Emitted when the window is closed.
+    win.on('closed', () => {
+        // Dereference the window object, usually you would store window
+        // in an array if your app supports multi windows, this is the time
+        // when you should delete the corresponding element.
+        win = null;
+    });
+    return win;
+}
+try {
+    electron_1.protocol.registerSchemesAsPrivileged([{
+            scheme: 'font',
+            privileges: { bypassCSP: true, supportFetchAPI: true }
+        }]);
+    electron_1.ipcMain.handle('app:get-version', () => electron_1.app.getVersion());
+    electron_1.ipcMain.handle('app:ready', () => appReadyPromise);
+    // This method will be called when Electron has finished
+    // initialization and is ready to create browser windows.
+    // Some APIs can only be used after this event occurs.
+    // Added 400 ms to fix the black background issue while using transparent window. More detais at https://github.com/electron/electron/issues/15947
+    electron_1.app.on('ready', () => {
+        electron_1.protocol.handle('font', (request) => {
+            const filePath = decodeURIComponent(request.url.replace('font://', ''));
+            return electron_1.net.fetch(`file://${filePath}`);
+        });
+        setTimeout(createWindow, 400);
+    });
+    // Quit when all windows are closed.
+    electron_1.app.on('window-all-closed', () => {
+        // On OS X it is common for applications and their menu bar
+        // to stay active until the user quits explicitly with Cmd + Q
+        if (process.platform !== 'darwin') {
+            electron_1.app.quit();
+        }
+    });
+    electron_1.app.on('activate', () => {
+        // On OS X it's common to re-create a window in the app when the
+        // dock icon is clicked and there are no other windows open.
+        if (win === null) {
+            createWindow();
+        }
+    });
+}
+catch (e) {
+    // Catch Error
+    // throw e;
+}
 //# sourceMappingURL=main.js.map

package/app/main.ts

@@ -1,94 +1,114 @@
-import { app, BrowserWindow, screen } from 'electron';
-import * as path from 'path';
-import * as fs from 'fs';
-import * as url from 'url';
-import { machineId } from 'node-machine-id';
-
-import Application from './Application';
-
-let win: BrowserWindow = null;
-const args = process.argv.slice(1),
-  serve = args.some(val => val === '--serve');
-
-function createWindow(): BrowserWindow {
-
-  const electronScreen = screen;
-  const size = electronScreen.getPrimaryDisplay().workAreaSize;
-
-  // Create the browser window.
-  win = new BrowserWindow({
-    x: 0,
-    y: 0,
-    width: size.width,
-    height: size.height,
-    webPreferences: {
-      webSecurity: false,
-      nodeIntegration: true,
-      allowRunningInsecureContent: (serve),
-      contextIsolation: false,  // false if you want to run e2e test with Spectron
-    },
-  });
-
-  machineId(true).then((machineId: string) => new Application(machineId, !serve, win).initialize());
-
-  if (serve) {
-    const debug = require('electron-debug');
-    debug();
-
-    require('electron-reloader')(module);
-    win.loadURL('http://localhost:4200');
-  } else {
-    // Path when running electron executable
-    let pathIndex = './index.html';
-
-    if (fs.existsSync(path.join(__dirname, '../dist/index.html'))) {
-      // Path when running electron in local folder
-      pathIndex = '../dist/index.html';
-    }
-
-    win.loadURL(url.format({
-      pathname: path.join(__dirname, pathIndex),
-      protocol: 'file:',
-      slashes: true
-    }));
-  }
-
-  // Emitted when the window is closed.
-  win.on('closed', () => {
-    // Dereference the window object, usually you would store window
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    win = null;
-  });
-
-  return win;
-}
-
-try {
-  // This method will be called when Electron has finished
-  // initialization and is ready to create browser windows.
-  // Some APIs can only be used after this event occurs.
-  // Added 400 ms to fix the black background issue while using transparent window. More detais at https://github.com/electron/electron/issues/15947
-  app.on('ready', () => setTimeout(createWindow, 400));
-
-  // Quit when all windows are closed.
-  app.on('window-all-closed', () => {
-    // On OS X it is common for applications and their menu bar
-    // to stay active until the user quits explicitly with Cmd + Q
-    if (process.platform !== 'darwin') {
-      app.quit();
-    }
-  });
-
-  app.on('activate', () => {
-    // On OS X it's common to re-create a window in the app when the
-    // dock icon is clicked and there are no other windows open.
-    if (win === null) {
-      createWindow();
-    }
-  });
-
-} catch (e) {
-  // Catch Error
-  // throw e;
-}
+import {app, BrowserWindow, ipcMain, net, protocol, screen} from 'electron';
+import * as path from 'path';
+import * as fs from 'fs';
+import { machineId } from 'node-machine-id';
+import Application from './Application';
+
+let win: BrowserWindow | null = null;
+let resolveAppReady: () => void;
+const appReadyPromise = new Promise<void>(resolve => { resolveAppReady = resolve; });
+
+const args = process.argv.slice(1),
+  serve = args.some(val => val === '--serve');
+
+function createWindow(): BrowserWindow {
+
+  const size = screen.getPrimaryDisplay().workAreaSize;
+
+  // Create the browser window.
+  win = new BrowserWindow({
+    x: 0,
+    y: 0,
+    width: size.width,
+    height: size.height,
+    webPreferences: {
+      nodeIntegration: true,
+      allowRunningInsecureContent: serve,
+      contextIsolation: false,
+      webSecurity: !serve
+    },
+  });
+
+  machineId(true).then((machineId: string) =>
+    new Application(machineId, !serve, win!).initialize().then(() => resolveAppReady())
+  );
+
+  if (serve) {
+    import('electron-debug').then(debug => {
+      debug.default({isEnabled: true, showDevTools: true});
+    });
+
+    import('electron-reloader').then(reloader => {
+      const reloaderFn = (reloader as any).default || reloader;
+      // watchRenderer: false — Angular dev server handles HMR for the renderer.
+      // Without this, reloader triggers spurious reloads on macOS (issue #840).
+      reloaderFn(module, { watchRenderer: false });
+    });
+    win.loadURL('http://localhost:4200');
+  } else {
+    // Path when running electron executable
+    let pathIndex = './browser/index.html';
+
+    if (fs.existsSync(path.join(__dirname, '../dist/browser/index.html'))) {
+       // Path when running electron in local folder
+      pathIndex = '../dist/browser/index.html';
+    }
+
+    const fullPath = path.join(__dirname, pathIndex);
+    const url = `file://${path.resolve(fullPath).replace(/\\/g, '/')}`;
+    win.loadURL(url);
+  }
+
+  // Emitted when the window is closed.
+  win.on('closed', () => {
+    // Dereference the window object, usually you would store window
+    // in an array if your app supports multi windows, this is the time
+    // when you should delete the corresponding element.
+    win = null;
+  });
+
+  return win;
+}
+
+try {
+  protocol.registerSchemesAsPrivileged([{
+    scheme: 'font',
+    privileges: { bypassCSP: true, supportFetchAPI: true }
+  }]);
+
+  ipcMain.handle('app:get-version', () => app.getVersion());
+  ipcMain.handle('app:ready', () => appReadyPromise);
+
+  // This method will be called when Electron has finished
+  // initialization and is ready to create browser windows.
+  // Some APIs can only be used after this event occurs.
+  // Added 400 ms to fix the black background issue while using transparent window. More detais at https://github.com/electron/electron/issues/15947
+  app.on('ready', () => {
+    protocol.handle('font', (request) => {
+      const filePath = decodeURIComponent(request.url.replace('font://', ''));
+      return net.fetch(`file://${filePath}`);
+    });
+    setTimeout(createWindow, 400);
+  });
+
+  // Quit when all windows are closed.
+  app.on('window-all-closed', () => {
+    // On OS X it is common for applications and their menu bar
+    // to stay active until the user quits explicitly with Cmd + Q
+    if (process.platform !== 'darwin') {
+      app.quit();
+    }
+  });
+
+  app.on('activate', () => {
+    // On OS X it's common to re-create a window in the app when the
+    // dock icon is clicked and there are no other windows open.
+    if (win === null) {
+      createWindow();
+    }
+  });
+
+} catch (e) {
+  // Catch Error
+  // throw e;
+}