Skip to content

Commit 82917f8

Browse files
upgrading packages and cleaning up logging (#150)
* upgrading packages and cleaning up logging * updating THIRD_PARTY_LICENSES for future release
1 parent 7ff104c commit 82917f8

16 files changed

+917
-822
lines changed

THIRD_PARTY_LICENSES.txt

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Copyright (c) 2013 Brian J. Brennan
6363
6464
Copyright (c) 2016, 2018 Linus Unnebäck
6565

66-
66+
6767
Copyright (c) 2015 Loopline Systems
6868

6969
@@ -84,7 +84,7 @@ Copyright (c) 2015 Arnout Kazemier, Martijn Swaagman, the Contributors.
8484
8585
Copyright Node.js contributors. All rights reserved.
8686

87-
87+
8888
Copyright (c) 2014-2017 TJ Holowaychuk <[email protected]>
8989
Copyright (c) 2018-2021 Josh Junon
9090

@@ -100,7 +100,7 @@ Copyright (c) 2015 TJ Holowaychuk <[email protected]>
100100
101101
Copyright (c) 2014 Mathias Buus
102102

103-
103+
104104
Copyright (c) 2015 Loopline Systems
105105

106106
@@ -143,10 +143,10 @@ Copyright (c) 2016 Mathias Buus
143143
144144
Copyright (C) 2011-2014 by Jorik Tangelder (Eight Media)
145145

146-
146+
147147
Copyright (c) 2013 Nathan Rajlich <[email protected]>
148148

149-
i18next@21.6.14
149+
i18next@21.8.14
150150
Copyright (c) 2022 i18next
151151

152152
@@ -226,7 +226,7 @@ Copyright James Halliday ([email protected]) and Isaac Z. Schlueter ([email protected])
226226
227227
Copyright (c) 2020 James Halliday ([email protected]) and Mathias Buus
228228

229-
229+
230230
Copyright (c) JS Foundation and other contributors
231231

232232
@@ -298,8 +298,8 @@ Copyright (c) Feross Aboukhadijeh
298298
299299
Copyright (c) Ruben Bridgewater
300300

301-
set-immediate-shim@1.0.1
302-
Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
301+
setimmediate@1.0.5
302+
Copyright (c) 2012 Barnesandnoble.com, llc, Donavon West, and Domenic Denicola
303303

304304
305305
No Copyright
@@ -349,6 +349,9 @@ Copyright (c) Sebastian Mayr
349349
350350
Copyright (c) 2017 winstonjs
351351

352+
353+
Copyright (c) 2018 Andy Wermke
354+
352355
353356
Copyright (c) 2017, Ryan Zimmerman <[email protected]>
354357

@@ -361,10 +364,10 @@ Copyright (c) 2010-2020 Robert Kieffer and other contributors
361364
362365
Copyright (c) 2015–2016 Sebastian Mayr
363366

364-
winston@3.6.0
367+
winston@3.8.1
365368
Copyright (c) 2010 Charlie Robbins
366369

367-
winston-daily-rotate-file@4.6.1
370+
winston-daily-rotate-file@4.7.1
368371
Copyright (c) 2015 winstonjs
369372

370373
@@ -939,7 +942,7 @@ redistribute it freely, subject to the following restrictions:
939942

940943
The following packages are licensed under (MIT OR GPL-3.0-or-later):
941944

942-
jszip@3.7.1
945+
jszip@3.10.0
943946
Copyright (c) 2009-2016 Stuart Knightley, David Duponchel, Franz Buchinger, António Afonso
944947

945948

@@ -2065,7 +2068,7 @@ POSSIBILITY OF SUCH DAMAGE.
20652068

20662069
The following packages are licensed under The Universal Permissive License (UPL), Version 1.0:
20672070

2068-
2071+
20692072
Copyright (c) 2022 Oracle and/or its affiliates.
20702073

20712074
@@ -2224,14 +2227,14 @@ Copyright (c) 2014-present Sebastian McKenzie and other contributors
22242227
22252228
Copyright JS Foundation and other contributors
22262229

2227-
@electron/get@1.13.1
2230+
@electron/get@1.14.1
22282231
Copyright (c) Contributors to the Electron project
22292232

22302233
22312234
No Copyright
22322235

2233-
@eslint/eslintrc@1.2.1
2234-
Copyright (c) 2020 ESLint
2236+
@eslint/eslintrc@1.3.0
2237+
Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
22352238

22362239
@istanbuljs/[email protected]
22372240
Copyright (c) 2019 CFWare, LLC
@@ -2281,7 +2284,7 @@ Copyright (c) Microsoft Corporation.
22812284
22822285
Copyright (c) Microsoft Corporation. All rights reserved.
22832286

2284-
@types/node@14.18.20
2287+
@types/node@16.11.45
22852288
Copyright (c) Microsoft Corporation.
22862289

22872290
@@ -2309,8 +2312,8 @@ [email protected]
23092312
Copyright (c) 2014 Jonathan Ong <[email protected]>
23102313
Copyright (c) 2015 Douglas Christopher Wilson <[email protected]>
23112314

2312-
2313-
Copyright (C) 2012-2020 by various contributors (see AUTHORS)
2315+
2316+
Copyright (C) 2012-2022 by various contributors (see AUTHORS)
23142317

23152318
23162319
Copyright (C) 2012-2018 by various contributors (see AUTHORS)
@@ -2354,7 +2357,7 @@ Copyright (c) Sindre Sorhus <[email protected]> (sindresorhus.com)
23542357
23552358
Copyright (c) 2015 Loopline Systems
23562359

2357-
app-builder-lib@23.1.0
2360+
app-builder-lib@23.3.1
23582361
Copyright (c) 2015 Loopline Systems
23592362

23602363
@@ -2445,10 +2448,10 @@ No Copyright
24452448
24462449
Copyright (c) 2016, 2018 Linus Unnebäck
24472450

2448-
builder-util@23.0.9
2451+
builder-util@23.3.0
24492452
Copyright (c) 2015 Loopline Systems
24502453

2451-
2454+
24522455
Copyright (c) 2015 Loopline Systems
24532456

24542457
@@ -2488,7 +2491,7 @@ Copyright (c) 2012-2019 Paul Miller (https://paulmillr.com), Elan Shanker
24882491
24892492
No Copyright
24902493

2491-
2494+
24922495
Copyright (c) 2016-2021 Thomas Watson Steen
24932496

24942497
@@ -2587,10 +2590,10 @@ Copyright (c) Nikita Vasilyev
25872590
25882591
Copyright (c) Chad Walker
25892592

2590-
2593+
25912594
Copyright © Domenic Denicola <[email protected]>
25922595

2593-
2596+
25942597
Copyright (c) 2014-2017 TJ Holowaychuk <[email protected]>
25952598
Copyright (c) 2018-2021 Josh Junon
25962599

@@ -2638,7 +2641,7 @@ Copyright 2014 Liviu Grigorescu ([email protected])
26382641
26392642
Copyright (c) Kevin Mårtensson <[email protected]> (github.com/kevva)
26402643

2641-
dmg-builder@23.1.0
2644+
dmg-builder@23.3.1
26422645
Copyright (c) 2015 Loopline Systems
26432646

26442647
@@ -2653,17 +2656,17 @@ Copyright (c) Sindre Sorhus <[email protected]> (sindresorhus.com)
26532656
26542657
Copyright (c) 2014 Jonathan Ong [email protected]
26552658

2656-
electron@17.4.3
2659+
electron@19.0.8
26572660
Copyright (c) Electron contributors
26582661
Copyright (c) 2013-2020 GitHub Inc.
26592662

2660-
electron-builder@23.1.0
2663+
electron-builder@23.3.1
26612664
Copyright (c) 2015 Loopline Systems
26622665

2663-
electron-notarize@1.1.1
2666+
electron-notarize@1.2.1
26642667
Copyright 2018 Samuel Attard and contributors
26652668

2666-
electron-publish@23.0.9
2669+
electron-publish@23.3.0
26672670
Copyright (c) 2015 Loopline Systems
26682671

26692672
@@ -2698,7 +2701,7 @@ Copyright (c) 2015 Tiancheng "Timothy" Gu
26982701
26992702
Copyright (c) Sindre Sorhus <[email protected]> (https://sindresorhus.com)
27002703

2701-
eslint@8.11.0
2704+
eslint@8.19.0
27022705
Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
27032706

27042707
@@ -2810,7 +2813,7 @@ Copyright (c) Sindre Sorhus <[email protected]> (https://sindresorhus.com)
28102813
28112814
Copyright (c) Sindre Sorhus <[email protected]> (https://sindresorhus.com)
28122815

2813-
globals@13.13.0
2816+
globals@13.16.0
28142817
Copyright (c) Sindre Sorhus <[email protected]> (https://sindresorhus.com)
28152818

28162819
@@ -2822,10 +2825,6 @@ Copyright (c) 2018 "Cowboy" Ben Alman
28222825
28232826
Copyright (c) Sindre Sorhus <[email protected]> (sindresorhus.com)
28242827

2825-
2826-
Copyright (c) 2009 TJ Holowaychuk [email protected]
2827-
Copyright (c) 2016 Joshua Boy Nicolai Appelman [email protected]
2828-
28292828
28302829
Copyright (c) 2013 Thiago de Arruda
28312830

@@ -2866,7 +2865,7 @@ Copyright (c) 2013 Nathan Rajlich <[email protected]>
28662865
28672866
Copyright (c) 2014 Forbes Lindesay
28682867

2869-
2868+
28702869
Copyright (c) 2013 Nathan Rajlich <[email protected]>
28712870

28722871
@@ -2971,7 +2970,7 @@ Copyright (c) 2014, 2015, 2016, 2017, 2018 Simon Lydell
29712970
29722971
Copyright (C) 2011-2015 by Vitaly Puzrin
29732972

2974-
jsdom@19.0.0
2973+
jsdom@20.0.0
29752974
Copyright (c) 2010 Elijah Insua
29762975

29772976
@@ -3128,7 +3127,7 @@ Copyright James Halliday ([email protected]) and Isaac Z. Schlueter ([email protected])
31283127
31293128
Copyright 2010 James Halliday ([email protected])
31303129

3131-
mocha@9.2.2
3130+
mocha@10.0.0
31323131
Copyright (c) 2011-2022 OpenJS Foundation and contributors, https://openjsf.org
31333132

31343133
@@ -3148,7 +3147,7 @@ Copyright (c) 2014 Douglas Christopher Wilson
31483147
31493148
Copyright 2021 Jorge Bucaran <[email protected]>,
31503149

3151-
3150+
31523151
Copyright 2017 Andrey Sitnik <[email protected]>
31533152

31543153
@@ -3211,7 +3210,7 @@ Copyright (c) Sindre Sorhus <[email protected]> (sindresorhus.com)
32113210
32123211
Copyright (c) Sindre Sorhus <[email protected]> (sindresorhus.com)
32133212

3214-
parse5@6.0.1
3213+
parse5@7.0.0
32153214
Copyright (c) 2013-2019 Ivan Nikulin ([email protected], https://github.com/inikulin)
32163215

32173216
@@ -3251,7 +3250,7 @@ Copyright (c) 2017-present, Jon Schlinkert.
32513250
32523251
Copyright (c) Sindre Sorhus <[email protected]> (sindresorhus.com)
32533252

3254-
3253+
32553254
Copyright (c) 2010-2017 Nathan Rajlich <[email protected]>
32563255

32573256
@@ -3559,7 +3558,7 @@ Copyright © Domenic Denicola <[email protected]>
35593558
35603559
Copyright © Domenic Denicola <[email protected]>
35613560

3562-
whatwg-url@10.0.0
3561+
whatwg-url@11.0.0
35633562
Copyright (c) Sebastian Mayr
35643563

35653564
@@ -3571,7 +3570,7 @@ Copyright (c) 2014-2017, Jon Schlinkert
35713570
35723571
Copyright (c) Sindre Sorhus <[email protected]> (https://sindresorhus.com)
35733572

3574-
ws@8.5.0
3573+
ws@8.8.1
35753574
Copyright (c) 2011 Einar Otto Stangvik <[email protected]>
35763575

35773576
@@ -3776,7 +3775,7 @@ Copyright (c) Isaac Z. Schlueter and Contributors
37763775
37773776
Copyright (c) Isaac Z. Schlueter and Contributors
37783777

3779-
saxes@5.0.1
3778+
saxes@6.0.0
37803779
Copyright (c) Contributors
37813780

37823781
@@ -3879,7 +3878,7 @@ [email protected]
38793878
Copyright JS Foundation and other contributors, https://js.foundation
38803879
Copyright (C) 2012-2013 Yusuke Suzuki (twitter: @Constellation) and other contributors.
38813880

3882-
3881+
38833882
Copyright (c) Open JS Foundation
38843883

38853884
@@ -3953,7 +3952,7 @@ The following packages are licensed under The 3-Clause BSD License, Version 2.0:
39533952
@humanwhocodes/[email protected]
39543953
Copyright (c) 2019, Human Who Codes
39553954

3956-
3955+
39573956
Copyright © 2019 W3C and Jeff Carpenter \<[email protected]\>
39583957

39593958
@@ -4103,7 +4102,7 @@ Copyright 2010-2020 James Coglan
41034102
41044103
Copyright 2014-2020 James Coglan
41054104

4106-
4105+
41074106
Copyright (C) 2014-2020 Jos de Jong [email protected]
41084107

41094108

electron/app/js/childProcessExecutor.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,11 @@ function spawnDaemonChildProcess(executable, argList, env, extraOptions = {}, {
5353
const command = workaroundNodeJsIssue38490(shell, executable, argList);
5454
const options = getSpawnOptions(env, shell, detached, windowHide, extraOptions);
5555

56-
getLogger().debug('Spawning daemon process %s with arguments %s and options %s',
57-
command.executable, command.argList, JSON.stringify(options));
56+
const wktLogger = getLogger();
57+
if (wktLogger.isDebugEnabled()) {
58+
wktLogger.debug('Spawning daemon process %s with arguments %s and options %s',
59+
command.executable, command.argList, JSON.stringify(options));
60+
}
5861
return spawn(command.executable, command.argList, options);
5962
}
6063

@@ -96,9 +99,10 @@ async function streamChildOutput(currentWindow, outputStream, eventName) {
9699
}
97100

98101
async function executeFileCommand(fileName, args, env, containsCredentials) {
102+
const wktLogger = getLogger();
99103
return new Promise((resolve, reject) => {
100-
if (!containsCredentials) {
101-
getLogger().debug('Executing %s with arguments %s and environment %s', fileName, args, env ? JSON.stringify(env) : '<none>');
104+
if (!containsCredentials && wktLogger.isDebugEnabled()) {
105+
wktLogger.debug('Executing %s with arguments %s and environment %s', fileName, args, env ? JSON.stringify(env) : '<none>');
102106
}
103107
const options = { windowsHide: true };
104108
if (env) {
@@ -117,7 +121,11 @@ async function executeScriptCommand(fileName, args, env) {
117121
}
118122

119123
const command = formatScriptCommand(fileName, args);
120-
getLogger().debug('Executing %s with environment variables %s', command, JSON.stringify(env));
124+
const wktLogger = getLogger();
125+
if (wktLogger.isDebugEnabled()) {
126+
wktLogger.debug('Executing %s with environment variables %s', command, JSON.stringify(env));
127+
}
128+
121129
exec(command, options, (err, stdout, stderr) => execCallback(fileName, resolve, reject, err, stdout, stderr));
122130
});
123131
}

0 commit comments

Comments
 (0)