From d761fcee395526fb1aba96a84bb929be19f6dd72 Mon Sep 17 00:00:00 2001 From: Ginie Date: Wed, 5 Oct 2022 08:48:54 +0200 Subject: [PATCH] bump version, updated build script --- apps/electron/package.json | 7 ------- apps/electron/yarn.lock | 4 ---- apps/web/app/pages/about/about.component.ts | 6 +++++- electron-config.js | 5 +---- package.json | 13 +++++++++---- 5 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 apps/electron/package.json delete mode 100644 apps/electron/yarn.lock diff --git a/apps/electron/package.json b/apps/electron/package.json deleted file mode 100644 index d9522706..00000000 --- a/apps/electron/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "nw-buddy", - "version": "1.0.0", - "main": "main.js", - "private": true, - "dependencies": {} -} diff --git a/apps/electron/yarn.lock b/apps/electron/yarn.lock deleted file mode 100644 index fb57ccd1..00000000 --- a/apps/electron/yarn.lock +++ /dev/null @@ -1,4 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - diff --git a/apps/web/app/pages/about/about.component.ts b/apps/web/app/pages/about/about.component.ts index 48962402..556058f2 100644 --- a/apps/web/app/pages/about/about.component.ts +++ b/apps/web/app/pages/about/about.component.ts @@ -13,7 +13,11 @@ export class AboutComponent implements OnInit { } public get gameVersion() { - return '1.6.4' + const version = APP_CONFIG.version.split('-')[0] + if (APP_CONFIG.isPTR) { + return `Public Test Realm ${version}` + } + return '1.6.6' // return APP_CONFIG.version.split('-')[0] } diff --git a/electron-config.js b/electron-config.js index 9ae5401d..c4e8216e 100644 --- a/electron-config.js +++ b/electron-config.js @@ -1,13 +1,10 @@ const env = require('./env') const config = require('./electron-config.base.json') -const package = require('./package.json') module.exports = { ...config, - appId: env.NW_PTR ? `${package.name}-ptr` : package.name, - productName: env.NW_PTR ? `${package.name}-ptr` : package.name, files: [ ...config.files, `!dist/web/nw-data/${env.NW_PTR ? 'live' : 'ptr'}`, - ], + ] } diff --git a/package.json b/package.json index 080fb8e7..29cc2e3e 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,12 @@ "main": "dist/electron/main.js", "private": true, "author": "Ginie", + "homepage": "https://giniedp.github.io/nw-buddy", + "repository": { + "type": "git", + "url": "https://github.com/giniedp/nw-buddy.git" + }, "scripts": { - "postinstall": "electron-builder install-app-deps", "dev": "npm-run-all -p dev:electron dev:web", "dev:web": "ng serve -c web -o", "dev:electron": "yarn electron:serve", @@ -25,6 +29,9 @@ "nw-extract": "ts-node ./tools/nw-extract.ts" }, "dependencies": { + + }, + "devDependencies": { "@angular/common": "14.1.2", "@angular/compiler": "14.1.2", "@angular/core": "14.1.2", @@ -42,9 +49,7 @@ "mithril": "2.2.2", "rxjs": "7.5.6", "tslib": "^2.4.0", - "zone.js": "~0.11.7" - }, - "devDependencies": { + "zone.js": "~0.11.7", "@angular-builders/custom-webpack": "14.0.0", "@angular-devkit/build-angular": "14.1.2", "@angular-eslint/builder": "14.0.2",