.

Makefile

@@ -6,7 +6,7 @@ SHORT_VERSION=$(shell python -c 'import subprocess; v = subprocess.check_output(
 all: run
 
 run:
-	DEV=1 NODE_PATH=./app/node_modules ./node_modules/.bin/electron ./app --debug
+	DEV=1 TERMINUS_PLUGINS=`realpath .` ./node_modules/.bin/electron ./app --debug
 
 lint:
 	tslint -c tslint.json app/src/*.ts app/src/**/*.ts

app/main.js

@@ -131,7 +131,7 @@ start = () => {
         width: 800,
         height: 400,
         //icon: `${app.getAppPath()}/assets/img/icon.png`,
-        title: 'Term',
+        title: 'Terminus',
         minWidth: 300,
         minHeight: 100,
         'web-preferences': {'web-security': false},

app/package.json

@@ -2,6 +2,10 @@
   "name": "terminus",
   "version": "0.0.1",
   "main": "main.js",
+  "scripts": {
+    "build": "../node_modules/.bin/webpack --progress --color --display-modules",
+    "watch": "../node_modules/.bin/webpack --progress --color --watch"
+  },
   "dependencies": {
     "@angular/animations": "4.0.1",
     "@angular/common": "4.0.1",
@@ -15,6 +19,7 @@
     "electron-config": "0.2.1",
     "electron-debug": "1.0.1",
     "electron-is-dev": "0.1.2",
+    "fs-promise": "^2.0.2",
     "js-yaml": "3.8.2",
     "path": "0.12.7",
     "rxjs": "5.3.0",

app/src/app.module.ts

@@ -1,28 +1,23 @@
 import { NgModule } from '@angular/core'
+import { BrowserModule } from '@angular/platform-browser'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
+import { loadPlugins } from './plugins'
 
-const projectRoot = '/home/eugene/Work/term/'
+export async function getRootModule(): Promise<any> {
-if (process.env.DEV) {
+    let plugins = await loadPlugins()
-    (<any>global).require('module').globalPaths.push(projectRoot);
+    let imports = [
-    (<any>global).require('module').globalPaths.push(projectRoot + 'app/node_modules')
+        BrowserModule,
-}
+        ...(plugins.map(x => x.default.forRoot ? x.default.forRoot() : x.default)),
-
-let plugins = [
-    (<any>global).require(projectRoot + 'terminus-settings').default,
-    (<any>global).require(projectRoot + 'terminus-terminal').default,
-    (<any>global).require(projectRoot + 'terminus-clickable-links').default,
-    (<any>global).require(projectRoot + 'terminus-community-color-schemes').default,
-    (<any>global).require(projectRoot + 'terminus-theme-hype').default,
-]
-
-const core = (<any>global).require(projectRoot + 'terminus-core')
-
-@NgModule({
-    imports: [
-        core.AppRootModule.forRoot(),
-        ...plugins,
         NgbModule.forRoot(),
-    ],
+    ]
-    bootstrap: [core.AppRootComponent]
+    let bootstrap = [
-})
+        ...(plugins.filter(x => x.bootstrap).map(x => x.bootstrap)),
-export class RootModule { }
+    ]
+
+    @NgModule({
+        imports,
+        bootstrap,
+    }) class RootModule { }
+
+    return RootModule
+}

app/src/entry.ts

@@ -3,12 +3,11 @@
 import 'core-js'
 import 'zone.js/dist/zone.js'
 import 'core-js/es7/reflect'
-import 'jquery'
 
 // Always land on the start view
 location.hash = ''
 
-import { RootModule } from './app.module'
+import { getRootModule } from './app.module'
 import { enableProdMode } from '@angular/core'
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
 
@@ -18,8 +17,6 @@ if ((<any>global).require('electron-is-dev')) {
     enableProdMode()
 }
 
-(<any>console).timeStamp('angular bootstrap started')
+getRootModule().then(module => {
-platformBrowserDynamic().bootstrapModule(RootModule);
+    platformBrowserDynamic().bootstrapModule(module)
-
+})
-
-(<any>process).emitWarning = function () { console.log(arguments) }

app/src/plugins.ts

@@ -0,0 +1,32 @@
+import * as fs from 'fs-promise'
+import * as path from 'path'
+
+let nodeRequire = (<any>global).require
+let module = nodeRequire('module')
+nodeRequire.main.paths.map(x => module.globalPaths.push(x))
+if (process.env.TERMINUS_PLUGINS) {
+    process.env.TERMINUS_PLUGINS.split(':').map(x => module.globalPaths.push(x))
+}
+
+export async function loadPlugins (): Promise<any[]> {
+    let paths = module.globalPaths
+    let plugins: any[] = []
+    for (let pluginDir of paths) {
+        if (!await fs.exists(pluginDir)) {
+            continue
+        }
+        for (let pluginName of await fs.readdir(pluginDir)) {
+            if (/^terminus-/.exec(pluginName)) {
+                let pluginPath = path.join(pluginDir, pluginName)
+                console.info(`Loading ${pluginName}: ${nodeRequire.resolve(pluginPath)}`)
+                try {
+                    let pluginModule = nodeRequire(pluginPath)
+                    plugins.push(pluginModule)
+                } catch (error) {
+                    console.error(`Could not load ${pluginName}:`, error)
+                }
+            }
+        }
+    }
+    return plugins
+}

app/tsconfig.json

@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "baseUrl": "./app/src",
+        "baseUrl": "./src",
         "module": "commonjs",
         "target": "es5",
         "declaration": false,

app/webpack.config.js

@@ -25,8 +25,10 @@ module.exports = {
     loaders: [
       {
         test: /\.ts$/,
-        use: 'awesome-typescript-loader',
+        loader: 'awesome-typescript-loader',
-        exclude: [/node_modules/]
+        options: {
+          configFileName: path.resolve(__dirname, 'tsconfig.json'),
+        }
       },
       {
         test: /\.scss$/,
@@ -40,14 +42,14 @@ module.exports = {
         test: /\.(png|svg)$/,
         loader: "file-loader",
         options: {
-          name: 'images/[name].[hash:8].[ext]'
+          name: 'images/[name].[ext]'
         }
       },
       {
         test: /\.(ttf|eot|otf|woff|woff2)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
         loader: "file-loader",
         options: {
-          name: 'fonts/[name].[hash:8].[ext]'
+          name: 'fonts/[name].[ext]'
         }
       }
     ]
@@ -60,6 +62,9 @@ module.exports = {
     '@angular/forms': 'commonjs @angular/forms',
     '@angular/common': 'commonjs @angular/common',
     '@ng-bootstrap/ng-bootstrap': 'commonjs @ng-bootstrap/ng-bootstrap',
+    'fs-promise': 'commonjs fs-promise',
+    'module': 'commonjs module',
+    'path': 'commonjs path',
     'rxjs': 'commonjs rxjs',
     'zone.js': 'commonjs zone.js',
   },

package.json

@@ -2,7 +2,6 @@
   "name": "term",
   "devDependencies": {
     "angular2-perfect-scrollbar": "2.0.0",
-    "jquery": "^3.1.1",
     "@types/fs-promise": "^1.0.1",
     "@types/core-js": "^0.9.35",
     "@types/electron": "1.4.34",
@@ -36,7 +35,7 @@
     "url-loader": "^0.5.7",
     "val-loader": "^0.5.0",
     "vrsource-tslint-rules": "^4.0.1",
-    "webpack": "2.3.3"
+    "webpack": "2.4.1"
   },
   "build": {
     "appId": "com.elements.benchmark",
@@ -58,8 +57,8 @@
     }
   },
   "scripts": {
-    "build": "webpack --progress --color",
+    "build": "node --max-old-space-size=4096 ./node_modules/.bin/webpack --progress --color",
-    "watch": "webpack --progress --color --watch",
+    "watch": "node --max-old-space-size=4096 ./node_modules/.bin/webpack --progress --color --watch",
     "pack": "build --dir",
     "postinstall": "install-app-deps",
     "dist": "build"

terminus-clickable-links/tsconfig.json

@@ -20,11 +20,7 @@
       "dom",
       "es2015",
       "es7"
-    ],
+    ]
-    "paths": {
-      "*": ["../../app/node_modules/*"],
-      "terminus-*": ["../../terminus-*"]
-    }
   },
   "compileOnSave": false,
   "exclude": [

terminus-clickable-links/webpack.config.js

@@ -22,6 +22,7 @@ module.exports = {
         test: /\.ts$/,
         loader: 'awesome-typescript-loader',
         query: {
+          configFileName: path.resolve(__dirname, 'tsconfig.json'),
           paths: {
             "terminus-*": [path.resolve(__dirname, '../terminus-*')],
             "*": [path.resolve(__dirname, '../app/node_modules/*')],

terminus-community-color-schemes/tsconfig.json

@@ -20,11 +20,7 @@
       "dom",
       "es2015",
       "es7"
-    ],
+    ]
-    "paths": {
-      "*": ["../../app/node_modules/*"],
-      "terminus-*": ["../../terminus-*"]
-    }
   },
   "compileOnSave": false,
   "exclude": [

terminus-community-color-schemes/webpack.config.js

@@ -22,6 +22,7 @@ module.exports = {
         test: /\.ts$/,
         loader: 'awesome-typescript-loader',
         options: {
+          configFileName: path.resolve(__dirname, 'tsconfig.json'),
           paths: {
             "terminus-*": [path.resolve(__dirname, '../terminus-*')],
             "*": [path.resolve(__dirname, '../app/node_modules/*')],

terminus-core/rxjs.ts

@@ -1 +0,0 @@
-export * from 'rxjs'

terminus-core/src/components/appRoot.ts

@@ -55,8 +55,6 @@ export class AppRootComponent {
         _themes: ThemesService,
         _quitter: QuitterService,
     ) {
-        (<any>console).timeStamp('AppComponent ctor')
-
         this.logger = log.create('main')
         this.logger.info('v', electron.app.getVersion())
 

terminus-core/src/components/titleBar.pug

@@ -1,4 +1,4 @@
-.title((dblclick)='hostApp.toggleMaximize()') Term
+.title((dblclick)='hostApp.toggleMaximize()') Terminus
 button.btn.btn-secondary.btn-minimize((click)='hostApp.minimize()')
     i.fa.fa-window-minimize
 button.btn.btn-secondary.btn-maximize((click)='hostApp.toggleMaximize()')

terminus-core/src/index.ts

@@ -1,5 +1,4 @@
 import { NgModule, ModuleWithProviders } from '@angular/core'
-console.info((<any>global).require.resolve('@angular/core'))
 import { BrowserModule } from '@angular/platform-browser'
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
 import { FormsModule } from '@angular/forms'
@@ -64,9 +63,6 @@ const PROVIDERS = [
     ],
 })
 export default class AppModule {
-}
-
-export class AppRootModule {
     static forRoot(): ModuleWithProviders {
         return {
             ngModule: AppModule,
@@ -75,5 +71,5 @@ export class AppRootModule {
     }
 }
 
-export { AppRootComponent }
+export { AppRootComponent as bootstrap }
 export * from './api'

terminus-core/src/services/config.ts

@@ -53,7 +53,7 @@ const configMerge = (a, b) => require('deepmerge')(a, b, { arrayMerge: (_d, s) =
 
 @Injectable()
 export class ConfigService {
-    store: ConfigProxy
+    store: any
     change = new EventEmitter()
     restartRequested: boolean
     private _store: any

terminus-core/src/services/electron.ts

@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core'
 
-
 @Injectable()
 export class ElectronService {
     constructor() {

terminus-core/src/services/hostApp.ts

@@ -28,7 +28,7 @@ export class HostAppService {
         electron.ipcRenderer.on('host:quit-request', () => this.zone.run(() => this.quitRequested.emit()))
 
         electron.ipcRenderer.on('uncaughtException', function(err) {
-            console.error('Unhandled exception:', err)
+            this.logger.error('Unhandled exception:', err)
         })
 
         electron.ipcRenderer.on('host:window-shown', () => {

terminus-core/webpack.config.js

@@ -22,6 +22,7 @@ module.exports = {
         test: /\.ts$/,
         loader: 'awesome-typescript-loader',
         options: {
+          configFileName: path.resolve(__dirname, 'tsconfig.json'),
           paths: {
             "terminus-*": [path.resolve(__dirname, '../terminus-*')],
             "*": [path.resolve(__dirname, '../app/node_modules/*')],

terminus-core/zone.js.ts

@@ -1 +0,0 @@
-export * from 'zone.js'

terminus-settings/webpack.config.js

@@ -22,6 +22,7 @@ module.exports = {
         test: /\.ts$/,
         loader: 'awesome-typescript-loader',
         options: {
+          configFileName: path.resolve(__dirname, 'tsconfig.json'),
           paths: {
             "terminus-*": [path.resolve(__dirname, '../terminus-*')],
             "*": [path.resolve(__dirname, '../app/node_modules/*')],

terminus-terminal/src/services/sessions.ts

@@ -23,7 +23,6 @@ export class Session {
     constructor (options: SessionOptions) {
         this.name = options.name
         this.recoveryId = options.recoveryId
-        console.log('Spawning', options.command)
 
         let env = {
             ...process.env,

terminus-terminal/webpack.config.js

@@ -22,6 +22,7 @@ module.exports = {
         test: /\.ts$/,
         loader: 'awesome-typescript-loader',
         query: {
+          configFileName: path.resolve(__dirname, 'tsconfig.json'),
           paths: {
             "terminus-*": [path.resolve(__dirname, '../terminus-*')],
             "*": [path.resolve(__dirname, '../app/node_modules/*')],

terminus-theme-hype/tsconfig.json

@@ -12,11 +12,7 @@
       "dom",
       "es2015",
       "es7"
-    ],
+    ]
-    "paths": {
-      "*": ["../../app/node_modules/*"],
-      "terminus-*": ["../../terminus-*"]
-    }
   },
   "exclude": [
     "node_modules"

terminus-theme-hype/webpack.config.js

@@ -21,6 +21,7 @@ module.exports = {
         test: /\.ts$/,
         loader: 'awesome-typescript-loader',
         options: {
+          configFileName: path.resolve(__dirname, 'tsconfig.json'),
           paths: {
             "terminus-*": [path.resolve(__dirname, '../terminus-*')],
             "*": [path.resolve(__dirname, '../app/node_modules/*')],

tslint.json

@@ -4,10 +4,6 @@
         "node_modules/tslint-eslint-rules/dist/rules"
     ],
     "rules": {
-        "no-console": [
-            true,
-            "log"
-        ],
         "no-duplicate-imports": true,
         "no-duplicate-variable": true,
         "no-jasmine-focus": true,