From b79db06edec8b813e139a82a95df893a96194a3b Mon Sep 17 00:00:00 2001 From: Mariotaku Date: Wed, 2 Jun 2021 01:24:08 +0900 Subject: [PATCH] Removed class-transformer --- main.ts | 1 - package-lock.json | 6 ------ package.json | 1 - src/app/core/services/apps-repo.service.ts | 15 ++++++++++++--- src/app/core/services/device-manager.service.ts | 8 ++++---- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/main.ts b/main.ts index 8910584b..6e1dd469 100644 --- a/main.ts +++ b/main.ts @@ -33,7 +33,6 @@ function createWindow(): BrowserWindow { allowRunningInsecureContent: serve, contextIsolation: false, // false if you want to run 2e2 test with Spectron enableRemoteModule: true, // true if you want to run 2e2 test with Spectron or use remote module in renderer context (ie. Angular) - devTools: serve }, }); diff --git a/package-lock.json b/package-lock.json index fbf21b2b..e1e84287 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8440,12 +8440,6 @@ "integrity": "sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ==", "dev": true }, - "class-transformer": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.4.0.tgz", - "integrity": "sha512-ETWD/H2TbWbKEi7m9N4Km5+cw1hNcqJSxlSYhsLsNjQzWWiZIYA1zafxpK9PwVfaZ6AqR5rrjPVUBGESm5tQUA==", - "dev": true - }, "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", diff --git a/package.json b/package.json index 14489cf1..ea68d64e 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,6 @@ "bootstrap": "4.1.1", "bootstrap-icons": "1.5.0", "chai": "4.3.4", - "class-transformer": "0.4.0", "conventional-changelog-cli": "2.1.1", "core-js": "3.6.5", "cross-env": "7.0.3", diff --git a/src/app/core/services/apps-repo.service.ts b/src/app/core/services/apps-repo.service.ts index f142bd7d..99d33569 100644 --- a/src/app/core/services/apps-repo.service.ts +++ b/src/app/core/services/apps-repo.service.ts @@ -1,6 +1,5 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { plainToClass, Type } from 'class-transformer'; import { map } from 'rxjs/operators'; import * as semver from 'semver'; import { ElectronService } from './electron.service'; @@ -29,7 +28,7 @@ export class AppsRepoService { } async showApp(id: string): Promise { - return this.http.get(`${baseUrl}/apps/${id}.json`).pipe(map((body) => plainToClass(RepositoryItem, body))).toPromise(); + return this.http.get(`${baseUrl}/apps/${id}.json`).pipe(map((body) => new RepositoryItem(body))).toPromise(); } async showApps(...ids: string[]): Promise> { @@ -43,6 +42,10 @@ export class PackageManifest { version: string; ipkUrl: string; + constructor(data: Partial) { + Object.assign(this, data); + } + hasUpdate(version: string): boolean { let v1 = this.version, v2 = version; const segs1 = this.version.split('.', 4), segs2 = version.split('.', 4); @@ -69,8 +72,14 @@ export class PackageManifest { export class RepositoryItem { id: string; title: string; - @Type(() => PackageManifest) manifest?: PackageManifest; manifestUrl?: string; + constructor(data: Partial) { + Object.assign(this, data); + if (data.manifest) { + this.manifest = new PackageManifest(data.manifest); + } + } + } diff --git a/src/app/core/services/device-manager.service.ts b/src/app/core/services/device-manager.service.ts index 225bc483..9ea7f1aa 100644 --- a/src/app/core/services/device-manager.service.ts +++ b/src/app/core/services/device-manager.service.ts @@ -1,13 +1,13 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from "@angular/core"; import novacom from '@webosose/ares-cli/lib/base/novacom'; +import * as net from 'net'; import { BehaviorSubject, Observable, ReplaySubject, Subject } from "rxjs"; -import { Device, DeviceEditSpec, Resolver, Session } from '../../../types/novacom'; -import { ElectronService } from './electron.service'; import * as util from 'util'; -import * as net from 'net'; +import { Device, DeviceEditSpec, Resolver, Session } from '../../../types/novacom'; import { cleanupSession } from '../../shared/util/ares-utils'; -import { Exclude, plainToClass } from 'class-transformer'; +import { ElectronService } from './electron.service'; + @Injectable({ providedIn: 'root' })