Skip to content

Commit 5a0d5f8

Browse files
committed
Removed test config options
1 parent 94dbd87 commit 5a0d5f8

File tree

2 files changed

+7
-24
lines changed

2 files changed

+7
-24
lines changed

core/nut.js/lib/constants.ts

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,4 @@ export const DISABLE_DEFAULT_MOUSE_PROVIDER_ENV_VAR =
99
export const DISABLE_DEFAULT_SCREEN_PROVIDER_ENV_VAR =
1010
"NUT_JS_DISABLE_DEFAULT_SCREEN_PROVIDER";
1111
export const DISABLE_DEFAULT_WINDOW_PROVIDER_ENV_VAR =
12-
"NUT_JS_DISABLE_DEFAULT_WINDOW_PROVIDER";
13-
export const NPM_CONFIG_DISABLE_DEFAULT_PROVIDERS_ENV_VAR =
14-
"npm_package_config_nut.js_disableDefaultProviders";
15-
export const NPM_CONFIG_DISABLE_DEFAULT_CLIPBOARD_PROVIDER_ENV_VAR =
16-
"npm_package_config_nut.js_disableClipboardProvider";
17-
export const NPM_CONFIG_DISABLE_DEFAULT_KEYBOARD_PROVIDER_ENV_VAR =
18-
"npm_package_config_nut.js_disableKeyboardProvider";
19-
export const NPM_CONFIG_DISABLE_DEFAULT_MOUSE_PROVIDER_ENV_VAR =
20-
"npm_package_config_nut.js_disableMouseProvider";
21-
export const NPM_CONFIG_DISABLE_DEFAULT_SCREEN_PROVIDER_ENV_VAR =
22-
"npm_package_config_nut.js_disableScreenProvider";
23-
export const NPM_CONFIG_DISABLE_DEFAULT_WINDOW_PROVIDER_ENV_VAR =
24-
"npm_package_config_nut.js_disableWindowProvider";
12+
"NUT_JS_DISABLE_DEFAULT_WINDOW_PROVIDER";

core/nut.js/lib/provider/provider-registry.class.ts

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,7 @@ import {
2626
DISABLE_DEFAULT_MOUSE_PROVIDER_ENV_VAR,
2727
DISABLE_DEFAULT_PROVIDERS_ENV_VAR,
2828
DISABLE_DEFAULT_SCREEN_PROVIDER_ENV_VAR,
29-
DISABLE_DEFAULT_WINDOW_PROVIDER_ENV_VAR,
30-
NPM_CONFIG_DISABLE_DEFAULT_CLIPBOARD_PROVIDER_ENV_VAR,
31-
NPM_CONFIG_DISABLE_DEFAULT_KEYBOARD_PROVIDER_ENV_VAR,
32-
NPM_CONFIG_DISABLE_DEFAULT_MOUSE_PROVIDER_ENV_VAR,
33-
NPM_CONFIG_DISABLE_DEFAULT_SCREEN_PROVIDER_ENV_VAR,
34-
NPM_CONFIG_DISABLE_DEFAULT_WINDOW_PROVIDER_ENV_VAR
29+
DISABLE_DEFAULT_WINDOW_PROVIDER_ENV_VAR
3530
} from "../constants";
3631
import { wrapLogger } from "./log/wrap-logger.function";
3732

@@ -295,23 +290,23 @@ providerRegistry.registerColorFinder(new ColorFinderImpl());
295290
providerRegistry.registerLogProvider(new NoopLogProvider());
296291

297292
if (!process.env[DISABLE_DEFAULT_PROVIDERS_ENV_VAR]) {
298-
if (!process.env[DISABLE_DEFAULT_CLIPBOARD_PROVIDER_ENV_VAR] && !process.env[NPM_CONFIG_DISABLE_DEFAULT_CLIPBOARD_PROVIDER_ENV_VAR]) {
293+
if (!process.env[DISABLE_DEFAULT_CLIPBOARD_PROVIDER_ENV_VAR]) {
299294
const Clipboard = require("@nut-tree/default-clipboard-provider").default;
300295
providerRegistry.registerClipboardProvider(new Clipboard());
301296
}
302-
if (!process.env[DISABLE_DEFAULT_KEYBOARD_PROVIDER_ENV_VAR] && !process.env[NPM_CONFIG_DISABLE_DEFAULT_KEYBOARD_PROVIDER_ENV_VAR]) {
297+
if (!process.env[DISABLE_DEFAULT_KEYBOARD_PROVIDER_ENV_VAR]) {
303298
const { DefaultKeyboardAction } = require("@nut-tree/libnut");
304299
providerRegistry.registerKeyboardProvider(new DefaultKeyboardAction());
305300
}
306-
if (!process.env[DISABLE_DEFAULT_MOUSE_PROVIDER_ENV_VAR] && !process.env[NPM_CONFIG_DISABLE_DEFAULT_MOUSE_PROVIDER_ENV_VAR]) {
301+
if (!process.env[DISABLE_DEFAULT_MOUSE_PROVIDER_ENV_VAR]) {
307302
const { DefaultMouseAction } = require("@nut-tree/libnut");
308303
providerRegistry.registerMouseProvider(new DefaultMouseAction());
309304
}
310-
if (!process.env[DISABLE_DEFAULT_SCREEN_PROVIDER_ENV_VAR] && !process.env[NPM_CONFIG_DISABLE_DEFAULT_SCREEN_PROVIDER_ENV_VAR]) {
305+
if (!process.env[DISABLE_DEFAULT_SCREEN_PROVIDER_ENV_VAR]) {
311306
const { DefaultScreenAction } = require("@nut-tree/libnut");
312307
providerRegistry.registerScreenProvider(new DefaultScreenAction());
313308
}
314-
if (!process.env[DISABLE_DEFAULT_WINDOW_PROVIDER_ENV_VAR] && !process.env[NPM_CONFIG_DISABLE_DEFAULT_WINDOW_PROVIDER_ENV_VAR]) {
309+
if (!process.env[DISABLE_DEFAULT_WINDOW_PROVIDER_ENV_VAR]) {
315310
const { DefaultWindowAction } = require("@nut-tree/libnut");
316311
providerRegistry.registerWindowProvider(new DefaultWindowAction());
317312
}

0 commit comments

Comments
 (0)