Fix module aliases

jsynowiec · Apr 22, 2019 · 8f5d9ff · 8f5d9ff
1 parent f8a671f
commit 8f5d9ff
Show file tree

Hide file tree

Showing 22 changed files with 32 additions and 30 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -70,7 +70,7 @@ gulp.task('build:html:release', () => {
 
 gulp.task('build:styles', () => {
   return gulp
-    .src('src/index.less')
+    .src('src/**/index.less')
     .pipe(less())
     .pipe(gulp.dest('build'));
 });

diff --git a/package.json b/package.json
@@ -80,9 +80,9 @@
     "winston": "~3.2.1"
   },
   "_moduleAliases": {
-    "@root": "out",
-    "app": "out/src/app",
-    "common": "out/src/common",
-    "data": "out/src/data"
+    "@root": ".",
+    "app": "build/app",
+    "common": "build/common",
+    "data": "build/data"
   }
 }
diff --git a/src/app/App.tsx b/src/app/App.tsx
@@ -1,7 +1,7 @@
 import { ipcRenderer, remote } from 'electron';
 import * as React from 'react';
 
-import { TrayWindow } from 'app/tray-window';
+import TrayWindow from 'app/tray-window/TrayWindow';
 import { getVisitor } from 'common/analytics';
 import { getCAQIMeta } from 'common/caqi';
 import { getLocation, Location } from 'common/geolocation';

diff --git a/src/index.html → src/app/index.html b/src/index.html → src/app/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <link
       rel="stylesheet"
-      href="../node_modules/photon/dist/css/photon.css"
+      href="../../node_modules/photon/dist/css/photon.css"
       media="screen"
       charset="utf-8"
     />

diff --git a/src/app/index.less b/src/app/index.less
@@ -0,0 +1,2 @@
+@import '../base.less';
+@import 'tray-window/TrayWindow.less';
diff --git a/src/index.tsx → src/app/index.tsx b/src/index.tsx → src/app/index.tsx
@@ -1,3 +1,5 @@
+import 'module-alias/register';
+
 import * as React from 'react';
 import { render } from 'react-dom';
 

diff --git a/src/app/preferences-window/index.html b/src/app/preferences-window/index.html
@@ -4,11 +4,11 @@
     <meta charset="utf-8" />
     <link
       rel="stylesheet"
-      href="../../node_modules/photon/dist/css/photon.css"
+      href="../../../node_modules/photon/dist/css/photon.css"
       media="screen"
       charset="utf-8"
     />
-    <link rel="stylesheet" href="../index.css" media="screen" charset="utf-8" />
+    <link rel="stylesheet" href="./index.css" media="screen" charset="utf-8" />
   </head>
   <body>
     <div id="preferences"></div>

diff --git a/src/app/preferences-window/index.less b/src/app/preferences-window/index.less
@@ -1,3 +1,5 @@
+@import '../../base.less';
+
 .preferences-window {
   font-size: 9pt;
   background-color: #theme.light.background.color() [primary];

diff --git a/src/app/preferences-window/index.tsx b/src/app/preferences-window/index.tsx
@@ -1,3 +1,5 @@
+import 'module-alias/register';
+
 import * as React from 'react';
 import { render } from 'react-dom';
 

diff --git a/src/app/tray-window/index.less → src/app/tray-window/TrayWindow.less b/src/app/tray-window/index.less → src/app/tray-window/TrayWindow.less
@@ -1,6 +1,6 @@
 @import 'Loader';
-@import 'measurement/index';
-@import 'air-quality/index';
+@import 'measurement/Measurement';
+@import 'air-quality/AirQuality';
 
 .error-message {
   .summary;

diff --git a/src/app/tray-window/air-quality/index.less → ...p/tray-window/air-quality/AirQuality.less b/src/app/tray-window/air-quality/index.less → ...p/tray-window/air-quality/AirQuality.less
diff --git a/src/app/tray-window/index.tsx b/src/app/tray-window/index.tsx
diff --git a/src/app/tray-window/measurement/index.less → .../tray-window/measurement/Measurement.less b/src/app/tray-window/measurement/index.less → .../tray-window/measurement/Measurement.less
diff --git a/src/index.less → src/base.less b/src/index.less → src/base.less
@@ -43,6 +43,3 @@
     }
   }
 }
-
-@import 'tray-window/index';
-@import 'preferences-window/index';
diff --git a/src/common/analytics.ts b/src/common/analytics.ts
@@ -5,7 +5,7 @@ import * as uuid from 'uuid';
 import * as isDev from 'electron-is-dev';
 import { userSettings } from 'common/user-settings';
 
-const keys = require('../keys.json');
+const keys = require('@root/keys.json');
 
 let clientID: string = null;
 let visitor: ua.Visitor = null;

diff --git a/src/common/error-handler.ts b/src/common/error-handler.ts
@@ -1,8 +1,8 @@
 import * as Rollbar from 'rollbar';
 
-const keys = require('../keys.json');
+const keys = require('@root/keys.json');
 
-const version: string = require('../package.json').version;
+const version: string = require('@root/package.json').version;
 
 const errorHandler: Rollbar = new Rollbar({
   accessToken: keys.rollbar,

diff --git a/src/common/geolocation.ts b/src/common/geolocation.ts
@@ -6,7 +6,7 @@ import getLogger from 'common/logger';
 
 const execFile = promisify(_execFile);
 
-const keys = require('../keys.json');
+const keys = require('@root/keys.json');
 
 const logger = getLogger('geolocation');
 
@@ -99,10 +99,7 @@ export async function getLocation(): Promise<Location> {
     const wifiAccessPoints = await getwifiAccessPoints();
 
     if (wifiAccessPoints.length > 0) {
-      const {
-        location: { lat: latitude, lng: longitude },
-        accuracy,
-      } = await geolocate(
+      const { location: { lat: latitude, lng: longitude }, accuracy } = await geolocate(
         wifiAccessPoints.reduce((acc, wifi) => [...acc, omit(wifi, ['ssid'])], []),
       );
 

diff --git a/src/data/update-checker.ts b/src/data/update-checker.ts
@@ -10,8 +10,8 @@ const CHECK_INTERVAL = 2 * 60 * 60 * 1000; // 2 hours
 const GITHUB_BASE_URL = 'https://api.github.com';
 const GITHUB_REPO = 'jsynowiec/airqmon';
 
-const currentVer: string = require('../package.json').version;
-const appName: string = require('../package.json').name;
+const currentVer: string = require('@root/package.json').version;
+const appName: string = require('@root/package.json').name;
 
 interface IGitHubRelease {
   // https://developer.github.com/v3/repos/releases/

diff --git a/src/main.ts b/src/main.ts
@@ -1,3 +1,5 @@
+import 'module-alias/register';
+
 import { app, ipcMain, shell, powerMonitor } from 'electron';
 import * as isDev from 'electron-is-dev';
 
@@ -9,7 +11,7 @@ import { Measurements } from 'data/airqmon-api';
 import TrayWindowManager from './tray-window-manager';
 import PreferencesWindowManager from './preferences-window-manager';
 
-const keys = require('../keys.json');
+const keys = require('@root/keys.json');
 
 let trayWindowManager: TrayWindowManager;
 let preferencesWindowManager: PreferencesWindowManager;

diff --git a/src/preferences-window-manager.ts b/src/preferences-window-manager.ts
@@ -17,7 +17,7 @@ export default class PreferencesWindowManager {
       maximizable: false,
     });
 
-    this._window.loadURL(`file://${path.join(__dirname, 'preferences-window/index.html')}`);
+    this._window.loadURL(`file://${path.join(__dirname, 'app/preferences-window/index.html')}`);
 
     if (isDev) {
       this._window.webContents.openDevTools({ mode: 'detach' });

diff --git a/src/tray-window-manager.ts b/src/tray-window-manager.ts
@@ -30,7 +30,7 @@ class TrayWindowManager {
       transparent: true,
       ...config,
     });
-    this._window.loadURL(`file://${path.join(__dirname, 'index.html')}`);
+    this._window.loadURL(`file://${path.join(__dirname, 'app/index.html')}`);
 
     if (isDev) {
       this._window.webContents.openDevTools({ mode: 'detach' });

diff --git a/tsconfig.json b/tsconfig.json
@@ -8,6 +8,7 @@
     "outDir": "build",
     "baseUrl": "./src",
     "paths": {
+      "@root": ["../*"],
       "app/*": ["app/*"],
       "common/*": ["common/*"],
       "data/*": ["data/*"]