Revert "Revert "more housekeeping""

This reverts commit 8ef6698a33.
This commit is contained in:
billchurch 2018-02-17 01:07:14 -05:00
parent 7b5224d7d1
commit de19843aad
5 changed files with 7 additions and 8 deletions

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
'use strict' 'use strict'
import * as io from 'socket.io-client/dist/socket.io.js' import * as io from 'socket.io-client'
import * as Terminal from 'xterm/dist/xterm' import * as Terminal from 'xterm/dist/xterm'
import * as fit from 'xterm/dist/addons/fit/fit' import * as fit from 'xterm/dist/addons/fit/fit'
// fontawesome, individual icon imports reduces file size dramatically but it's // fontawesome, individual icon imports reduces file size dramatically but it's
@ -13,8 +13,6 @@ import faDownload from '@fortawesome/fontawesome-free-solid/faDownload'
import faKey from '@fortawesome/fontawesome-free-solid/faKey' import faKey from '@fortawesome/fontawesome-free-solid/faKey'
import faCog from '@fortawesome/fontawesome-free-solid/faCog' import faCog from '@fortawesome/fontawesome-free-solid/faCog'
fontawesome.library.add(faBars, faClipboard, faDownload, faKey, faCog) fontawesome.library.add(faBars, faClipboard, faDownload, faKey, faCog)
fontawesome.config.searchPseudoElements = true
fontawesome.dom.i2svg()
require('xterm/dist/xterm.css') require('xterm/dist/xterm.css')
require('../css/style.css') require('../css/style.css')
@ -22,7 +20,6 @@ require('../css/style.css')
Terminal.applyAddon(fit) Terminal.applyAddon(fit)
/* global Blob, logBtn, credentialsBtn, downloadLogBtn */ /* global Blob, logBtn, credentialsBtn, downloadLogBtn */
var sessionLogEnable = false var sessionLogEnable = false
var loggedData = false var loggedData = false
var allowreplay = false var allowreplay = false

View file

@ -34,7 +34,7 @@
"express": "^4.16.1", "express": "^4.16.1",
"express-session": "^1.15.6", "express-session": "^1.15.6",
"morgan": "^1.9.0", "morgan": "^1.9.0",
"read-config": "^1.6.0", "read-config": "^2.0.0",
"socket.io": "^2.0.4", "socket.io": "^2.0.4",
"ssh2": "^0.5.5", "ssh2": "^0.5.5",
"validator": "^9.0.0" "validator": "^9.0.0"

View file

@ -7,6 +7,7 @@ module.exports = merge(common, {
new UglifyJSPlugin({ new UglifyJSPlugin({
uglifyOptions: { uglifyOptions: {
ie8: false, ie8: false,
dead_code: true,
output: { output: {
comments: false, comments: false,
beautify: false beautify: false

View file

@ -2,8 +2,9 @@
var path = require('path') var path = require('path')
// configPath = path.join(__dirname, 'config.json') // configPath = path.join(__dirname, 'config.json')
var configPath = path.join(path.dirname(require.main.filename), 'config.json') var nodeRoot = path.dirname(require.main.filename)
var publicPath = path.join(path.dirname(require.main.filename), 'client', 'public') var configPath = path.join(nodeRoot, 'config.json')
var publicPath = path.join(nodeRoot, 'client', 'public')
console.log('Reading config from: ' + configPath) console.log('Reading config from: ' + configPath)
var config = require('read-config')(configPath) var config = require('read-config')(configPath)
var express = require('express') var express = require('express')