From 3584e8e5c841ca8405fa76081963d4376034cac5 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 27 Aug 2019 22:48:04 +0200 Subject: [PATCH] Launcher --- src/backend/Admin.ts | 2 +- src/backend/Installer.ts | 4 +--- src/backend/Launcher.ts | 2 ++ src/backend/webpack.prod.js | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 src/backend/Launcher.ts diff --git a/src/backend/Admin.ts b/src/backend/Admin.ts index ee192d1..7739028 100644 --- a/src/backend/Admin.ts +++ b/src/backend/Admin.ts @@ -79,7 +79,7 @@ export class FrontblockAdmin extends AdminBase{ } private destroy(){ - this.startWebsocket() + this.wsServer.close() this.stopWebserver() } diff --git a/src/backend/Installer.ts b/src/backend/Installer.ts index cddffda..dace064 100644 --- a/src/backend/Installer.ts +++ b/src/backend/Installer.ts @@ -29,6 +29,4 @@ export const install = (plugins: Plugin[] = [], npmPkgs: [NPMPkgName, NPMVersion new Admin(plugins) }) -} - -install([], [['sqlite3', '4.1.0'], ['knex', '0.19.2']]) +} \ No newline at end of file diff --git a/src/backend/Launcher.ts b/src/backend/Launcher.ts new file mode 100644 index 0000000..cf0809a --- /dev/null +++ b/src/backend/Launcher.ts @@ -0,0 +1,2 @@ +import { install } from "./Installer"; +install([], [['sqlite3', '4.1.0'], ['knex', '0.19.2']]) diff --git a/src/backend/webpack.prod.js b/src/backend/webpack.prod.js index 21c426c..ae9d975 100644 --- a/src/backend/webpack.prod.js +++ b/src/backend/webpack.prod.js @@ -39,6 +39,41 @@ module.exports = [{ minimize: false }, entry: path.resolve(__dirname, 'Installer.ts'), + output: { + path: path.resolve(__dirname, '../../dist'), + filename: 'Installer.js', + libraryTarget: 'commonjs', + } +},{ + mode: 'production', + target: "node", + node: { + global: true, + process: true, + __filename: false, + __dirname: false, + Buffer: true, + }, + + + resolve: { + // Add `.ts` and `.tsx` as a resolvable extension. + + extensions: [".ts", ".tsx", ".js"] + }, + module: { + rules: [ + { test: /\.ts?$/, loader: "ts-loader" } + ] + }, + + externals:{ + knex: "../plugins/node_modules/knex" + }, + optimization: { + minimize: false + }, + entry: path.resolve(__dirname, 'Launcher.ts'), output: { path: path.resolve(__dirname, '../../dist'), filename: 'FrontblockAdmin.js',