From 8dc28c52812e70e3e01f68350884fa30e69672c1 Mon Sep 17 00:00:00 2001 From: Yuriy Zaitsev Date: Tue, 4 Mar 2025 09:37:29 +0300 Subject: [PATCH 1/2] fix whitespace module execSync under Windows whih no shebang --- packages/eslint-config-airbnb-base/whitespace.js | 7 ++++++- packages/eslint-config-airbnb/whitespace.js | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/eslint-config-airbnb-base/whitespace.js b/packages/eslint-config-airbnb-base/whitespace.js index 01e5198671..38210a5696 100644 --- a/packages/eslint-config-airbnb-base/whitespace.js +++ b/packages/eslint-config-airbnb-base/whitespace.js @@ -50,9 +50,14 @@ if (CLIEngine) { } else { const path = require('path'); const { execSync } = require('child_process'); + const isWindows = process.platform === 'win32'; + const whitespaceAsyncPath = path.join(__dirname, 'whitespace-async.js'); + const execSyncCommand = isWindows ? `node ${whitespaceAsyncPath}` : whitespaceAsyncPath; + const execSyncOptions = isWindows ? { windowsHide: true, stdio: 'inherit' } : {}; // NOTE: ESLint adds runtime statistics to the output (so it's no longer JSON) if TIMING is set - module.exports = JSON.parse(String(execSync(path.join(__dirname, 'whitespace-async.js'), { + module.exports = JSON.parse(String(execSync(execSyncCommand, { + ...execSyncOptions, env: { ...process.env, TIMING: undefined, diff --git a/packages/eslint-config-airbnb/whitespace.js b/packages/eslint-config-airbnb/whitespace.js index 01e5198671..38210a5696 100644 --- a/packages/eslint-config-airbnb/whitespace.js +++ b/packages/eslint-config-airbnb/whitespace.js @@ -50,9 +50,14 @@ if (CLIEngine) { } else { const path = require('path'); const { execSync } = require('child_process'); + const isWindows = process.platform === 'win32'; + const whitespaceAsyncPath = path.join(__dirname, 'whitespace-async.js'); + const execSyncCommand = isWindows ? `node ${whitespaceAsyncPath}` : whitespaceAsyncPath; + const execSyncOptions = isWindows ? { windowsHide: true, stdio: 'inherit' } : {}; // NOTE: ESLint adds runtime statistics to the output (so it's no longer JSON) if TIMING is set - module.exports = JSON.parse(String(execSync(path.join(__dirname, 'whitespace-async.js'), { + module.exports = JSON.parse(String(execSync(execSyncCommand, { + ...execSyncOptions, env: { ...process.env, TIMING: undefined, From ea10c71403ef81b1380aa581a6abb39fc30dfbfc Mon Sep 17 00:00:00 2001 From: Yuriy Zaitsev Date: Tue, 4 Mar 2025 09:48:11 +0300 Subject: [PATCH 2/2] stdio wasn't initially defined and windowsHide will be ignored under non-Windows systems --- packages/eslint-config-airbnb-base/whitespace.js | 3 +-- packages/eslint-config-airbnb/whitespace.js | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/eslint-config-airbnb-base/whitespace.js b/packages/eslint-config-airbnb-base/whitespace.js index 38210a5696..7fe6502bda 100644 --- a/packages/eslint-config-airbnb-base/whitespace.js +++ b/packages/eslint-config-airbnb-base/whitespace.js @@ -53,11 +53,10 @@ if (CLIEngine) { const isWindows = process.platform === 'win32'; const whitespaceAsyncPath = path.join(__dirname, 'whitespace-async.js'); const execSyncCommand = isWindows ? `node ${whitespaceAsyncPath}` : whitespaceAsyncPath; - const execSyncOptions = isWindows ? { windowsHide: true, stdio: 'inherit' } : {}; // NOTE: ESLint adds runtime statistics to the output (so it's no longer JSON) if TIMING is set module.exports = JSON.parse(String(execSync(execSyncCommand, { - ...execSyncOptions, + windowsHide: true, env: { ...process.env, TIMING: undefined, diff --git a/packages/eslint-config-airbnb/whitespace.js b/packages/eslint-config-airbnb/whitespace.js index 38210a5696..7fe6502bda 100644 --- a/packages/eslint-config-airbnb/whitespace.js +++ b/packages/eslint-config-airbnb/whitespace.js @@ -53,11 +53,10 @@ if (CLIEngine) { const isWindows = process.platform === 'win32'; const whitespaceAsyncPath = path.join(__dirname, 'whitespace-async.js'); const execSyncCommand = isWindows ? `node ${whitespaceAsyncPath}` : whitespaceAsyncPath; - const execSyncOptions = isWindows ? { windowsHide: true, stdio: 'inherit' } : {}; // NOTE: ESLint adds runtime statistics to the output (so it's no longer JSON) if TIMING is set module.exports = JSON.parse(String(execSync(execSyncCommand, { - ...execSyncOptions, + windowsHide: true, env: { ...process.env, TIMING: undefined,