From 26db25035a2c9abfd3fe64fed7eb502c644472f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20H=C3=BCbleitner?= Date: Tue, 27 Aug 2019 17:11:31 +0200 Subject: [PATCH] npm installes every package into a dir now --- src/backend/Extension.ts | 9 +++++---- src/backend/UpdateManger.ts | 5 ++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/backend/Extension.ts b/src/backend/Extension.ts index 7eec3ed..686a4c0 100644 --- a/src/backend/Extension.ts +++ b/src/backend/Extension.ts @@ -76,7 +76,7 @@ abstract class Extension{ } export type FSStatus = SharedStatus & { - prefix: string + path: string empty?: boolean } @@ -144,13 +144,14 @@ type NPMStatus = FSStatus & { } export class NPMExtension extends FSExtension{ - + private prefix: string constructor( pkgName: string, + prefix: string = './plugins', private version: string, - private prefix: string ){ - super(pkgName, path.resolve(prefix, "node_modules")) + super(pkgName, path.resolve(prefix, pkgName, "node_modules")) + this.prefix = (path.resolve(prefix, pkgName)) } public async status(): Promise { diff --git a/src/backend/UpdateManger.ts b/src/backend/UpdateManger.ts index 847c4e3..afeb135 100644 --- a/src/backend/UpdateManger.ts +++ b/src/backend/UpdateManger.ts @@ -87,9 +87,8 @@ export class UpdateManager extends Plugin{ */ const extensions = [ - new NPMExtension("knex", "0.19.2", "./plugins"), - new NPMExtension("sqlite3", "4.1.0", "./plugins"), - new NPMExtension("frontblock", "latest", "./plugins") + new NPMExtension("knex", "./plugins", "0.19.2",).install(), + new NPMExtension("sqlite3", "./plugins", "4.1.0").install() ]