From e925485135ced09fc426f161c48d33bd84d8bd76 Mon Sep 17 00:00:00 2001 From: crusader Date: Thu, 27 Sep 2018 18:44:56 +0900 Subject: [PATCH] ing --- config/app-info.js | 1 + config/webpack.config.main.js | 2 +- config/webpack.config.renderer.js | 11 +++++------ package.json | 9 +++++---- src/app/pages/home/home-page.component.html | 14 +++++++------- src/commons/component/host-detail.component.html | 10 +++++----- src/commons/component/menu/about.component.html | 4 ++-- .../component/service-detail.component.html | 10 +++++----- src/commons/component/zone-detail.component.html | 4 ++-- src/electron/app-window.ts | 4 +++- src/index.html | 2 +- yarn.lock | 9 ++++++++- 12 files changed, 45 insertions(+), 35 deletions(-) diff --git a/config/app-info.js b/config/app-info.js index dc94432..ec0212a 100644 --- a/config/app-info.js +++ b/config/app-info.js @@ -10,6 +10,7 @@ const channel = getReleaseChannel(); const s = JSON.stringify; function getReplacements() { + console.log(`channel: ${channel}`); return { __DARWIN__: process.platform === 'darwin', __WIN32__: process.platform === 'win32', diff --git a/config/webpack.config.main.js b/config/webpack.config.main.js index 0c0c2b1..172b85c 100644 --- a/config/webpack.config.main.js +++ b/config/webpack.config.main.js @@ -22,7 +22,7 @@ module.exports = function () { let config = Object.assign({}); config.target = 'electron-main'; config.mode = PROD ? 'production' : 'development'; - config.devtool = PROD ? 'source-map' : 'cheap-module-source-map'; + config.devtool = PROD ? false : 'cheap-module-source-map'; config.externals = [nodeExternals()]; config.entry = { 'index': root('src', 'electron', 'main.ts') diff --git a/config/webpack.config.renderer.js b/config/webpack.config.renderer.js index a3a4d84..2d4a931 100644 --- a/config/webpack.config.renderer.js +++ b/config/webpack.config.renderer.js @@ -13,12 +13,11 @@ const PROD = EVENT.includes('prod'); module.exports = function (config) { config.target = 'electron-renderer'; - // config.output = { - // path: PROD ? root('build', 'dist') : root('build', 'dev'), - // filename: '[name].js', - // sourceMapFilename: '[file].map', - // }; - + config.output = { + path: PROD ? root('build', 'dist') : root('build', 'dev'), + filename: '[name].js', + crossOriginLoading: false, + }; config.plugins.push( new webpack.DefinePlugin( diff --git a/package.json b/package.json index b0a726b..9b41625 100644 --- a/package.json +++ b/package.json @@ -13,10 +13,10 @@ "start:hmr": "ng serve --configuration hmr", "start:electron:hmr": "npm-run-all -p start:hmr wait-on:build:main:dev", "build": "ng build", - "build:renderer:dev": "ng build", - "build:renderer:prod": "ng build --aot", - "build:main:dev": "webpack --config config/webpack.config.main.js --progress --profile", - "build:main:prod": "webpack --config config/webpack.config.main.js --progress --profile", + "build:renderer:dev": "cross-env NODE_ENV=development ng build --aot", + "build:renderer:prod": "cross-env NODE_ENV=production ng build --prod", + "build:main:dev": "cross-env NODE_ENV=development webpack --config config/webpack.config.main.js --progress --profile", + "build:main:prod": "cross-env NODE_ENV=production webpack --config config/webpack.config.main.js --progress --profile", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e", @@ -62,6 +62,7 @@ "awesome-typescript-loader": "^5.2.0", "codelyzer": "~4.2.1", "core-js": "^2.5.4", + "cross-env": "^5.2.0", "d3": "^5.7.0", "devtron": "^1.4.0", "dexie": "^2.0.4", diff --git a/src/app/pages/home/home-page.component.html b/src/app/pages/home/home-page.component.html index 17a9574..68374ad 100644 --- a/src/app/pages/home/home-page.component.html +++ b/src/app/pages/home/home-page.component.html @@ -7,7 +7,7 @@
- +

Network Scanner


를 이용해 주셔서 감사합니다. @@ -30,22 +30,22 @@ + xlink:href="assets/image/node/icon/icon_overflow.svg"> {{node.target.network}} + xlink:href="assets/image/node/icon/icon_background.svg"> + attr.xlink:href="assets/image/node/icon/icon_{{node.target.hostType | lowercase}}.svg"> + attr.xlink:href="assets/image/node/logo/logo_{{node.target.osType | lowercase}}.svg">
- + + preserveAspectRatio="xMidYMid slice" attr.xlink:href="assets/image/node/logo/logo_{{host.osType | lowercase}}.svg" />

{{host.name}} {{host.address}}

diff --git a/src/commons/component/menu/about.component.html b/src/commons/component/menu/about.component.html index d04bd38..54d18e0 100644 --- a/src/commons/component/menu/about.component.html +++ b/src/commons/component/menu/about.component.html @@ -4,12 +4,12 @@
- +

Network Scanner

diff --git a/src/commons/component/service-detail.component.html b/src/commons/component/service-detail.component.html index 36b9dbe..f2633c4 100644 --- a/src/commons/component/service-detail.component.html +++ b/src/commons/component/service-detail.component.html @@ -2,17 +2,17 @@
- + + attr.xlink:href="assets/image/node/logo/logo_{{service.key | lowercase}}.svg" />

diff --git a/src/commons/component/zone-detail.component.html b/src/commons/component/zone-detail.component.html index b0573c6..ebc793a 100644 --- a/src/commons/component/zone-detail.component.html +++ b/src/commons/component/zone-detail.component.html @@ -2,11 +2,11 @@
- +

diff --git a/src/electron/app-window.ts b/src/electron/app-window.ts index 10d4269..97d33e9 100644 --- a/src/electron/app-window.ts +++ b/src/electron/app-window.ts @@ -176,7 +176,9 @@ export class AppWindow { registerWindowStateChangedEvents(this.window); - if (__DEV__) { + console.log(`NODE_ENV: ${process.env.NODE_ENV}`); + + if (process.env.NODE_ENV === 'development') { const indexUrl = URL.format({ pathname: path.join('//localhost:4200'), protocol: 'http:', diff --git a/src/index.html b/src/index.html index 1d399e7..56a18dc 100644 --- a/src/index.html +++ b/src/index.html @@ -4,7 +4,7 @@ overFlow - + diff --git a/yarn.lock b/yarn.lock index 5273976..9920208 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1944,6 +1944,13 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" +cross-env@^5.2.0: + version "5.2.0" + resolved "https://nexus.loafle.net/repository/npm-all/cross-env/-/cross-env-5.2.0.tgz#6ecd4c015d5773e614039ee529076669b9d126f2" + dependencies: + cross-spawn "^6.0.5" + is-windows "^1.0.0" + cross-spawn@^3.0.0: version "3.0.1" resolved "https://nexus.loafle.net/repository/npm-all/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" @@ -4239,7 +4246,7 @@ is-utf8@^0.2.0: version "0.2.1" resolved "https://nexus.loafle.net/repository/npm-all/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" -is-windows@^1.0.2: +is-windows@^1.0.0, is-windows@^1.0.2: version "1.0.2" resolved "https://nexus.loafle.net/repository/npm-all/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"