From 9cdcc8d8e5d98f343ea763c64a2ac036e0338147 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Sat, 9 Feb 2019 22:10:42 +0100 Subject: [PATCH] fixed #649 --- app/src/plugins.ts | 4 ++-- app/webpack.config.js | 2 +- app/webpack.main.config.js | 2 +- package.json | 6 +++--- terminus-community-color-schemes/webpack.config.js | 2 +- terminus-core/webpack.config.js | 2 +- terminus-plugin-manager/webpack.config.js | 2 +- terminus-settings/webpack.config.js | 2 +- terminus-ssh/webpack.config.js | 2 +- terminus-terminal/src/buttonProvider.ts | 2 +- terminus-terminal/src/services/uac.service.ts | 2 +- terminus-terminal/webpack.config.js | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/plugins.ts b/app/src/plugins.ts index 6c1b015b..35a074de 100644 --- a/app/src/plugins.ts +++ b/app/src/plugins.ts @@ -16,11 +16,11 @@ function normalizePath (path: string): string { nodeRequire.main.paths.map(x => nodeModule.globalPaths.push(normalizePath(x))) -if (process.env.DEV) { +if (process.env.TERMINUS_DEV) { nodeModule.globalPaths.unshift(path.dirname(require('electron').remote.app.getAppPath())) } -const builtinPluginsPath = process.env.DEV ? path.dirname(require('electron').remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins') +const builtinPluginsPath = process.env.TERMINUS_DEV ? path.dirname(require('electron').remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins') const userPluginsPath = path.join( require('electron').remote.app.getPath('appData'), diff --git a/app/webpack.config.js b/app/webpack.config.js index 0db27868..e30acd18 100644 --- a/app/webpack.config.js +++ b/app/webpack.config.js @@ -9,7 +9,7 @@ module.exports = { preload: path.resolve(__dirname, 'src/entry.preload.ts'), bundle: path.resolve(__dirname, 'src/entry.ts'), }, - mode: process.env.DEV ? 'development' : 'production', + mode: process.env.TERMINUS_DEV ? 'development' : 'production', optimization:{ minimize: false, }, diff --git a/app/webpack.main.config.js b/app/webpack.main.config.js index 353906c0..9f51793f 100644 --- a/app/webpack.main.config.js +++ b/app/webpack.main.config.js @@ -7,7 +7,7 @@ module.exports = { entry: { main: path.resolve(__dirname, 'lib/index.ts'), }, - mode: process.env.DEV ? 'development' : 'production', + mode: process.env.TERMINUS_DEV ? 'development' : 'production', context: __dirname, devtool: 'source-map', output: { diff --git a/package.json b/package.json index c5fdcdc8..bf6e11b0 100644 --- a/package.json +++ b/package.json @@ -127,9 +127,9 @@ }, "scripts": { "build": "webpack --color --config app/webpack.main.config.js && webpack --color --config app/webpack.config.js && webpack --color --config terminus-core/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-terminal/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-plugin-manager/webpack.config.js && webpack --color --config terminus-community-color-schemes/webpack.config.js && webpack --color --config terminus-ssh/webpack.config.js", - "watch": "cross-env DEV=1 webpack --progress --color --watch", - "start": "cross-env DEV=1 electron app --debug", - "prod": "cross-env DEV=1 electron app", + "watch": "cross-env TERMINUS_DEV=1 webpack --progress --color --watch", + "start": "cross-env TERMINUS_DEV=1 electron app --debug", + "prod": "cross-env TERMINUS_DEV=1 electron app", "lint": "tslint -c tslint.json -t stylish terminus-*/src/**/*.ts terminus-*/src/*.ts app/src/*.ts", "postinstall": "node ./scripts/install-deps.js" }, diff --git a/terminus-community-color-schemes/webpack.config.js b/terminus-community-color-schemes/webpack.config.js index bbecf921..b407a9fb 100644 --- a/terminus-community-color-schemes/webpack.config.js +++ b/terminus-community-color-schemes/webpack.config.js @@ -13,7 +13,7 @@ module.exports = { libraryTarget: 'umd', devtoolModuleFilenameTemplate: 'webpack-terminus-community-color-schemes:///[resource-path]', }, - mode: process.env.DEV ? 'development' : 'production', + mode: process.env.TERMINUS_DEV ? 'development' : 'production', optimization:{ minimize: false, }, diff --git a/terminus-core/webpack.config.js b/terminus-core/webpack.config.js index 05e01711..99e984a1 100644 --- a/terminus-core/webpack.config.js +++ b/terminus-core/webpack.config.js @@ -14,7 +14,7 @@ module.exports = { libraryTarget: 'umd', devtoolModuleFilenameTemplate: 'webpack-terminus-core:///[resource-path]', }, - mode: process.env.DEV ? 'development' : 'production', + mode: process.env.TERMINUS_DEV ? 'development' : 'production', optimization:{ minimize: false, }, diff --git a/terminus-plugin-manager/webpack.config.js b/terminus-plugin-manager/webpack.config.js index 3cb34854..b5f86394 100644 --- a/terminus-plugin-manager/webpack.config.js +++ b/terminus-plugin-manager/webpack.config.js @@ -13,7 +13,7 @@ module.exports = { libraryTarget: 'umd', devtoolModuleFilenameTemplate: 'webpack-terminus-plugin-manager:///[resource-path]', }, - mode: process.env.DEV ? 'development' : 'production', + mode: process.env.TERMINUS_DEV ? 'development' : 'production', optimization:{ minimize: false, }, diff --git a/terminus-settings/webpack.config.js b/terminus-settings/webpack.config.js index 49376b28..e53cda9b 100644 --- a/terminus-settings/webpack.config.js +++ b/terminus-settings/webpack.config.js @@ -14,7 +14,7 @@ module.exports = { libraryTarget: 'umd', devtoolModuleFilenameTemplate: 'webpack-terminus-settings:///[resource-path]', }, - mode: process.env.DEV ? 'development' : 'production', + mode: process.env.TERMINUS_DEV ? 'development' : 'production', optimization:{ minimize: false, }, diff --git a/terminus-ssh/webpack.config.js b/terminus-ssh/webpack.config.js index 5b93c9c9..ecb6c27f 100644 --- a/terminus-ssh/webpack.config.js +++ b/terminus-ssh/webpack.config.js @@ -12,7 +12,7 @@ module.exports = { libraryTarget: 'umd', devtoolModuleFilenameTemplate: 'webpack-terminus-ssh:///[resource-path]', }, - mode: process.env.DEV ? 'development' : 'production', + mode: process.env.TERMINUS_DEV ? 'development' : 'production', optimization:{ minimize: false, }, diff --git a/terminus-terminal/src/buttonProvider.ts b/terminus-terminal/src/buttonProvider.ts index b37b39bb..52fe6c14 100644 --- a/terminus-terminal/src/buttonProvider.ts +++ b/terminus-terminal/src/buttonProvider.ts @@ -15,7 +15,7 @@ export class ButtonProvider extends ToolbarButtonProvider { hotkeys: HotkeysService, ) { super() - if (!electron.remote.process.env.DEV) { + if (!electron.remote.process.env.TERMINUS_DEV) { setImmediate(async () => { let argv: string[] = electron.remote.process.argv for (let arg of argv.slice(1).concat([electron.remote.process.argv0])) { diff --git a/terminus-terminal/src/services/uac.service.ts b/terminus-terminal/src/services/uac.service.ts index 8e27be23..c6eef136 100644 --- a/terminus-terminal/src/services/uac.service.ts +++ b/terminus-terminal/src/services/uac.service.ts @@ -25,7 +25,7 @@ export class UACService { 'UAC.exe', ) - if (process.env.DEV) { + if (process.env.TERMINUS_DEV) { helperPath = path.join( path.dirname(this.electron.app.getPath('exe')), '..', '..', '..', diff --git a/terminus-terminal/webpack.config.js b/terminus-terminal/webpack.config.js index 9bdda29a..7e4c4fce 100644 --- a/terminus-terminal/webpack.config.js +++ b/terminus-terminal/webpack.config.js @@ -13,7 +13,7 @@ module.exports = { libraryTarget: 'umd', devtoolModuleFilenameTemplate: 'webpack-terminus-terminal:///[resource-path]', }, - mode: process.env.DEV ? 'development' : 'production', + mode: process.env.TERMINUS_DEV ? 'development' : 'production', optimization: { minimize: false, }, -- GitLab